From 0ecce6abf2f4f584b11c8ec9ad7d085d6249fe1e Mon Sep 17 00:00:00 2001 From: Markus Larsson <82539179+MarkusLarsson421@users.noreply.github.com> Date: Sun, 1 Sep 2024 21:46:38 +0200 Subject: [PATCH 01/58] Added Efficiency Board to be Printable (#11400) * added efficiency board * Update AI_module_designs.dm --- code/modules/research/designs/AI_module_designs.dm | 11 ++++++++++- code/modules/research/techweb/all_nodes.dm | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm index c0d09b3f44616..e41e7d00f75fe 100644 --- a/code/modules/research/designs/AI_module_designs.dm +++ b/code/modules/research/designs/AI_module_designs.dm @@ -146,8 +146,17 @@ category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE +/datum/design/board/efficiency + name = "Core Module Design (Efficiency)" + desc = "Allows for the construction of a Corporate AI Core Module." + id = "maintain_module" + materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/copper = 300) + build_path = /obj/item/aiModule/core/full/maintain + category = list("AI Modules") + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + /datum/design/board/default_module - name = "Core Module Design (Default)" + name = "Core Module Design (Crewsimov)" desc = "Allows for the construction of a Default AI Core Module." id = "default_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/copper = 300) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index c09d4bc52451f..01e4fa09b090a 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -986,6 +986,7 @@ "asimov_module", "borg_ai_control", "corporate_module", + "maintain_module", "default_module", "freeform_module", "freeformcore_module", @@ -2265,7 +2266,7 @@ ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000, TECHWEB_POINT_TYPE_NANITES = 1000) export_price = 5000 - + /datum/techweb_node/nanite_cc id = "nanite_cc" tech_tier = 5 From 10064ce3134d672b5a5f5f14691fd313fa75a294 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sun, 1 Sep 2024 14:56:15 -0500 Subject: [PATCH 02/58] Automatic changelog generation for PR #11400 [ci skip] --- html/changelogs/AutoChangeLog-pr-11400.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11400.yml diff --git a/html/changelogs/AutoChangeLog-pr-11400.yml b/html/changelogs/AutoChangeLog-pr-11400.yml new file mode 100644 index 0000000000000..4dae8d333e7c3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11400.yml @@ -0,0 +1,5 @@ +author: MarkusLarsson421 +delete-after: true +changes: + - bugfix: Fixed so that Efficiency Law board can be printed. + - tweak: Changed the name of the Crewsimov board from "Default" to "Crewsimov". From 9044378233f4e3450973c21d5f617f6658cb1517 Mon Sep 17 00:00:00 2001 From: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com> Date: Sun, 1 Sep 2024 15:48:37 -0400 Subject: [PATCH 03/58] Adds stamina damage to 'jumping' (#11396) * flop * 15 --- code/modules/multiz/movement/mob/living_zmove.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/multiz/movement/mob/living_zmove.dm b/code/modules/multiz/movement/mob/living_zmove.dm index 4c8ddb00b9809..60c33b8596dac 100644 --- a/code/modules/multiz/movement/mob/living_zmove.dm +++ b/code/modules/multiz/movement/mob/living_zmove.dm @@ -64,6 +64,7 @@ if(MOVETYPE_NONE_JUMP) visible_message("[src] jumps into the air, as if [p_they()] expected to float... Gravity pulls [p_them()] back down quickly.", "You try jumping into the space above you. Gravity pulls you back down quickly.") do_jump_animation() + adjustStaminaLoss(15, forced = TRUE) return FALSE if(MOVETYPE_JAUNT) move_verb = "moving" From eb7be77ec18e84053db7cd38f56a743a5e1e57ca Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sun, 1 Sep 2024 15:05:47 -0500 Subject: [PATCH 04/58] Automatic changelog generation for PR #11396 [ci skip] --- html/changelogs/AutoChangeLog-pr-11396.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11396.yml diff --git a/html/changelogs/AutoChangeLog-pr-11396.yml b/html/changelogs/AutoChangeLog-pr-11396.yml new file mode 100644 index 0000000000000..d8fe566a589de --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11396.yml @@ -0,0 +1,5 @@ +author: rkz +delete-after: true +changes: + - tweak: 15 base stamina damage is dealt every time a failed jump is attempted on + a multi-z map From 04a150b453909aac28f32e8ce0031c69d70855cb Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sun, 1 Sep 2024 21:03:34 +0000 Subject: [PATCH 05/58] Automatic changelog compile [ci skip] --- html/changelog.html | 9 +++++++++ html/changelogs/.all_changelog.yml | 6 ++++++ html/changelogs/AutoChangeLog-pr-11396.yml | 5 ----- html/changelogs/AutoChangeLog-pr-11400.yml | 5 ----- 4 files changed, 15 insertions(+), 10 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11396.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-11400.yml diff --git a/html/changelog.html b/html/changelog.html index 0625918f87318..e8bd90f8ef904 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -61,6 +61,11 @@

Aramix updated:

+

MarkusLarsson421 updated:

+

Penwin0 updated:

+

rkz updated:

+

31 August 2024

PowerfulBacon updated:

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 83dddae61347a..867cc18ebc8ae 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44049,6 +44049,9 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2024-09-01: Aramix: - tweak: pacified all pets spawned by Xenobiology's Stabilized Gold + MarkusLarsson421: + - bugfix: Fixed so that Efficiency Law board can be printed. + - tweak: Changed the name of the Crewsimov board from "Default" to "Crewsimov". Penwin0: - bugfix: Plague Doctor hat no longer covers the face and doesn't look like a biohood when held. @@ -44057,3 +44060,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. XeonMations: - tweak: Bodybags can no longer be heirlooms. - tweak: Medical flashlight pens, scalpels and suit sensors can now be heirlooms. + rkz: + - tweak: 15 base stamina damage is dealt every time a failed jump is attempted on + a multi-z map diff --git a/html/changelogs/AutoChangeLog-pr-11396.yml b/html/changelogs/AutoChangeLog-pr-11396.yml deleted file mode 100644 index d8fe566a589de..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11396.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: rkz -delete-after: true -changes: - - tweak: 15 base stamina damage is dealt every time a failed jump is attempted on - a multi-z map diff --git a/html/changelogs/AutoChangeLog-pr-11400.yml b/html/changelogs/AutoChangeLog-pr-11400.yml deleted file mode 100644 index 4dae8d333e7c3..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11400.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: MarkusLarsson421 -delete-after: true -changes: - - bugfix: Fixed so that Efficiency Law board can be printed. - - tweak: Changed the name of the Crewsimov board from "Default" to "Crewsimov". From 3ae78637db91c28e8ced389737d6f42ef0c52d73 Mon Sep 17 00:00:00 2001 From: Rukofamicom Date: Mon, 2 Sep 2024 01:47:01 -0500 Subject: [PATCH 06/58] Rare Ruko mining buff spotted! (#11413) * PKA mods cost 0, 25, or 50. No more 30/35 * Elite lavaland shards now poll ghosts for control * Update elite.dm * Adds concussive gauntlets to necropolis chest loot * Replaces diamond pickaxe with gauntlets * Updates outdated stuff * Removes the RNG from gibtonite * Tweaks AoE and fixes oversight in damage mod * Cleans up a lot of code * Expands webbing --- code/game/objects/items/storage/belt.dm | 6 +- code/game/turfs/closed/minerals.dm | 4 - .../mining/lavaland/necropolis_chests.dm | 41 ++++++- code/modules/mining/machine_vending.dm | 1 - .../hostile/mining_mobs/elites/elite.dm | 16 ++- .../guns/energy/kinetic_accelerator.dm | 102 ++++++++---------- icons/mob/clothing/hands.dmi | Bin 11014 -> 11902 bytes icons/obj/clothing/gloves.dmi | Bin 16907 -> 18339 bytes 8 files changed, 101 insertions(+), 69 deletions(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 5be91934e8016..20589f52313a8 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -385,6 +385,7 @@ /obj/item/resonator, /obj/item/mining_scanner, /obj/item/pickaxe, + /obj/item/shovel, /obj/item/stack/sheet/animalhide, /obj/item/stack/sheet/sinew, /obj/item/stack/sheet/bone, @@ -392,7 +393,8 @@ /obj/item/storage/fancy/cigarettes, /obj/item/reagent_containers/food/drinks/bottle, /obj/item/stack/medical, - /obj/item/knife/kitchen, + /obj/item/knife/combat/survival, + /obj/item/tank/internals/emergency_oxygen, /obj/item/reagent_containers/hypospray, /obj/item/gps, /obj/item/storage/bag/ore, @@ -411,6 +413,8 @@ /obj/item/skeleton_key, /obj/item/discovery_scanner, /obj/item/gun/energy/e_gun/mini/exploration, + /obj/item/gun/energy/kinetic_accelerator, + /obj/item/gun/energy/plasmacutter, /obj/item/grenade/exploration, /obj/item/exploration_detonator, /obj/item/research_disk_pinpointer diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index 079a3de486990..471dc4d0c96bd 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -521,10 +521,6 @@ var/activated_name = null var/mutable_appearance/activated_overlay -/turf/closed/mineral/gibtonite/Initialize(mapload) - det_time = rand(8,10) //So you don't know exactly when the hot potato will explode - . = ..() - /turf/closed/mineral/gibtonite/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner) && stage == 1) user.visible_message("[user] holds [I] to [src]...", "You use [I] to locate where to cut off the chain reaction and attempt to stop it...") diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 936e5c2db5ef3..7d5dc9a9181af 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -34,7 +34,7 @@ /obj/structure/closet/crate/necropolis/tendril/try_spawn_loot(datum/source, obj/item/item, mob/user, params) ///proc that handles key checking and generating loot - MAY REPLACE WITH pick_weight(loot) var/static/list/necropolis_goodies = list( //weights to be defined later on, for now they're all the same /obj/item/clothing/glasses/godeye = 5, - /obj/item/pickaxe/diamond = 5, + /obj/item/clothing/gloves/concussive_gauntlets = 5, /obj/item/rod_of_asclepius = 5, /obj/item/organ/heart/cursed/wizard = 5, /obj/item/ship_in_a_bottle = 5, @@ -666,6 +666,45 @@ name = "jacob's ladder" desc = "An indestructible celestial ladder that violates the laws of physics." +/obj/item/clothing/gloves/concussive_gauntlets + name = "concussive gauntlets" + desc = "Pickaxes... for your hands!" + icon_state = "concussive_gauntlets" + worn_icon_state = "concussive_gauntlets" + item_state = "combatgloves" + toolspeed = 0.1 //Sonic jackhammer, but only works on minerals. + strip_delay = 40 + equip_delay_other = 20 + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT + resistance_flags = LAVA_PROOF | FIRE_PROOF //they are from lavaland after all + armor = list(MELEE = 15, BULLET = 35, LASER = 35, ENERGY = 20, BOMB = 35, BIO = 35, RAD = 35, FIRE = 0, ACID = 0, STAMINA = 20, BLEED = 20) //Equivalent to bone bracers. Not bad. + +/obj/item/clothing/gloves/concussive_gauntlets/equipped(mob/user, slot) + . = ..() + if(slot == ITEM_SLOT_GLOVES) + tool_behaviour = TOOL_MINING + RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(rocksmash)) + RegisterSignal(user, COMSIG_MOVABLE_BUMP, PROC_REF(rocksmash)) + else + stopmining(user) + +/obj/item/clothing/gloves/concussive_gauntlets/dropped(mob/user) + . = ..() + stopmining(user) + +/obj/item/clothing/gloves/concussive_gauntlets/proc/stopmining(mob/user) + tool_behaviour = initial(tool_behaviour) + UnregisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK) + UnregisterSignal(user, COMSIG_MOVABLE_BUMP) + +/obj/item/clothing/gloves/concussive_gauntlets/proc/rocksmash(mob/living/carbon/human/user, atom/rocks, proximity) + if(!ismineralturf(rocks)) + return + rocks.attackby(src, user) + ///Bosses //Legion diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index e839b766c9dd3..976f4a1babf2b 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -202,7 +202,6 @@ new /datum/data/vendor_equipment("Mining Bot Companion", /mob/living/simple_animal/hostile/mining_drone, 800), new /datum/data/vendor_equipment("Minebot Upgrade: Armor", /obj/item/minebot_upgrade/health, 400), new /datum/data/vendor_equipment("Minebot Upgrade: Ore Scoop", /obj/item/minebot_upgrade/ore_pickup, 400), - new /datum/data/vendor_equipment("Minebot Upgrade: Cooldown", /obj/item/borg/upgrade/modkit/cooldown/minebot, 600), new /datum/data/vendor_equipment("Minebot Upgrade: Medical", /obj/item/minebot_upgrade/medical, 800), new /datum/data/vendor_equipment("Minebot Upgrade: A.I.", /obj/item/slimepotion/slime/sentience/mining, 1000), new /datum/data/vendor_equipment("Minebot Weatherproof Chassis",/obj/item/minebot_upgrade/antiweather, 1200), diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index 92353fa8a5813..707a0c84e5354 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -307,14 +307,26 @@ While using this makes the system rely on OnFire, it still gives options for tim w_class = WEIGHT_CLASS_SMALL throw_speed = 3 throw_range = 5 + var/using = FALSE /obj/item/tumor_shard/afterattack(atom/target, mob/user, proximity_flag) . = ..() if(istype(target, /mob/living/simple_animal/hostile/asteroid/elite) && proximity_flag) var/mob/living/simple_animal/hostile/asteroid/elite/E = target - if(E.stat != DEAD || E.sentience_type != SENTIENCE_BOSS || !E.key) - user.visible_message("It appears [E] is unable to be revived right now. Perhaps try again later.") + if(E.stat != DEAD || E.sentience_type != SENTIENCE_BOSS) + user.visible_message("[E] does not respond to [src].") return + if(!E.key && !using) + using = TRUE //No ghost poll spam please. + user.visible_message("[E] stirs briefly...") + var/list/candidates = poll_candidates_for_mob("Do you want to take over as [E] (Lavaland Elite), silent servant of [user]?", ROLE_SENTIENCE, null, 15 SECONDS, E) + if(length(candidates)) + var/mob/dead/observer/C = pick(candidates) + E.key = C.key + else + user.visible_message("It appears [E] is unable to be revived right now. Perhaps try again later.") + using = FALSE + return E.faction = list("neutral") E.revive(full_heal = TRUE, admin_revive = TRUE) user.visible_message("[user] stabs [E] with [src], reviving it.") diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 6f7d03fc9ffa0..4311e4548f739 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -238,12 +238,14 @@ require_module = 1 module_type = list(/obj/item/robot_module/miner) module_flags = BORG_MODULE_MINER - var/denied_type = null + ///Should be the type path of mods in the same group + var/restricted_mod_type = null + ///Only used if restricted_mod_type is defined. How many mods of this type are allowed? var/maximum_of_type = 1 - var/cost = 30 - var/modifier = 1 //For use in any mod kit that has numerical modifiers - var/minebot_upgrade = TRUE - var/minebot_exclusive = FALSE + ///How much mod capacity, out of 100, does this mod use + var/cost = 25 + ///Will vary based on individual mod logic. Dictates the power of the mod. + var/modifier = 1 /obj/item/borg/upgrade/modkit/examine(mob/user) . = ..() @@ -263,20 +265,13 @@ /obj/item/borg/upgrade/modkit/proc/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = TRUE - if(minebot_upgrade) - if(minebot_exclusive && !istype(KA.loc, /mob/living/simple_animal/hostile/mining_drone)) - to_chat(user, "The modkit you're trying to install is only rated for minebot use.") - return FALSE - else if(istype(KA.loc, /mob/living/simple_animal/hostile/mining_drone)) - to_chat(user, "The modkit you're trying to install is not rated for minebot use.") - return FALSE - if(denied_type) - var/number_of_denied = 0 + if(restricted_mod_type) + var/restricted_mod_count = 0 for(var/A in KA.get_modkits()) var/obj/item/borg/upgrade/modkit/M = A - if(istype(M, denied_type)) - number_of_denied++ - if(number_of_denied >= maximum_of_type) + if(istype(M, restricted_mod_type)) + restricted_mod_count++ + if(restricted_mod_count >= maximum_of_type) . = FALSE break if(KA.get_remaining_mod_capacity() >= cost) @@ -287,7 +282,7 @@ playsound(loc, 'sound/items/screwdriver.ogg', 100, 1) KA.modkits += src else - to_chat(user, "The modkit you're trying to install would conflict with an already installed modkit. Use a crowbar to remove existing modkits.") + to_chat(user, "You cannot install any more mods of this type. Remove mods with a crowbar and check their compatibility.") else to_chat(user, "You don't have room([KA.get_remaining_mod_capacity()]% remaining, [cost]% needed) to install this modkit. Use a crowbar to remove existing modkits.") . = FALSE @@ -318,7 +313,6 @@ name = "range increase" desc = "Increases the range of a kinetic accelerator when installed." modifier = 1 - cost = 25 /obj/item/borg/upgrade/modkit/range/modify_projectile(obj/projectile/kinetic/K) K.range += modifier @@ -328,7 +322,7 @@ /obj/item/borg/upgrade/modkit/damage name = "damage increase" desc = "Increases the damage of kinetic accelerator when installed." - modifier = 10 + modifier = 5 /obj/item/borg/upgrade/modkit/damage/modify_projectile(obj/projectile/kinetic/K) K.damage += modifier @@ -337,9 +331,9 @@ //Cooldown /obj/item/borg/upgrade/modkit/cooldown name = "cooldown decrease" - desc = "Decreases the cooldown of a kinetic accelerator. Not rated for minebot use." + desc = "Decreases the cooldown of a kinetic accelerator. Incompatible with rapid repeater mods." modifier = 3.2 - minebot_upgrade = FALSE + restricted_mod_type = /obj/item/borg/upgrade/modkit/cooldown/repeater /obj/item/borg/upgrade/modkit/cooldown/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = ..() @@ -350,23 +344,14 @@ KA.overheat_time += modifier ..() -/obj/item/borg/upgrade/modkit/cooldown/minebot - name = "minebot cooldown decrease" - desc = "Decreases the cooldown of a kinetic accelerator. Only rated for minebot use." - icon_state = "door_electronics" - icon = 'icons/obj/module.dmi' - denied_type = /obj/item/borg/upgrade/modkit/cooldown/minebot - modifier = 5 - cost = 0 - minebot_upgrade = TRUE - minebot_exclusive = TRUE - //AoE blasts /obj/item/borg/upgrade/modkit/aoe modifier = 0 var/turf_aoe = FALSE var/stats_stolen = FALSE + restricted_mod_type = /obj/item/borg/upgrade/modkit/aoe + maximum_of_type = 2 /obj/item/borg/upgrade/modkit/aoe/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = ..() @@ -404,32 +389,32 @@ /obj/item/borg/upgrade/modkit/aoe/turfs name = "mining explosion" - desc = "Causes the kinetic accelerator to destroy rock in an AoE." - denied_type = /obj/item/borg/upgrade/modkit/aoe/turfs + desc = "Causes the kinetic accelerator to destroy rock in an AoE. Only two AoE mods may be installed." turf_aoe = TRUE /obj/item/borg/upgrade/modkit/aoe/turfs/andmobs name = "offensive mining explosion" - desc = "Causes the kinetic accelerator to destroy rock and damage mobs in an AoE." - maximum_of_type = 3 - modifier = 0.25 + desc = "Causes the kinetic accelerator to destroy rock and damage mobs in an AoE. Only two AoE mods may be installed." + maximum_of_type = 2 + modifier = 0.40 /obj/item/borg/upgrade/modkit/aoe/mobs name = "offensive explosion" - desc = "Causes the kinetic accelerator to damage mobs in an AoE." - modifier = 0.2 + desc = "Causes the kinetic accelerator to damage mobs in an AoE. Only two AoE mods may be installed." + maximum_of_type = 2 + modifier = 0.40 //Minebot passthrough /obj/item/borg/upgrade/modkit/minebot_passthrough name = "minebot passthrough" - desc = "Causes kinetic accelerator shots to pass through minebots." + desc = "Causes kinetic accelerator shots to pass through minebots. Only one may be installed." + restricted_mod_type = /obj/item/borg/upgrade/modkit/minebot_passthrough cost = 0 -//Tendril-unique modules /obj/item/borg/upgrade/modkit/cooldown/repeater name = "rapid repeater" - desc = "Quarters the kinetic accelerator's cooldown on striking a living target, but greatly increases the base cooldown." - denied_type = /obj/item/borg/upgrade/modkit/cooldown/repeater + desc = "Quarters the kinetic accelerator's cooldown on striking a living target, but greatly increases the base cooldown. Not compatible with any other cooldown mods." + restricted_mod_type = /obj/item/borg/upgrade/modkit/cooldown modifier = -14 //Makes the cooldown 3 seconds(with no cooldown mods) if you miss. Don't miss. cost = 50 @@ -450,7 +435,7 @@ desc = "Causes kinetic accelerator shots to slightly heal the firer on striking a living target." icon_state = "modkit_crystal" modifier = 2.5 //Not a very effective method of healing. - cost = 10 + cost = 0 //Obtained only from chests in limited quantities var/static/list/damage_heal_order = list(BRUTE, BURN, OXY) /obj/item/borg/upgrade/modkit/lifesteal/projectile_prehit(obj/projectile/kinetic/K, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) @@ -463,9 +448,8 @@ /obj/item/borg/upgrade/modkit/resonator_blasts name = "resonator blast" - desc = "Causes kinetic accelerator shots to leave and detonate resonator blasts." - denied_type = /obj/item/borg/upgrade/modkit/resonator_blasts - cost = 30 + desc = "Causes kinetic accelerator shots to leave and detonate resonator blasts. Only one may be installed." + restricted_mod_type = /obj/item/borg/upgrade/modkit/resonator_blasts modifier = 0.25 //A bonus 15 damage if you burst the field on a target, 60 if you lure them into it. /obj/item/borg/upgrade/modkit/resonator_blasts/projectile_strike(obj/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) @@ -479,10 +463,9 @@ /obj/item/borg/upgrade/modkit/bounty name = "death syphon" - desc = "Killing or assisting in killing a creature permanently increases your damage against that type of creature." - denied_type = /obj/item/borg/upgrade/modkit/bounty + desc = "Killing or assisting in killing a creature permanently increases your damage against that type of creature. Only one may be installed." + restricted_mod_type = /obj/item/borg/upgrade/modkit/bounty modifier = 1.25 - cost = 30 var/maximum_bounty = 25 var/list/bounties_reaped = list() @@ -521,9 +504,8 @@ name = "decrease pressure penalty" desc = "A syndicate modification kit that increases the damage a kinetic accelerator does in high pressure environments." modifier = 2 - denied_type = /obj/item/borg/upgrade/modkit/indoors - maximum_of_type = 1 - cost = 35 + restricted_mod_type = /obj/item/borg/upgrade/modkit/indoors + cost = 50 /obj/item/borg/upgrade/modkit/indoors/modify_projectile(obj/projectile/kinetic/K) K.pressure_decrease *= modifier @@ -532,9 +514,9 @@ //Trigger Guard /obj/item/borg/upgrade/modkit/trigger_guard name = "modified trigger guard" - desc = "Allows creatures normally incapable of firing guns to operate the weapon when installed." - cost = 20 - denied_type = /obj/item/borg/upgrade/modkit/trigger_guard + desc = "Allows creatures normally incapable of firing guns to operate the weapon when installed. Only one may be installed." + cost = 0 + restricted_mod_type = /obj/item/borg/upgrade/modkit/trigger_guard /obj/item/borg/upgrade/modkit/trigger_guard/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = ..() @@ -552,7 +534,7 @@ name = "super chassis" desc = "Makes your KA yellow. All the fun of having a more powerful KA without actually having a more powerful KA." cost = 0 - denied_type = /obj/item/borg/upgrade/modkit/chassis_mod + restricted_mod_type = /obj/item/borg/upgrade/modkit/chassis_mod var/chassis_icon = "kineticgun_u" var/chassis_name = "super-kinetic accelerator" @@ -575,9 +557,9 @@ /obj/item/borg/upgrade/modkit/tracer name = "white tracer bolts" - desc = "Causes kinetic accelerator bolts to have a white tracer trail and explosion." + desc = "Causes kinetic accelerator bolts to have a white tracer trail and explosion. Only one may be installed." cost = 0 - denied_type = /obj/item/borg/upgrade/modkit/tracer + restricted_mod_type = /obj/item/borg/upgrade/modkit/tracer var/bolt_color = "#FFFFFF" /obj/item/borg/upgrade/modkit/tracer/modify_projectile(obj/projectile/kinetic/K) diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 5e3654908904def27861344f61a5ed2de4efb541..e73ddd7e38f6a71ea3bbec084e2cd6b10705a9a5 100644 GIT binary patch literal 11902 zcmbt)2UJsAw=U{IjunrB2ntw0Pz0oj)aXH_Ns$&hBE5=IB7r29qaLIwy`%I1p@%>c zKt+0!8b}C{P68oP5(pviHvV_K`@eDT|Hl2_%NW^fues-5WzKKSz2;mq!qiyz*kO^w zJUl$d^!4tT@$l^Xy!Ze8AV5)(tP2Dxo=^+xpgV4XE>FDzg1jF4^YA>&NF4g&zyHFC zgFn`m%}+EGQ*Dh*!n~BD`Cz48e#lmOUV1p5i_r@Zyyb0*6*rk3@tw^ zdfXoI$P`5^ouGMNOxGAL-UxOG)+_7k)9-x$0PQ_@VH#!yPP&P-@}tqdUVmtY@^-vx z>b|-Vj(5IF(_aw#vu*zPOIZ!6ae3JTuOGk1o_`Hv|8;aAN2^}WC&v7Q+-7XzW#n|` z%TtPUT>-PUzh`}5L_Vl^p&~1{rnvn?hJcdoCwxq};KtuBcf4$m3IrvDBu*;4xO=); zGB?rXL8s7Dhomfm?x4vBPW3AV*VuY|0e>#FVS!d=A!n>~##P@lKqtobl6*em98_FN zX)fp7^CjVDCp4807sUT|j_=sOnHs*qBlOoVbyz8#LytZ-X)NTHU4uR=vhow^@!2lB zl%gPsb*4s?I)$l}&~t437VC-GA>I(pA&?^E+)CUF?iU`O^E~=@Zd*Ldpp(L$Su!&j zD}597OPNc5NzCkjBVB*u)`bXEHN{)>+9?QY4v_^n-QjGYPkTA)9wVdLY5D$V=}*W!<@ z+t`AEC=^>~F3UFT?tTCP|He;Btg&#w7ruIGZZhm@k6zT;CD6^$bQy4&{o^Q`rVu)j z`RiUXe6}-jkx=GgbVdcSH;gW3_<{lz;>jdDfiMyh;MBcU5Ur=#T7a@i2{m${X% zVs$qAdpMifkklsO(-@zHZ$DRBo4f|wLKa3Tw3a&HMoR7L2h8Y+GT=0{4?)BwYF42m zjgcoMugF(IhBTUhmh3TLyUt$<2xm$%*{?&h4RA)du}A{pVh+y{ikd6Nuev50;#p`38E0p`2Xk$uzLj9b)4 z=uDLHqu2&2Ubb1|7ClZ*=H9od>|mi(q+H@uD6v~1p<{i&SPX*xlSMP!B)=Y6He^Ll zry0EEa-AsQQj~qzME-vR6#ts_VGwjP%b=RwVUqHefmDWXoQ#js+Q$=TS4`dqC<~Ya zO~ql4W$iUb`}cJiXu`)|KY@UeQXL*1PR;VPu=((}Es2D7?@7BbZwUr_C^kE*U}~gO z;vRYZLKU*CthX*x&Du|X-tKB@xV~^4O_Cn>rqtnT>PdaSxESkmO4g{S`kBX92PI+3 z-P>QF>IIu?GKo>7)K|lDTA@)-XLiEpyHN_M!qm>ru8~h%-Sv@H)wiWu9{$l+uJ(ch zrw^fPgKb6POWCiO%Jq3>CYozSX(lzl9c*NT%soU`S6!MbHgPB=0>F>3*7JZN_@iWaq!xk3 zLO2;0Fg0^2P?P15RSlDvwE+eFvs3FeU5~Pjzm+t6B68}*ywpDGa8Q}{{B%&xC0Rb8 zAtyh&Q6aRLf&=+Cf~SVdD7f9BaF>SAWx#&K(>OQeImnU{rQqP;T5k};QBZW#sV7=$h&bZ4hdut0!I?M%t(ERvZ|(k*XEq!65Y^imlTxA` zoEbtu{MZWTPVBP>IZl3;N2*(Lf){=HI9f$~@KuwO zhAX|Ca-HJpI_tSJ^F9miRtVqudb*7pbq5|$^wK7DtTXn$#e*k}`2~^h)&TSrmEwI3 zNm60(oGc0C%+gdH+c5&HG4cw$#thr#WM&shQM+&M=*Eg!dU+vRqtAMHah^=KB5P_a z0GjA2U=dhYSj^bGv8-(AD`AhQqJ4mF4}WzwBnkc1oCZ?M+bUo^_yC&OKl&4tJ^Uf* zfO^gD-}x`!vc&s=iuY!ApDl6XuoTNM8gJ(QUqu0{2B!g&VcU`))#w>C=(*V zHM>m>Dl}XEj%V8pYmB^C%&zDni@Dh27q+oHyfWP;>le1Y`Gii!LGI7CRYMq#qUu5I zYZ;%;?GQa(eJha1a)WBtF$fx-wyGYOU5sXjoxQG($ zUcMA}vtgIp8#{kreaA3aPKDqYhC&hdt~S^pqzrd6lVN4zxcaow2^*fo-a5ACH@pK} zdy?g{XAMB``2+tR(EdB_TdRjQ$viv~>6uPNX+Lv~ILGzO48ay4@`NYbo=r}RxSSzk zAuU-{j<;oOp5sK@@LpC@DH>T8<32QeHLI>_6{V!q>fzlNaoi4Ohm_H`@w!qr65Q-J zxOP7fY!SE4(1@{HmR+#X<+*Oa^&D(Gkes3AIP5X&J@=P=*YwrE=2MDaosD|>M(`{3 zTmC(FrX_Zl)$Y!XucUg@m;1kr7~8p2510uUAM@_8VPpNES-IOU0LwI1S8-TrU>z7v z;c&FybpA78N{Zz}fMjt)&KJi|I`RXMk(*c(6~GKU>X8jHDF);u(-ae;F}p;#>b#ra|p>o2BsWUh(3>XUqm*cfgAC zdY#n+>0%scP4TVfFppNxZtOGshs}`s#Ze1hb4W-p9C~<*kA!6|_gleeOTLEa`MG@2 z&5uYUjva1jNH{nnTgceb--Cv1>7(g$Ti-n?sFx{@wZpoq=f9pVm7lP(nDJQLKBShW za$&wE>$I_40RD&F3ZM-4$(fh%a70qKhC>h>miSM{}ikB94f7R?$EbYA3z2@6k zy+b*0__r9JRZLS!`Ht(Sd<6)X_RieJ9R+o>nAf0E%bXl0q3-u{H09?=L{UqLv>ZL} zTMiF$SEwV)#reFuRSt&Ni{q9ma<^H_Vhym;mj2N)vD{cvjx7cHCnH3yM8R~a_K`>I z11pnv-saURF5&J?eqYJAjk>y`G$xJ>t||&HFE_dNoXJKKhkV_bc}3N2>x;vO+c38< zOE=3dg|Re5m(zg4rz>VU%Y8|62sy1aVqDP{mO~6}pOB4o?Thu8|7467^IzBWkVd^d ztCh}3YHBpcIrSxk(!@|5SmHp6WuI1e)ko5^=JY0RjZXQTbGDS{NvEV)b=@&%izm>J?%z>gaEy_B<#6a zsklTD3rA_owgD`9{*G?b2GKlhXtba1?dTLOO7=FPQ#XiNr$p70Mo@Uu;wm$`yhlu9 z`}V+W_5Hcczs0t>#JtUm>x-)0swiE%^);c|x`{pjYnNg6dM1rt+^!`6miOmZj%#g9 zOge8&|Js^$46@}opB^|zucz~l`26n=SuXq$|EDF*3IE07DF9iQWn}Mus1dN^FaK7e zq$HCANwf2vMYveKxbk}e5?!LZ>qELt*ocr2^`$Qn%$GunGPN`RP7ZWwxv6wP$sz6y zx@q5kXEy#l+QXpVkFwlHhMg4RT-Av~RW$G`e-gOYiQ@N?>dZSZ5WKz%?^>;U#{Lpe z043TDZ*RuR5)L^*8xCbE8Ij*^jL}F24ufN52?2LdC5S~^2US-`mf9)5#}CeHm9jvn zfPBo5UGK8ij^Bg3yDm+$X;ez-^%th5FV;U28L+-5@<>dE-+tjMihd7*cb}Hes(&eo zyiZH;y}N-KqlL9&lcQA+^9r^bLeOPr&9t3-@4FNZ_2*^{>pD>B=E;0f62UrmUh7@dAYcg$_jPw<$Bt8`(pL4BaS>7G0?ly59oQxvC# z5PxdXQ8a&bUmstCdr4I#1;sxG!7^3r?z-#)ujR0vclej$B=S!uW^4s~2X786I&_HK z$48ZxG(9qlG?38mKY$a!E)+X&e1LY1T`mcEd2wDyS}_=ps{9n7Cp=rKjHY63J9uuw^7MycYAmxO;uxfWHjn1wZNy9x~MuwedDt~ z23kK?zJHF996R{hGF3ffd}1`fy11lcC_1}$C`a9ceV`}(>~-B(0~BhYZmB8!=7LP^ zE$9`;)fSzQ{N4oQMiH@ z${I0u9B#R~J#rw6`%@6UxGx?Y{G^HSHQDiTE5UJ;H269@NLI$rptg0McQ~+4hpds7 z_|&U0Ka@8~FlAxcDpg0cQ>ix=@gUS%7qqO2-n4PBe+d>69wf>J)|uOU5i=_9dNQs9 z`XF#c_Tv(7OQ$9Te>%Kip(d-!M@rrCCrWSE{dGrK<|qUGWB9K77ms%dq07(QQmwj3i6;gcBWB7e%T&yy_j(`wzCt{; z@AV}!Nb`SRr)f~btq*GX0JA{M zI!k@L)HGHu<*H@39@xag;xd7#ukxOiERGb;-p+VK zcSUC*!TN0`dhwS>aa##_%l=4eN{u@Vr|ln*1p0pVtkL;%NzfcK$B=h&X_-i*8+X?z zDA+Kx-fW(wZ*G5xo*T%?yAoR8APh5-U8GCOYuwf9pD3ZI-oS<*sd10MkT@yX0sDM8 zp2-3oR&(sY1oI7HJGQXkyi7x>g@ZVz7)Cj6=VCI8sL(-9OL=ZfB}*%Ny=?e$1!T*BuJZGbFbWhp_0~{i1qDsO?IN_FZQefI>iTaW|qic+o0Y z+{c{oL5}z9ANezc3o?}LFyInqXk}zV$>gVb365)K29JCb)1gicjCf6 zH8h@n#?9ZLP)*Md?as4*%(?rKFR2_H%6NFCIQk+JJ28um6ye04_l*IKOf0Z)iSfj~AmYtVcFtb&EBV!}nNPaqdFuUQrHrd6`e#yRuh$ z=Cedp)7CQAUC|~|Cuf=TjvhQma;?#IIl23AhZ$W^3KJWBwufyDts)klide;`F(B?c zL#5?6<}{QL-dS}&j11A)z;zHZ?%4|&h#%I@)Jss!U>_8Pm{)&WF(rhKcOjet+DBLj z&^%coQ9PEMg`WwQ2Z!Q;C>STvIg!wC?GS}V-3z;c-&i(NTgLW}RuG&N4^7$kGTB85MC(ru} zw(y6|VUDkbsg)gZh=R4S-Pk+u@A^-8Jl@Q#A9sfQt=Rlr3{)O>gXM zsAuz@xbo^>`UVbS0=pq#L0e)y z#lg~ZE2etrZrol_)jQi*qI1o=k&?0((w9uAgpjMPJfM)P6(y|HBw21!IHGk-lA*%ias^tq~ z`$HK$K}d@%fVV8TZnD*XFzf)L<~DGv%KKP!m|e!2k>sD3(eKX^Gr^d!!kZLJSFu7( z8%^cx5PwkXH~+5a*Ws97u~XR3Hy5k_tg;My?J9=<)Sd`iT=8^W3OyIsRG@58L!6I;Q1R*>pKjo zG~1rRwT}s1>ROgN5erl68RyiWGgM*NCOn$(4^-j?g|OQ6&h%=V1mjXG^8k%q(mz|f z{Cm{QsA~sbuLZ(V^m<$k3aLxFvFn7r-HtOOvURxkWUh&4jt3TP1(n_O+OGh5x2wIE*qX@*O6}m7^ zh|5ZR1|#;v^$eJQ*uGNj@~_ua_1CHqoljkSb?UP-ufCdQ zWvPQ9C>tr9)bQe^D|2Nki|gw{^||VxtgT{O*-)0HiMIw5pxCZ1l@ym32czbkEcx!c z_}q%!sdS7+jS$}B@8{Bx(+SDc-q@UYD2x;1P=5@J=T2JDCq;U-Awj&GdgniOu2$7a zos%y=dUDn>DVh4=xhiA}SR*HURkEx>iL-7l7eW55%|a67m5oPV}PE9Lp%{8YoO3PHXn2PbKKOU zV2Ez!QRW>8!~$4QSwsFlj0!CRu%d`WjaFclc?_(Scj}otxTm2Mf>XVUJ1bP(E4DEt z?6vGsFfbnfIVoDlvi1saxZvk|Y~k$@GZkDrk(He-GQ=;GM_WE(_7*0XlI#_pE1$E6Vn zPP}Q2+gZ`s}Cx5S3WV$4d+S=FRP~9!0P!>id!>IwK*02)mF1&EF<#YSZ@u zdAcwheyOeFfVjW5#MI2~GxB23g{>*5w?^YX+(1rscWM!Z%Vl@3%pFPoPphHj^gsL< z{1>+8{qjE`2Y9aAj&lrLvFkv^anms8mP7w?JBAD1$$T_XQVU%GaqlJ|>@*J(kX=(XkxCESi z#+XGLE-|sNw7ffE%}GOT8zzrGs(Px^9APXiqdMc6{frt-7)iM@=z+|u8DQQWT^=^3 z$edJ7NPtj>=VQk@DNN^PVTg+I=+~%kZ|r$oBGU?}`;JxB*^vFO33u>bnRpxdVe4~c z7_jdqH8EMI(HM-3l9H0o&HB{TR2w>-4qc?n*0zq(3B@jcZG5oZPMPv`2~4@ZhhQtL zp`pQHGGLUcStwVEQ&7hU^Q#yKXM=8B)QXZszG@g_e8b+3 zOB}Sxrgw)}@)h{JT4Tk5vs-j4)mp=PdafA_9)Oxa(&%w{fszg-URyO2g9g=#uV`lt$7I#abriSU!}7&rr3JLR}9 zOP$(kj6W-(($<94K>MwA(2X5=TS+4^la6E0p18TzmJodj(Q(V#YJIq#5c187;Livf zVsD~Fkvq&56t8TQon)~PvYeg8ar;=0)X~7~bd2z?pfD36qc}*pjMfqv2gXc5OHkXH zcDn+e{urPU68?8>8gu|X+ zXPcT9c}WRn&zVQ|)yK`SnBbTELa(2OBBZ8*{y-KNAMVZuA*`jQ*=zHB#l^+vhJQX< zi40ww)rBFp%%L;tl2C0rd)mSwbY#SUH_^i#N5>2M0u*#AQL!A zm*4Gf!Lk{b7l8&fyZjhSL(@KvmFv~a%{1_SdS+(sWsq~fwiIVVrs=mxr*Q?un4?Z~ z1Sdu+wod35Zo1kC2}Zvp{6hyxMdveawV+MD7PBDw*v zrP-x1Ctn;$@-a%i*{@fn(i+nTd-@^O_CvZr)4>bO<;R%Eh^#9I$s2#LxC%Jtlxh*=HkIqIFq!j|xL@$>Mi$?Z4?)B!@2DuDNQ&2(RN#R@X7fHRwFwH( z^WT;x%mSxz8r2SvGiz>vw7w9s^DN<;w;oLV`-3F8+TH)z%j1YHH^WkJ`voL(V zEs)f0?+`HdDA<=sR5NyBKE;7EV}jjL;Xr=ssM#dn$biBONoMKm2cpDDW) zy9;&f_Z&i}H9e!IT-JXv`bv?LiV-R zm|3w9bXl(BQ~nLdeG~A)+`AJivfo*~##)VYiGx;Tz>){loV5F+oCR2bLp2a6$7|!Y zlu~fZs+Hjy_ED(M51`ft9O=tzrXth*$7aVWYiR{`A)z-Yqr(Iy*x`{+7Qrc4|8sQ7 z^`^DyhtOl2EW^6w@d_*d(s>;iqUO;X{Y^Z)G8sUs= zQoH!S*u$&q=`0PSg%~Gdu`qTzd2Vmcg>Z+5HFNx5se;KuaY&(u-2vFmsKk{6f~Sp@ zeN^cocdyf5)t$QBO%H;ZLRvRvb}X{aUpCTsTh4 z?XN$xTrU^Xnc*&hJ&84e^Su`^AfKsk<_O5zCMR((^Jx|OkEY2B9fp?_DDgM2cn7l? z{(7FdxmhH#vVXPLZ*k$h$l1j7yeycz{t&I`hRDE)CGxmNX#U>(PTlX@BQF`ZI<69s-&BVX_ z=ByjY*c&$nq=^8TGLh2^hemNGeQGl-`9Eaz-_P-XNWHaci}$S;?s#%3GnLOIK3*%a@ue%E~eCwtrOM4)8>&Rkq|6u)^)8y}kRuw{K5W zl<(KQh-eoS+&GJ8Q*}vVNd)taak- zA4b^^Zd_gEbKvpu@gewMmE9#7<8w`h<~UzhX-Nr15XnVzjb4E2a4n@8Ln8 zYaq+9@863oP0IVb>(RxyDdK}ndE~}P(sDjJeh)fO`B zm`ayDTkBTS+W*H&_?+spQZ+lr2V$qL;9_6Ef5vC00&U|ak_XfLnNtur9t#8%_^yZW zW*&tGlHL1^D~zu>){f)r{i{8gAdadNI{c{v02=lZC46`oHVtgkJ&3>yH^yvvnm-87 z4TBo;+r;fq0BFjgRj7~WO=3Z{w&goi+1Hnp>@^hRfyM*`W|02}f`kq=t?{W3#(;P- z6mjmU>@Oy8cXz@yrH-H+08uH84fQq{hIo0agwKEURy&5>Ki=q9=pVkyAD7p;`uAx$ z`z20?`{dV_f-236`q-5YkSC`$vuq?=JNG_-x1JKY+8QpN_Q*0xR~dG1ETx?RWY1+{ zbG|9B52f$5ymE);)(x+qpyZ@*fdPoq^lp^J>+YB z>#0SLX_abp*yPNEO!2-+@Qvfdc&9c5KnvbXjCQZuhhICdg?a2SIjjj-KfL3eGNDh<#c)peuMP@nn7)#kmf>7=#79<= z--}Ps)y2)Wxy3m^^tJg!QBz0@`l@vMU~wVg8?5QmrzfLEk|)bUbaZm9v>NX1q42Ak zIdf_-wk}C^$o>>_!3r=?8dR@qq6nUwJxghB`b-UQWU}nW(j=c$U~n}M(D@Zk?-TmJ em=ed$-8Go^S%({3Ad88INB^$zow7e4zWiU{H^9aK literal 11014 zcmb_?2{c>VySU!oTepL{ZLg}DIv84tqNHf(tZIlFYfM}7Tn%E3wr)p7&9k6N2{BVc zq^+tkf;5RKQdB}BQi31}@92GR{oi}P_15~|x1P1^z0V#__BWnydSPy6D6;419w8wi z5u+PdErf)2d;tFQf8PbnfCn2-0}s~WR=0z$y1`r?c-;^33h);a3e8FVit*ohe4p@- z_0T=acG+cf&vYpk@?{!wm49TmPtL9%({NM`RnNPZ=BE?Yr^Xp;UM{dW>tTzunMwe?FWuuRW z%hz5=ObS0<24zwvp6lR(`;r^Va0-IHzP2I>kZbtb~hSGZ$9%xf_a`3OG;z_P5-8Xri2Vhw( zrB*Y~KT6-a-f?AbHB)Ox$zY-OuHIphn-O~klh4lR2LIVkm0tEbYWND|IXUemIO4v0 ztbLa@FL(X77cIiy^IQl`a0b@VTcnul7A2TX7tC& z&qu7z*_5S()UA@9dDYjJnV~duo26UB($Y+Q$Y_eIVkB#{KHJ{j zUR%P&H^GP;2?DPt>e%=h(DmTB!<>yYK^6B)i*;x1&Ar2{Jl9)f;+*x}Gw6453OUiZ?VMcfU%8WtAT5RdEaB|Pa!^h!m(O3ved=SIeC z^2CF-cXi{}odFpFy*|YnLw5*J^O=F3?j!vKTS&y1oGccP%sX{zN$YS?G&!N z+rBF`C1qGwpTfb+c0&+&cyxecMEE_%{Cr(-q=!d|_RXwZ@InG9rHfmrXt1tBy?sGu zmWs{iU>MzycDiJ2C%6)->r>5;lrJ?kurt_Pe1R(oBHc6cv($$Ih!5s_;&1>0MGM<3 z5v!U2syh=%TTTuBzb%}BC{CXWju`Jv9dZOuQny6#aE{)^%B6qC z7XK3inV9|;cDck&dL0kmAvEMLJogZwhFrZDWn%|8h%-tsFgUHGKsg?e5JjHvq!vj%f@#dr4%m5 zskwacyQ|0P%JWbbZ$C4kvh{*L>uv8*)39r$x(Rvaa0qt$*9>eRurk`*prVWo{e`N} zG8fY?g$i*-pqpszWG1FT8ckz{?rbg8v0RC>zF9xHFDl>}p{79&h4B}Bc%Fx-nHcM9 z9d}Ia&nU3S?nF9S2Q%;#48~HQ8k@&IC&6JQTFHAg#UVz~l7*4(FX5$GFm@Nwk2V6#YJLBHj{QU%z0S#ZGsvAG7D?W(5?2 zr~uhp>o%gYk%DsotpPe3)>Hn2Q+*6XG`wHej{1Ko@~`sxI49cU^_OQd+{vXj|z` z3-pQJ{4%4US83i$zq-t%!{>zYzQGi{>-T40lrwB|Du>4Hlqyfv6N3N%Zo;-1ol07q z%R`na8kOm`obYOcCK1h+zmX$joVW5hmMe0(67;RE#FJ%cw9TbUk1D43?%8AIt}RY``}yVCtasNnG?Za56mHI9 zU1K9ppIV`pz%;MKh|HJ=R5mQs!O_K6HvtB6pR2h(%>{HM#C@_btc?Ws1}19n4_<(7 z><$;i^h0PSx?9`mCOg4%-;8dzb^sL=0jjXAA&4bd8?x!ai*Zb{h9_U@a}3S)Gw|lwuh)OEQ#iW+bkcz#y0a%N zDo*ezNkTzU$^!0dz7@edJ{IhcRz4eh^FbZ`D)LPm>uYLJYu`QyGkh}sNk=j4n5xl6 zV{WG(_wZ81Nui9wHjEp4(-^OMtKIIJ{e{}D)%Ri71~W$n-_g=(%uh)tqACK@0+XZJ zLl0nPM)A!qF}ed3wx_SN`_sb7*EYGNV)BXS|!F=(_EBk+0pOA^X%&LeJ}ql8r=*YU`w#9_x40)vq@0< zFBy@X3F8rWrkaYwPaP5oS`lBrS z%7}~7fE+I9+U*+RA#Tj3b9>?yYxqpY#Gd zX?r|nicsS#wfZ&Eahd8w9;EBG=#8jFddXBNbs^X0;AcrZ=t$bOcgvXB2LjI8iwrv#MIvDLg$&T$oS1)=XEdMPZ;6;e?Gm&Af#e!zh4M z*!K=>Ov*{lT9iE!UQwYA*`$?Px-_8Mf^O1V=H|Mo7iPlTFPB{~pz*u|N^YJwuAE2gf_!n&ls7w)2h9|U-&^j5v+VNFVMryGhthf<$MzeV8#_h1X^s!77)ODLf z6-wl6sT*#__WTpe9FQuAV%WSKoJ(>ZBWTxsY8*$nM-d8W*djW9i>tfZ`IY`Doz_f0TPlYL3^tZH<~ zO^ECa$(@}6WpvH|_ELJB`7S^&*fhFQqp*qL%!T0@;m7GOAsL|o>E-3`!lSWYk|#bj z=7NJZBc@(%@$|>EYTIsml;5~vV{-!oMf3)%O^)?z+k`wdfjCyn){mkOH8+g^MW-pZ zRd(K@PLnW&pHCf3vd)?Da#C}RtofAjMqokB-$j;QENT>mdPx{DnCW>=0lwtcMVGYh zo+OR-p@eAnXvZ4A6;oci`!^B6gR?W@zKMt zoiT4~&C3G511PWzo#;@yU1hbdwO3j!&fNo5)#iMySJiwHI_@)m&gKUlsv$4Sf4D26 zMT~iV*3EAv>I7I$7sc+~~ky8aAj*cjIlt7mM_@47u)}FZLDGRwGb0bozsPM`7riO7Y2YKdX zdp|&ibn! zY3t1FJwdmk;^U>^+S*4`vm{|b979-L&4|;cr?_fuU*bs%c%#+ptrAh;c6sd^2J*dY zz>80J$ud}7i3QGr1()Uosb2ED*yWN2ZH z8u;6oD0C!U=4{7G`l~hj?PErSYgfQd%g6CG8gv?}=zP(~n5dVmd8;ooZyRWCQLay4 zV96?kiIRKMoBVY0_2BP=p683oBsCT<^lY)=-(Ld}rRT zBX7UBxI_r=3CNlWZ*M%wj15-6dXb)2K0&L1l=Yp_Ik1~4*uu*_bx*@{^HbBWrifK9 z=R#!$mB;SsM!&$sdRxZ0O&AB5ubrPoS54@cU8IYx$(j28Sd8ZYHU?K(9cN z1Xn(|zqD!4385semackUt=yrqmq493C_P9Bi+wB1#;>sW2BFbtoq)xzN&!pd7K|Aj z*8HutO4WHG@S6a8Hhk&b;C45w6~O@-&3len^pbHQ;fR($Rr?Z8=x9{$I9)mHOpv&O zJS@ClI$7?TqyNR2ol%T%muyt^%g%G5uGnxmJ86y`Z0nNJCN5k5Coc8g&K@WGilhXz zIbymCd0um%Bq=q$=-t^sd1bXki6dd46zY3Nd0D4|@wY?^--|D4`&V=a%e(SbGt`JG zJwtb*9gDjrt`U3qgoLk!-o}|8Gw*vqf|yZk_oU(0=ix_}GIvIe3hWzAw(?O&--w{~ z?wwYa6WLc*H!zg5o|#qO>gnoF&F^n2zbKj&YZHD@w=afPm`ZoFIYt0I(63Ds_v+`H zq#m{(`jDR@w)FjgClp!d0zsC!KM{*HYSM=yKJDg@j_uc4(+(^~T zr9|DdIHM3Ol}rj?5P8qWXA&9~#aynv8M@=B)Q=zNpwm4OxGwCWo$96UZ!oCNI^^Vm zyBm$R{VJ+Qdye=caOP?q>k>y_iBbgqksZ^9`Ee*dSpNe*Me+{5rRD8-G&1nlA!pOH*RT}-y`Qsbcdb&(?u61g> z>~XyY)4CsevDyX9n9zO@)1Yxum;ZSee(Aa%(Aj04G#CsC7%LvGmJyMXc`b&szJ4oH z(Jn^u9%H}TY-pg>h^_7UquEXGF4}mdm75p~TFl<}1W*Uxyn5-ITig6~@wT$2oR2fw z>Ilg}t*IAMcI?cI>#XM~%dyoP!p=;oOv&AIEHZDokz|Yy7uWqBP?4S&#aq$0OH4Gt z0~@|JfQJUni&K)-zrGQ6o)|5OM_OOap~t`4B!4>%~Jm z+e!3yK5Ms_v9o|fO#;{tw*I_Vmm_sr+4$($Krm)9L))JvyC~?ZTBe~9ZYtxvc#i_b z?Y=*|Wg}IGVdXnMT3G^;B0PMdtnBm75F+iJJ06&vW3XU+c95YYA~jy(Vh}MfXnaay zB&_DdNW8PNk&U9GRq^f4ONMG8+v+?yn6%IB@XYK7^47Bwv zlXhnJa^*}tF^0yie+?l9MqIu94?JJa2UDOR3w`&_qhv$5i0emtv{Y*Hh5!!mZsO32lF1c>IdR%6u@==8F1mW9nWl(=ZJKd zC;AedVM}YD-Lv2C(!<7p3&ZuciNc1omX3_c9Vbhfy(p#C=V6yZ+s24du>c37T==%_g z;*A^m-Dno+`)Uef(Zl>;!lkHh-xpmjPgRcxb#cqKBWF;>1ldER(6#fbe_LosPVmy2 z`tilv{<_~Ih{;HPp4vY)o&M!Oan@59)1+zLi0#Vtx+^!@3Wl2p(+;r+C{?!f_~949ZzD# zZ{b{`v%_zPIwMX4SCudWj9Ms1z>|z!=Eg~D$ZkB6Y1lt{R1>~($teJFj9DuAHa)h8 zSM1-Gokv4AkV_=Hy?J12-h{r}Q$HsKvlksxN1t~TUqfhEi;2DLm}(=!l@78Op=UtSOWPq*L_gO7l$NcP^k&pYj#DAo z3!eLT3mu?8=kb$tHMd`LWv@n+@aGk`Lo>4fLehUSQJfuNWjyF z9IaeRUYT|WE5u~$JmY)*DpVY68!-=c#PVNU=AiK5EtmL=+Duw6@>HEQCoffkMwC$_ zKmo$cO;C$-?*3u_{w}u%3NI#3m?_9 zhRP%{E;k!$Z1H`^SE$(StL$Z7F2kp3FU;3zDV#hZ2!fdmA!$F>+%+eC9*(VK>^o!! zv#s?!-`FpwS~d3pkI;_xPR=3u0~5ZRUyHpGk!72i_cyV+C%yf85jh*HK1x9ivn{vXn)tq^l9i zN}SCdqLMwdw#q+h7`CW@`7PSgtOo3}Kj}xb`qaz=<3R>5{TU)`y+FG5t!`2~YV?p+ zq82<@culi+sC6`}NL&gK42x~S7{s56&RYfsMml8IgMvO(MdsmkBTbp+W2}CxtR#Yn zl3d2)Ov~{7b(r0h*V%U&wVEs26XC(_DgCm3rnciZmzNV8p|@&UF8-9ZsP8OWGaTGB zoo5)|F29g-P@H(}+Nx?Qa8W-5@BJH7LT~sB{Xn$H$>)CdhcNJ=A zXzdSWFZXoZ3j|$>IuP4oZGCIfm<0%0CoHaGiZRE^KD^$YV?@X5>sjJ-GULCTqq~;r zkBwwhFF{!nRZ(}L1hK}}J_s?HptYEc0-wx7Lhr!Lm=C~g4w@K?xy~B zn0|y3aS2G~93Uyu$6BnAP}L~dwc%Qk(D$7nNv3C`7Al_jiBYSSSdVP#Gb&YS=i#%!=tFu`e$-SE&|7``~XuS}^J64Ryu= zrwxslT7qqCp2~5V(LiS(xBOQu9|8*UneM*?)_=rz{o;_U!pi#+=P=g0(!eqa+x^MU zPmQ-**Wmev+4@LAwzz(4q|s+w>{&#skY;n6ty*^IM?6A5xKwH@yLnrLAWlkALP5CpCZ5&zBUWlw7Q9P#_vm=Y;{bT8T5w_Qs;;sq}&PG8}usjM|7c=|O zFZac=zBA4$cxwf^MdU)L#%eA4USGb5le6R0(A;wd)tTopRW`)^p%0#=44a_5g{9(r zA^=yerJw<>X}PK?0f&xHhV_zmg+8!s@omN776R`pjx=vzNMY9w=umEGH?(>(m`oVC z!U2Bo#0ZmAp?3=kMYdGWTr*rxuWZJB7rUl#FxSHQ)@NeYn%8tJ6F2_E*vcA==a>%9 zQTl)A9aOU-?w@^9lAzN=74#QqF8F(v$4QjNwd_#P)>0YRdDI0~8!;ZFktu0WBPyP} z@@N`^(UX?m>a=YvYizXD(a{Mz)Q#)z?q;%BL|G_>;h94~uyjeV$UZhSYK7SLeZOs( zjonZscXd_iXk2(6eYKE5-1WU7UN-yVn4VtBup@P1BypLCkW}UZ*D$>)N-zp74~TzX z<)7wCf1o{ozSc>EblES2>b!BZVf~bPrz@1BVZ3+w;lvQdy+v+L%82asNWZMHj^s+KyT<8G0ZMo!0y~=XhOlr$Nl7VkD|cWT%U|%45O*H;m0$P; zv%K2Be{QZ|3yk$gkJNB-1L<%C#WDH)?~vtt7h2<|`6U?YYsBW)T9TrE-O^X-kea;t z)wwV0!7xZm3nbDH;EU~72>7KQ;9mc7lxC8Zz5bPFW1@32xq6)yl-sr*2Rn^xv=qAd zDe#9Ss?9IK0g%U2?KtVV~5ii*7D0U%O87J#MP z+5}b_b@euq{4EZxbkb!SR@c-1tR z^2gJtQ>O@zld~c8QXE~%XlY|px#L-^Mp)}a>3a$gUSd|v^rk~*@3ls*KR~s$O<0Q< zXk-5}(C6O&7O*8hy+Q+F(Kl=>vQVvdPfDETE$8MLRukoyo$9^OG_siKsV$r|yA-yi zUY|F6KZP28&yx@d>pT~}d{{_m_nqxpfQUmq5E?62y4joPNZGK31ra*cbXdGNy4vam zAPEGD;vf7uO)P6_n^|4uG80$uV;dvkt^$rtK=f8hH^eSzxC1fUuhv0J59&k4lS5sk zzDhKbp65v~v)-3{F4mmC^5`HudOGrU#{E@yBV_6s<1|~QNKsNKbD&#!3&^)U0C;K)~$K`F*Fb!Az0&>sM8*cv?RYb(N-&O*Dj#T z!LfTK7taUQKGjYspsEy)TbYgJADo_8x_dIoY|Jq(anXgNr^0hZ*PBzNh{?>AT|!0Q zmJ_qYu`QZo!RhKqt&+_#bjv(nb028hahY_s89jn-=~D>HOPAx-ZFqc=Y!v!dUx#ti zX9X5>^vn&X$Cp8^3qSPK4cMQGIob6>XETRFcBWjP7&+fG+ae9R4hnp!I@c>6$4m9o@X#zCwg zhgl#n`ki*TtRZBFT+vUB?7)f&a+-!;4Vt|t=bEwg?6{R;x%8D>^C{n|}UPfD~SD?x%6 zt#>9ndL=H=6=9uIC!Fqg2ooDwqKFiDQNWmN&_^-ZuhOxxj&bnT9oi&f=9gw&PC;yz ziHj4(Yj4iayiWRT2XkJSovPmHhFE&z&1q-TN6G|1n~CJV8_k&35S`Ggmi>^=>13X^ zi`uT?5PZWd1-I?oDbNj^%6Ox$XeLGYaB-`y3nG7*NhaViG@qx^5Cd-3J@o*(F5fNT zX7>Y5O(#gs^0b}5bKmc}(HE$^bm4MSCW2RDSa7K?|b;|nrm>=vC6E?B9^ zBZn|n$c+r@7RRe&IuP%@`D4VTET#N&tQeHPOwJWsTPEYgA@P+d<+A$B`JE;M>(fmD z@o>M{Mw-L_lwPhwqnuyv-%r^w5!Q$@ome?JFtLdM*KDp6LMZ9*g`oOFV~ORfCz;5` zaGpR=$Ln*^X=W7rJ8-sJW@hJuVrzs3{zBRt2mdkFSW^QtZ7hVRP5n$Ei;x`|o_Qcg zSm{iM)9r!v?$6VK0&+6m2cHLy=Pk7Z>)x!9TEnfC@0>ip$A=IjE|1mRf6Wc()v>FF7vt>j9(wxKlrj+WIalW1ZZ(&F{l+9jJ!AFOb)F=KkF21S-?AL=GUIGL)` zhRVv>ZuSkW^l-~nLY5&Cq~b8a3EJ7ZjV4jqs88$HAIwzHo+aqtRS3VkA8_W*n&|o? zb|aQUI&+vs*X1c^Y|1s7gf|!A^fk#xzBZxD=|n7XcpoLy;7KIxj20)HE(rGom4|b`$1~U;Vz* z{Pntj_#OtIr%uf$8_WXH7Sj?A_3PKKN%MH;gxwkj7bbQz>F6jasiwut)F)TY-*BA` zH3COPHGC<8wGr}aP9A`2SQ1ww+FmprHX5z>A;0fLYWa{#4I;ueV|sp88iD_QwOaTR z!L^TDWP3qhRb{D@A{6^FmKeDFj@7}MVGJ+3T($o zt?QefF20Tc;GK5x0l5rm{cWW~2AHxz+f^So8xd!t0QA+Lk4l+yH)*E*AEem-rjg}! zOG``R8iRxtErS}?s^(y;3bEeZIJlzP;b-;^ZfWqG!zM>UNd6-hPGeK|1=4ZbMQkfO zb+>>T3|AK0zZ5M%x39p@DL8Q`Uqxs6EqMW+kHHv?kBiP3XEGgd9ql4UfMvJ+Wa{8{m7b+RK8M{4AW7fHIGAPkU#7<*OIlvX zxIh=z&X+vy{|OM|_;$$UKf^jV(4I2my3>)i7-;re?l$zv#4A6k4pz8Ww)rJ+Q_#Cz?lwmf{crI6r^i)6bTaw6s^Imi%=WC&HM6Ve I%Xc3C8&4_YL;wH) diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index e464a51594a3b1cd4df4b98f675c6428a6354780..edea244cfdb38d48a5a70023184a0d2dcab72d93 100644 GIT binary patch literal 18339 zcmb4rWn5fMvnTEvJa|Zu;O?#o4#9#ZcnIz~KnNCsgaip5EChE8%;4_s?lL$748tCt zXYadrzwGbshndsU)qPHPbyao!yXs7omWDDu&QlyDBqaP-DhfJCNXS4DX%!0t_&$_v z&;ly_{oWXQC|J8&y4kyU*gHERA^D{L_&%i3!GqT`a-^%^VokCkpYA7{HcD`U^CQit z$SCQJMw65CNDfbfno#t!7vq|B4~Qng^0fM+2qUob0h3z+sk&um(zT~x0(*=7;D)^E zrAjOJISU1=-BWjx?A5)3G8$K*uSQc-v1`HScXEm^)sPjP_KSK+Ya9`lO-O0Q1qeWck~>#l+grLWfD7oBn?Hqk!u%EF8x`EE?#J=ZCG%+ubBGaVBp};Tq|>@S6{kb zuHx#zuCF6o_w*HP=!6L^Jl;GW`{v%^Y$M>IK~&iLcrc?8J2BWVGftTpkeQQZC`8TMX>?5E@5%7JHbm^Mus>fuFTla@6pLVOtFri_oL7R+l4v^G1pWXOp`Khd6pvIgh~ z(!9VHr^Zq6vKOiE_r9sf52^9eFk6r|YOmr}6Zf4GQJ1!qdpKC<2!#NH!C^!ri0DwY znwy*Z<#@=8RG`c$i^UjAFHLtgB29DZNFDs6*V;EIND4^~>-OM>%x)DhoPo1R$__gl zlV=xcioatZuQ#hqf`T@@uuO%t8url>5+^XfqiU0$g&MYOY4mgy<0uYJ(lEyt;qUVC zr#4@ReY;WRs&Nk*x#5++EGF6bQ z)c%d%bnN>SO+SfbRSp`FyygKR0$NO>7g>W|0TZGYcKYtj-HT;a?)<_n%Z)*hIeoJ4 z9u$cyfHHRgLY!w^v%7(|Zf3%S&I98bN9XxS06)=~U2%k;h2SzEOhatS_u= z);|PiCdzQ6i|cgt)%<|?ifz*mwuCk*YeGe(^YB)$52_W$Vx8boG#H&(=|78|Q*|vC zvvB!P*w$aM#ZzKt(nZEm%_dP|vSF{f$T)Kg)Uq{L!;6060QBY@19!q8@!Pj&U&0!D=sv)w1;q_vv7YcjZ+%@8 z-QF;9#&WP(1uO~k#b@xl4vc|M3)QxSX+n;C(WYN!vkH1=kgk{gq1kFOIH0{vs{ygv zj24lDr>N5jq!~r@-?3HJq%TJ0lRRImsrSaa)I^YBZlKf|R#{ezT%Jp!K@I*k5_E`YLQBu8c5D*i=T-?@_Z;rgJK zZjse5xA(w-uo~q3LQ%Zw=Bla4Y$0ZH<^xm0eKR|zHHuCR|2V@lnsv*ZR`hR5vQ}u5 z^>Xgw0<|57c)R=I1cYid2TK~p$w~M%9*{YuJLdR|3{Ir8v$Kn;^?f<1M6bjkr{*Q6 z4UkE#-obMA z)B7%fL;WF>4*o>$ZeR`e=%C)#l(&UsVcqb zxY7UZ5aN1DM2AuPb#xrN2ph5R<;!%?@T7wg8d?^0@9;3Wudnazg8`0t!Oas(W!ug* zmt9ZkKfa$v@|HRe=c*m!hN`Qp72)2o{MHNVsHgQy3N}sh6pdh5Dzs#}et@xUj$)O6 z0pQLT=lB-p1(w#4KqQKnK}=_>SBG;QnUemq74JUHDEyKRmxq4?_|U@qk-!QG zTe4z(AJcdBbjH`>oZff!(je7y!tJVYIKJ8Kg*3Yf8BY*vm-FHMHMHzdID}&WrUTy~ zVRS61hrO^=miK!iP$TbeaAFBa#aT5&m{3?s{H}i&BvKnrKlK-Rb?Sf``{IGSjB8R# z_x8j7!GUY@(qN|KfCyA zQ=DvUIW;xk;qZXy=;+X&kaApuDCZKBsDWDQWCu(a^6_B%(Zsxb7?}*aHpHVwR#uQ} z#yqOv$18{xLmjP4TTw=#OU4IAes^q*9p7kEE;oa+%^7lLhAwV&V{?B)3Ri|JXxW7y z_ccEb*iPA7hQu)CD}xD1kU~S!yfHB?c4A`fN=smHu$k@`)1|lN<_lOPPZ(aJEDrrd zrs)7cw3f#S9zIvRuVR zPC;B0T+*js*SY7%zRqDGm9JD~p1Nge!-A7fz%5RH5KVT<^#+GyRFO=uVzmsN;UW(eR&<(3Oj22FCpp>*Jg$26}YSr!1eiBhf9*cjqa~a zC(y{OeAJ=T|>xLLY2tTa#Z-PZ8_XESIlezxH6_aY|M>O1VLVp3cC%2zD8viGWDPBG~N(eqq0h*u!fZ8xe&%8Rmvt69Gj#BZzs1 zMn?;hWetXl>$GpAJP5&`!9@}K)=<>p#jt6QOQXc*X31)B^|vfoDke|#`NBbgAC;`z zhcd2@mP!`n(%DcJbqFgwU-em_8fx|ks&-{XG4^nM2os)|NnUp;`L&h+!*1vxxOfACa0!&T1 zram{pHic5pW~Qgzc1IaojscTbR9f0~fpn^ zN49Y@A*sWF?U1`WQ;MjHvl<(1y|dJvcDPB&t^398;PH&t)xKmat(CD230Bx)Uow~J zYkPY((A~ny#oYb)xK3uk*{c}ImW;YVW}?U`@bbC~qC9ax*L~Nu(N5egEX{xmeR$Qa zWhBe{Z%Fk7c49Wc5E@1bqqL}2mvDWFSB+RkO_PZhHaoX*)Ol_qBo9Gvp1HE-);kcW z#Dv6pyW$8xEYhu$YOVx^X1ErKq>1S>pVNtYiSprRjU$_7jjOawecMCY{F+M_#LCPE zO+m@t07qjIQu(2DN0Snrq^HflbaW1d_jGgt@2GZ}B%~*f-W!m#_@t!pg`;hNO@o=G zk|KLv&7vN=L{){C!c=w&SN%4`x5eV$VJY8K7||%p6bPAHS0X|N*9j*bR0oSn=g_R0 zy~s47_ZnQ~*W#I^&K+xsTIg$-Y z{3X10LO+TrU)i4%?fbO7QoI=QTk*9?BbUrEKX_$sZPs}y>fN;h#C%x(9csWN21`>; z9&ufRg*zF%6tle}X9-`@l*s1vmDL9mW8;GtQpL;54J#MFUzl0j5chkbnxa=wudsSG zuIxhbI9q3|AwjPDBp&+f*TS*Ml7B19Dka6+rCkq9FvGFM*iY}Md&Cc(x~@xd#2=*& zlM27c)gfDlNi<;?DQR9O$~XP*kX5-gtDz6b(s_#Cxd*9Og*jm7H9 zW)ZrC$(Ca_H8b!%RbuH#s~w%dY{_srCXMY&W<;R*%x8BKEsx>T4h18Pp<1@*YzxFT zyoyW`+dcTaOn0Qz7pecd_!LA{VQzK%uu={ib*e8FG^`*Bou7Z3)l?-}TmxW}M_XUY z7)^hn#8B;`yq}XrMecp_by8m1tzemBF~M)Q@T5;Kw5a0N26}q?r~NC6CeHV^q{}u% z$v2yU4>oK4;;8qI&05_WvL4>D3Mie-a>`84z1y&py)tbyUvh&<&S<{H~0q= z{%>gbKfK7M3Oi?}0H6D=C!{!CJrOb}S->x%XJ#}3U5r5|s0Yv`;J)5mdi|8XIk1xMVQolUSpq?O z&VK;|&FT`5!_K#dNG!W!avB>`rKSA8$FM(3kp^M-Umtr8rU`2v&bfz16Z-p{6#YO- zm+*aJ1cENN?5Fv2y~DU1!LE_=^*?i!xohwI`SWKy=a-KFPy`;C+}qnbdZ72_4c-@Q z!zg&=0>zg(63o{8b1l7%iWC5>K~u6A`AB|U`jr)w#is^q!zT*VQCIgoLDTB1-PG48 zC-q>?F|a)NQ;>{o zUU(;>AFD)xYk4eTY3-3Y;LivU7=sR0$$F3Mi*MI_JbRnC6;s$Jz5HRML&nT)unP%&4?pv?rY)(ZJ z6Vu+`w;y$Mbw%e|bj>+(8k*uGu51o23Fstt6M6A4<_?Ub7EPSCI|!xG!ky5nX6m0b zHZBg9dDn1j)BPdtHCuVTx$VZ^bCrb=Zh_V)95uF=NL;(6U~=WyB$?*=eWvP}_|y7@ zQbNqufEAAJm@)m+k4{cD<+d-e8?PtaH*LeLO>u+mL~o*a0KOAo6;AZIk4X0DYD#Xs zH~}gm@1WqU*;&Kj_%w*7?8PrmtaFfEahE!3&@%YmD;wXCAOL?B8{P;u%l-&)`{WyV z*5ypQ+2`AHqc*S3adXb-wH&`wEp@YAPf&FpE|GQFmkhrl8quIi2LPS9YZqCPXC5}% zAEuj=4#G#I1vB8TM{K*>qlE0Mc(v&Av695MXNlTIThsni6?-J@xPZ2P*2>UcRrZ48 zeH|A(a-daxBq1w-Ry!XT0fsL0NlWn>&_n5=sVaukwZJ<409xS7n2#_@lJvSkX%a+3 z{ve>!S(NRfT)8l0F)=aNRC!Q7u8GqFa8>;Hkz)jWP5=eN&(PB#*RpwWvCm#|eJii? z)Fo7Nx;&ArA*90a$hAg0k`bI2)7A}ESf#De%LRQntv_kz)AI7FYXGAJdVT|tpI1rx zQ2WJH6RgcU@GL`kvl0-~+uPkQD`LIMg3c9|TOSdlKi)OI{FB;z+@xv(FrzNaF`2!r zq1}OiktlAd)zG9RAcXVX!q)y4?%!=96xSX&9Vh<|o`^^uux z->dWDjbAJrPkG-X_F65kv5_jcohh`%|60uJaCQyJ3VsMG7fUt|YV6qaaC^AFcHbQp z!Wrj=KkEgB!akajP82A+b^KO|jp$g@CwvIGde`bXWret(-z&-b*&D}2-D4=QHh^v= z9&$H2*oH%o`UnZR{R$o@F9pCrKv*VcSb!a^bLC~>BjCZE^OdJF{!o_R+M4O9D^WMC zoV-r>VrpvYje)@eAAobT#(iLDUn4YU|NXJ`Cx1YXdJ=6j1`(sn%}`Ld&RU+oP@Q^G zApuB;;$+f+{e3L0IE^%{O{Toc8)_C&xr4bYddB~Z>rP0zVGI9}4e%R&k!AjbhQHis zaO#xL?C3+ZaoANjaA=wygP{)-sk8MGZJewBgH(4GE-!L$s7G6l{6fP6;?7kpLrU^4 zH%@BbMJz+&{(}AS6Lf$V9zCX=Zg--!ge^|}bZ&n09Ys6|Nf-WJUzobuFLoxX5zn~_ zmnR3#eOqaweI6*z$l7-9s39kONR3iAO>A_4cRr`%&MEHPJMk658pO1H*_VHEu)l98 z+-2z>=)o4mW(c6VA4hqGg}U0>#FJ=wuzZW7_j(3(i7Dcry>V8GgapmS-(4iX9b1h23H0H0#Y0YZ*Tnw zc*O$wT;I_FT(o{WCx$qe-tgT_AV;Dpnm`RA&t2UbIf68a(|uYmtvFHQP|x-$M!2~@ zKo>$h=Q$cJe={@qd*@b^>VN*mO!PaJmi*Iiq<-U^+}gA=eIJse)rE;CyHDv=l~WkR zbcmLjMCh?IBwG}iyG}MId96^eW$+6wAJld+R-FUS04Zo#a$3TQK{L*RN5OeNy`^7b zMMOvAj89DbgYV$yBjTGeV2b75z(vf}7=fD_sqTHuI>|XRG-Gwq=c-|-Knb|P-gD8m_$*h}czaM#N{Utm0 zQG@Y^K=2JoaNaHC?ph{y6cu1!J(I;`zB?no|=Iy)6y>$>C}EHN)jmr7Pl2XG$@ z6ki33=N^dLKc($Lg|L;dAhlT_eKN{|Lu(6Lo)XKQ%uR;49%un(Lef`BDSYHG2-x-M zgJ6vR0ZwvPo7F7L0A>=VlWHsTe$8`r;Wf{fCc|K*nVCv-#NWKK^=E4qF+u6?C+?W4 z4k2j4cXs=0`;4VJ^Zmt^s)+B|^Tq=x<0(7ndC<*LQj4(NIg-(F27EP1*v@xHw9YA` z2hggfljNQ(M)6<$ZdhxY@Ws=VY@dVRilZkGG%14bAxtQal@k+7^ZniLWDJaj)rXE~ zBqtOoN2kXW6N@vQX^J)+vujJ!DrM+K31Ty3@kSg7Ajh|xN|gim)9R-_Kk%&sJ)(@@ zUdM<0g;xOhIGS%HwIc^-h~EtswfqBnxX^!gIqwWhxqo;>Ic0j{kM5n7@|#Kt1YR~( z$YvAok3q@1-=zaSkAz;l_QmZY-NMjgXEuZdtk{w-M9Ykv2D0)a=s|#CGnWi`=-_*MtLX6DzR%|VcBS4}H-7)%_!AY1WKj|x)|FKzk1BnqI13i3g zvjUtSaRLm`&_^e}xjotYs_*(AFKV_>p#|KbhK{H zV#hAXH0-Y?-&=!G?Jju=raDR;mo88y{4GAJk*+{5T!_>s)3`45SHHAKH3^{n10m?` z(QMXY0SGaUHP}u&91--q`|e??Ln4_Oo1tlJ8+{wOl2@D5!?(d)W`Kc@_HsmzRSH45 zBlNw142S^z58eF#yJd77`~HHw6yskX_Xb2Mk9lB=cjrU7CROW?ZMjxI|KAds&9ZS1 z_Z`?#5TjIL9uL)iJ#CTS$jC*hR{4a|}UMLQ`l5D~g5xp*D8Ft-2d zkgXV5E*al2$|Pw-@Z-V^m{!gfP5)W)*4}#y$(|3&*qGw4Lq@GpAFC#|J9if}j-h!a zZ|>e6$5VwohL)n=jgehbIf|nRqTFF#6NQ@9^=W8dpR@@d3mR}y3tuqNXGnjUJBOJMalVRTNyIk@u77BMVLcqQn-hdzpx4<8B~UX zGo^ZA6huy}>3DMwn&R+QDJ{{;mU)zek60wFS<&lkjmfdEh5NqMt>%)bC&_cY6a z?h!grnAn>B+iPh74)p#kzm`RuYLL&*&lU4i`>Q~MaSj0tGaIvk?n(PI6(Zt>dGR&L znu!8T6*>M-P?U0XX({j^%%JVt4;~vlpMtj3j!`{K`v(l(+|{#k*$>e+QcI8s=}*H1 zc9PhAsiP7YWdTV254I|6P{gxm-pnSxa|+$&LUBn=d>TjM-8<#MvtyQ&S)+qHINc1- zHtersY~Co~M=<>?lEC->vew__a<6x?_&~sQ45%Bf_%AxVxBhGGvDgym?XkZxf_)JVVNzkP}urOeeTdx&#Ik{`93rNBR_m=C?Dg4y>Ep&MtKKyINDz zhVRjo<>X|?WZy~Z&8gb!C>HyDpIg8Ay^r?R)9E8F>%GL82x~Iq>tGfXn=QEw-#gw2 zdAM>h3vz|cs~2r*79ySC@`rj_5=w$o1M$~L{>(fy>(Y&2-7n5PXh87B$lmLlO|N8_DHpBD>&}j}?^XIkOJ$W5k%9tq= z{^1TqDQ(GqzgNLfR8GlcN8f#hiT5>Sc`>$`%4zcmUgR{vql?d$Sep}iHyDh4Vd;p3 z(oT`TDz>67Z$O`i8W>MXEvp+qSZdmm7ty6NRx;$3DKb5r39gUVC+^zHRqDX55e-fb z5g1^d#zMwz#d74-GRI__2*!%Uiny>J9YZf&a;c+zE2(9M;{Sj(~9CMyIXC3>Jq;Cg~#M5*y|F8YPz0Yp;)$W}@y|VkJ6|N`#n3b)1UJLHq z5b$Bdn2;E0F6{dI6c2j~Up8^CAFvtDFxtYc8#_4yZszHgP7Si7gyI3h0Yv-VOTeo) z5ApO@I;B5kePPP+k5_+9xN;EBkEk+vPu?1EM3@U3crB@xMnW=*W!17n@8s4?1v28| z#Wioe`l1alO#f+zN)=L4j}VHG+Tb2|VFLtqFiP;V$^9O7nK>kM(yZ=8d2mIrzsu^W zQ`i#t*_DQ$jhi8^I+Xrgd9{hwM76uE7Rr#wH{*=z;=cfoF`u>5oFqH9*W8RAghw;Y zd)99!uG)v5F;zG-egBK=UoY=ZQxkyXEQMETn{x)nqy<;wB9=jAllmEJ!ra1%yx32F zwwcbv+CULj;ir|=iV+PFe{H2XR;mfrVsBAeZ&Px6D&DTUfrN;<~ zq3OYju6_q#Hu3Erf=_mA^U?n*Lqv*f1yDA;qNZvQI5pVPmh;@7vxqIEPckR@p8|22 z&i%I!ZLvCao=z99@A6O1-=Cu{Gg+knhX^t%if|ke^v}Q7ff?Oshd_yWH1?^!LK;lp zdzLQU3f$`w zsxSD%dgn?m;qD7#2FDjHA!M#{^Zpdpul$e%tbP`KlkB6E3={&)8EB1| zwq=epxz=_zf?GZsD)H6w4M$DAkUI>*i$o*WysNcVzQUclrhKCMQNpol@ zjQ(eTX9Ke4?g7sL*ks-x?j6-w3x&w^W=gP2_uG0sY$7!3BxhnO3+pEy+duO^D-vz3 zzB}gs`TOg?VU<-(2UMgKv?V>yPNgo0be^4U8)Y_uiNCmLMfs02UDM|t%A+TDbWivF zS8eQ;mr?nTXdPr|bXUWerKGNjzDr`Rt*y@EvRt&OJ1=gZ1)M&S13@<)^^Q*i_2!S#A~+bq#q;k4k7GsAjF)v%+*Ia`gR zA!de!T2C^_zuhBn9-#%n{!7S;tBY#h?(dRMGtG?TFp^PV_t1r0YO|5rE0jkLT{>f+N$72*E{y(^boBa|t z`QvDgy!CIj=6e90oTC(`w*p;}@vL^ArGCz)c1)5c*$vMdQ5-$-A)Jiq>|h{4y9l;q z&fB!lvKr%K4Zw22_lL7{%X@grj@zlwpb`_uOB+yMgX^K~(%|$WVO(z@Mvwr66pvLT zFPOeU{s~PeKMgTzV7eNOdjuX4u+ccOoExMlEWc5w?!6{fP0FhW?e^eS;yCaLUl&(Chodao{D85jA7G3|pwbJYfLK-;8fFiw zSy)&OP7e+alqG@?hkJhTarv#62o@|h#KzWF4zN>rGK^hQ3B{!#KViBqr&NXv&-FWe zwN`+py5f4O?;fuo>9B0%*crb{%i_h^=B5?zhe=jTy~ors&u=>;nOw~Ih5lXi1jGUJ z8)?20FKku=JiG~1B`ik>SH;#a{!Tmqk73k&Q2%8v5qXbcjdF#*I+m=soHlV;AGhN~ zgqXH9KQUx#$Xy#t?lOJnAb-^r^#}^a#>Tcy(ZaZ>E5!P&eLt!RWU)zOLt>*yE@3%O z+Itug0}myoDE=EGt)yo#C8w{r6z=bt*nYZ`N#FEo?*837m&gpos>N10wH;O&8;DI7 zz5>7A6Gr{|j_4tH*LL~bxz1av4%_vOzkLtZ$I|b&0V_&@v}fNU1cfKTRX5F9mjH?$ zaOc9Tu}*-h?5+Ovmz2Ln?K4~9I4djTnqOE5>>m;k5I~X_2C~A`Uu)XF(j!BnSI<&X zwx#$nHAUGqGqs?c(jjY=@+q!B6E*vAlg(mRuHpN-^ZivC(&E*DalkroM&)#O$;lYy ztQ7swRPXJ&li|$=q;D;udDVDVgLBgi7P#OG--gzOuVLAy*dk`jz1#Km5oU0HsIOo4 zn+aFVo1pS0;)xxYJtH{DG7VAuFf?qzY~j1QAgmB2-C%i%{={hk1gZblb-SqpM>2m! zO(-+g{pk~MQVY+^dp;mGj)pRo089g~A8j)#OVIIUuzAQUVk`Bue%pS{@g~ctnZg$)ZBkhP@pZ>bdT2seUl*s zfuqi`8~{h*N+d{fFN5U!!6~WN5=**>bj^%jDoL}-CQSv{qCbxXP7^Vj05VuU_=x&f z=Xk9z2fA62D5l-7D+d%G+~r78X$VmH7j`UVd@uos@;|=%{n6Y{>fS6#(_WGl6@bfG zM6mNAfX@e-ZM0JBsHQ4)-QCF_;4+VV_8{T;0;)K@e@6pFh5u^J5M?jhuG3Cfyy;$f z6qDOJ(aMBTX|%@CkC2rxdb@RL9k2O=SO^gws>dmH*RkfV(%*w)il5lu3;516LAXNC zPk4hVoCzpYXSVmC;BP|9186bniz~0@>b@FN$0}dXK$ghiBv0pQZXWCG|m| z=QaIBy(yS@myHO$oRC9x2-6OQiR{!O59e z*Kf0yKLq;Z!WI@5qGDqUii=e#DyfXhTU(dMmY0w9xE?E8S~7rneEat80>}@_gahi= z*{v`!HkY5(X=Bv_n7i2i{SW1CuK*(g&^$c65(FLpAl`Nn#?S!4yp=&jtP}mIYK$Z0 z4iQS_&CyXTV6hrB8ZLRkqz{0?iN9TV>-lI#*7most%g+?{r#TJO^{qJeC7^2CLwO; zxB}#v;5-g|i>NbR^JH0-I(eIg$Y*I6WQwQkG=1|VUvqz|bpiLm6z9RTUsW^ge4O)6 z60joCh{53GUFM8Q5=MYQu!sq5OhabK>- z+CXNY#>YHOAq#;BKp6ogT^axm8MeGOwA#4zivk>s*=|IWIZkkTyI_ znrc=ujPc9J$imX=lNY}#3)x2FAu%hq$ji5t%x^2|r2>ZzTK-+MN10{lZOd>eQMysf)rds4rk+sjX#%-j+f5ZB_1+-IpI z)J0#eDK3u=?PjV%%_ki)LjG=ZtIJK_Ch*>RpC2uC8Z!{sWa{#Nc_I6S6| z)YsSFJ-S6?t%r@9{>6zaDL3I!1xY`pC$O?M>HtJX+o$1-eJ z1`B?)-Bnu4jCS3yY$BMM9NJ%IqN5r%D8^w_B+m*;`hI!qyTdFb0p6d=YI+>b7*Fd+ zRB{@K@`!sGgS97vq0KBWh{QT79M3N51cFp$z{uuH8St;XF*ufn+M|`%&G<9xSlx)Ba z8ad*ko*HJb`Uc>j-%JHz+=eGGP)@Yw$3hl zsPswx_X%eP9pUB9qFQ<$x16i262oU2l})M5o$4C!z83*O9~Qt8woq(3cv`6ILeCPK zRe5qs%I~aAj4<$7SQwh+96I)?PV~y?sEmzGfptLgKt6rp5=<69dx6)bU6h8n3Dy%w zJb-<+HfAlTKi_?XKLSsRtpOyyH_div&V5L-8<`lfDy+G!MbS5`{OE(y4? zagMKbL~Jl9=PbFZL#aHdLATx}BYz3UYGV_<}4@cS{bOU1Z={raTj> zaJdU2Hn|!0SEn5^+(5*N9nb!8#0Trp3!mK!pO3&YfM;IzP`rM4IpC$nz{K=vIF^8b zUP?t(m8AS(Pm=DYkNeaXCuH~VFuS_?)AF*}`}gmoqM}~#@%2Nka;VsRZq65u)IVYX z;rk@!cs+)0#Kw}=-yfdd65U5YlEa8|z3`a3a=_>;kVhnU<#(na)OuxL^LcT3aZ%0P zy_%EQ?Byx-)2CJ=M^i}x$bir!_bso)kb-n{zF7wxFv{%X@OBYHnGoP)n)4?h)`a!s zmH@Rkq`cbNQtd($d#64_sFVZN;(Sb4VcKv&TINMsYXmH!36b|zNcu(!?KWhSbZ}sF zg$Y2IY&czNO^;bU=hv^$m>9ezv_W|^$`q!^n92392xIQ`{kTl=^{$bJ)t27FBS_~z zG547Jo@UVpaWw1Zz+uEWm>TAEJJcPxwY4o>6WQ(XBy4I_=IXDy`dc`!W%sI!NGMKe zQBmItEWNv1iG~0ZNCq48ACietfFsP7oW-1CxG8GT1Lif<)bc7TwL#A5XaaPJq@ZjV zGCy!spqXBFPW-U9OWBkmjo$~8_6>-Zij9kk9`|OEvk z!QNdLrj*V0n^`+SDxRBSA~9U7Pu^1G0NZD>5CjafLV=3KvsKxC62d zj=VwS6j~_$DAHKb9V;W<#iEXBo5nx7U%cbzrM~%WZ6OGLJruw?Hr8feKjR1gfkx!R_mr z^DJ^s7nmsbDRjP86$uz2QiVku%EC6oXO3#5iI1%Yn%rH^Q{glZn(5zvH@k>kOuuaSnQrd+3f<$HK} zXuUlPF}Pn`ln8XIsIM2ch=ZPbXzA&_qj~@o@ZyrLSmqop8ypA zHZ@o>CYV|aUUf|vPHMX$h>f}q-e*=n3DQ9X|C>!v))eJwgkHCe1iV&5^Xk>B1{1FP zO-ywkuH=D(O<~K!7uMyh1EJU>4VpSSPt?`b&DQHlR?Ln0S`Pz{4ii&T_sFCf8D*t| z8kaoSM!f<+sbS6-@lA3Hf(E00QFe5RMDbFs?XJULj44l|t zK8qqyIWsxAYuy$GCEU35viw7DhcY5TXdzKxVf3jnBOwOr&ZC{{77*&wZ522?9*?7mG1!@!>v<^>j%js>ic7R)&UgP3Q zfXOGx<%C#hBJ#ym4G~GQZ2jIbSY{nl#C;o&UB6@$ox5*nXzOIHBVF8^3szX)*7c-y z^F5aN`(do^IO-jK76uk{15>aHH?Gjlj-q}D13&lk_fu>ON4vL)N!Y;;>{wn@$C!?I zM|W5~v&Hk01#NUtm7eQ4N;*L!wf+Wj?|a^sk~9^GG2W#0WQp@Z{`XzcWMk3zAAW5 z7>TZ$?8+U9FAeg8;8|r9JB8v7qLJpbL9J!%QO+(cp1ujCH;U;9Et;sg35LPYlDJzJ zGf%!M;F%~kT$|IA;wEwB=IxqR@fTK9pP-YMxAMD;EODP?eC9^ddT*x;EWcz+k~*sr z`G7bwCVN0vm*Uel^mjzt;q}Y5J4+7=S4$6_sw4LxU{Eps&W4@gSx|!6&K6;g^@an1 z7m84nitS?%%Ibl03#cuk5KA&73tcNfY>%FR!z_@c$FvZcmCcVLi?@Yd2oAT8s62L^ zvFCKhx}XV>%V|LCeMtnQ&0I}z>x&Zdyt%l)uPN1HFu=}yUvCBFX=1+7u-fio}o z&Xf*c|rF24{xNXf%(x#i$`;V@%4 zT4`o3<$#;*eA3nn>Op1;@`ruFmDRX%im^GH7L3r&I%LDB#n*>tab$m_!yW_t-A5fn zE3;DJFsaKK4ay##&TC>I1-K!Qa{Vq6NDW?;!aEIoObc+L2bw$+PNuGpcp0Q-65DX= zem;9Td|=|c^-K!38c0u)Qhh@kODCD_Y+ePo@oK3T{*8?$7%U@KH!)%Uo4EJBRN=UM z(S$|e^uG3}{@+6MqIqMZM&$Y(StHoZJ%gz0pVv{h#TcWZ2AhcfAy2O7t(80Avwp?D z@Wc9veTEsjqQVbcF~W+$mwv@mG!nz(Nxz(v7ciKGSIpa`dw zHf)wX==GD2p?|a5w*UVud=f-<9|3`^N#eS43UAy*EP@_fsNo-ULQB;kP=nA{mEmqQ zOcO7}J+0q5E6;k(`P4bBF>EY6xnfx7?}hmvV)+xDUgPm0oR1z$An{(<^&BxkToLYt z75_sunEOhIDhV9IIJhP>!IC+^z*;-BwgGF8759?>LNWsXma9y7Vo38i(;o(0?|a0{ z&$rT&pOEY{uM)y|gV%mSQ2m)L1Pch!z0@Ed)aZY~WYz!Q*E%(sD>&Z~$hk{S@(8q^ zYQ8Qt6S=Sip*QD#Ch&F+?fIVT8`$pd&b;tlx zxGub#@$(e@JCQE#9Tb#Qh)cBjFghAv$Qmg)9T&?ArGqUMeUj2a*|nppqq7bMzt-N_H$ydH7hqCaj*FohnWTj&qJi51hVJZNcY7!mYKg`^Kb zeXLP{_5o@#k8jvvCcZ>Jm^#8TpH5s)evcncGlTiZnKUTdPw7;(az0WM1P}JS-N5`f z!y3e`(opc@lWicIP(&_S>J&+CV}=A9(yo(|}+jQQaGayfmi3DRkjJ$r2bm z5-|ETshQs6b=2Dv3!{8v@CTQR-*wP%Nq{Dx;QKN@ct_8DnpS?dFoZW~BwMk(QW2L78=AR4vccFcVK9U` z&-SRow+|3r{HX5wL?ze4hZ`?~&OJfRsUf256%%)=W$qEDEw}C*MnTnF%TTEkb(^6k zlLusvQ`Jp>OUcHpbP>4Oy=a-c|Md-WIf`LR{U_~ z!(Ji^d0W%7(|+*(_U~GMr&rE><0g3Gd#(Mi zeQ{!4^DfBzfAjS^dr$qhU$5Iu|7l<5Vmelz8s+HmSX)G#xA=Uz$b3Utv;F2>ADpV3 zifb1CWa-K`Sr~9k{^j}g0X*h);cQIzzn*-*KIf9S7SA@jpTJtv2EDB9KSwqV}-<>&K+in;SHRGa;rdiZqSk5wRtAN8Mq zx8$JhLd$)IZ{>VylCA0#Kf3?=40KBGj2$xTIdzk7>H7bhZ@2p-uwTG^P=hJiYTop4 zfe@BwKmHvtpYg*@kWY1={bxy^n#G(qJJ$#FsKj}*ocwx{|9y3Ng6+qD_g7!9abExZ z`1S6F#?-Derv*=LJ;@dStJmLp=iltPKcnZp00-5IBS)TggfA2A049P8--45JzW;ti zXS#fAIaYOSo`I23)EV6!j(d#G?h@|-mb>Ze_t!-{p1=3suZEBM&z^^CxJm7oJg{ww z-99O^X|nJ4yt~@$dCG5FR{&>FLX}-!o z`7)O0`X?V}@2%fxx8KR|(vQ7d9}fI@S@ZbB#|i8F|Me;#uT1z;63uQp>Gk6HuKDo` zB{cW&IOwUr0ah!IpM10_UN;9=&@dFt&pz@t??Yt$ojw28eg9T;rLybpQFeyh+E3}{ zrhW!0+;Nxr_2lTc`j6wE^Ce&XeN?e?|Es@Az@maz>)+8If4Gi%JT~ub?cQ$pbGhw4 xr^1UnZ@ivde+!f#<^osVf(3D=aOVgA*@NAJ3csJ*y%}@{kEg4j%Q~loCID-Tj>rH2 literal 16907 zcmb8XWmFtdvo?wo+#z@%xCaRkU~qR5Jh;2NYjAhBK=9!1t^>h>yX&BX-y!cg>pS<) zx%XRZW_o(>>F(;FcZ@z5P)Xy#AY#G35p zyb8AKJw9^qn(j3L7`49fTYuVZ*4+^67SE4RE`@m02l>|pXXnJK;AYZFhFX!O07>^o zbV^g4rdatKF3RdL?rhPT3v=Q5efQ6j)C_W1;@t2IwT4nGZj$6z@QBLmY=ivaOq5Cf zOsxjVbUyy`)Xe;mQyeQh?{`Ekcoi>WT}DOp{EfNQw|TI};Gb&ojgs8btCQLjJS4us z0o7$XqYK+-(iybrIH;=4^_&Y1CC~8g#M9LilLA!A-|@oPdqiYpXpkY=NATUCsb>`4 z_mpYSUgp!$ijV2Xo46?y3P=tFq6&-z@b|&2XZNh$oT8@xi!VW(ZK16Z+H2 zknwKi@l3r_%dt`;Trw!=df0BLB9UlLA8cQ#^vm_MX#5eqc;a?L%is4RR0b|Ff`a-0 zB`qfW%{}Wh+sFIcT=qp5cX~Var3efabizeKUT_#Dofe*!b^Omt7M04@v#KS))={Gl z-reC@tM$)^dYwv}re!tnhhJ?rb7k>I^J+Ff0~_(A-OVr)x-o}Qs3^|u5|Q@rxA#_7 zTAa?uvyHK*a?bY?6-_4v?w(9(?lRX~_E%aEagjqr@|EatBap=T)>(zHoL=z2f%5mP z{&sQ~R?1>RNZ{!$y#UsC_`%jw7l8>Efue6MdD-3x21o=7f6JA{sLs5*pa#Hso5{WO zEc!|QJeUc0UbcfIaXzq`81mZWv{HhOuwmw5Up8Pgnd8cq|IXxy~oD7%~Owq{YK#Y=|$ zMf&r3NQYt1?09?x>j~aAMSh}j=4Tu1a_npA_LB6Y^5Jt?UlYH3Af5?-FZMe5>P zA?*WmS%WdnGw`W2rKQ6U(jDRaTf!N!M8XOsV_PFmwS;I#j6FO&c%ekzg&wPloYX=j zspaQhoXyP1Kg|s zoANoh;8&Qex{m1QF8UDN$uodg*!wJuFVZw)1k9NhORf>BjFIr&dUjPYBaeEzfx{EX zzMWTe8A)~$pZn2b&8hlDy?|lAYcOkyio|yI_Ee77ZTST~uYY~^d-0y;*nKy4wE+77 z5{!ZhqcRkOHkog`n&i{0H4ay1q2?H)rDtU|8%trnJWLZy(gaG^#yNiA=FM5rTzp9U z6hT+FMk{zPtvzxwIyN>oVPb?0vRhCMGt{3PAo%)?lW-V*5=#2pMMat`XaFuE;-W!# z<9!^A8Tx_~lO3~tN+&g<3~QmsRrsozWHPj0YpI6yG9WD5n2l1;)wZ<8WSafzB}!V1 zetMi_I1BCtN=|`nF@+b&kzHs;-~8Q@XP!NSv0UI``qaF@XDnG6nc!jzxm-YYRu+ll zl=!kVJT*17;luSI2{FIntX~(%BxS#vmX=l$AIWNva~m93<72Rj{BjBb^DM(MA#fP=uA*kF&ey%YFz??70|dv@uvZj-{yAuE4;#*HUPusy zzzJz;rYkqre!JiGcz-De*TOw2mPFuN-0BtPR4J}m~Vsd&rAEl36Sc%Gm0sK z<0#v{aA)21>TXJunQL${F5k3l7RzS_6PL=ZMu(v`?H{e!>kM%BFEyz5EmB>G)L~!; z7=MUO7b3TRM^OfiF%#h1jgiF*f3@$E#TfgH#Sfhqc~7o4+}ogjHG$kO*b;Y9k{J<# z3zV)f*Q~du5nK%pquRX0?k}Pmmi|$1{MO>%yjS6y@nnl-nj>|MyUn`<| z-Zw7K5vRCpF@QK79U~*hOQ#C|;zUv!PBfwXOjPSRcjx%fWtG`xZ%E^QC?(DAq-9arx40K z40%47dQ3@_`yDnYR5<;K9gUX{Af;Mo%#9KAE;ODkzUs(z*u^gFUMEsKMlUpT=nG(s+;4k?!u+7nOQ0 zpKh3ddWy2LC{QQ_EMha929v?UI3ShI)iyWcKh45q`mVdGs;W$ywZXKx-U*P_t9~3s zxai`H_)D%EjOp3)t(j>5mTVhZZHpsv!?}u+yyGWw+sIgn1*UCgE#10Wfrip(X zam8oO9BDia8Z=t$;Hqnf6XxHMpKi+{?U)25VC$SDC8%}QSnLmF-TwOoQ%gfg{HmYc8 zSvuSGP~~ZMzA1)UHYFHOdEV=G(JU2kzmq7@a<9+C%8G%l2x#nM%57@NUfBWvrnKc- zjDUR4AZDFw%(mtlow#vI+y;GaBHkJqa!uP^hNx+Gch^8X>E^TDS_Qh!rxq08dUu|Jy^~v2#ivq{X{Ub(#(=dhJfADpTUD<-{a|Mk zLUSo{V+s9B&`cv2-PbR-u5M~vPuDkZayBsl3yROc|QXs=C$@bhaz{{0Bm4? zo7=YaHVC3S;hGs_%pX7W)v8`r1mBg0D|r!R@VTT{Tw@%;GUf365-e8~$g&P;#rNsr z$o3q(>ObD{*t&+!szi%pC%kQdZ{mhT_nJ3NYHM3qTT}7zWu~OyL)0qLnv*BHFgx2H z|538OxVSjaab&jiD;fx&<-3%T(Z|ZlO5t=4I#`*~3d)Qo*&^?Gg4>-$#ae?tgl(ba zT9ZhMHOORp*h~(GQI;moX~%7}kbDhM;3E1vY`dOWIZ>@P@Sbq;=%|dS*p+K|5^!m- z(Pr8GdRj85HCv@!wOoz&Z0OU)^N3{T!kB>7!XMXmqUyUQT)Y8M5dz$R^Q>6(*c^Dj zZY!!rgapKd_tXGti2I8 z^x3Q3%Hsyx>QviY427Ph$b~JR*Y|8rVA`aTrbkZRRegLc{pHv89yfBnv!jm8 z73RrPRaK`0f7R}LO_;+QtW1)X8jnqJXBqUGE2wM6V&+*&GF|=iO5vTPT+-3~mRV`HmU3+yO7yUVc)k6*MGUXurtDAG_U2{Hm*nfmu<{8{pd{1HQ`t;<0@ zNE>kOcR7Z~50aE!eu>_$I`VA~^H)OU!L>O$d;%p?jxY~K6nSNu1fSf#IN$YwW;O&$ z&D!ZL9)OEy@z1bi;0euN=0SH}d8U{Q%Le5bIpsgr5kCOPJheZtK{=qGi@Bm@W@H5J zIE}jQJ@3&}p)%CT&@H3!A%9`|@kwZlDtFZ*YutXXb?9*Gf?Z_NS1ymqgDCoJzsIvw5sB3W^CU23j$Dl+1@DDOPSP_Gc7ak*V2PTov_3vxQL5 zQZ@jSSH%L)tbnC8XWt%vOiag_S(2f0OKw(t0WY=+XFT*K7XzTDtzIL(0SthEeEQmN zh2pw*7I>1nghov^6>{`qsObK*uqy2N)ugqEd4nb7CDcxsJ|3;st7dtx*TbMpejNf@ zfH3e^Ex#3h0kGOkz^aLZi0s zWq#6mf38aZ)ebosgB#x^EjD9Ua@z+}vDr zWUxYl0OZ0o_JhMZ8R+v(v2QJ_twln(CRBts-lVXf5~rBfvv{4L+`YG}(U7X!Y%!p^ zUY}*Q$#U?>-_Z=*Pdn~YW>_BbUX-J#i7c>Iye%JgcL|RRe>SG*>yS@0wFdTbS8?0g zBgZdDMw&d~Rg>yJE`@AkuS>IQ=H%wuSzDQ#=T#|mIhj?6IVZ@an59f|G&YczZR&UU zlFw>{A5f(;DKd<5HKKttE?iKdjK)F}M*)mQVo+8x*I-EKc)Dv^L)>6J?|kQfeeLY% z=;;1@0A*;)0&+0PDt|eJXEo?2FwrHi+^=?3y575ZFh|2HYD|gC%p9xfAsw8Mar^v@ z?fG+*Cn7q@yAh3P{g|$oXBt=UVkW~U#M`9zH-kiarUJAh6}xI{UgrY(*Oa3b`&8)- zE2C|8N8B~Um0|41ywax3O^(LvNcy;xDY~qGF3l)1EJ5GBS%Y5orz|ryz9xvt%0^C; zK99ArQVQtkiImpWB?`PO8YiuZZd|y9Grn*_6&(MCXUyM5sjZ6L)7I%ZG}|!pSa90P zNTv65@)>?G@0`QK?PviQ`_$tsw9DOXUlk^F6Zs8TA-X$*lmRJj0*rn>aiqEQDB)dO z4X`I*IZdgjYfvMPHhivOL9L#+kCk?BYm1^V&R&+ zi$O5ORDZIVRDHz<4&1@mv)E4!2M;jw(d=aX_64sMaD1oYS>`iJO-c$Ixg+N~LvODW zKG$La>e&q=<{ua0b(Fe^?*6;I_H{6Oh~0O^C15OEB{EJ-LISpfBB?N_saj_k0)a!l zT|sW%#ZeFoV%w^AKZSaO@wW{q_lrUS$KW@+Za%3U`yRfVGRD%zbU?yRg0bE%^1a2g zl(A;Tarfw_@P6E8vx{^8?WS3!q*3+!Vb@?48TZF@M3p+mgSfU~gh=EIT0rv~MAIs4Ut#&1Z zpb#KLt1T(3s8ITzu^L0X<4qHcx_tWmse~-wz3De6Ly;i{8C4mbTino)93A4T4*Ka` zQeN4! zj0G7gv9FcWl`9ZTetT0LYn&$Fb!)yij)=+gq{C0JKDJ=zp1#^<^%iC%VL8&i-7fyl z4NxVa$87>I(dn9Y*@4)5E|2y18LiuI3~b5PhMtUQ4dVPAed_BU)&DFljb4)az9btgNY+Jm)l4Z`Sutu83r@rUlL#p@c2NlQA{JIw#s@{Zj=?Gb z`Y7$Jqfyt(tEYL=!*e)P6U_`_Dq8+Q`4CVCAh#a9O8h1WQqq zr6z)woG*WO(j?aJGlszIz_Q)>oBSVfEF0t{Xq-iyNsSsBgRK52DsPqUzsPo48g~x8 zT&UiH%|2#W(t~D~&scX8dsq0szht!}NY`Sf=$Xwfx*zvx{7eK+yoU+ZCa*lmZ1uj} zxPAV5@aBz$+T;`RPj<;Ahy$-$s%BDr5PM`R24nL7GQ^*5*V*D+P*+zU@;dJ@o8^jB zS5m@sjhXsCeQv)yv)$G!IFB+0w0S;qoRH*uC=D~bpRX&J4Fo|#c;%`rVqUWeqMh?((H5+*%Ooi%4)26A`&XLL-}5tNn0e1$L;YX>AAx zI|PI;W6WKgWhSR_WM}?YdqGrD-1G#r9**Q~c6Zj{O1(+)6q=|_wIjq3jRs=lT}NbM zNckiVi}^;LdRf!kAJB(R;2%8nAwi?lw{Oh3;~uxVy*8~dfH2g(oHn&2!X{B0Nh+4<@xEpi)95I6oqklL>( zRc{ZINbj>Z==xnpM@LF$F-IG;lgxbC0>RJw4v5Fg`2hDSpn3J$DoI{@tvKKxbe&xI z1eMYPC=^I_^6ztem)3JMLd(0RV#m;TLz2^=3keC-WNr%~Lde*S`p@WX8f$JDQVTO?NhA9YIOfsDDEG}jU2L7 z82-@Owe_(FC`fL%!mwSfOO$c3{qSj~BdVf_3{`Sm@8IS65x$!`^*g&Qc`vunHB3i0 zcfhx2i84wuDd>cN>gavJ)GqOr;Q)|aCAAacRq-xxYln_ohHh_+8uDq`!Sh;K1KJawCOV4_xIiByVIS3vFKPobK9bp>w z8k*QYv70tv%-;@59qOhVU!UQk%ZPak0j@)c;Wx|yOeahdlpm}!Orn1-tW$uxA&KAM zD?VK4hmVA&t4LZnPiJJq+Q{UO*v>krK@-3C`Pldn(XAsao~l>E4vvFnaWy({6}b9X z*F%%2z?brI*|6ab7e{uOCgK z##n`(4v%-|1iIC!B{`lELu6h|Qoo-c?;^dWs5qbQ9S^V|fU7DUsF7PyYiX95$+5GzazcFCWDj7zUu2}j_7FAt} zcDx(63-NcR)WX6Lh96i|l&$6Yhu{+hJv}}D^Im5A)zg(x%7vcLP6>4a4}Cz_ z5n&Nt+T7`W?v!9Uk3Ocr$6FY*ZvH&XVYoH1*SJm&Eu>fUc&=60peZ#Xf4B{Vjn6(# zYPCNaQ~X~j9|9;oAWFeK9bo&C`~{4HojMtYnf<$Y>A+r?%u1h7WM1&5Hdc7UB4^sN zq39jrRNk4*T(h4?{x<)7^0@bFYaPVfUxfP(ZsSsxf)qSzbWs|6oa-k-+3)qi3Ymlt zwNjpq3)c2t_Wfnwc}Jdn;Q0$@>mBPro5^mR5h=Yv^Opp(rXfk{eBARTHkYE{%_Aw@ z0bP+;`BluK@9L}0IEt0J@_KsYcPmbcO4+h3En>^{7KzRKIbO}@ovgo^$jSBzY%|<; z)`h$)nBtq8;qYB(?CbsFiqQpMqkPM5k{L}u(R0N&XQ+ue!enA_C;I0UZA}B=&k=M< zPEo*oV$*o{|;U9t}r8vLMXuo&D zylf%6ANdtTK0^E!g{^O?6hZQM2w7yfM^581CB&IO}drUIFCj$2lUE9{f z;=I9s?BPnW0}m{dTAu*`Ua;WQNc-kDq0mD6LtrV+V^Q$a!)JP z*bj({_4Y(AKQfxvmq)F-VGs603-PBAIZ_6DHZZd%p#O%jsDHxUrRJbU+$*M?J|;Kx z-N%jbE+)wBB5#BtM@3wi5+^~6el*x%=W)e;u@= z)_lC!i_JfSW75K43Ynp8nbga(Ij$t5$(ft zT)VkAO&7!}JAv6^U-NR*U4zzP36ez~HSazRiFRTTnZnqQjeZqNu;<@d=6hOJ5Lw1^ zto-gcLY=X2ybBugGZ=32xH4Vlu7P|`9N&aiZinK1IPzbzJvb&SYSdQThB=rR)7RHR z_HhU-f)n-@vi}VI04qvmOnr55;vC_Rnio&^Iwr*;It6vp;M2bTH>kRp+!e+`i8F58 zTam#+lnhw~XXKWu)=-NkcMQ0hAZ=m)Y)@R;&3XNegc<2)V2+VeWi@DWaohezgK9vM)YsutK?hD~y)y!T%Sri?{2bQs zc<}6w^JI2VOeZJ8W3BXLON7vqVQ88RsCU5ImU(9)c-&%YG3t1-E9pEaG(D8l*1n8! zxrOc(x2>G`KF@%rse%NVNS^EC?($gJe|6$^l(!P-h+LVMF+x*(sd+P+XmP-OuiB0m zrs&l2shL8VF2Ll0iX|gQ#!-S&bTtSS)f{ds&*VdQBZp4=^4?Hlf0EHC^>OYH4l61r7xDV&T`oK;Jyesj_U&d%i{=J_%)q+SvD{6>R}h+b{+`xkCKkGaM1hpC0I?`ofn*df%kpznkE!v^UWuS6d2ipaf2DwzngDL$yx zZo6AyEzccy(|cESZb#*p(l-R`ck?HXMv~v8rJo_k+xmxQ=ND&--f+5O8@S3z6$mU= zmo)cMrv6bQgNJt09UF6d8G`!!p}7l9EkAeNq~X?aB+FXC?LJ)gz=(}HN8T%g$E`Vi zafTLTk@t}~zS{Ls6ZvVu96>)r{~(pQUng~5G7#Q>wC`Q`l2lb+Xq+T6d{E+x`eXqchgJ_dI^=Bo#A<@GA zziR<7F$I$b4--46igquy&0-v;+jSes0KGO%llx%$gR`J4ddS>+w$=r~)wcfPrX2P; z$ICja!)HhCM$XqM$)fyi9aw2230oIV!F$4ZZP57X6WtzF)iE2>(^iCpNX)+%fi4JH z=4HZHP#`3GLnZQW;jjpv2!{tJyFrPh{m=qFu+Ctud%Yi-9;63ngvQ892-ks)M)ifc zv{PY0U>=ODTOsT?C>tHLDpsE;(r|b=ZWziu5Sm$=U4IjIboO>4drRl%iOB7&N zpDs8IXRyC}SZq)y%Ypfi7*8q1fJQQ@asQLH?z?r*?0$OtGs--z!W-_wh;xB}lnj`T z)ohX_KR77)gPe!qgIT*?kb0TOH)nt2kdv#ahm9}t-F;gpR+NaTwGBkRwnALQ5%ALK+Rzx%*j`zaFq&PTeP6WZ-m z`0|*4!*l|GGRr(3kvZHGnlNV9apueZJ-WX)iVw+*Fyvb=Owj#O1#qi3YP6-OA(^zz zyRv|-gzaE95nm8};JziGucW06W3qAQ0bfmS9$WCiUEPX?H*2<1*kMi=Yk2@5Eo+}N zq8hqj4w9ysK>Y;jfs=1F6zd?J?=4Y)Ae2s5o%L{_c+=6xd5>6nBG!VG|3N=RgTqID~=8oA{B%{!FTOL;uSi>LS|fX^d3@6;()$ z$hbIY2zEEMw|YIa=`QB^nJ=6}nLr2fxfEHI4W2?a@8PfD2c6U72tx^oV`QZQox#sT z(EBv}FPD*6B0`3g?QO3go#g2M@7ER)SMuYX9Zyn+ID<`pUU#Q-a9%18mdPjCwgjK` zhx+{(y{@i4u8*#BKC}hIrd&PWo0*vrgS54^Y59Hcds`%)%7PlmGr-CnN+p7qAAc%_ z)h0O>t_5_KIq<&AqH25IL{2t8+2hkwQUauG^vlZ-r-AV&@4~gx&`^hXd;YC9-*|#6$qACXG@tnEJ?NmrMXXgq%z2Uc`}F~U^-FV5AqBmb4`XIPV97DW!AX&~(D zy*>@w<^Ai}0>GB|^fy1At0cDk{4$oIbKFxQL36CKzM%oSkU-fqJN^E?qM{mc zz^(>|1v&j}BkC)N;O=XPYmmQG@O4`^T{=)-r? z5r|a(XwnJNNjLXo2y<%G?^nk01?i{zSd~N7KbExiIQkcr_i?xws4fL}yJNN9?jMci z&$=TItG}EA`&J1uHahC~A5Qhp{5*bg@MSk^4hM1fEmSHtE--y!$TIemyMn#KyM(Q6 zRA{QXp%_W(O|gL{9pbI{KeUi)ih|9I9Wf3S698s-==?` z5OwGfV0Ye#6=*c%N2zwR5&@xFzcpfGGi4FdlXsV)nLItYdFfQfre7eP5#ys}}BuANNSX?g700Djh z0npvq!3v0eMX=xJYYMCNV$UUd!(+(nKL;mO3zu^iIRt&xSybrM7!BxTAgY(Cl3v5) z%rKJ}eY++_H1QiDxW^<@+&T)Z@p=C4BpkZ;Rl;4p;Y@snth_?Tau+g&}E`{hu_Ro=b8rZ)8GW1l_T~v;L3&17adIJGXUp zGVCGfCe!v$)PK`^%NOs%Ojx5Uyt;GWW0}9NGuAWb8M(wE<%b;HSm|i&{P%mVU{Bq8 z1cnwl(4vE{&bylM~IrjluGZPF!#gF~oH;C^V*pLE`gv(cnR z{V{Glup3TMm^pNNb2a!i`@cCmanssG6cI@RZG|J1^#9`VgjvjzFH{b;lE|N~EOI&w zs#$h^o6C1O=}NA){<9SK)6A0I!PImnE-o%(XD5Aq|Hj78>{ zf*0knq(fO2ZzSM`NR(Y0An$)p#oth zr1I24r$>YdYl|LvHRvaW?i2erKTSW>*5GQND_mAzkD{DRmotCN`<3sDhNoIu)JdnU zgzybyPqtM|kV26P>|xi{s6Ykdr#xjP50jApP;)B~PeRB14#~SRyNT#7Qs(lFn7NTb zMiZlyaoLGE2SUvK%Ra9-*qK8ZJXz4^KvS|09-uL$A$rk_!PL-SzS8GqpRu!`cmE8V z_85EF4iKmGg`NMS{p{@Q{zLnPVkms+wD zwMu6u4X!N_-Dolt4Bn!&L|jPSo61j$y>vRC@jns^(Bm2?y*3o?>~X21_$RcaODr;0 zpBv5Z$SJrsl*|1JLw5Ns)-z#Mg|E_H;K4hd#W7rJgao$Ka^Jo2alUi@Ix|}Y_!?sM zjbN5q;c_C2Bw)3qJiCpWSxA%c^{!p>=IVDk4y!X3$3l=+&y&&@r!z*knn^1j#eSnLmOo zpz(B!ZuJ=$I5)xA`NpC4M~iq{aooq~*x;XTKhW7pAEtxJ4iplYGx^kw6~_om5e@mN zoD)teX|V^&e!k>++EP0+=Or5N-Aw1awh=%#pS3NB;JOt?q!7~%M2gcRS!+APufNBq+E$q- zZ#`UL=33Nr`e&qjNZWvz^uLU(0!a&>`)xf*3L3dz4K@TH6t;WsyzVlTp=y4F6bAf! zKeZs~wY#Pc-F!I29b6Ghvzxeby-n<2Qw=l~A9b5JK6hNUY5L^z;4IpE+7WbeOuQ44 zGt3Aj4&ko3wgUjzo)G=+>-sU?UQTpff#OwG3x!TQ^ICISBCWOP?6!szUja|XLmJd_ z8uneocTI#qu8F<^S%R9UQT}52?A}x|4}eTz)Sd2)XJ(k0~c{BdTQMclIrUhm?(o{LR0gg!H6lUH} z@h29%!nKPdW=phXwxtv~7C*~AjE-pz{0>IHOuzGsgl$|^(T2`WF-IPf7wqhb`(`T0 zFW^}8Nm>QKau%0E zZOsq$HeE!p;y0kZ4>~@>@ieU%HF?Q?Ci5oPFK+(lSFB7EuNedzt7;n5$b7zTx8$Q~50?G%!PAyJ#9D$=qV(X#T? zynfD|8j?H}S6#+nZ5kP|DeeN12_v3OO6Uq(UTA8R4O5rRN=K7rxfI}<1wn>Y)Tp#M zE#GD6$o;7KxQZs(s@i_;1*H7GbZKx}C3@z!MhYRRv@s+6Ntv=AtTuhp&k<=st@QY< z%FOqEo20arwXD0vN-Q7c-Y}f^Du6}b(XgOUBf+<8{WD|6ay;QD5=iZyDot$}i5umY zx%hI;`-r_=``sf{$VQ2sI}sAn26ruu41N!Otf-|PM=_r#Z+mcEmJCwu z%)ptTxXhN4F`atMPJ8Mb$w@KF8ltA9`E!0pjI9}e<2pBQS!t#fI7&Sd9$uegk-vTp z8BK4aDHmWIGE|>*v1mHV0v17YlLJtlf z6ePiQCS-qMK!QXpM6~8%l;0F!5@qzID2d+9s!jA5eve$UGty!5@I*P&MgG$O^dYE+ zUq{I5i4PF9P45KeIduxEk!|`lk|C!kI)_C0cRrrAZLPYk<0U627u43WmjUx`BQ)EZY79^faL-TA)k}x-J1W!>Pfsk0?z+$e+G}jI&bn&AnWusiXa2j$FYDtKk zc`#=mYaz_~)Rdf%B?ih`lpx?F;Z}$s&>KQ79!QI-*r`ph}jLPs6&YJQ3aDTttL z%4{pMbvTl7y>oWL?pU_yB$1Cv=)9MRrZC`KRX(LG>qqR4roQ5AO?1)K!5-=oQZs0T1{F}ss`&+%Bt!WNx}Wfv`w2MJ75FE ze+JPz9J>JF{1-JWaq3ec1pQg=*59q(RW!ReUkQSr5^qWflsH?UC}0{d16V%zCn-4| zOi@5ViqjGNwXw3}u7dWrJr%oe@K|h-M*L}%Mfz)4^v&xO-%ZQ$woh>s2_z&kjbjV{ z@^-a8C*=%I)Wo_LP6NeZT(guVT}*IW`cKiL(i_&N+ou%^6(b5whVGA|?V*|p++D%J zcs3H}_L3MXQ)&Jdwc_YM=1uj|w{Jm;Q7Pvz6f3;d^XF zY(@|j!ATQ7*@!g$d{uEfD%v}&(RO)V90m@{ih(-pvvQevdekQD(C-+?aQtL#Rw8Kh zL1J>-6#9r_+;;@IJhJ0VU{2;r$*5Xk>T z1&<@6uP!g6fQ2vbz6p5>Sb24Jok_>hF=G4kh@`wsNf4y6 zThZ9WB)vQW#PjZTWt)$5=j{mAm8ORX;cUGe>CLIrr(P`La6^F$=Rtz#8(bLy*#Z zd>VD!V>XWiWm(XLNYwiDw6K>KUr0y@1!&?@b9*d`MBck;tNGMcVwo9@HiwWKd(_hv zv|Rzu+Wrs&sT73T_^H=nlO%Y3N`6tkei{Ytt)!wYVe`86rtmAUg);B@B03wC=dKBU zj!Z>L(HnB=R$M#EBMW}A==##2KH0o)u{mCvh76k<*XfmJW z8my_QNdfw)PpgpiJDQavH`{xxKry3 zL;0eJ2S-P5f=!67zd*aHgcf#n#lE}%LPJBP6ci|Uc|(GO#g==B7*%-guM(TSxTF6o z=YeQS?mm<6zl)a;ayXu!b}G?fniOK*^FhpI`1N70D(hyW3D78Ndwz0KR981MC+wcz zZ)asySXakU#7v(L+~*iIzOAF&eIs^A{n`JzKKb^6aBU0nyq(nq0K_HNF$8dLLBHHE-aH4xqn>;kTnr+wa%s%Pj#4mP*_^M@d zog0=|c=_GZo$tJOvm70VqNF4u#QZ4Ihr(mfAH~C$mX{9?4n7D72<-R+^gw;m`Z27C zDqp^Q5!uo&7|w-hzt=+_!12b?Gw+z(D`{C3erLPxtHKEdvJ?K^Aqn^(mG=brY?n7fh>4# zeAaE=JYVqV8)D(d5$#Dv_mS6G$lCosC8~$+_G7RWH8skKAAM`TC#0uakhrs#YlI%7 z?eqw)fwEta{tj@a1ej#MK=#<>lqua!wq(vaBWEhr9kANk7mJ%X@}<(xnK2=jVl;os*#Tdx+iX zZ(npP354zYM-PleoghX@;l~{55b@~+>@E;ukB&Ee8XvaP*3NX;7!Hy`uNJ-NIpzHI z0YgGloy`5RW#QN*iWTDp6k(S#XyaWM43RF>eBL!8A|gs-&yRBteCg2K^S+5PG}HI@ zXrSf`?i3zHbA~u_&Zxt#z{K}%j z!q7T8q)*R2dPe5v!^(j4XG)4)hzs?_#WGec?3SxLD~r+q zkro#h_f6WOq&HPpRmBLl*F|$#E!5m_p9lLW$JgeH<-po9=^}`mT>MBaOjT6rkln^$ z6;&oAj!fOW*HrI!ZP%@)5l=#l)+9?u8c)OEp|5PQqFHu+teyCZG7nY=_LARoU9EQl zY>Qe$Dwq-{ZTMU-qiH%-zqGl2*NJf5Zcw*iV;7%>czODsDa23>)HeBz^7bIUPRi-V z!^v5TX=+%|b}tG9wsJI@7HN)%dyH?WF_gqO!% zPLITTR{%WZPp;`=rgTma#$y@w)q99MlGF7nbpEU)6HLqmS{*gx-n6x4Eei)rrHNNS zd>E<@c^_IytBm!y?TodG{b;O*fSWLG%OtRX{etvevYmSluu+!CR=dcRRcJ>l|E4?p zS7Z)^6{LNuRXPrj5G=;H=;)vo^V1`bj=tfXJsu+hGGs|YOdyfg>^J0;5xSj>RTzh^ zYd08o;k2E1&G^y&g8-H#b-GCcWgp_+QIk}B%eN?;CSXS9;lW{UU4gN*HdE-P`hBeF zsr3Wz*~5=Vxb8oyxq%C7NV%J#Z5e%qMTUoEiVg%}kn@4VqG~7c7GTfX3Xuogv0O0+ z(e?r|7M&z&*N^a0mGtyVS`rku2noeIj>*q(WYv9;{SyjAT)*+-cyKzq?>I>ga3ta4 zAvAn6LHNM7GaD%KDL;xHHX|OE%cz%X5U0AMFNUvEYJ^m8XR+jk9CCa_8^8%q(c4b_ zFU{G*xGKp_cAn$%IaKp*3@gmV&xPLDKMc70L7&XJ9SoZJS`D9VNNx@ZUes(KNh$W7 zKl6h+hPa$o3p;TtH2k!|$5MF6@U0)302QyOW7xAUB=CbTpKTa%kr@ZZ1{LE#*4l5+ zD*x{V`-WTLiv%iy6~}d@VDe}%xmp1>TknIpLWvM zvh_pCl$qNu*5oOcq3Ue<-3C>Bfw`X1}T?}#8)!5q{t+L+_G$oH$t!U9o zfNZGi7@Ot^WuIcd7}#N<-)^Nle9W)l9=%zlM8+?TfqVmF!AE|RoF_JU3JVl3`*~L?@wm*XM<&19owLe-zx&Ku<33TrI zQ4JS#9>f0fh1*aZ%P)Hw?57a??!Z}r0A)q$ZBq!wqIUjL5~=(YhW#abW`NFD3@Ll^ z&=6No+MGhF``^?NnrP3zo46miNkyV~ztf`6g9MpbJXqc<{AXriKnnT<$2mr85+2N7 zjiSEJq}%LidSArEvc*ambFT3}_Wdk)I*okl+&7QXcN1%y!(IzF!7(=zTOs9UDTADA1BS=3{PIwuPS8LGU-b)Y)N_}ZM{W}5~P2oQ+ zHbV-X%7YjQ|A~3*zH!bBk0IF3R-Qj@rdMQ)>J1jw-p`vkG0G1IdpWX;y!|7C{M-Km zL~XSt(-`*(NPt#laM(A=3c*!Hi~1a!WHwKNl9USlezOZ^UqP(n;Q!4Vl&@Z)m8t0! V28}njAt#2C7FQ6f644L*e*j+nno0lw From 7e7f6b834df18eff489f610c4dab15eb1d0c1729 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Mon, 2 Sep 2024 01:56:39 -0500 Subject: [PATCH 07/58] Automatic changelog generation for PR #11413 [ci skip] --- html/changelogs/AutoChangeLog-pr-11413.yml | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11413.yml diff --git a/html/changelogs/AutoChangeLog-pr-11413.yml b/html/changelogs/AutoChangeLog-pr-11413.yml new file mode 100644 index 0000000000000..6798e0be1b655 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11413.yml @@ -0,0 +1,30 @@ +author: Rukofamicom, Fikou +delete-after: true +changes: + - rscadd: Concussive gauntlets have arrived! Shaft miners will find that the diamond + pickaxe can no longer be found in tendril chests, and instead they may find + concussive gauntlets! + - tweak: Tumor shards will now poll ghosts for control of lavaland elites if the + original player has left the body. There is still no guarantee of having a new + pet if alternatives are not available. + - tweak: Gibtonite fuses are no longer variable so that miners with good timing + are more consistently rewarded for risking life and limb to try and defuse it. + - balance: PKA modkits have been standardized to cost either 0%, 25%, or 50% capacity. + This means it is now possible to utilize 100% of the weapon's potential and + up to four impactful mods may now be installed! + - balance: PKA modkits that do AoE damage have had their power doubled, but still + have an upper limit of 80% normal power. It is now far more practical to install + AoE damage mods, but will still weaken the power of the weapon overall in exchange + for versatility. + - balance: Damage increasing modkits have had their power halved. This was overlooked + during the major lavaland rebalance that halved the HP of all fauna and halved + the damage of mining tools. Damage modkits are supposed to increase damage by + 25% of base power, not 50%. + - tweak: All modkits are now compatible with mine bots, and the special cooldown + reduction mod has been removed since the normal cooldown mod works on them now. + Mine bots have the same capacity for mods as a PKA. + - tweak: 'Explorer webbing can now hold additional mining tools and items: shovel, + survival knife, emergency oxygen tank, PKA and plasma cutters. It can no longer + hold kitchen knives.' + - code_imp: Cleaned up some variable names and unnecessary code within the kinetic_accelerator + file. From 20df1608f550b2b3de87cbf633ff407aa26c527d Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Mon, 2 Sep 2024 07:03:58 +0000 Subject: [PATCH 08/58] Automatic changelog compile [ci skip] --- html/changelog.html | 14 ++++++++++ html/changelogs/.all_changelog.yml | 29 +++++++++++++++++++++ html/changelogs/AutoChangeLog-pr-11413.yml | 30 ---------------------- 3 files changed, 43 insertions(+), 30 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11413.yml diff --git a/html/changelog.html b/html/changelog.html index e8bd90f8ef904..b141e5e04827d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,20 @@ -->
+

02 September 2024

+

Rukofamicom, Fikou updated:

+
    +
  • Concussive gauntlets have arrived! Shaft miners will find that the diamond pickaxe can no longer be found in tendril chests, and instead they may find concussive gauntlets!
    • +
  • Tumor shards will now poll ghosts for control of lavaland elites if the original player has left the body. There is still no guarantee of having a new pet if alternatives are not available.
    • +
  • Gibtonite fuses are no longer variable so that miners with good timing are more consistently rewarded for risking life and limb to try and defuse it.
    • +
  • PKA modkits have been standardized to cost either 0%, 25%, or 50% capacity. This means it is now possible to utilize 100% of the weapon's potential and up to four impactful mods may now be installed!
    • +
  • PKA modkits that do AoE damage have had their power doubled, but still have an upper limit of 80% normal power. It is now far more practical to install AoE damage mods, but will still weaken the power of the weapon overall in exchange for versatility.
    • +
  • Damage increasing modkits have had their power halved. This was overlooked during the major lavaland rebalance that halved the HP of all fauna and halved the damage of mining tools. Damage modkits are supposed to increase damage by 25% of base power, not 50%.
    • +
  • All modkits are now compatible with mine bots, and the special cooldown reduction mod has been removed since the normal cooldown mod works on them now. Mine bots have the same capacity for mods as a PKA.
    • +
  • Explorer webbing can now hold additional mining tools and items: shovel, survival knife, emergency oxygen tank, PKA and plasma cutters. It can no longer hold kitchen knives.
    • +
  • Cleaned up some variable names and unnecessary code within the kinetic_accelerator file.
    • +
+

01 September 2024

Aramix updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 867cc18ebc8ae..f091f07c9fb21 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44063,3 +44063,32 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. rkz: - tweak: 15 base stamina damage is dealt every time a failed jump is attempted on a multi-z map +2024-09-02: + Rukofamicom, Fikou: + - rscadd: Concussive gauntlets have arrived! Shaft miners will find that the diamond + pickaxe can no longer be found in tendril chests, and instead they may find + concussive gauntlets! + - tweak: Tumor shards will now poll ghosts for control of lavaland elites if the + original player has left the body. There is still no guarantee of having a new + pet if alternatives are not available. + - tweak: Gibtonite fuses are no longer variable so that miners with good timing + are more consistently rewarded for risking life and limb to try and defuse it. + - balance: PKA modkits have been standardized to cost either 0%, 25%, or 50% capacity. + This means it is now possible to utilize 100% of the weapon's potential and + up to four impactful mods may now be installed! + - balance: PKA modkits that do AoE damage have had their power doubled, but still + have an upper limit of 80% normal power. It is now far more practical to install + AoE damage mods, but will still weaken the power of the weapon overall in exchange + for versatility. + - balance: Damage increasing modkits have had their power halved. This was overlooked + during the major lavaland rebalance that halved the HP of all fauna and halved + the damage of mining tools. Damage modkits are supposed to increase damage by + 25% of base power, not 50%. + - tweak: All modkits are now compatible with mine bots, and the special cooldown + reduction mod has been removed since the normal cooldown mod works on them now. + Mine bots have the same capacity for mods as a PKA. + - tweak: 'Explorer webbing can now hold additional mining tools and items: shovel, + survival knife, emergency oxygen tank, PKA and plasma cutters. It can no longer + hold kitchen knives.' + - code_imp: Cleaned up some variable names and unnecessary code within the kinetic_accelerator + file. diff --git a/html/changelogs/AutoChangeLog-pr-11413.yml b/html/changelogs/AutoChangeLog-pr-11413.yml deleted file mode 100644 index 6798e0be1b655..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11413.yml +++ /dev/null @@ -1,30 +0,0 @@ -author: Rukofamicom, Fikou -delete-after: true -changes: - - rscadd: Concussive gauntlets have arrived! Shaft miners will find that the diamond - pickaxe can no longer be found in tendril chests, and instead they may find - concussive gauntlets! - - tweak: Tumor shards will now poll ghosts for control of lavaland elites if the - original player has left the body. There is still no guarantee of having a new - pet if alternatives are not available. - - tweak: Gibtonite fuses are no longer variable so that miners with good timing - are more consistently rewarded for risking life and limb to try and defuse it. - - balance: PKA modkits have been standardized to cost either 0%, 25%, or 50% capacity. - This means it is now possible to utilize 100% of the weapon's potential and - up to four impactful mods may now be installed! - - balance: PKA modkits that do AoE damage have had their power doubled, but still - have an upper limit of 80% normal power. It is now far more practical to install - AoE damage mods, but will still weaken the power of the weapon overall in exchange - for versatility. - - balance: Damage increasing modkits have had their power halved. This was overlooked - during the major lavaland rebalance that halved the HP of all fauna and halved - the damage of mining tools. Damage modkits are supposed to increase damage by - 25% of base power, not 50%. - - tweak: All modkits are now compatible with mine bots, and the special cooldown - reduction mod has been removed since the normal cooldown mod works on them now. - Mine bots have the same capacity for mods as a PKA. - - tweak: 'Explorer webbing can now hold additional mining tools and items: shovel, - survival knife, emergency oxygen tank, PKA and plasma cutters. It can no longer - hold kitchen knives.' - - code_imp: Cleaned up some variable names and unnecessary code within the kinetic_accelerator - file. From f14526b4ed8b58a210044fe44d01a3bb500cef8f Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:06:04 +0100 Subject: [PATCH 09/58] Fixes various mapping issues (#11412) --- .../map_files/Deltastation/DeltaStation2.dmm | 920 ++++++++---------- 1 file changed, 399 insertions(+), 521 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index a5ea8f41ba1a2..f61b319d1e4a0 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -705,20 +705,11 @@ }, /area/hallway/secondary/entry) "aeX" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/delivery, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +/obj/machinery/power/apc/auto_name/directional/north, +/turf/closed/wall/r_wall, +/area/security/brig) "afb" = ( /obj/effect/spawner/randomvend/snack, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/hallway/secondary/entry) @@ -2013,9 +2004,6 @@ /turf/open/floor/plating, /area/maintenance/disposal) "apC" = ( -/obj/machinery/light/small{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -2495,12 +2483,12 @@ /area/maintenance/starboard/fore) "asd" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/maintenance/disposal) -"ase" = ( /obj/machinery/light/small{ dir = 8 }, +/turf/open/floor/plating, +/area/maintenance/disposal) +"ase" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -3780,9 +3768,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 1 +/obj/structure/disposalpipe/sorting/mail/destination/disposals{ + dir = 8 }, /turf/open/floor/iron, /area/quartermaster/storage) @@ -4477,12 +4464,10 @@ /area/maintenance/port/fore) "aBB" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - name = "Custodial Junction"; - sortType = 22 - }, /obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/sorting/mail/destination/janitor_closet{ + dir = 8 + }, /turf/open/floor/iron, /area/maintenance/port/fore) "aBC" = ( @@ -4928,10 +4913,6 @@ /obj/machinery/computer/cargo{ dir = 8 }, -/obj/machinery/camera/directional/east{ - c_tag = "Cargo Bay - Starboard"; - name = "cargo camera" - }, /obj/effect/turf_decal/bot, /obj/machinery/light{ dir = 4 @@ -5034,6 +5015,12 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/power/apc/auto_name/directional/north{ + areastring = "/area/engine/supermatter" + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "aEt" = ( @@ -5721,6 +5708,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "aJk" = ( @@ -6129,9 +6119,6 @@ /area/quartermaster/sorting) "aLY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/conveyor/inverted{ dir = 10; id = "cargoload" @@ -6889,18 +6876,13 @@ /turf/open/floor/iron, /area/engine/atmos) "aRB" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/camera/autoname/directional/east, /obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 4 }, /turf/open/floor/iron, -/area/engine/atmos) +/area/crew_quarters/fitness/recreation) "aRE" = ( /obj/structure/lattice, /turf/open/space, @@ -9246,12 +9228,10 @@ /turf/open/floor/engine/n2o, /area/engine/atmos) "biX" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/yellow/visible, /turf/open/floor/iron, /area/engine/atmos) "bjh" = ( @@ -9447,9 +9427,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 10 }, @@ -9458,7 +9435,7 @@ "bkL" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 1 + dir = 8 }, /turf/open/floor/iron, /area/engine/atmos) @@ -10970,16 +10947,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 23 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/genetics{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/medbay/central) "bsW" = ( @@ -14502,10 +14478,6 @@ pixel_x = -1; pixel_y = 4 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/item/paper/fluff/jobs/medical/hippocratic, /turf/open/floor/iron/dark, /area/medical/medbay/lobby) @@ -16107,9 +16079,6 @@ /obj/item/clothing/mask/cigarette/cigar, /obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/reagent_containers/food/drinks/flask/det, -/obj/machinery/camera/directional/west{ - c_tag = "Detective's Office" - }, /turf/open/floor/carpet/red, /area/security/detectives_office) "ceQ" = ( @@ -17129,16 +17098,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - sortType = 10 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/cmo_office{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "cld" = ( @@ -17468,11 +17436,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 29 - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/sorting/mail/destination/law_office{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard) "cne" = ( @@ -20475,17 +20442,13 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "cCq" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/structure/lattice, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Head of Security's Office"; + network = list("ss13","security") }, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) +/turf/open/space, +/area/space/nearstation) "cCr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -22492,12 +22455,12 @@ pixel_x = -26; pixel_y = -26 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/dormitories{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "cMG" = ( @@ -22864,10 +22827,6 @@ /obj/machinery/gulag_item_reclaimer{ pixel_y = 24 }, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","security") - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -23208,6 +23167,10 @@ /obj/item/radio/intercom{ pixel_x = 26 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/open/floor/iron, /area/science/xenobiology) "cRW" = ( @@ -23747,9 +23710,6 @@ dir = 4 }, /obj/effect/landmark/start/assistant, -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) @@ -24115,10 +24075,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","medbay") - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -24138,6 +24094,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "cYB" = ( @@ -24388,7 +24347,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/disposal/bin, +/obj/structure/disposaloutlet, /turf/open/floor/iron, /area/science/xenobiology) "dav" = ( @@ -24592,7 +24551,6 @@ /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, /obj/effect/decal/cleanable/dirt, -/obj/structure/rack, /obj/item/wrench, /obj/item/rollerbed, /turf/open/floor/plating, @@ -24628,9 +24586,6 @@ /obj/item/canvas/twentythree_twentythree, /obj/item/canvas/twentythree_twentythree, /obj/item/canvas/twentythree_twentythree, -/obj/machinery/light/small{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 4 }, @@ -25433,10 +25388,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","prison") - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/prison, /area/security/prison) "die" = ( @@ -25623,21 +25575,19 @@ /turf/open/floor/iron/white, /area/science/research) "djM" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 24 - }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/testing_range{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "djO" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 25 - }, /obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/sorting/mail/destination/toxins{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "djS" = ( @@ -25937,7 +25887,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/science/research) "dmN" = ( @@ -28411,6 +28363,10 @@ /area/science/robotics/lab) "dGo" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/plating, /area/medical/medbay/lobby) "dGA" = ( @@ -29227,7 +29183,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/preset/toxins{ - dir = 4 + dir = 8 }, /turf/open/floor/plating/airless, /area/science/test_area) @@ -30059,6 +30015,10 @@ }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/medical/medbay/lobby) "dSh" = ( @@ -30221,10 +30181,6 @@ id = "chemistbot"; name = "Chemistry Side Shutters" }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/structure/desk_bell{ pixel_x = 5; pixel_y = -1 @@ -30480,12 +30436,19 @@ /turf/open/floor/iron/checker, /area/engine/atmos) "dWg" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/effect/turf_decal/delivery, /turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/area/security/brig) "dWv" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 @@ -31748,6 +31711,10 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/plating, /area/medical/medbay/lobby) "ehA" = ( @@ -31832,22 +31799,12 @@ /area/security/checkpoint/customs/auxiliary) "eiw" = ( /obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "AI Satellite - Fore Starboard"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 + dir = 1; + layer = 2.9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) +/obj/machinery/camera/directional/south, +/turf/open/space, +/area/space/nearstation) "eiz" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -31962,9 +31919,6 @@ /turf/closed/wall, /area/medical/medbay/aft) "ekb" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -32820,6 +32774,7 @@ pixel_x = -31; pixel_y = -3 }, +/obj/machinery/camera/directional/west, /turf/open/floor/iron, /area/security/checkpoint/medical) "ewt" = ( @@ -33234,9 +33189,6 @@ /turf/open/floor/iron, /area/maintenance/starboard/aft) "eBr" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -33244,6 +33196,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/science/nanite) "eCe" = ( @@ -33279,6 +33234,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/security/checkpoint/medical) +"eCm" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/camera/directional/west, +/turf/open/space, +/area/space/nearstation) "eCn" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -33544,10 +33506,6 @@ pixel_x = -4; pixel_y = 2 }, -/obj/machinery/camera{ - c_tag = "Security - Medbay"; - dir = 5 - }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/item/radio/intercom{ @@ -33696,12 +33654,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/camera/directional/west{ - c_tag = "AI Satellite - Starboard"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -34620,14 +34572,12 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar/atrium) "eYT" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "HoS Junction"; - sortType = 8 - }, /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/hos_office{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "eYY" = ( @@ -35525,6 +35475,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "fll" = ( @@ -36155,10 +36108,6 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/item/clipboard{ pixel_x = -4; pixel_y = 2 @@ -36256,15 +36205,13 @@ /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness/recreation) "fAF" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 }, -/obj/machinery/camera/directional/west{ - c_tag = "Recreation - Center"; - name = "recreation camera" +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron{ + heat_capacity = 1e+006 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "fAO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -36815,13 +36762,12 @@ /turf/open/floor/iron, /area/engine/atmos) "fKY" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 28 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/xenobiology{ + dir = 8 + }, /turf/open/floor/iron, /area/science/research) "fLo" = ( @@ -39527,15 +39473,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/science/research) "gze" = ( @@ -39771,7 +39717,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/sorting/unsorted{ dir = 4 }, /turf/open/floor/iron, @@ -39892,10 +39838,8 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "RD's Junction"; - sortType = 13 +/obj/structure/disposalpipe/sorting/mail/destination/rd_office{ + dir = 2 }, /turf/open/floor/iron/white, /area/science/research) @@ -40471,9 +40415,6 @@ /turf/open/floor/iron, /area/medical/patients_rooms) "gPb" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -42940,6 +42881,7 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/medical/patients_rooms) "hEk" = ( @@ -43958,10 +43900,8 @@ /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "Research Junction"; - sortType = 12 +/obj/structure/disposalpipe/sorting/mail/destination/research{ + dir = 1 }, /turf/open/floor/iron, /area/science/research) @@ -44476,9 +44416,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/disposalpipe/sorting/mail{ - name = "Atmospherics Junction"; - sortType = 6; +/obj/structure/disposalpipe/sorting/mail/destination/atmospherics{ dir = 8 }, /turf/open/floor/iron, @@ -44584,6 +44522,9 @@ /area/engine/atmos) "iaF" = ( /obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/science/research) "iaQ" = ( @@ -45113,10 +45054,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "Security Junction"; - sortType = 7 +/obj/structure/disposalpipe/sorting/mail/destination/security{ + dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -45238,6 +45177,10 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/medical/medbay/lobby) "ikW" = ( @@ -45661,10 +45604,6 @@ name = "Chemistry Desk"; req_access_txt = "5; 33" }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "geneticslab"; - name = "Genetics Lab Shutters" - }, /obj/item/folder/white{ pixel_x = -5; pixel_y = 3 @@ -46214,10 +46153,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, -/obj/machinery/camera/autoname{ - dir = 6; - network = list("ss13","prison") - }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/prison, /area/security/prison) "iBI" = ( @@ -46351,6 +46287,16 @@ /area/crew_quarters/kitchen) "iEe" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "geneticslab"; + name = "Genetics Lab Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "iEp" = ( @@ -46452,10 +46398,6 @@ id = "chemistbot"; name = "Chemistry Side Shutters" }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/structure/sign/departments/minsky/medical/chemistry/chemical2{ pixel_y = 32 }, @@ -47040,16 +46982,15 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/hop) "iSf" = ( -/obj/machinery/light, -/obj/machinery/camera/directional/south{ - c_tag = "Recreation - Aft"; - name = "recreation camera" +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, /turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) +/area/security/brig) "iSq" = ( /obj/structure/cable{ icon_state = "0-2" @@ -47395,9 +47336,6 @@ /turf/open/floor/catwalk_floor, /area/security/checkpoint/escape) "iZX" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/window/reinforced{ dir = 8 }, @@ -47407,11 +47345,8 @@ network = list("minisat"); start_active = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) +/turf/open/space, +/area/space/nearstation) "jaj" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -47720,22 +47655,20 @@ /turf/open/floor/iron, /area/engine/atmos) "jfy" = ( -/obj/structure/window/reinforced, -/obj/machinery/camera/directional/south{ - c_tag = "AI Satellite - Fore"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/pool{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "jfE" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/iv_drip, @@ -48365,10 +48298,6 @@ /turf/open/floor/plating, /area/quartermaster/qm) "jqk" = ( -/obj/structure/disposalpipe/sorting/mail{ - name = "Chapel Junction"; - sortType = 17 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -48376,6 +48305,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/chapel, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "jqq" = ( @@ -49664,10 +49594,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","security") - }, /turf/open/floor/iron/dark/smooth_corner{ dir = 4 }, @@ -52159,12 +52085,10 @@ /obj/structure/sign/poster/official/random{ pixel_x = 32 }, -/obj/machinery/camera/autoname{ - dir = 9 - }, /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/wood, /area/quartermaster/exploration_prep) "kAZ" = ( @@ -52463,7 +52387,6 @@ /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) "kFT" = ( -/obj/machinery/light, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -52506,6 +52429,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/medical/morgue) "kGh" = ( @@ -52876,25 +52800,23 @@ /area/maintenance/disposal/incinerator) "kNE" = ( /obj/effect/turf_decal/tile/neutral, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 30 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/sorting/mail/destination/detective_office{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "kNI" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 27 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail/destination/virology{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/medbay/aft) "kOn" = ( @@ -53868,11 +53790,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - name = "Bar Junction"; - sortType = 19 - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -53880,6 +53797,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/bar/flip{ + dir = 8 + }, /turf/open/floor/iron, /area/maintenance/port/fore) "lhu" = ( @@ -53912,6 +53832,10 @@ dir = 1 }, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/medical/medbay/lobby) "lif" = ( @@ -55603,11 +55527,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2; - name = "Theatre Junction"; - sortType = 18 - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -55615,6 +55534,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/threatre/flip, /turf/open/floor/iron, /area/maintenance/port/fore) "lJV" = ( @@ -56751,6 +56671,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/science/research) "mck" = ( @@ -56864,16 +56785,14 @@ /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "meF" = ( -/obj/machinery/light{ - dir = 1 +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/effect/turf_decal/delivery, -/obj/item/kirbyplants{ - icon_state = "plant-22"; - name = "legally obbligatory mapper potted plant" +/obj/machinery/light{ + dir = 4 }, /turf/open/floor/iron, -/area/hallway/secondary/entry) +/area/crew_quarters/fitness/recreation) "meG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -57642,10 +57561,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/spawner/structure/window/reinforced, @@ -58125,10 +58040,6 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; @@ -60046,6 +59957,7 @@ /obj/structure/chair{ dir = 1 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/medical/surgery) "neH" = ( @@ -60240,9 +60152,6 @@ /turf/open/floor/iron, /area/hallway/primary/central) "nhm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -60256,6 +60165,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/science/nanite) "nhn" = ( @@ -60582,6 +60494,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "nmn" = ( @@ -60645,10 +60560,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/camera/autoname{ - dir = 10; - network = list("ss13","security") - }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "nmW" = ( @@ -60818,10 +60729,6 @@ /obj/machinery/status_display/evac{ pixel_y = -32 }, -/obj/machinery/camera/autoname{ - dir = 10; - network = list("ss13","medbay") - }, /turf/open/floor/iron, /area/medical/patients_rooms) "npA" = ( @@ -62274,6 +62181,21 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/hop) +"nKQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "nLk" = ( /obj/structure/chair/stool/bar, /obj/structure/disposalpipe/segment{ @@ -62450,12 +62372,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - name = "Kitchen Junction"; - sortType = 20 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/kitchen/flip{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "nOt" = ( @@ -62989,6 +62909,12 @@ /obj/machinery/light_switch{ pixel_x = 22 }, +/obj/machinery/camera/directional/east{ + c_tag = "AI Satellite - Port"; + name = "ai camera"; + network = list("minisat"); + start_active = 1 + }, /turf/open/floor/iron/dark, /area/aisat) "nWU" = ( @@ -64193,17 +64119,10 @@ /turf/open/floor/iron, /area/hallway/primary/central) "osG" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/structure/table, /obj/item/clipboard, /obj/item/folder/white, /obj/item/pen, -/obj/machinery/camera/directional/north{ - c_tag = "Recreation - Fore"; - name = "recreation camera" - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -64576,10 +64495,7 @@ pixel_x = -26; pixel_y = 1 }, -/obj/machinery/camera/autoname{ - network = list("ss13","security"); - dir = 10 - }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark/smooth_edge{ dir = 4 }, @@ -65027,10 +64943,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/obj/structure/disposalpipe/sorting/mail{ - name = "CE's Junction"; - sortType = 5 - }, +/obj/structure/disposalpipe/sorting/mail/destination/ce_office, /turf/open/floor/iron, /area/engine/break_room) "oGs" = ( @@ -65498,13 +65411,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 9 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/medbay{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "oPi" = ( @@ -66893,6 +66805,7 @@ /turf/open/floor/iron/dark, /area/library) "pnP" = ( +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/security/main) "pnV" = ( @@ -67295,6 +67208,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "pvd" = ( @@ -67693,6 +67609,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/white, /area/security/brig/medbay) "pDc" = ( @@ -68345,15 +68262,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, /obj/effect/turf_decal/pool{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "pMI" = ( @@ -68528,10 +68445,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "Quartermaster Junction"; - sortType = 3 +/obj/structure/disposalpipe/sorting/mail/destination/qm_office{ + dir = 1 }, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -70897,6 +70812,9 @@ /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/science/research) "qCL" = ( @@ -72456,10 +72374,7 @@ /area/maintenance/port/aft) "rbB" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/camera/autoname{ - dir = 10; - network = list("ss13","medbay") - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/medical/genetics/cloning) "rbE" = ( @@ -73040,23 +72955,9 @@ /turf/open/floor/plating, /area/maintenance/port) "rjz" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/camera/directional/east{ - c_tag = "AI Satellite - Aft Port"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) +/obj/machinery/power/apc/auto_name/directional/north, +/turf/closed/wall/r_wall, +/area/maintenance/disposal/incinerator) "rjB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73255,11 +73156,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - name = "Hydroponics Junction"; - sortType = 21 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -73270,6 +73166,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/structure/disposalpipe/sorting/mail/destination/hydroponics/flip{ + dir = 8 + }, /turf/open/floor/iron, /area/maintenance/port/fore) "rnd" = ( @@ -73465,9 +73364,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, @@ -73559,6 +73455,13 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) +"rrk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/science/nanite) "rrl" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -74484,6 +74387,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/science/nanite) "rHf" = ( @@ -74653,9 +74559,6 @@ /area/engine/engineering) "rJs" = ( /obj/structure/closet/athletic_mixed, -/obj/machinery/light/small{ - dir = 4 - }, /obj/item/pool/pool_noodle, /obj/item/pool/pool_noodle, /obj/item/pool/rubber_ring, @@ -75162,6 +75065,13 @@ }, /turf/open/floor/iron, /area/engine/storage_shared) +"rQM" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/camera/directional/west, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "rRd" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -75207,15 +75117,13 @@ id = "bridgedoors"; name = "Bridge Access Blast door" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "HoP Junction"; - sortType = 15 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/hop_office{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/bridge) "rSZ" = ( @@ -75307,8 +75215,10 @@ icon_state = "1-8" }, /obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/science/xenobiology) "rTH" = ( @@ -75440,6 +75350,9 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "rVT" = ( @@ -75542,10 +75455,10 @@ /area/science/lab) "rXz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/science/xenobiology) "rXE" = ( @@ -76007,14 +75920,14 @@ /turf/open/floor/iron, /area/security/brig) "see" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "sef" = ( @@ -76469,6 +76382,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/science/research) "smd" = ( @@ -76948,14 +76862,12 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "stM" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 10 +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 }, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/tcommsat/server) +/obj/machinery/camera/directional/north, +/turf/open/floor/iron, +/area/quartermaster/storage) "stS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -77009,8 +76921,8 @@ dir = 9 }, /obj/effect/turf_decal/tile/brown/half/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 8 }, /turf/open/floor/iron, /area/quartermaster/sorting) @@ -77762,10 +77674,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","security") - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark/smooth_edge{ dir = 1 }, @@ -77796,6 +77705,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/medical/medbay/lobby) "sHi" = ( @@ -79260,10 +79173,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Head of Security's Quarters"; - network = list("ss13","security") - }, /turf/open/floor/iron, /area/crew_quarters/heads/hos) "tep" = ( @@ -79557,14 +79466,12 @@ /turf/open/floor/iron, /area/quartermaster/qm) "tkd" = ( -/obj/machinery/light/small{ +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 6 - }, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/tcommsat/server) +/obj/machinery/camera/directional/west, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "tkj" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -79707,9 +79614,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 11 +/obj/structure/disposalpipe/sorting/mail/destination/chemistry{ + dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -80832,23 +80738,12 @@ /turf/open/floor/iron/dark, /area/maintenance/department/medical/morgue) "tBX" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/camera/directional/east{ - c_tag = "AI Satellite - Fore Port"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 10 + }, +/turf/open/floor/iron, +/area/engine/atmos) "tCb" = ( /obj/structure/window/reinforced{ dir = 8 @@ -82726,6 +82621,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/plating, /area/medical/medbay/lobby) "ujf" = ( @@ -83486,6 +83385,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, /turf/open/floor/iron, /area/security/checkpoint/medical) "uvs" = ( @@ -83876,6 +83779,13 @@ /obj/item/paper_bin, /obj/item/pen, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "geneticslab"; + name = "Genetics Lab Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "uEb" = ( @@ -85486,6 +85396,7 @@ c_tag = "Cargo Bay - Aft Starboard"; name = "cargo camera" }, +/obj/machinery/light, /turf/open/floor/iron, /area/quartermaster/storage) "veA" = ( @@ -85605,6 +85516,9 @@ "vgu" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/nanite) "vgB" = ( @@ -86475,6 +86389,13 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "geneticslab"; + name = "Genetics Lab Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "vuq" = ( @@ -87645,9 +87566,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/light/small{ dir = 1 }, @@ -88148,13 +88066,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - name = "Library Junction"; - sortType = 16 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail/destination/library/flip{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port) "vVL" = ( @@ -88420,23 +88336,11 @@ /turf/open/floor/iron/white, /area/medical/genetics) "vZk" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "AI Satellite - Aft Starboard"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/aisat) +/obj/structure/window/reinforced, +/obj/structure/lattice, +/obj/machinery/camera/directional/north, +/turf/open/space, +/area/space/nearstation) "vZo" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 6 @@ -89212,9 +89116,12 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) "wlf" = ( -/obj/machinery/light/small, -/turf/open/floor/iron/smooth, -/area/tcommsat/server) +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "wlp" = ( /obj/effect/turf_decal/siding/wideplating_new/dark/corner{ dir = 8 @@ -89375,12 +89282,8 @@ dir = 1; pixel_y = -26 }, -/obj/machinery/camera{ - c_tag = "Courtroom - Fore"; - dir = 5; - network = list("ss13","security") - }, /obj/structure/fluff/hedge, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark/smooth_edge{ dir = 8 }, @@ -89444,15 +89347,12 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/disposalpipe/sorting/mail{ - name = "Engineering Junction"; - sortType = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail/destination/engineering, /turf/open/floor/iron, /area/engine/engineering) "woe" = ( @@ -90795,10 +90695,6 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -91492,6 +91388,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "wRi" = ( @@ -93106,9 +93005,6 @@ /area/ai_monitored/turret_protected/ai) "xtq" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/delivery, /obj/item/kirbyplants{ icon_state = "plant-22"; @@ -93760,10 +93656,6 @@ /obj/item/reagent_containers/syringe, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /turf/open/floor/iron/dark, /area/medical/medbay/lobby) "xDV" = ( @@ -93793,13 +93685,10 @@ name = "old sink"; pixel_y = 28 }, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","security") - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/security/main) "xDX" = ( @@ -93812,10 +93701,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - name = "Cargo Junction"; - sortType = 2 +/obj/structure/disposalpipe/sorting/mail/destination/cargo_bay{ + dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/central) @@ -93955,12 +93842,10 @@ /turf/open/indestructible/sound/pool/end, /area/crew_quarters/fitness/recreation) "xHF" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "Robotics Junction"; - sortType = 14 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/robotics{ + dir = 1 + }, /turf/open/floor/iron, /area/science/research) "xHG" = ( @@ -94327,9 +94212,6 @@ /turf/open/floor/prison/dark, /area/security/prison) "xMT" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Security Post - Medbay" - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -94529,6 +94411,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron, /area/engine/atmospherics_engine) "xPo" = ( @@ -94837,9 +94722,6 @@ "xTZ" = ( /obj/structure/table/glass, /obj/item/storage/backpack/duffelbag/med/surgery, -/obj/machinery/camera/autoname{ - dir = 5 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -95389,10 +95271,6 @@ /area/janitor/custodian) "ybx" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "geneticslab"; - name = "Genetics Lab Shutters" - }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -101029,7 +100907,7 @@ bmD bpF bmD bpF -bmD +eCm bpF bmD bpF @@ -101284,7 +101162,7 @@ aad bkE ppV qfm -iZX +qfm qfm tCb kgc @@ -101788,7 +101666,7 @@ bmD bmD bpF bmD -bmD +eCm bpF bmD bmD @@ -102045,7 +101923,7 @@ uPJ uPJ uPJ uPJ -tBX +uPJ uPJ uPJ uPJ @@ -102322,7 +102200,7 @@ bPC bkE sqE bNB -bmD +eCm bpF bmD bmD @@ -102582,7 +102460,7 @@ uPJ uPJ uPJ uPJ -rjz +uPJ uPJ uPJ wGQ @@ -104130,7 +104008,7 @@ bkE vli suY lUu -brN +eiw wiQ aaa aaa @@ -104353,7 +104231,7 @@ aad bkE dpf obd -jfy +jQx brQ btH btH @@ -104607,7 +104485,7 @@ aaa aaa aaa wiQ -bkF +vZk dpf vFU xvN @@ -106180,7 +106058,7 @@ uPJ uPJ uPJ uPJ -vZk +uPJ uPJ uPJ cvA @@ -106437,7 +106315,7 @@ bNu bmH bpN bmH -bmH +iZX bpN bmH bmH @@ -106671,7 +106549,7 @@ uPJ uPJ uPJ uPJ -eiw +uPJ uPJ uPJ uPJ @@ -106931,7 +106809,7 @@ bmH bmH bpN bmH -bmH +iZX bpN bmH bpN @@ -119255,7 +119133,7 @@ bdd hvQ hvQ hvQ -hvQ +tBX bkL rZo bom @@ -119751,7 +119629,7 @@ nlZ nlZ vtt tde -aFr +rjz uIt gtJ aLm @@ -122328,7 +122206,7 @@ qje aRF wLp lwT -aRB +aRw rOx hoy gPR @@ -127030,7 +126908,7 @@ cMY dhU djK djK -dmF +rrk kkD dmF djF @@ -128196,7 +128074,7 @@ ads aaO aaO aaO -meF +gOs afw afT agk @@ -132051,7 +131929,7 @@ ads aaO cYD aaO -meF +gOs afw afT agk @@ -133079,7 +132957,7 @@ adq aaO enM aaO -aeX +agk afx afx gOs @@ -134699,11 +134577,11 @@ sQH bUI coe bUI -tkd +vCq hGZ qDD cSI -wlf +cSI bUI coe wwj @@ -135213,11 +135091,11 @@ sQH bUI bUI bUI -stM +qxk hEN qDD cSI -wlf +cSI bUI bUI hgU @@ -135797,7 +135675,7 @@ dST uus qCL dVl -dWg +dVl dVl dVl bLp @@ -135805,7 +135683,7 @@ dVl bLp dVl dVl -dWg +dVl dVl dVl bLp @@ -141073,7 +140951,7 @@ aoE pKM lkf aoF -sNU +stM ayB azE azE @@ -141850,7 +141728,7 @@ gcu nBv aCb hlZ -aEh +avW ldp aGD aHW @@ -145742,7 +145620,7 @@ fVL rob rob gdZ -gdZ +nKQ gPb gdZ gdZ @@ -145754,7 +145632,7 @@ tnr bgZ bgZ bgZ -bgZ +aeX bgZ jFJ pMO @@ -147550,7 +147428,7 @@ qZl kko taC pZK -sdY +iSf vSX oXU uzA @@ -147807,7 +147685,7 @@ eJa pne cLk uiv -uiv +dWg tJz mPI mIl @@ -149364,14 +149242,14 @@ cuL cwd qzt czg -cwd +tkd cCk cDJ cFC cwd cIk xLr -fAF +gsU cMF cYr cPX @@ -149379,7 +149257,7 @@ cRw cTd cVc xEx -cYr +rQM sTR dbF ddv @@ -149630,7 +149508,7 @@ sNq fDm phy pMF -sNq +jfy sNq qFm uxo @@ -150410,7 +150288,7 @@ sTP gsU pDo qwP -iSf +upD cuM aad cHU @@ -151420,22 +151298,22 @@ cuM twt twt twt -twt -cCq +meF +cFD cDO cFD cFD -twt +meF iLk nvA nvA dbJ -dbJ +wlf cRx cRx cVg cRx -dbJ +aRB dbJ dbJ ddy @@ -151668,7 +151546,7 @@ boa mgC ewo biP -aad +cCq aaa aaa aaa @@ -151676,8 +151554,8 @@ aaa cuM jQL jQL -jQL -cuM +fAF +cuL cuM cuM cuM @@ -151692,7 +151570,7 @@ cuM cuM cuM cuM -cuM +cuL daj dbK ddz From fe1c302ddc20038a946988039e80ab42acfa9ccf Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Mon, 2 Sep 2024 07:15:38 -0500 Subject: [PATCH 10/58] Automatic changelog generation for PR #11412 [ci skip] --- html/changelogs/AutoChangeLog-pr-11412.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11412.yml diff --git a/html/changelogs/AutoChangeLog-pr-11412.yml b/html/changelogs/AutoChangeLog-pr-11412.yml new file mode 100644 index 0000000000000..894d75aaddddb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11412.yml @@ -0,0 +1,4 @@ +author: PowerfulBacon +delete-after: true +changes: + - bugfix: Fixes some mapping issues with DeltaStation. From 023f7b5eccd6cc492b2e587d446cc897fb7274c3 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:06:52 +0000 Subject: [PATCH 11/58] Automatic changelog compile [ci skip] --- html/changelog.html | 4 ++++ html/changelogs/.all_changelog.yml | 2 ++ html/changelogs/AutoChangeLog-pr-11412.yml | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11412.yml diff --git a/html/changelog.html b/html/changelog.html index b141e5e04827d..87b307417a296 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,10 @@

    02 September 2024

    +

    PowerfulBacon updated:

    +
      +
    • Fixes some mapping issues with DeltaStation.
      • +

    Rukofamicom, Fikou updated:

    • Concussive gauntlets have arrived! Shaft miners will find that the diamond pickaxe can no longer be found in tendril chests, and instead they may find concussive gauntlets!
      • diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index f091f07c9fb21..b3ee171c49bba 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44064,6 +44064,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - tweak: 15 base stamina damage is dealt every time a failed jump is attempted on a multi-z map 2024-09-02: + PowerfulBacon: + - bugfix: Fixes some mapping issues with DeltaStation. Rukofamicom, Fikou: - rscadd: Concussive gauntlets have arrived! Shaft miners will find that the diamond pickaxe can no longer be found in tendril chests, and instead they may find diff --git a/html/changelogs/AutoChangeLog-pr-11412.yml b/html/changelogs/AutoChangeLog-pr-11412.yml deleted file mode 100644 index 894d75aaddddb..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11412.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: PowerfulBacon -delete-after: true -changes: - - bugfix: Fixes some mapping issues with DeltaStation. From a42316d87619e66fcd1999275ab83af930cb57bf Mon Sep 17 00:00:00 2001 From: ClownMoff <148357670+ClownMoff@users.noreply.github.com> Date: Mon, 2 Sep 2024 16:23:38 +0100 Subject: [PATCH 12/58] Pigeon DeltaStation Fixes (#11417) * Update DeltaStation2.dmm * Update DeltaStation2.dmm * FREEEEEEE BIIIIIIIIIIIIIIIIIIIIIIIIIIRD * Update DeltaStation2.dmm * Update DeltaStation2.dmm * Update DeltaStation2.dmm --- .../map_files/Deltastation/DeltaStation2.dmm | 186 +++++++++--------- 1 file changed, 92 insertions(+), 94 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index f61b319d1e4a0..72e3771251359 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -8234,12 +8234,6 @@ /obj/machinery/status_display/evac, /turf/closed/wall, /area/quartermaster/office) -"bct" = ( -/obj/effect/turf_decal/tile/techfloorgrid{ - dir = 5 - }, -/turf/open/space/basic, -/area/space) "bcy" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -14385,11 +14379,13 @@ /obj/machinery/status_display/evac{ pixel_x = 32 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/camera/directional/east{ c_tag = "Interrogation room"; network = list("interrogation") }, +/obj/structure/chair/foldable{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/security/main) "bTW" = ( @@ -15909,6 +15905,16 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"cdN" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark/smooth_large, +/area/security/main) "cdX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ @@ -38555,10 +38561,15 @@ /turf/open/floor/plating, /area/security/checkpoint/medical) "gne" = ( -/obj/structure/chair/foldable, /obj/machinery/airalarm/directional/north{ pixel_y = 23 }, +/obj/structure/table/wood, +/obj/item/taperecorder{ + layer = 2.9; + pixel_x = -1; + pixel_y = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "gnF" = ( @@ -38773,12 +38784,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/secondary/command) -"gqe" = ( -/obj/machinery/airalarm/directional/south{ - pixel_y = -22 - }, -/turf/closed/wall/r_wall, -/area/security/prison/shielded) "gqp" = ( /obj/machinery/door/poddoor/preopen{ id = "brigfront"; @@ -38996,6 +39001,7 @@ /obj/structure/chair/fancy/bench/right{ dir = 1 }, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/security/prison) "gsS" = ( @@ -44199,12 +44205,6 @@ }, /turf/open/floor/catwalk_floor/iron, /area/tcommsat/server) -"hVJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) "hVM" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -45590,8 +45590,11 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "irK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, /turf/open/floor/iron/dark, /area/security/main) @@ -47511,6 +47514,11 @@ }, /turf/open/floor/iron/white, /area/science/mixing) +"jco" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/plating, +/area/security/main) "jcs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -50897,8 +50905,8 @@ /turf/open/floor/iron/dark, /area/medical/morgue) "kgi" = ( -/obj/structure/chair/foldable{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, /turf/open/floor/iron/dark, /area/security/main) @@ -54736,6 +54744,11 @@ dir = 1 }, /area/engine/atmos) +"lwK" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/departments/minsky/medical/medical2, +/turf/open/floor/plating, +/area/medical/medbay/lobby) "lwT" = ( /obj/structure/window/reinforced{ dir = 1; @@ -60804,6 +60817,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/security/brig/medbay) +"nrc" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/security/main) "nrf" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -65853,20 +65880,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) -"oWQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 4 - }, -/area/security/main) "oWT" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -65920,16 +65933,6 @@ }, /turf/open/floor/iron, /area/medical/chemistry) -"oXU" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/structure/sign/departments/medbay/alt2{ - pixel_y = -32; - pixel_x = -32 - }, -/turf/open/floor/iron, -/area/security/brig) "oYi" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -68058,7 +68061,6 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "pJP" = ( -/obj/structure/chair/foldable, /obj/item/radio/intercom{ broadcasting = 1; frequency = 1423; @@ -68066,6 +68068,9 @@ name = "Interrogation Intercom"; pixel_y = 24 }, +/obj/structure/chair/foldable{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "pJR" = ( @@ -73367,9 +73372,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/security/main) "rpS" = ( @@ -73431,12 +73433,10 @@ /area/crew_quarters/heads/hop) "rqy" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp, -/obj/item/taperecorder{ - layer = 2.9; - pixel_x = -15; - pixel_y = 4 +/obj/item/folder/red{ + pixel_x = 8 }, +/obj/item/flashlight/lamp, /turf/open/floor/iron/dark, /area/security/main) "rqA" = ( @@ -74056,6 +74056,14 @@ }, /turf/open/floor/iron, /area/construction/mining/aux_base) +"rAM" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/main) "rBd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -76998,10 +77006,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/command) -"suR" = ( -/obj/effect/spawner/structure/window/reinforced/tinted, -/turf/closed/wall/r_wall, -/area/security/brig) "suT" = ( /obj/structure/chair/office, /turf/open/floor/carpet/grimy, @@ -85521,6 +85525,10 @@ }, /turf/open/floor/iron/dark, /area/science/nanite) +"vgz" = ( +/obj/structure/sign/departments/minsky/medical/medical2, +/turf/closed/wall, +/area/security/brig/medbay) "vgB" = ( /obj/structure/window/reinforced{ dir = 4 @@ -88993,14 +89001,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/aft) "wiX" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/structure/chair/foldable{ + dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/security/main) "wjC" = ( @@ -89467,12 +89471,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/atmos) -"wqd" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) "wqg" = ( /obj/structure/table/reinforced, /obj/machinery/newscaster{ @@ -93278,9 +93276,6 @@ /turf/open/floor/iron, /area/security/courtroom) "xxT" = ( -/obj/structure/table/wood, -/obj/item/taperecorder, -/obj/item/folder/red, /obj/machinery/button/door{ id = "interrogationacess"; name = "Interrogation Access"; @@ -93288,6 +93283,9 @@ pixel_y = -6; req_access_txt = "3" }, +/obj/structure/chair/foldable{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/main) "xyD" = ( @@ -135630,7 +135628,7 @@ tLM jUF nqa nsr -dGo +lwK dYe xdx tNX @@ -147174,7 +147172,7 @@ bgZ bgZ fqd oiE -suR +bgZ bgZ clw aaX @@ -147430,7 +147428,7 @@ taC pZK iSf vSX -oXU +sdY uzA sYk clw @@ -148185,7 +148183,7 @@ sQN sjv sjv sjv -gqe +sjv sjv sjv nAX @@ -148194,7 +148192,7 @@ aaz tNF sMU nXU -tNF +vgz sXL lXi txd @@ -149488,7 +149486,7 @@ bhd xDW vGc bLh -pVV +jco bhd bhd bhd @@ -149736,7 +149734,7 @@ tNF tNF hNU igR -tNF +vgz bpa aZx oAB @@ -150498,7 +150496,7 @@ uof beh gne rqy -kgi +rAM xcB kic whT @@ -151011,8 +151009,8 @@ ssg wLW beh beh -lnP beh +lnP beh beh eWs @@ -151268,8 +151266,8 @@ ssg sEn pVV oAH -oWQ dzx +nrc dzx ozi dzx @@ -151525,8 +151523,8 @@ nyn rhW rtH jYR +cdN oHM -gYy vld fNx gYy @@ -157176,7 +157174,7 @@ aaa aaa aaa aaa -bct +aaa aaa aaa aaa @@ -159240,7 +159238,7 @@ aaa aaa aaa aaa -wqd +aaa aaa aaa aaa @@ -159497,7 +159495,7 @@ aaa aaa aaa aaa -hVJ +aaa aaa aaa aaa @@ -159754,7 +159752,7 @@ aaa aaa aaa aaa -hVJ +aaa aaa aaa aaa @@ -160011,7 +160009,7 @@ aaa aaa aaa aaa -hVJ +aaa aaa aaa aaa @@ -160268,7 +160266,7 @@ aaa aaa aaa aaa -hVJ +aaa aaa aaa aaa From b82a3fc574b7712168e033d8d64378f9cc57972c Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Mon, 2 Sep 2024 18:02:37 +0100 Subject: [PATCH 13/58] Fixes several corg mapping issues, including issues with lights, APCs, cameras, disposals and duplicate objects (#11402) Fixes light issues --- _maps/map_files/CorgStation/CorgStation.dmm | 1071 ++++++++----------- _maps/shuttles/tram/tram_corg.dmm | 16 +- 2 files changed, 440 insertions(+), 647 deletions(-) diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm index 83fec45370945..53f06fc4f2f33 100644 --- a/_maps/map_files/CorgStation/CorgStation.dmm +++ b/_maps/map_files/CorgStation/CorgStation.dmm @@ -19,7 +19,6 @@ /area/ai_monitored/turret_protected/ai) "aad" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/camera/autoname/directional/west, /mob/living/simple_animal/parrot/Poly, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) @@ -228,12 +227,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/bridge) "aba" = ( @@ -600,9 +597,6 @@ /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) "aeN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/closed/indestructible{ desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; icon_state = "riveted"; @@ -1256,9 +1250,6 @@ /turf/open/floor/plating, /area/quartermaster/storage) "amr" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -1298,9 +1289,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/effect/landmark/start/warden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1945,10 +1933,6 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - sortType = 13 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -1958,6 +1942,9 @@ /obj/effect/turf_decal/tile/purple/opposingcorners{ dir = 1 }, +/obj/structure/disposalpipe/sorting/mail/destination/testing_range/flip{ + dir = 1 + }, /turf/open/floor/iron, /area/maintenance/department/science) "awJ" = ( @@ -2442,9 +2429,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plating, /area/engine/engine_room) "aDA" = ( @@ -2871,7 +2856,7 @@ dir = 8 }, /obj/machinery/camera/preset/toxins{ - dir = 4 + dir = 8 }, /obj/item/target/alien/anchored, /turf/open/floor/plating/airless, @@ -4172,10 +4157,6 @@ /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = 32 }, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","security") - }, /turf/open/floor/iron/dark, /area/security/main) "aYv" = ( @@ -4694,10 +4675,10 @@ /turf/open/floor/iron, /area/science/mixing) "bih" = ( -/obj/machinery/camera/autoname/directional/south, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/surgery) "bik" = ( @@ -5639,6 +5620,9 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "bBx" = ( @@ -5709,9 +5693,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -6377,14 +6358,12 @@ /turf/open/floor/iron, /area/hallway/secondary/command) "bMa" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "bMw" = ( @@ -6408,13 +6387,11 @@ /turf/open/floor/iron, /area/ai_monitored/storage/eva) "bMC" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/hydroponics) "bME" = ( @@ -7112,13 +7089,11 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "bXu" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2; - name = "Hydroponics Junction"; - sortType = 21 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/green/half/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/hydroponics/flip{ + dir = 2 + }, /turf/open/floor/iron, /area/hallway/secondary/service) "bXO" = ( @@ -7837,20 +7812,9 @@ /turf/open/floor/iron, /area/engine/atmos) "ckQ" = ( -/obj/structure/window/reinforced/spawner{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron, +/area/maintenance/starboard/central) "clk" = ( /obj/machinery/light_switch{ pixel_x = -25; @@ -7894,6 +7858,7 @@ /obj/structure/cable/yellow, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/closet/crate/freezer/surplus_limbs, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/white, /area/security/brig/medbay) "cmv" = ( @@ -8369,25 +8334,10 @@ }, /turf/open/floor/iron/dark, /area/security/checkpoint/engineering) -"cuS" = ( -/obj/structure/window/reinforced/spawner{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner{ - dir = 8 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) "cvn" = ( /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, /obj/effect/turf_decal/bot, -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/quartermaster/storage) "cvq" = ( @@ -8514,18 +8464,19 @@ /turf/open/floor/iron, /area/maintenance/department/science) "cxO" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/medical/chemistry) "cxQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "cxY" = ( @@ -8902,9 +8853,7 @@ "cFt" = ( /obj/structure/flora/ausbushes/pointybush, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/extinguisher_cabinet{ - pixel_x = -30 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/grass/no_border, /area/hallway/secondary/command) "cFG" = ( @@ -9630,12 +9579,10 @@ /turf/open/floor/iron/dark, /area/hallway/primary/starboard) "cUm" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/chapel/main/monastery) "cUn" = ( @@ -9962,6 +9909,7 @@ /obj/item/radio/intercom{ pixel_x = 27 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/engine/atmos) "cZY" = ( @@ -10970,6 +10918,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/medbay/aft) "dpw" = ( @@ -11831,7 +11780,9 @@ }, /obj/structure/cable/yellow, /obj/effect/landmark/blobstart, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sorting/mail/destination/qm_office/flip{ + dir = 2 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "dHf" = ( @@ -12259,9 +12210,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "dMM" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/engine, /area/engine/engine_room) "dMR" = ( @@ -12413,11 +12362,10 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - sortType = 12 - }, /obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/structure/disposalpipe/sorting/mail/destination/research/flip{ + dir = 1 + }, /turf/open/floor/iron, /area/science/research) "dQy" = ( @@ -12476,10 +12424,8 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2; - name = "Security"; - sortType = 8 +/obj/structure/disposalpipe/sorting/mail/destination/hos_office/flip{ + dir = 2 }, /turf/open/floor/iron, /area/security/brig) @@ -12539,6 +12485,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "dRO" = ( @@ -12774,7 +12723,6 @@ /area/quartermaster/sorting) "dVf" = ( /obj/machinery/light, -/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "dVh" = ( @@ -12833,6 +12781,9 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "dWq" = ( @@ -13187,13 +13138,12 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 18 - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/threatre/flip{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "eaL" = ( @@ -14144,13 +14094,13 @@ /area/crew_quarters/dorms) "etP" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/structure/disposalpipe/junction/flip{ - dir = 8 +/obj/structure/disposalpipe/sorting/mail/destination/chemistry{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "euB" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -14185,10 +14135,10 @@ /turf/open/floor/prison, /area/security/prison) "euO" = ( -/obj/structure/disposalpipe/sorting/mail{ +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/structure/disposalpipe/sorting/mail/destination/cmo_office{ dir = 8 }, /turf/open/floor/iron/white, @@ -14711,9 +14661,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/item/radio/intercom{ - pixel_x = -32 - }, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/white, /area/medical/medbay/aft) "eCE" = ( @@ -15228,9 +15176,6 @@ /turf/open/floor/iron, /area/engine/engine_room) "eOo" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/stack/spacecash/c10, @@ -15239,6 +15184,7 @@ pixel_y = 2 }, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "eOw" = ( @@ -15252,12 +15198,11 @@ /turf/open/floor/iron, /area/science/robotics/lab) "eOW" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/maintenance/starboard/fore) "ePb" = ( /obj/machinery/camera/autoname/directional/south, /obj/structure/cable/yellow{ @@ -15291,6 +15236,9 @@ department = "Cargo Deliveries"; pixel_y = -32 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/quartermaster/sorting) "ePr" = ( @@ -15738,9 +15686,7 @@ pixel_x = -3; pixel_y = -3 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, /area/science/explab) "eYN" = ( @@ -16733,12 +16679,10 @@ /turf/open/floor/wood, /area/security/prison) "fod" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/engine/engineering) "fow" = ( @@ -16811,9 +16755,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "fpv" = ( -/obj/machinery/camera/autoname{ - dir = 6 - }, /obj/structure/sign/poster/random{ pixel_x = 32 }, @@ -16827,8 +16768,16 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) +"fpx" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "fpB" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -16869,7 +16818,6 @@ dir = 4 }, /obj/machinery/computer/atmos_control/tank/oxygen_tank, -/obj/machinery/camera/directional/north, /turf/open/floor/iron/dark, /area/engine/atmos) "fqj" = ( @@ -17373,12 +17321,10 @@ /area/hydroponics/garden) "fzC" = ( /obj/item/kirbyplants/random, -/obj/structure/extinguisher_cabinet{ - pixel_x = -30 - }, /obj/effect/turf_decal/siding/wood{ dir = 10 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/wood, /area/crew_quarters/bar) "fzO" = ( @@ -17417,12 +17363,10 @@ /obj/machinery/firealarm{ pixel_y = -24 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -30 - }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/white, /area/medical/surgery) "fAg" = ( @@ -17847,6 +17791,9 @@ req_access_txt = "45" }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/surgery) "fHb" = ( @@ -18798,16 +18745,13 @@ /area/hallway/primary/fore) "fYh" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/obj/machinery/camera/directional/north, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/heat_exchanger{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/science/mixing) "fYp" = ( @@ -19008,10 +18952,6 @@ /area/maintenance/starboard/aft) "gbO" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/camera/motion{ - c_tag = "E.V.A. Storage"; - dir = 6 - }, /obj/machinery/light_switch{ pixel_x = 26 }, @@ -19254,6 +19194,9 @@ dir = 9 }, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "gfV" = ( @@ -19482,18 +19425,15 @@ /turf/open/floor/plating, /area/maintenance/starboard/secondary) "gjq" = ( -/obj/structure/window/reinforced/spawner{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced/spawner{ +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron, +/area/crew_quarters/fitness/recreation) "gjH" = ( /obj/structure/chair{ dir = 8 @@ -19522,6 +19462,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/quartermaster/sorting) "gjY" = ( @@ -20375,8 +20316,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/effect/landmark/start/medical_doctor, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "gyG" = ( @@ -20508,9 +20451,6 @@ /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) "gBc" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -20523,6 +20463,7 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/science/lab) "gBe" = ( @@ -21435,12 +21376,10 @@ /turf/open/floor/plating, /area/maintenance/fore) "gOU" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, /area/security/courtroom) "gPn" = ( @@ -21488,6 +21427,12 @@ dir = 5 }, /area/science/breakroom) +"gQc" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "gQn" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -21676,11 +21621,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/camera{ - c_tag = "Medbay Break Room"; - dir = 10; - network = list("ss13","medbay") - }, /turf/open/floor/iron/freezer, /area/medical/virology) "gTW" = ( @@ -21912,6 +21852,9 @@ /obj/structure/table/optable{ name = "Robotics Operating Table" }, +/obj/machinery/light{ + light_color = "#7AC3FF" + }, /turf/open/floor/iron/white, /area/science/robotics/lab) "gYQ" = ( @@ -23009,6 +22952,7 @@ pixel_x = -26; pixel_y = -35 }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/carpet/orange, /area/crew_quarters/heads/chief) "hqx" = ( @@ -23451,18 +23395,21 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/camera/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/green/half/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/virology/flip{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "hyO" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/surgery) "hyS" = ( @@ -23955,9 +23902,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/camera/autoname{ - dir = 5 - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/plating, /area/hallway/secondary/entry) "hGR" = ( @@ -24807,6 +24752,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/floor/iron, /area/science/xenobiology) "hUT" = ( @@ -25371,7 +25319,7 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/item/kirbyplants/photosynthetic, +/obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/AIsatextAP) "idm" = ( @@ -25535,6 +25483,9 @@ "ifz" = ( /obj/effect/landmark/start/cargo_technician, /obj/effect/landmark/event_spawn, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "ifF" = ( @@ -26312,12 +26263,10 @@ /area/ai_monitored/turret_protected/aisat_interior) "irc" = ( /obj/machinery/camera/autoname/directional/west, -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/engine/engineering) "ire" = ( @@ -26924,15 +26873,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - sortType = 5 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/ce_office/flip{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engineering) "iAW" = ( @@ -27194,14 +27142,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2; - name = "Disposals Sorting Junction"; - sortType = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/structure/disposalpipe/sorting/mail/destination/disposals/flip{ + dir = 2 + }, /turf/open/floor/plating, /area/maintenance/starboard/central) "iFt" = ( @@ -27221,13 +27167,12 @@ /area/science/shuttle) "iFz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - sortType = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/engineering{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "iFF" = ( @@ -27617,8 +27562,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail/destination/genetics{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "iOb" = ( @@ -27709,7 +27656,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/camera/autoname/directional/south, /obj/structure/table/reinforced, /obj/item/tank/internals/plasma/full, /obj/item/analyzer, @@ -28130,10 +28076,8 @@ /turf/open/floor/iron, /area/quartermaster/exploration_prep) "iWm" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 30 - }, /obj/effect/turf_decal/tile/purple, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/white, /area/science/research) "iWM" = ( @@ -28504,15 +28448,13 @@ dir = 4 }, /obj/structure/reagent_dispensers/watertank/high, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, /obj/machinery/light{ dir = 1 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/engine/atmos) "jbn" = ( @@ -28740,10 +28682,8 @@ /turf/open/floor/iron, /area/security/brig) "jeM" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron, /area/maintenance/department/science) "jeT" = ( @@ -28838,12 +28778,10 @@ /turf/open/floor/iron/white, /area/science/explab) "jfW" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/engine/engineering) "jfY" = ( @@ -28959,10 +28897,11 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 30 - }, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/white, /area/medical/medbay/aft) "jhK" = ( @@ -29080,6 +29019,9 @@ pixel_x = 32 }, /obj/effect/turf_decal/tile/green/anticorner/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "jkB" = ( @@ -30005,9 +29947,7 @@ }, /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/structure/extinguisher_cabinet{ - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, /area/quartermaster/qm) "jDe" = ( @@ -31431,6 +31371,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/quartermaster/storage) "kco" = ( @@ -31476,8 +31417,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/iron, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth, /area/quartermaster/sorting) "kdc" = ( /obj/structure/grille/broken, @@ -31783,9 +31729,6 @@ /turf/open/floor/engine/co2, /area/engine/atmos) "kiW" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 30 - }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -31794,6 +31737,7 @@ dir = 4; light_color = "#c1caff" }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron, /area/security/brig) "kjl" = ( @@ -32034,9 +31978,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -32044,19 +31985,6 @@ /obj/machinery/telecomms/server/presets/security, /turf/open/floor/circuit/telecomms/server, /area/tcommsat/server) -"kme" = ( -/obj/structure/window/reinforced/spawner{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/AIsatextAP) "kmm" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -32830,7 +32758,6 @@ /obj/machinery/computer/atmos_control/tank/plasma_tank{ dir = 4 }, -/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/engine/atmos) "kxF" = ( @@ -32897,9 +32824,6 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "kyP" = ( -/obj/machinery/camera/autoname{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, @@ -32913,6 +32837,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/engine/atmos) "kyY" = ( @@ -33107,13 +33032,11 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "kCE" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 30 - }, /obj/machinery/camera/autoname/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/wood, /area/crew_quarters/bar) "kDe" = ( @@ -33180,10 +33103,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "kEy" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/camera/autoname/directional/east, +/obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, -/area/engine/atmos) +/area/ai_monitored/storage/eva) "kEH" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/white{ @@ -33204,12 +33127,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"kEV" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/closed/wall, -/area/security/prison) "kFa" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -33939,11 +33856,6 @@ /turf/open/floor/iron/dark, /area/security/main) "kTz" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2; - name = "Kitchen Junction"; - sortType = 20 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, @@ -33951,6 +33863,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/kitchen/flip{ + dir = 2 + }, /turf/open/floor/iron, /area/hallway/secondary/service) "kTL" = ( @@ -34070,6 +33985,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","security") + }, /turf/open/floor/iron, /area/security/brig) "kVq" = ( @@ -34265,14 +34183,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 16 - }, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/library/flip{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "kYS" = ( @@ -34517,7 +34434,6 @@ /obj/structure/table/glass, /obj/item/reagent_containers/glass/bottle/epinephrine, /obj/item/reagent_containers/syringe/epinephrine, -/obj/machinery/camera/autoname/directional/east, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/white, /area/medical/sleeper) @@ -34573,9 +34489,6 @@ /turf/open/floor/plating, /area/science/xenobiology) "lee" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, @@ -34589,6 +34502,7 @@ /obj/structure/window/reinforced/spawner{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/carpet/green, /area/crew_quarters/bar) "lev" = ( @@ -34894,9 +34808,6 @@ /turf/open/floor/iron, /area/quartermaster/storage) "lkw" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, @@ -34906,6 +34817,7 @@ /obj/effect/turf_decal/siding/white/corner{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/white, /area/medical/medbay/central) "lkI" = ( @@ -35020,13 +34932,12 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 23 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/genetics/flip{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "lmv" = ( @@ -35205,15 +35116,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/hallway/primary/fore) "lpA" = ( @@ -36457,12 +36366,10 @@ /turf/open/floor/iron/white, /area/medical/genetics) "lKj" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, /area/engine/engineering) "lKv" = ( @@ -37216,15 +37123,13 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law, /obj/machinery/airalarm/directional/east, /obj/item/storage/fancy/donut_box, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/security/checkpoint/medical) "lWl" = ( @@ -37364,6 +37269,9 @@ }, /obj/machinery/anesthetic_machine, /obj/effect/turf_decal/tile/blue, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/surgery) "lYE" = ( @@ -38269,6 +38177,9 @@ "mkL" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "mkT" = ( @@ -38693,6 +38604,15 @@ /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/maintenance/department/chapel/monastery) +"mrr" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "mrH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -38751,9 +38671,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13","security") - }, /obj/effect/landmark/start/security_officer, /turf/open/floor/iron, /area/security/brig) @@ -39003,9 +38920,6 @@ /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, @@ -39653,7 +39567,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 10 + dir = 4 }, /turf/open/floor/iron, /area/quartermaster/sorting) @@ -39694,10 +39608,6 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "mFx" = ( -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","security") - }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -39782,11 +39692,12 @@ /turf/closed/wall/r_wall, /area/science/lab) "mHx" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -30 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/closed/wall, -/area/quartermaster/storage) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "mHK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -40192,9 +40103,6 @@ /area/quartermaster/exploration_prep) "mOr" = ( /obj/structure/dresser, -/obj/machinery/camera/autoname{ - dir = 6 - }, /obj/machinery/light_switch{ pixel_x = 26 }, @@ -40833,6 +40741,7 @@ /obj/machinery/atmospherics/pipe/manifold/general/hidden{ dir = 1 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/circuit, /area/science/server) "mZM" = ( @@ -41202,6 +41111,7 @@ }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/security/checkpoint/medical) "nfV" = ( @@ -41855,9 +41765,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/bridge) "nsZ" = ( @@ -41943,9 +41851,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - sortType = 6 +/obj/structure/disposalpipe/sorting/mail/destination/atmospherics/flip{ + dir = 4 }, /turf/open/floor/iron, /area/engine/engineering) @@ -42156,12 +42063,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/quartermaster/sorting) "nzh" = ( @@ -42701,10 +42609,8 @@ /turf/open/floor/iron, /area/engine/atmos) "nHF" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2; - name = "Bar Junction"; - sortType = 19 +/obj/structure/disposalpipe/sorting/mail/destination/bar/flip{ + dir = 2 }, /turf/open/floor/wood, /area/crew_quarters/bar) @@ -43314,7 +43220,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/junction{ +/obj/structure/disposalpipe/sorting/mail/destination/detective_office{ dir = 2 }, /turf/open/floor/iron, @@ -43345,13 +43251,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) -"nQJ" = ( -/obj/machinery/camera/directional/north, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/kitchen) "nRb" = ( /obj/structure/window/reinforced/spawner{ dir = 8 @@ -43359,10 +43258,12 @@ /obj/structure/sign/departments/minsky/medical/virology/virology1{ pixel_x = -32 }, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "nRf" = ( @@ -43624,7 +43525,6 @@ /area/maintenance/starboard/aft) "nWj" = ( /obj/structure/window/reinforced/spawner, -/obj/machinery/light/small, /obj/machinery/ai_slipper{ uses = 10 }, @@ -44575,6 +44475,10 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "oms" = ( @@ -44627,9 +44531,7 @@ /area/crew_quarters/heads/hos) "onb" = ( /obj/effect/turf_decal/tile/purple, -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/science/research) "onl" = ( @@ -44769,9 +44671,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/camera/autoname{ - dir = 9 - }, /turf/open/floor/iron, /area/maintenance/starboard/central) "opu" = ( @@ -44805,7 +44704,6 @@ /area/hydroponics) "opK" = ( /obj/machinery/vending/medical, -/obj/machinery/vending/medical, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, @@ -45177,6 +45075,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "owR" = ( @@ -45727,19 +45628,6 @@ }, /turf/open/floor/iron, /area/medical/chemistry) -"oEj" = ( -/obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) "oED" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/wood, @@ -45871,9 +45759,6 @@ /turf/open/floor/grass/no_border, /area/hallway/secondary/command) "oGN" = ( -/obj/machinery/camera/autoname{ - dir = 10 - }, /obj/structure/closet/radiation, /turf/open/floor/noslip/dark, /area/engine/engineering) @@ -46000,6 +45885,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/medbay/aft) "oJm" = ( @@ -46012,12 +45898,10 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "oJn" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 30 - }, /obj/structure/closet/radiation, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron, /area/engine/atmos) "oJE" = ( @@ -46069,17 +45953,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) -"oKU" = ( -/obj/machinery/camera/autoname{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness/recreation) "oLv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -46809,9 +46682,6 @@ /turf/open/floor/plating, /area/crew_quarters/toilet) "paN" = ( -/obj/structure/bed{ - dir = 8 - }, /obj/structure/bed{ dir = 8 }, @@ -47122,20 +46992,11 @@ /turf/open/floor/plating, /area/maintenance/port/central) "phw" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 +/obj/structure/disposalpipe/segment{ + dir = 9 }, /turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/maintenance/starboard/fore) "phz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -47640,12 +47501,10 @@ /turf/open/floor/iron, /area/engine/atmos) "pra" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/medical/chemistry) "pri" = ( @@ -47656,9 +47515,7 @@ /obj/structure/mirror{ pixel_x = 28 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/white, /area/crew_quarters/bar) "prx" = ( @@ -47681,6 +47538,9 @@ }, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/white, /area/medical/surgery) "prT" = ( @@ -47786,7 +47646,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/holopad, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -47807,9 +47666,7 @@ "ptC" = ( /obj/structure/table/wood, /obj/item/instrument/violin, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/carpet/grimy, /area/chapel/office) "ptE" = ( @@ -47875,10 +47732,8 @@ /obj/item/assembly/prox_sensor, /obj/item/assembly/prox_sensor, /obj/item/assembly/prox_sensor, -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, /obj/machinery/cell_charger, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, /area/science/robotics/lab) "puw" = ( @@ -48076,6 +47931,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/construction/mining/aux_base) "pxv" = ( @@ -48576,6 +48432,7 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/white, /area/medical/genetics/cloning) "pFS" = ( @@ -49326,6 +49183,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/science/mixing) "pSB" = ( @@ -49501,12 +49359,10 @@ /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) "pVH" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, /obj/effect/turf_decal/caution, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/camera/autoname/directional/west, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/noslip/standard, /area/hallway/secondary/service) "pVT" = ( @@ -49829,19 +49685,6 @@ }, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/foyer) -"qaQ" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/advanced_airlock_controller{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "qaT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -50236,6 +50079,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/white, /area/medical/surgery) "qiD" = ( @@ -50243,13 +50087,11 @@ /turf/open/space/basic, /area/space) "qiL" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - name = "Security"; - sortType = 7 - }, /obj/effect/turf_decal/box, /obj/machinery/holopad, +/obj/structure/disposalpipe/sorting/mail/destination/security{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/brig) "qiM" = ( @@ -50512,6 +50354,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/disposalpipe/sorting/unsorted/flip{ + dir = 2 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "qnt" = ( @@ -51301,11 +51146,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Medbay Break Room"; - dir = 9; - network = list("ss13","medbay") - }, /turf/open/floor/iron/white, /area/medical/virology) "qBa" = ( @@ -51315,16 +51155,15 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 15 - }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/structure/disposalpipe/sorting/mail/destination/hop_office{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "qBi" = ( @@ -51484,11 +51323,10 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 26 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/dormitories/flip{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) "qCW" = ( @@ -52319,9 +52157,7 @@ /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, /area/engine/engine_room) "qRL" = ( @@ -52329,6 +52165,7 @@ /obj/machinery/newscaster{ pixel_y = -32 }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/security/main) "qRP" = ( @@ -52774,18 +52611,10 @@ /turf/open/space/basic, /area/space/nearstation) "rav" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/obj/structure/closet/secure_closet/engineering_personal, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/noslip/dark, +/area/engine/engineering) "raK" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -52930,12 +52759,10 @@ /turf/closed/wall, /area/hallway/primary/aft) "rdL" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 - }, /obj/effect/turf_decal/tile/bar{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "rdU" = ( @@ -52997,9 +52824,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/plating, /area/maintenance/starboard/aft) "reZ" = ( @@ -53422,13 +53247,12 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "rkU" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - sortType = 17 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/structure/disposalpipe/sorting/mail/destination/chapel/flip{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/chapel/main/monastery) "rlh" = ( @@ -53460,13 +53284,11 @@ }, /obj/item/stack/cable_coil/green, /obj/item/stack/cable_coil/green, -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, /obj/item/rcl/pre_loaded, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/engine/engine_room) "rlM" = ( @@ -53716,10 +53538,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/structure/disposalpipe/sorting/mail/destination/cmo_office{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "rps" = ( @@ -54253,10 +54077,8 @@ /obj/structure/chair/wood{ dir = 1 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/effect/turf_decal/siding/wood, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/wood/big, /area/crew_quarters/heads/captain) "ryM" = ( @@ -54661,9 +54483,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 30 - }, /obj/machinery/door/window/northright{ name = "Library Desk Door"; req_access_txt = "37" @@ -54671,6 +54490,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/wood, /area/library) "rFo" = ( @@ -54699,11 +54519,10 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - sortType = 28 - }, /obj/effect/landmark/start/scientist, +/obj/structure/disposalpipe/sorting/mail/destination/xenobiology/flip{ + dir = 1 + }, /turf/open/floor/iron/white, /area/science/research) "rFM" = ( @@ -54850,7 +54669,7 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/structure/chair, +/obj/item/kirbyplants/photosynthetic, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/AIsatextAP) "rHW" = ( @@ -55011,6 +54830,9 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/medbay/aft) "rKx" = ( @@ -55053,7 +54875,7 @@ /area/science/shuttle) "rLL" = ( /obj/structure/disposalpipe/segment{ - dir = 5 + dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) @@ -55393,10 +55215,8 @@ }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/delivery, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/medical/cryo) "rRh" = ( @@ -55826,13 +55646,12 @@ /area/security/brig/medbay) "rYP" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - sortType = 25 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/toxins/flip{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/mixing) "rYU" = ( @@ -55959,12 +55778,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/quartermaster/exploration_prep) "sbI" = ( @@ -56062,13 +55879,11 @@ /turf/open/floor/iron, /area/science/shuttle) "sdi" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/hallway/secondary/service) "sdz" = ( @@ -56283,9 +56098,6 @@ /turf/open/floor/iron/dark, /area/chapel/office) "sgJ" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/machinery/light, /obj/machinery/chem_master/condimaster{ name = "BrewMaster 3000" @@ -56293,6 +56105,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, /area/hydroponics) "sgK" = ( @@ -56309,12 +56122,12 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/disposalpipe/sorting/mail/destination/janitor_closet{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/central) "shl" = ( @@ -57329,23 +57142,20 @@ /turf/open/floor/plating, /area/storage/tools) "sxK" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "45" }, /turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/medical/surgery) "sxV" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, /obj/machinery/camera/autoname/directional/west, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/hallway/primary/fore) "syg" = ( @@ -57506,12 +57316,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/medical/medbay/central) "sAp" = ( @@ -58218,7 +58026,6 @@ /obj/structure/fireaxecabinet{ pixel_y = -28 }, -/obj/machinery/camera/autoname/directional/south, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) "sLZ" = ( @@ -58404,7 +58211,7 @@ /area/maintenance/solars/port/aft) "sPt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron_smooth, /area/quartermaster/sorting) "sPx" = ( /obj/effect/turf_decal/stripes/line{ @@ -58694,6 +58501,12 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"sUu" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "sUC" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -58705,9 +58518,8 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 9 +/obj/structure/disposalpipe/sorting/mail/destination/medbay/flip{ + dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -59043,6 +58855,9 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "taY" = ( @@ -59218,14 +59033,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 29 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/law_office/flip{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/hallway/primary/aft) "tfy" = ( @@ -59327,13 +59141,11 @@ /turf/open/floor/iron, /area/science/lab) "tgS" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/structure/closet/secure_closet/freezer/kitchen, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "tgX" = ( @@ -59724,6 +59536,7 @@ dir = 1 }, /obj/machinery/vending/dinnerware, +/obj/machinery/camera/directional/north, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) "tnM" = ( @@ -59892,6 +59705,7 @@ dir = 6 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/white, /area/science/research) "tqE" = ( @@ -60160,12 +59974,12 @@ /obj/structure/disposaloutlet{ dir = 4 }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/open/floor/plating, /area/quartermaster/sorting) "tvk" = ( @@ -60242,9 +60056,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/camera/autoname{ - dir = 6 - }, /obj/structure/sign/departments/minsky/research/robotics{ pixel_x = 32 }, @@ -60874,9 +60685,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/extinguisher_cabinet{ - pixel_x = 30 - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plating, /area/maintenance/starboard/aft) "tHu" = ( @@ -61702,9 +61511,8 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - sortType = 14 +/obj/structure/disposalpipe/sorting/mail/destination/robotics{ + dir = 1 }, /turf/open/floor/iron/white, /area/science/research) @@ -62136,6 +61944,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/freezer, /area/medical/virology) "ucM" = ( @@ -62463,9 +62272,6 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "uie" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 - }, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -62473,6 +62279,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, /area/hallway/secondary/exit) "uig" = ( @@ -63176,6 +62983,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "usU" = ( @@ -63262,12 +63072,10 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, /area/hallway/primary/fore) "uvd" = ( @@ -63536,20 +63344,21 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "uAa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - sortType = 13 +/obj/structure/disposalpipe/sorting/mail/destination/rd_office/flip{ + dir = 1 }, /turf/open/floor/iron/white, /area/science/research) @@ -64084,13 +63893,11 @@ /turf/open/space/basic, /area/space/nearstation) "uIc" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/hallway/primary/central) "uIh" = ( @@ -64313,10 +64120,8 @@ /obj/structure/sign/departments/minsky/supply/mining{ pixel_x = 32 }, -/obj/machinery/camera/autoname{ - dir = 6 - }, /obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "uLg" = ( @@ -64371,12 +64176,10 @@ /turf/open/floor/iron/dark, /area/quartermaster/office) "uLs" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/science/xenobiology) "uLA" = ( @@ -64711,8 +64514,8 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/structure/disposalpipe/junction{ + dir = 4 }, /turf/open/floor/iron, /area/quartermaster/sorting) @@ -64865,9 +64668,6 @@ name = "RD Server Vent"; pressure_checks = 0 }, -/obj/machinery/camera/autoname{ - dir = 9 - }, /turf/open/floor/circuit, /area/science/server) "uUn" = ( @@ -65031,9 +64831,6 @@ /area/ai_monitored/turret_protected/aisat_interior) "uXG" = ( /obj/structure/table, -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, @@ -65114,12 +64911,6 @@ dir = 4 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron, /area/engine/engine_room) "uYN" = ( @@ -65885,6 +65676,9 @@ pixel_x = 24 }, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "vlY" = ( @@ -65933,6 +65727,7 @@ /turf/open/floor/iron/white, /area/crew_quarters/kitchen/coldroom) "vmR" = ( +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/security/brig) "vno" = ( @@ -66235,6 +66030,9 @@ /obj/item/storage/toolbox/mechanical, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow, +/obj/machinery/camera/motion{ + c_tag = "E.V.A. Storage" + }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "vrC" = ( @@ -66655,9 +66453,6 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "vxy" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -66667,6 +66462,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/hallway/primary/aft) "vxz" = ( @@ -66701,7 +66497,7 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/structure/chair, +/obj/item/kirbyplants/photosynthetic, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/AIsatextAP) "vxU" = ( @@ -67063,11 +66859,9 @@ /turf/open/floor/plating, /area/science/shuttle) "vCv" = ( -/obj/machinery/camera/autoname{ - dir = 6 - }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) "vCz" = ( @@ -68160,12 +67954,10 @@ /turf/open/floor/iron/white/side, /area/medical/surgery) "vUx" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - name = "Bar Junction"; - sortType = 19 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/bar/flip{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/secondary/service) "vUC" = ( @@ -68175,10 +67967,8 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, /obj/machinery/camera/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/engine/atmos) "vUX" = ( @@ -68242,6 +68032,18 @@ }, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/relay) +"vWa" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "vWw" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -68712,9 +68514,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/computer/security, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -69092,11 +68891,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail/destination/medbay{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "wlj" = ( @@ -69260,13 +69061,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - sortType = 13 - }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, /turf/open/floor/iron, /area/maintenance/department/science) "wnZ" = ( @@ -69503,15 +69303,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/camera/autoname{ - dir = 9 - }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/engine/atmos) "wsy" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -30 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -69519,6 +69314,7 @@ dir = 8; light_color = "#e8eaff" }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/security/brig) "wsN" = ( @@ -70001,10 +69797,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 27 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, @@ -70888,12 +70680,10 @@ /obj/structure/chair{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/crew_quarters/dorms) "wRG" = ( @@ -71565,9 +71355,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/hallway/primary/fore) "xdj" = ( @@ -71929,9 +71717,6 @@ /turf/open/floor/iron, /area/medical/virology) "xkh" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall29"; @@ -71940,6 +71725,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/hallway/primary/fore) "xkk" = ( @@ -72929,6 +72715,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "xBa" = ( @@ -73134,13 +72923,12 @@ /area/science/nanite) "xEc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 11 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/chemistry{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "xEu" = ( @@ -73213,10 +73001,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/storage/tools) "xGi" = ( @@ -73843,6 +73629,9 @@ /obj/machinery/firealarm{ pixel_y = -24 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plating, /area/quartermaster/sorting) "xOB" = ( @@ -73998,12 +73787,9 @@ /turf/open/floor/iron/dark, /area/science/nanite) "xQG" = ( -/obj/machinery/camera/autoname/directional/south, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hydroponics) +/obj/machinery/camera/directional/north, +/turf/open/floor/iron/white, +/area/science/mixing) "xQH" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -74064,7 +73850,7 @@ pixel_y = 32 }, /obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron_smooth, /area/quartermaster/sorting) "xRO" = ( /obj/structure/table, @@ -74766,16 +74552,15 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortTypes = list(9,10,11,23) - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/white, /area/medical/medbay/aft) "yeI" = ( @@ -92183,7 +91968,7 @@ tWl cZK gDn dQc -kEy +gDn gDn gDn tWl @@ -92221,7 +92006,7 @@ idI amI oGN nHf -eAY +rav amI sFX sKV @@ -95535,7 +95320,7 @@ dWW dwj gbC mWA -aaQ +aGC aNF pHR oxI @@ -96049,7 +95834,7 @@ vrb lmd kOj meS -aGC +aaQ aNF kNC aWt @@ -101739,7 +101524,7 @@ ihY ihY kNN dhK -kNN +kEy ihY ihY ihY @@ -101793,7 +101578,7 @@ bII lhA iEu iEu -oKU +iEu hIQ hnq buq @@ -102053,7 +101838,7 @@ auR auR wfL fTU -bXS +gjq iOL xiK xsd @@ -102822,7 +102607,7 @@ auR nis hYp auR -oEj +kDC fTU bXS iOL @@ -103885,7 +103670,7 @@ iZh uIQ vHK ngK -qaQ +fZt hLF aMT aMT @@ -104141,9 +103926,9 @@ eDQ iZh iyv gMV -bBo nOP -bBo +nOP +nOP aMT aMT aMT @@ -105364,7 +105149,7 @@ lyZ tZF tZF hdz -lIO +xQG lIO bpq aDm @@ -105771,7 +105556,7 @@ eqa eqa eqa eqa -cuS +eqa eqa pqa ooo @@ -106197,9 +105982,9 @@ eDQ iZh ikC kbJ -bBo nOP -bBo +nOP +nOP aMT aMT aMT @@ -106455,7 +106240,7 @@ iZh gEl rmn ngK -rav +eJW hLF aMT aMT @@ -106788,7 +106573,7 @@ aMT aMT aMT byn -kme +nVG ooo aMT aMT @@ -110129,7 +109914,7 @@ aMT aMT aMT byn -ckQ +lCz tNy hTH aMT @@ -110911,7 +110696,7 @@ fRG fRG fRG fRG -gjq +fRG fRG tNy hTH @@ -111036,9 +110821,9 @@ sMa sLr ntO qyp -xQG +djh gWp -nQJ +cyL uYN kuf bPr @@ -113109,7 +112894,7 @@ iJX bjJ fhO pXR -phw +sag kfy pxs iuM @@ -114853,7 +114638,7 @@ awK ebB lyM hZM -kEV +nmg adc sic ogz @@ -117721,11 +117506,11 @@ vUe rKx prA bih -mVi -dxf -rDi -rDi -nSl +sxK +mHx +ifS +ifS +bSb kfy kfy kfy @@ -117979,10 +117764,10 @@ nIO lYv kDe mVi -sxK -tBk -tBk -eOW +uyh +pLJ +pLJ +xAF bSb kfy bwh @@ -118179,8 +117964,8 @@ anT anT fOv qeI -ivK -ivK +eOW +phw mYW ivK vrC @@ -118236,7 +118021,7 @@ vtl hyO pWb mVi -mql +uyh gZc gZc gZc @@ -118435,7 +118220,7 @@ fOv fOv fOv fOv -etP +cfP rLL jdN jdN @@ -118448,7 +118233,7 @@ lbX oeF ivK msl -mHx +aWM rjT lLj eht @@ -118493,7 +118278,7 @@ tiJ fHa mVi mVi -mql +uyh gZc uTm gZc @@ -118747,10 +118532,10 @@ qSI eCC etx jUV -irr +sUu rie oaL -mql +uyh gZc gZc gZc @@ -119004,10 +118789,10 @@ kBi bjq ulY mkL -irr +gQc qAg oaL -mql +uyh kfy aMT aMT @@ -119264,7 +119049,7 @@ cxQ irr rie oaL -mql +uyh kfy anT anT @@ -119770,10 +119555,10 @@ oAB oAB oAB diN -oAB +mrr oJi dpt -oAB +fpx bBs oAB omo @@ -120026,9 +119811,9 @@ qdR sZw usf sZw -bgd +vWa gyB -sZw +etP rpq iNV wli @@ -125141,7 +124926,7 @@ tvU cSs opt mRH -kXc +ckQ kXc cSs xBm diff --git a/_maps/shuttles/tram/tram_corg.dmm b/_maps/shuttles/tram/tram_corg.dmm index 18078f5006128..45d4c28be4c1c 100644 --- a/_maps/shuttles/tram/tram_corg.dmm +++ b/_maps/shuttles/tram/tram_corg.dmm @@ -15,6 +15,9 @@ "h" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/chair/fancy/shuttle, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_1) "m" = ( @@ -36,6 +39,14 @@ "p" = ( /turf/open/floor/mineral/titanium/white, /area/shuttle/pod_1) +"t" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/chair/fancy/shuttle, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/pod_1) "w" = ( /obj/structure/chair/fancy/shuttle{ dir = 8 @@ -76,9 +87,6 @@ /turf/closed/wall/mineral/titanium, /area/template_noop) "I" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line, /obj/machinery/computer/shuttle_flight{ possible_destinations = "corg_north;corg_south"; @@ -145,7 +153,7 @@ m "} (4,1,1) = {" S -h +t p D W From 3247e9b85833ed2a0cb8345e9567f818c8a74991 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Mon, 2 Sep 2024 12:12:12 -0500 Subject: [PATCH 14/58] Automatic changelog generation for PR #11402 [ci skip] --- html/changelogs/AutoChangeLog-pr-11402.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11402.yml diff --git a/html/changelogs/AutoChangeLog-pr-11402.yml b/html/changelogs/AutoChangeLog-pr-11402.yml new file mode 100644 index 0000000000000..0bdb97e6c1ce1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11402.yml @@ -0,0 +1,4 @@ +author: PowerfulBacon +delete-after: true +changes: + - bugfix: Fixes a bunch of mapping issues with CorgStation From 48dfb882e3317241fc2f0bc93de15b6cbd506a53 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Mon, 2 Sep 2024 18:03:59 +0000 Subject: [PATCH 15/58] Automatic changelog compile [ci skip] --- html/changelog.html | 1 + html/changelogs/.all_changelog.yml | 1 + html/changelogs/AutoChangeLog-pr-11402.yml | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11402.yml diff --git a/html/changelog.html b/html/changelog.html index 87b307417a296..534935a679c00 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -60,6 +60,7 @@

      02 September 2024

      PowerfulBacon updated:

      • Fixes some mapping issues with DeltaStation.
        • +
      • Fixes a bunch of mapping issues with CorgStation

      Rukofamicom, Fikou updated:

        diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index b3ee171c49bba..fc7820233da49 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44066,6 +44066,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2024-09-02: PowerfulBacon: - bugfix: Fixes some mapping issues with DeltaStation. + - bugfix: Fixes a bunch of mapping issues with CorgStation Rukofamicom, Fikou: - rscadd: Concussive gauntlets have arrived! Shaft miners will find that the diamond pickaxe can no longer be found in tendril chests, and instead they may find diff --git a/html/changelogs/AutoChangeLog-pr-11402.yml b/html/changelogs/AutoChangeLog-pr-11402.yml deleted file mode 100644 index 0bdb97e6c1ce1..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11402.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: PowerfulBacon -delete-after: true -changes: - - bugfix: Fixes a bunch of mapping issues with CorgStation From 30d360d9ab1d6f1e075c43fa773a579b6563dc34 Mon Sep 17 00:00:00 2001 From: Geatish <130587823+Geatish@users.noreply.github.com> Date: Tue, 3 Sep 2024 13:28:57 +0200 Subject: [PATCH 16/58] Makes Blood Packs printable from the med lathe (#11401) * Bloodbags in medlathe I will suck your blood oooooo also removed health analyzer from the hacked auto lathe * Added a description --- code/modules/research/designs/autolathe_designs.dm | 4 ++-- code/modules/research/designs/medical_designs.dm | 10 ++++++++++ code/modules/research/techweb/all_nodes.dm | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index f05f5f0905c30..cace6ca4a9d10 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -546,10 +546,10 @@ /datum/design/healthanalyzer name = "Health Analyzer" id = "healthanalyzer" - build_type = AUTOLATHE | PROTOLATHE + build_type = PROTOLATHE materials = list(/datum/material/iron = 500, /datum/material/glass = 50) build_path = /obj/item/healthanalyzer - category = list("hacked", "Medical", "Medical Designs") + category = list("Medical", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL /datum/design/pillbottle diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 33a66137b01e5..fb92bc2cbda16 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -62,6 +62,16 @@ build_path = /obj/item/reagent_containers/glass/beaker/meta category = list("Medical Designs") +/datum/design/blood_pack + name = "Blood Pack" + desc = "An empty pack for blood transfusions" + id = "blood_pack" + build_type = PROTOLATHE + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + materials = list(/datum/material/plastic = 500) + build_path = /obj/item/reagent_containers/blood + category = list("Medical Designs") + /datum/design/bluespacesyringe name = "Bluespace Syringe" desc = "An advanced syringe that can hold 60 units of chemicals" diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 01e4fa09b090a..9d7cad9d579fe 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -252,6 +252,7 @@ "pandemic", "sleeper", "soda_dispenser", + "blood_pack", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 From 70585a0f0df59d1023ea84b7b318b69b20d7de3f Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Tue, 3 Sep 2024 06:38:26 -0500 Subject: [PATCH 17/58] Automatic changelog generation for PR #11401 [ci skip] --- html/changelogs/AutoChangeLog-pr-11401.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11401.yml diff --git a/html/changelogs/AutoChangeLog-pr-11401.yml b/html/changelogs/AutoChangeLog-pr-11401.yml new file mode 100644 index 0000000000000..29dfa2b1e0123 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11401.yml @@ -0,0 +1,5 @@ +author: Geatish +delete-after: true +changes: + - tweak: Empty blood packs can now be printed from the med lathe + - bugfix: health analyzer is no longer printable from a hacked autolathe From 88f19952be847c2575f35191d2827ae3ff59ba0e Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:05:05 +0000 Subject: [PATCH 18/58] Automatic changelog compile [ci skip] --- html/changelog.html | 7 +++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-11401.yml | 5 ----- 3 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11401.yml diff --git a/html/changelog.html b/html/changelog.html index 534935a679c00..97c7b68130a76 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,13 @@ -->
        +

        03 September 2024

        +

        Geatish updated:

        +
          +
        • Empty blood packs can now be printed from the med lathe
          • +
        • health analyzer is no longer printable from a hacked autolathe
          • +
        +

        02 September 2024

        PowerfulBacon updated:

          diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index fc7820233da49..e6fbb71bc809f 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44095,3 +44095,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. hold kitchen knives.' - code_imp: Cleaned up some variable names and unnecessary code within the kinetic_accelerator file. +2024-09-03: + Geatish: + - tweak: Empty blood packs can now be printed from the med lathe + - bugfix: health analyzer is no longer printable from a hacked autolathe diff --git a/html/changelogs/AutoChangeLog-pr-11401.yml b/html/changelogs/AutoChangeLog-pr-11401.yml deleted file mode 100644 index 29dfa2b1e0123..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11401.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Geatish -delete-after: true -changes: - - tweak: Empty blood packs can now be printed from the med lathe - - bugfix: health analyzer is no longer printable from a hacked autolathe From 2595f4523240a8b241697fcc32afaebb648889b8 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Wed, 4 Sep 2024 00:12:36 +0000 Subject: [PATCH 19/58] Automatic changelog compile [ci skip] --- html/changelog.html | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index 97c7b68130a76..c13252de623d6 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -915,17 +915,6 @@

          XeonMations updated:

          • Added the ability for admins to remove a language from a mob's blocked language's list innately.
          - -

          03 July 2024

          -

          rkz, GoldenAlpharex updated:

          -
            -
          • refactored undertile element to support layers without casting ambient occlusion
            • -
          • no more audio runtime when walking on catwalk tiles
            • -
          -

          spockye updated:

          -
            -
          • adds lights to the abductor pods
            • -
        GoonStation 13 Development Team From 85e0a614b4115b2715637310791b24b1a00b0638 Mon Sep 17 00:00:00 2001 From: Programs-The-Station <100493881+Programs-The-Station@users.noreply.github.com> Date: Tue, 3 Sep 2024 21:00:21 -0500 Subject: [PATCH 20/58] Adds Positronic Brains to Latejoin Menu (#11162) * Fixes Posi Created in null bug And Dehardcode random PAI * Adds Posibrain to Latejoin Menu * Posi Job now subtype of cyborg. Failing to Spawn as Posi Kicks player back to lobby. * No more Latejoin Cyborg * Adds after_spawn_silicon per request * Forgot Debug Code Comment * Requested Changes * Remove from Prefs * Procify * Remove Src * Missed a Job * Fix stupid problem that slipped testing * Requested Changes. DM is weird. * Update code/modules/mob/living/brain/posibrain.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> * Update code/modules/mob/living/brain/posibrain.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> * Update code/modules/mob/living/brain/posibrain.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> * Revert "Fix stupid problem that slipped testing" This reverts commit f3f1dd1b7fbec3c8fa265bd70ac3c7d3251877ea. * Revert "Fixes Posi Created in null bug" This reverts commit 39d0309caae0a831ff7585eb00c6a6121048f8eb. * Changes as requested by Bacon, refactored unused code. * Whoops Forgot a Path * Refactors Posibrain job back into own type and not subtype of cyborg * Update Return * Whoopsies forgot a debug comment out * Requested changes * Removed report to coders line, since posi's have known "fail" states * Fix Spawning Logic --------- Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Co-authored-by: Rukofamicom --- beestation.dme | 1 + code/__DEFINES/jobs.dm | 1 + code/controllers/subsystem/job.dm | 10 +++- code/modules/jobs/job_types/_job.dm | 1 + code/modules/jobs/job_types/cyborg.dm | 2 +- code/modules/jobs/job_types/posibrain.dm | 57 ++++++++++++++++++++++ code/modules/jobs/jobs.dm | 1 + code/modules/mob/living/brain/posibrain.dm | 56 ++++++++++++++++++--- 8 files changed, 119 insertions(+), 10 deletions(-) create mode 100644 code/modules/jobs/job_types/posibrain.dm diff --git a/beestation.dme b/beestation.dme index 598b90abcda73..a23ea0463ef16 100644 --- a/beestation.dme +++ b/beestation.dme @@ -2849,6 +2849,7 @@ #include "code\modules\jobs\job_types\medical_doctor.dm" #include "code\modules\jobs\job_types\mime.dm" #include "code\modules\jobs\job_types\paramedic.dm" +#include "code\modules\jobs\job_types\posibrain.dm" #include "code\modules\jobs\job_types\quartermaster.dm" #include "code\modules\jobs\job_types\research_director.dm" #include "code\modules\jobs\job_types\roboticist.dm" diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 7188b23913772..21bd824b82320 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -128,6 +128,7 @@ // Silicon #define JOB_NAME_AI "AI" #define JOB_NAME_CYBORG "Cyborg" +#define JOB_NAME_POSIBRAIN "Positronic Brain" #define JOB_NAME_PAI "Personal AI" // ERTs diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 5f66bd10bb517..992c7e6d37169 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -35,6 +35,7 @@ SUBSYSTEM_DEF(job) JOB_NAME_AI, JOB_NAME_ASSISTANT, JOB_NAME_CYBORG, + JOB_NAME_POSIBRAIN, JOB_NAME_CAPTAIN, JOB_NAME_HEADOFPERSONNEL, JOB_NAME_HEADOFSECURITY, @@ -553,7 +554,14 @@ SUBSYSTEM_DEF(job) newplayer.new_character = living_mob else M = living_mob - + else + if(!isnull(new_mob)) //Detect fail condition on equip + //if equip() is somehow able to fail, send them back to lobby + var/mob/dead/new_player/NP = new() + NP.ckey = M.client.ckey + qdel(M) + to_chat(M, "Error equipping [rank]. Returning to lobby.        ") + return null SSpersistence.antag_rep_change[M.client.ckey] += job.GetAntagRep() if(M.client.holder) diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 522502a2d25fc..c988a8c2d53c6 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -252,6 +252,7 @@ return antag_rep //Don't override this unless the job transforms into a non-human (Silicons do this for example) +//Returning FALSE is considered a failure. A null or mob return is a successful equip. /datum/job/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE, announce = TRUE, latejoin = FALSE, datum/outfit/outfit_override = null, client/preference_source) if(!H) return FALSE diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm index 44f340c3bd80d..9a36457dd2170 100644 --- a/code/modules/jobs/job_types/cyborg.dm +++ b/code/modules/jobs/job_types/cyborg.dm @@ -5,7 +5,7 @@ department_head_for_prefs = JOB_NAME_AI auto_deadmin_role_flags = DEADMIN_POSITION_SILICON faction = "Station" - total_positions = 1 + total_positions = 0 spawn_positions = 1 supervisors = "your laws and the AI" //Nodrak selection_color = "#ddffdd" diff --git a/code/modules/jobs/job_types/posibrain.dm b/code/modules/jobs/job_types/posibrain.dm new file mode 100644 index 0000000000000..e4c5b396803ce --- /dev/null +++ b/code/modules/jobs/job_types/posibrain.dm @@ -0,0 +1,57 @@ +GLOBAL_LIST_EMPTY(on_station_posis) + +/datum/job/posibrain + title = JOB_NAME_POSIBRAIN + description = "Follow your AI's interpretation of your laws above all else, or your own interpretation if not connected to an AI. Choose one of many modules with different tools, ask robotics for maintenance and upgrades." + department_for_prefs = DEPT_BITFLAG_SILICON + department_head_for_prefs = JOB_NAME_AI + auto_deadmin_role_flags = DEADMIN_POSITION_SILICON + faction = "Station" + total_positions = 0 + spawn_positions = 0 + supervisors = "your laws" //No AI yet as you are just a cube + selection_color = "#ddffdd" + minimal_player_age = 21 + exp_requirements = 120 + exp_type = EXP_TYPE_CREW + random_spawns_possible = FALSE + + display_order = JOB_DISPLAY_ORDER_CYBORG + departments = DEPT_BITFLAG_SILICON + + show_in_prefs = FALSE //No reason to show in preferences + +/datum/job/posibrain/equip(mob/living/carbon/human/H, visualsOnly = FALSE, announce = TRUE, latejoin = FALSE, datum/outfit/outfit_override = null, client/preference_source = null) + + var/obj/item/mmi/posibrain/P = pick(GLOB.on_station_posis) + + //Never show number of current posis + current_positions = 0 + + if(!P.activate(H)) //If we failed to activate a posi, kick them back to the lobby. + to_chat(H, "Failed to Late Join as a Posibrain. Look higher in chat for the reason.") + return FALSE //Returning False is considered a failure, rather than null or a mob, which is a success. + + qdel(H) + return P + +/datum/job/posibrain/radio_help_message(mob/M) + to_chat(M, "Prefix your message with :b to speak with other cyborgs and AI.") + +/datum/job/posibrain/proc/check_add_posi_slot(obj/item/mmi/posibrain/pb) + var/turf/currentturf = get_turf(pb) + if( is_station_level(currentturf.z) ) + GLOB.on_station_posis |= pb + + //Update Job Quantities + //We should never show a posibrain as a filled job, so just make number of current positions zero + current_positions = 0 + total_positions = length(GLOB.on_station_posis) + +/datum/job/posibrain/proc/remove_posi_slot(obj/item/mmi/posibrain/pb) + GLOB.on_station_posis -= pb + + //Update Job Quantities + //We should never show a posibrain as a filled job, so just make number of current positions zero + current_positions = 0 + total_positions = length(GLOB.on_station_posis) diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 0c3764e702b3d..535880c30a30c 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -151,6 +151,7 @@ GLOBAL_LIST_INIT(security_lightup_areas, \ GLOBAL_LIST_INIT(nonhuman_positions, list( JOB_NAME_AI, JOB_NAME_CYBORG, + JOB_NAME_POSIBRAIN, ROLE_PAI )) diff --git a/code/modules/mob/living/brain/posibrain.dm b/code/modules/mob/living/brain/posibrain.dm index a8e4655e2276e..826fade383784 100644 --- a/code/modules/mob/living/brain/posibrain.dm +++ b/code/modules/mob/living/brain/posibrain.dm @@ -85,33 +85,38 @@ GLOBAL_VAR(posibrain_notify_cooldown) //Two ways to activate a positronic brain. A clickable link in the ghost notif, or simply clicking the object itself. /obj/item/mmi/posibrain/proc/activate(mob/user) if(QDELETED(brainmob)) - return + return FALSE if(is_banned_from(user.ckey, ROLE_POSIBRAIN)) to_chat(user, "You are restricted from taking positronic brain spawns at this time.") - return + return FALSE if(user.client.get_exp_living(TRUE) <= MINUTES_REQUIRED_BASIC) to_chat(user, "You aren't allowed to take positronic brain spawns yet.") - return + return FALSE if(is_occupied() || QDELETED(brainmob) || QDELETED(src) || QDELETED(user)) - return + return FALSE if(user.ckey in GLOB.posi_key_list) to_chat(user, "Positronic brain spawns limited to 1 per round.") - return + return FALSE if(!(GLOB.ghost_role_flags & GHOSTROLE_SILICONS)) to_chat(user, "Central Command has temporarily outlawed posibrain sentience in this sector...") - return + return FALSE if(user.suiciding) //if they suicided, they're out forever. to_chat(user, "[src] fizzles slightly. Sadly it doesn't take those who suicided!") - return + return FALSE var/posi_ask = alert("Become a [name]? (Warning, You can no longer be cloned, and all past lives will be forgotten!)","Are you positive?","Yes","No") if(posi_ask != "Yes" || QDELETED(src)) - return + return FALSE if(brainmob.suiciding) //clear suicide status if the old occupant suicided. brainmob.set_suicide(FALSE) var/ckey = user.ckey if(transfer_personality(user)) GLOB.posi_key_list += ckey + var/datum/job/posibrain/pj = SSjob.GetJob(JOB_NAME_POSIBRAIN) + pj.remove_posi_slot(src) + + return TRUE + /obj/item/mmi/posibrain/transfer_identity(mob/living/carbon/C) name = "[initial(name)] ([C])" brainmob.name = C.real_name @@ -179,6 +184,11 @@ GLOBAL_VAR(posibrain_notify_cooldown) brainmob.real_name = brainmob.name brainmob.forceMove(src) brainmob.container = src + + //If we are on the station level, add it to the list of available posibrains. + var/datum/job/posibrain/pj = SSjob.GetJob(JOB_NAME_POSIBRAIN) + pj.check_add_posi_slot(src) + if(autoping) ping_ghosts("created", TRUE) @@ -195,3 +205,33 @@ GLOBAL_VAR(posibrain_notify_cooldown) icon_state = "[initial(icon_state)]-occupied" else icon_state = initial(icon_state) + +//This Proc triggers when the Z level changes. If the Posi enters the station level, add it to the Job list. +//If it leaves, remove it. +/obj/item/mmi/posibrain/onTransitZ(old_z, new_z) + . = ..() + + if(is_station_level(old_z) == is_station_level(new_z)) + //Early Return if we aren't entering or leaving station Z level. + return + + if(is_occupied()) + //No need to track occupied Posis + return + + var/datum/job/posibrain/pj = SSjob.GetJob(JOB_NAME_POSIBRAIN) + + //Posi was on station, now is not on station + if(is_station_level(new_z)) + pj.check_add_posi_slot(src) + else + pj.remove_posi_slot(src) + +/obj/item/mmi/posibrain/Destroy() + if(is_occupied()) + //No need to track occupied Posis + return ..() + + var/datum/job/posibrain/pj = SSjob.GetJob(JOB_NAME_POSIBRAIN) + pj.remove_posi_slot(src) + return ..() From 8d98b4528cf434133a37fddec2a02c28927b33f2 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Tue, 3 Sep 2024 21:09:58 -0500 Subject: [PATCH 21/58] Automatic changelog generation for PR #11162 [ci skip] --- html/changelogs/AutoChangeLog-pr-11162.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11162.yml diff --git a/html/changelogs/AutoChangeLog-pr-11162.yml b/html/changelogs/AutoChangeLog-pr-11162.yml new file mode 100644 index 0000000000000..a85324791fc4e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11162.yml @@ -0,0 +1,5 @@ +author: Programs-The-Station, Rukofamicom +delete-after: true +changes: + - rscadd: You can now Latejoin directly as an on-station posibrain. + - rscadd: Due to Job-code, Positronic Brain is now a job. From a99c58d40a25f008253a15e82f26e44123e66bcf Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Wed, 4 Sep 2024 02:21:11 +0000 Subject: [PATCH 22/58] Automatic changelog compile [ci skip] --- html/changelog.html | 7 +++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-11162.yml | 5 ----- 3 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11162.yml diff --git a/html/changelog.html b/html/changelog.html index c13252de623d6..df8915136035c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,13 @@ -->
        +

        04 September 2024

        +

        Programs-The-Station, Rukofamicom updated:

        +
          +
        • You can now Latejoin directly as an on-station posibrain.
          • +
        • Due to Job-code, Positronic Brain is now a job.
          • +
        +

        03 September 2024

        Geatish updated:

          diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index e6fbb71bc809f..f39d39a198333 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44099,3 +44099,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Geatish: - tweak: Empty blood packs can now be printed from the med lathe - bugfix: health analyzer is no longer printable from a hacked autolathe +2024-09-04: + Programs-The-Station, Rukofamicom: + - rscadd: You can now Latejoin directly as an on-station posibrain. + - rscadd: Due to Job-code, Positronic Brain is now a job. diff --git a/html/changelogs/AutoChangeLog-pr-11162.yml b/html/changelogs/AutoChangeLog-pr-11162.yml deleted file mode 100644 index a85324791fc4e..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11162.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Programs-The-Station, Rukofamicom -delete-after: true -changes: - - rscadd: You can now Latejoin directly as an on-station posibrain. - - rscadd: Due to Job-code, Positronic Brain is now a job. From 036135b88df5b6a0c4f3fdfd574c50c0d7710581 Mon Sep 17 00:00:00 2001 From: ClownMoff <148357670+ClownMoff@users.noreply.github.com> Date: Thu, 5 Sep 2024 21:03:01 +0100 Subject: [PATCH 23/58] BoxStation Areas Reworks and Fixes (#11219) * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * Missing firelocks * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * piping problems * a single pipe fix * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * Update BoxStation.dmm * s * Update BoxStation.dmm * Update __byond_version_compat.dm * Update BoxStation.dmm * Update BoxStation.dmm * hopefully fixes * Update __byond_version_compat.dm * Update BoxStation.dmm * Update BoxStation.dmm --- _maps/map_files/BoxStation/BoxStation.dmm | 27001 +++++++++++--------- 1 file changed, 15008 insertions(+), 11993 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 7a73b04e23595..3531ec5ff39a5 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -108,6 +108,20 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/science/explab) +"abx" = ( +/obj/machinery/door/airlock{ + name = "Kitchen"; + req_access_txt = "28" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "aby" = ( /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, @@ -120,6 +134,25 @@ /obj/effect/spawner/room/fivexthree, /turf/open/floor/plating, /area/maintenance/port/fore) +"abI" = ( +/obj/machinery/light_switch{ + pixel_y = 28 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/icecream_vat, +/obj/effect/turf_decal/bot/right, +/obj/machinery/camera/directional/north, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) +"abJ" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "abY" = ( /obj/structure/grille, /turf/open/space, @@ -161,6 +194,19 @@ /obj/item/stack/cable_coil/random, /turf/open/space, /area/space/nearstation) +"acM" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron, +/area/science/mixing/chamber) "acO" = ( /obj/structure/lattice/catwalk/over, /obj/structure/cable/yellow{ @@ -204,22 +250,18 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"adn" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"adq" = ( -/obj/structure/table/wood, -/obj/item/instrument/guitar{ - pixel_x = -7 - }, -/obj/item/instrument/eguitar{ - pixel_x = 5 +"adg" = ( +/obj/item/grown/bananapeel, +/obj/structure/flora/ausbushes/fullgrass, +/mob/living/carbon/monkey, +/turf/open/floor/grass/no_border, +/area/medical/genetics) +"adm" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "adt" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -289,6 +331,13 @@ }, /turf/open/space, /area/solar/port/fore) +"adI" = ( +/obj/machinery/computer/crew{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "adR" = ( /turf/closed/wall/r_wall, /area/security/main) @@ -390,18 +439,18 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) -"aeK" = ( +"aeB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + dir = 5 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "aeQ" = ( /obj/effect/spawner/room/fivexfour, /turf/open/floor/plating, @@ -517,6 +566,24 @@ "agn" = ( /turf/closed/wall/r_wall, /area/security/warden) +"agr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/item/grown/bananapeel{ + pixel_x = -2; + pixel_y = -1 + }, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "agD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -603,6 +670,27 @@ /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"aic" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/glass, +/obj/effect/turf_decal/tile/green/opposingcorners, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) +"aij" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/item/cigbutt{ + pixel_x = 9; + pixel_y = -3 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/mapping_helpers/tile_breaker, +/obj/item/broken_bottle, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "aim" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; @@ -665,6 +753,24 @@ }, /turf/open/space, /area/solar/port/fore) +"ajG" = ( +/obj/structure/bodycontainer/morgue, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/medical/morgue) +"ajY" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "ajZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum/external{ @@ -672,16 +778,6 @@ }, /turf/open/floor/plating, /area/construction/mining/aux_base) -"aku" = ( -/obj/structure/table/optable, -/obj/item/radio/intercom{ - pixel_x = -27 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "akv" = ( /obj/machinery/door/airlock/research{ name = "Genetics Research Access"; @@ -728,6 +824,9 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"akO" = ( +/turf/open/floor/wood/big, +/area/maintenance/aft) "akW" = ( /obj/machinery/computer/atmos_control/tank/oxygen_tank{ dir = 1 @@ -768,17 +867,6 @@ }, /turf/open/space, /area/solar/starboard/fore) -"alh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "ali" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -861,13 +949,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"amy" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plating, -/area/maintenance/solars/port/fore) "amz" = ( /obj/machinery/power/terminal, /obj/machinery/light/small{ @@ -959,6 +1040,14 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"anC" = ( +/obj/structure/sign/poster/official/help_others{ + pixel_y = 32 + }, +/obj/effect/decal/cleanable/glass, +/obj/item/shard, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "anF" = ( /turf/open/floor/plating, /area/maintenance/fore/secondary) @@ -974,6 +1063,12 @@ /obj/effect/decal/cleanable/food/egg_smudge, /turf/open/floor/plating, /area/maintenance/port/fore) +"anS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "aof" = ( /turf/closed/wall/r_wall, /area/maintenance/solars/starboard/fore) @@ -1000,13 +1095,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"aoN" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plating, -/area/maintenance/solars/starboard/fore) "aoO" = ( /obj/machinery/power/terminal, /obj/machinery/light/small{ @@ -1026,6 +1114,18 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"aoS" = ( +/obj/structure/window/reinforced/spawner{ + dir = 1 + }, +/obj/machinery/telecomms/server/presets/exploration, +/obj/structure/window/reinforced/spawner{ + dir = 1 + }, +/obj/machinery/telecomms/server/presets/exploration, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/circuit/telecomms/server, +/area/quartermaster/exploration_dock) "aoU" = ( /obj/structure/bed, /obj/effect/landmark/xeno_spawn, @@ -1047,14 +1147,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"apC" = ( -/turf/closed/wall/r_wall, -/area/maintenance/starboard/fore) -"apD" = ( -/obj/structure/closet/wardrobe/mixed, -/obj/item/clothing/shoes/jackboots, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "apE" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -1074,6 +1166,29 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/space, /area/space/nearstation) +"aql" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/structure/closet/secure_closet/freezer/cream_pie, +/obj/item/food/pie/cream, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) +"aqw" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/door/airlock{ + id_tag = "Toilet2"; + name = "Toilet Unit #2" + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "aqx" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, @@ -1109,12 +1224,6 @@ name = "Holodeck Projector Floor" }, /area/holodeck/rec_center) -"arx" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "arA" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -1149,6 +1258,15 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness) +"asn" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "asw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1265,10 +1383,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) -"atW" = ( -/obj/structure/chair/stool, -/turf/open/floor/plating, -/area/maintenance/port/fore) "aue" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1344,18 +1458,18 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"auE" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "auP" = ( /turf/open/floor/plating, /area/hallway/secondary/entry) "auQ" = ( /turf/open/floor/iron, /area/construction/mining/aux_base) +"auX" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "avp" = ( /obj/machinery/door/poddoor/shutters{ id = "aux_base_shutters"; @@ -1408,12 +1522,6 @@ }, /turf/open/floor/iron, /area/engine/break_room) -"avE" = ( -/obj/machinery/door/poddoor/preopen{ - id = "maint3" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "avP" = ( /obj/structure/sign/warning/pods, /turf/closed/wall, @@ -1435,6 +1543,19 @@ /obj/machinery/cell_charger, /turf/open/floor/plating, /area/maintenance/port/fore) +"awd" = ( +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) +"awn" = ( +/obj/effect/turf_decal/tile/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "awo" = ( /obj/structure/rack, /obj/machinery/light/small{ @@ -1461,10 +1582,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) -"awD" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "awE" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -1528,27 +1645,41 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/port/fore) -"axy" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe, -/turf/open/floor/iron, -/area/science/xenobiology) "axz" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, /turf/open/floor/prison/dark, /area/security/execution/transfer) +"axL" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Chief Medical Officer"; + req_access_txt = "40" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "axV" = ( /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron/dark, @@ -1626,6 +1757,24 @@ "ayL" = ( /turf/closed/wall/r_wall, /area/ai_monitored/storage/eva) +"ayR" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/light/directional/east, +/obj/structure/table, +/obj/item/storage/box/bodybags, +/obj/item/pen, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/hallway/primary/aft) +"ayX" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/plating/dirt/jungle, +/area/medical/genetics) "azc" = ( /obj/machinery/modular_computer/console/preset/engineering, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -1633,13 +1782,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"azm" = ( -/obj/structure/chair/stool, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) "azn" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, @@ -1660,6 +1802,15 @@ }, /turf/open/floor/iron/dark, /area/storage/tech) +"azw" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "azz" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1722,6 +1873,20 @@ "aAh" = ( /turf/closed/wall, /area/crew_quarters/toilet) +"aAj" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 9 + }, +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/hydroponics) "aAr" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb, @@ -1733,12 +1898,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"aAt" = ( -/obj/machinery/door/poddoor/preopen{ - id = "maint2" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "aAv" = ( /obj/structure/closet, /obj/effect/landmark/blobstart, @@ -1757,6 +1916,20 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"aAI" = ( +/obj/structure/curtain/directional{ + dir = 8 + }, +/obj/structure/curtain/directional{ + dir = 8 + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/medical/surgery) +"aAM" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "aAP" = ( /obj/machinery/hydroponics/soil, /turf/open/floor/grass, @@ -1771,12 +1944,42 @@ }, /turf/open/floor/iron, /area/hydroponics/garden) +"aAT" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 2 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "aAU" = ( /obj/structure/sink{ pixel_y = 30 }, /turf/open/floor/iron, /area/hydroponics/garden) +"aAW" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/cryo) "aBa" = ( /turf/closed/wall/r_wall, /area/ai_monitored/nuke_storage) @@ -1803,6 +2006,10 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, /area/security/prison) +"aBC" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "aBF" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -1848,6 +2055,13 @@ /obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/iron, /area/quartermaster/warehouse) +"aCf" = ( +/obj/effect/spawner/structure/window, +/obj/structure/curtain/directional{ + dir = 1 + }, +/turf/open/floor/plating, +/area/hydroponics) "aCg" = ( /obj/machinery/door/window/brigdoor{ name = "Justice Chamber"; @@ -1867,12 +2081,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/execution/transfer) -"aCh" = ( -/obj/machinery/vending/autodrobe, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/crew_quarters/theatre) "aCr" = ( /turf/closed/wall, /area/crew_quarters/theatre) @@ -1881,21 +2089,6 @@ /obj/effect/spawner/structure/window/depleteduranium, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) -"aCz" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"aCC" = ( -/obj/machinery/door/poddoor/preopen{ - id = "maint1" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "aCD" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/tank/air{ @@ -2027,12 +2220,6 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) -"aDU" = ( -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hydroponics) "aDZ" = ( /obj/structure/chair/fancy/comfy, /obj/effect/landmark/start/assistant, @@ -2084,24 +2271,11 @@ "aEU" = ( /turf/open/floor/iron/dark, /area/security/main) -"aFa" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) -"aFl" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/dresser, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron, -/area/crew_quarters/theatre) +"aEY" = ( +/obj/structure/kitchenspike, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "aFm" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -2145,6 +2319,14 @@ }, /turf/open/floor/noslip/white, /area/crew_quarters/heads/captain) +"aFO" = ( +/obj/structure/curtain, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white, +/area/medical/surgery) "aFQ" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -2199,35 +2381,6 @@ }, /turf/open/space/basic, /area/engine/atmos) -"aGB" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 20 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"aGC" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"aGF" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - sortType = 17 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "aGG" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line{ @@ -2237,56 +2390,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/grid/steel, /area/storage/tech) -"aGL" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"aGP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"aGQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"aGT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"aGV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"aGX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) "aGZ" = ( /obj/machinery/door/airlock/security{ name = "Security Checkpoint"; @@ -2383,17 +2486,19 @@ }, /turf/open/floor/iron, /area/quartermaster/miningdock) +"aHw" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar/atrium) "aHy" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/checkpoint/auxiliary) -"aHD" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron, -/area/storage/primary) "aHE" = ( /obj/structure/table, /obj/item/weldingtool, @@ -2412,6 +2517,22 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/security/brig) +"aHJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "aHK" = ( /obj/machinery/flasher{ id = "justiceflash"; @@ -2445,16 +2566,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/crew_quarters/fitness) -"aIg" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=2"; - freq = 1400; - location = "Bar" - }, -/obj/structure/plasticflaps/opaque, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/crew_quarters/bar) "aIp" = ( /turf/closed/wall, /area/hydroponics) @@ -2495,6 +2606,17 @@ /obj/item/analyzer, /turf/open/floor/iron, /area/storage/primary) +"aIP" = ( +/obj/structure/table/reinforced, +/obj/structure/desk_bell{ + pixel_x = 8 + }, +/obj/machinery/door/window/northright{ + name = "Hydroponics Desk"; + req_access_txt = "35" + }, +/turf/open/floor/iron, +/area/hydroponics) "aIQ" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -5; @@ -2557,13 +2679,6 @@ dir = 4 }, /area/engine/atmos) -"aJm" = ( -/obj/structure/sink/kitchen{ - pixel_y = 28 - }, -/obj/structure/reagent_dispensers/beerkeg, -/turf/open/floor/wood, -/area/crew_quarters/bar) "aJo" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -2594,39 +2709,12 @@ }, /turf/open/floor/wood, /area/library) -"aJH" = ( -/obj/machinery/door/window/southleft{ - name = "Bar Delivery"; - req_access_txt = "25" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/crew_quarters/bar) "aJI" = ( /turf/closed/wall, /area/crew_quarters/kitchen) "aJJ" = ( /turf/open/floor/iron/dark, /area/chapel/office) -"aJL" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=2"; - freq = 1400; - location = "Hydroponics" - }, -/obj/structure/plasticflaps/opaque, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/hydroponics) -"aJN" = ( -/obj/machinery/chem_dispenser/mutagensaltpetersmall, -/turf/open/floor/iron, -/area/hydroponics) -"aJO" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder, -/turf/open/floor/iron, -/area/hydroponics) "aJP" = ( /obj/structure/table/wood, /obj/item/folder/yellow, @@ -2707,76 +2795,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/primary/port) -"aKD" = ( -/obj/structure/table/reinforced, -/obj/structure/displaycase/forsale/kitchen, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"aKH" = ( -/obj/structure/sink{ - pixel_y = 30 - }, -/turf/open/floor/iron, -/area/hydroponics) -"aKJ" = ( -/obj/machinery/light_switch{ - pixel_y = 28 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"aKN" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"aKQ" = ( -/obj/machinery/reagentgrinder, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"aKR" = ( -/turf/open/floor/wood, -/area/crew_quarters/bar) -"aKW" = ( -/obj/machinery/light_switch{ - pixel_y = 28 - }, -/obj/effect/turf_decal/loading_area{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hydroponics) -"aKX" = ( -/obj/machinery/door/window/eastright{ - name = "Hydroponics Delivery"; - req_access_txt = "35" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/hydroponics) -"aLd" = ( -/obj/structure/table, -/obj/item/reagent_containers/spray/plantbgone{ - pixel_y = 3 - }, -/obj/item/reagent_containers/spray/plantbgone{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/reagent_containers/spray/plantbgone{ - pixel_x = 13; - pixel_y = 5 - }, -/obj/item/watertank, -/obj/item/paper/guides/jobs/hydroponics, -/obj/item/book/manual/hydroponics_pod_people, -/turf/open/floor/iron, -/area/hydroponics) "aLg" = ( /obj/structure/table/wood, /turf/open/floor/wood, @@ -2788,6 +2806,15 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"aLu" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Kitchen - Hydroponics"; + req_one_access_txt = "25,28,35" + }, +/turf/open/floor/iron, +/area/crew_quarters/kitchen) "aLv" = ( /obj/machinery/firealarm{ dir = 4; @@ -2888,39 +2915,9 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"aMp" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) "aMr" = ( /turf/open/floor/wood, /area/crew_quarters/theatre) -"aMB" = ( -/obj/machinery/food_cart/coffee, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"aMG" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/shovel/spade, -/obj/item/wrench, -/obj/item/reagent_containers/glass/bucket, -/obj/item/wirecutters, -/turf/open/floor/iron, -/area/hydroponics) -"aMI" = ( -/obj/machinery/light/small, -/obj/machinery/vending/wardrobe/hydro_wardrobe, -/turf/open/floor/iron, -/area/hydroponics) -"aMN" = ( -/obj/structure/table, -/obj/machinery/smartfridge/disks{ - pixel_y = 2 - }, -/turf/open/floor/iron, -/area/hydroponics) "aMW" = ( /obj/structure/bodycontainer/morgue, /turf/open/floor/iron/dark, @@ -2969,13 +2966,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"aNl" = ( -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "aNm" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3000,12 +2990,6 @@ /obj/effect/landmark/start/head_of_personnel, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) -"aNu" = ( -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) "aNv" = ( /obj/effect/turf_decal/plaque{ icon_state = "L4" @@ -3064,13 +3048,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"aNH" = ( -/obj/machinery/door/window{ - dir = 4; - name = "Theatre Stage" - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) "aNJ" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -3162,6 +3139,34 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) +"aOr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) +"aOs" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "aOt" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3196,53 +3201,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"aOH" = ( -/obj/structure/window/reinforced, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"aOJ" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"aOK" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/crew_quarters/bar) -"aOO" = ( -/obj/machinery/door/airlock{ - name = "Bar Storage"; - req_access_txt = "25" - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/wood, -/area/crew_quarters/bar) -"aOP" = ( -/obj/effect/landmark/blobstart, -/obj/item/toy/beach_ball/holoball, -/turf/open/floor/plating, -/area/crew_quarters/bar) -"aOQ" = ( -/obj/machinery/requests_console{ - department = "Hydroponics"; - departmentType = 2; - pixel_y = 30 - }, -/turf/open/floor/iron/dark, -/area/hydroponics) -"aOX" = ( -/obj/machinery/hydroponics/constructable, -/turf/open/floor/iron/dark, -/area/hydroponics) -"aOZ" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/hydroponics) "aPb" = ( /obj/structure/bookcase/random/religion, /turf/open/floor/wood, @@ -3297,6 +3255,11 @@ "aPq" = ( /turf/open/floor/iron, /area/hallway/secondary/exit) +"aPr" = ( +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/closet, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "aPs" = ( /obj/structure/chair, /turf/open/floor/iron, @@ -3364,20 +3327,6 @@ /obj/machinery/status_display/evac, /turf/closed/wall/r_wall, /area/bridge) -"aQb" = ( -/obj/structure/window/reinforced, -/obj/structure/table/wood, -/obj/item/instrument/violin, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"aQg" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/preopen{ - id = "barShutters"; - name = "privacy shutters" - }, -/turf/open/floor/plating, -/area/crew_quarters/bar) "aQh" = ( /obj/structure/table/wood, /obj/item/food/chips, @@ -3397,6 +3346,14 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"aQn" = ( +/obj/structure/rack, +/obj/item/clothing/gloves/boxing/green, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "aQp" = ( /obj/machinery/light/small{ dir = 8 @@ -3447,6 +3404,18 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"aQK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "aQL" = ( /obj/structure/rack, /obj/item/electronics/apc, @@ -3524,49 +3493,22 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) -"aRo" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/wood{ - broken = 1 - }, -/area/crew_quarters/heads/captain) "aRt" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/central) -"aRy" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = 30 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aRA" = ( -/obj/machinery/vending/dinnerware, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aRC" = ( -/obj/structure/sink/kitchen{ - pixel_y = 28 +"aRu" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 }, -/obj/machinery/food_cart, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aRF" = ( -/obj/structure/table, -/obj/machinery/microwave{ - pixel_x = -3; - pixel_y = 6 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aRJ" = ( +/obj/structure/closet/secure_closet/security/science, /turf/open/floor/iron, -/area/hydroponics) +/area/security/checkpoint/medical) "aRN" = ( /obj/structure/bookcase/random/fiction, /turf/open/floor/wood, @@ -3690,17 +3632,6 @@ /obj/machinery/smartfridge, /turf/closed/wall, /area/crew_quarters/kitchen) -"aSR" = ( -/turf/open/floor/iron/dark, -/area/hydroponics) -"aSS" = ( -/obj/machinery/seed_extractor, -/turf/open/floor/iron, -/area/hydroponics) -"aST" = ( -/obj/machinery/biogenerator, -/turf/open/floor/iron, -/area/hydroponics) "aTb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3812,54 +3743,22 @@ /obj/machinery/portable_atmospherics/canister/water_vapor, /turf/open/floor/iron, /area/janitor) -"aTM" = ( -/obj/structure/table, -/obj/item/food/mint, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aTN" = ( -/obj/structure/table, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_x = 3 +"aTP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = -3 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aTO" = ( -/obj/structure/table, -/obj/item/book/manual/chef_recipes, -/obj/item/book/manual/wiki/cooking_to_serve_man{ - pixel_x = -4; - pixel_y = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/turf/open/floor/iron, +/area/maintenance/aft) "aTQ" = ( /turf/closed/wall, /area/bridge) -"aUh" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/eastleft{ - name = "Hydroponics Desk"; - req_access_txt = "35" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/crew_quarters/kitchen) -"aUj" = ( -/obj/machinery/vending/hydronutrients, -/turf/open/floor/iron, -/area/hydroponics) -"aUk" = ( -/obj/machinery/vending/hydroseeds{ - slogan_delay = 700 - }, -/turf/open/floor/iron, -/area/hydroponics) "aUs" = ( /obj/structure/table, /obj/structure/disposalpipe/segment, @@ -4024,71 +3923,22 @@ broken = 1 }, /area/maintenance/starboard/aft) -"aVq" = ( -/obj/machinery/holopad, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"aVz" = ( -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aVA" = ( -/obj/structure/table/reinforced, -/obj/item/food/pie/cream, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aVB" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme{ - layer = 5 +"aVx" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/light{ + dir = 4 }, -/obj/item/stack/package_wrap, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/engine/atmos) +"aVz" = ( /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "aVD" = ( /obj/machinery/griddle, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) -"aVE" = ( -/obj/structure/table, -/obj/item/storage/box/donkpockets{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 5 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aVF" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aVH" = ( -/obj/machinery/processor, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aVJ" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/hydroponics/constructable, -/turf/open/floor/iron/dark, -/area/hydroponics) -"aVK" = ( -/obj/effect/landmark/start/botanist, -/turf/open/floor/iron, -/area/hydroponics) -"aVM" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/hydroponics) "aVP" = ( /obj/structure/table/wood, /obj/item/paper, @@ -4220,26 +4070,22 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"aXf" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/carpet/blue, +/area/medical/break_room) "aXh" = ( /obj/structure/disposalpipe/segment{ dir = 10 }, /turf/open/floor/iron, /area/hallway/primary/central) -"aXm" = ( -/obj/effect/landmark/start/cook, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aXn" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder, -/obj/machinery/requests_console{ - department = "Kitchen"; - departmentType = 2; - pixel_x = 30 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "aXq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4274,10 +4120,13 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/crew_quarters/locker) -"aXz" = ( -/obj/effect/landmark/start/paramedic, +"aXC" = ( +/obj/machinery/computer/pandemic, +/obj/structure/sign/departments/minsky/medical/virology/virology1{ + pixel_y = 32 + }, /turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/area/medical/virology) "aXD" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -4290,6 +4139,25 @@ /obj/item/pool/rubber_ring, /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness) +"aXI" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/stasis{ + dir = 4 + }, +/obj/effect/turf_decal/tile/white/opposingcorners, +/obj/effect/turf_decal/tile/white{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "aXL" = ( /turf/open/floor/carpet, /area/vacant_room/office) @@ -4303,10 +4171,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"aXN" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/medical/morgue) "aXP" = ( /turf/closed/wall, /area/storage/tools) @@ -4325,12 +4189,6 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) -"aYf" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/port) "aYi" = ( /turf/open/floor/plating, /area/vacant_room/commissary) @@ -4338,46 +4196,6 @@ /obj/effect/turf_decal/tile/dark_blue/half/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) -"aYJ" = ( -/obj/machinery/light_switch{ - pixel_y = -25 - }, -/obj/machinery/light, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aYM" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/button/door{ - id = "kitchen"; - name = "Kitchen Shutters Control"; - pixel_x = -1; - pixel_y = -24; - req_access_txt = "28" - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aYN" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"aYO" = ( -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/iron, -/area/hydroponics) -"aYP" = ( -/obj/structure/reagent_dispensers/watertank/high, -/turf/open/floor/iron, -/area/hydroponics) -"aYR" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/botanist, -/turf/open/floor/iron, -/area/hydroponics) "aYV" = ( /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -4477,9 +4295,36 @@ "aZM" = ( /turf/closed/wall/r_wall, /area/bridge/meeting_room) +"aZN" = ( +/obj/structure/bed, +/obj/item/bedsheet/captain, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "aZP" = ( /turf/closed/wall, /area/bridge/meeting_room) +"aZU" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "aZV" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) @@ -4512,22 +4357,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"bal" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/turf/open/floor/iron, -/area/hydroponics) -"bam" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/hydroponics) "baq" = ( /obj/machinery/door/airlock/security{ name = "Evidence Storage"; @@ -4542,12 +4371,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/security/main) -"bar" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "bas" = ( /obj/machinery/vending/coffee, /turf/open/floor/wood, @@ -4657,15 +4480,6 @@ "bbw" = ( /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"bby" = ( -/obj/structure/sign/barsign, -/turf/closed/wall, -/area/crew_quarters/bar) -"bbz" = ( -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/primary/starboard) "bbD" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -4765,6 +4579,15 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port) +"bcP" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "bcS" = ( /obj/machinery/light/small{ dir = 4 @@ -4776,32 +4599,17 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/vacant_room/commissary) -"bdc" = ( -/obj/machinery/chem_heater, -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "bdi" = ( /obj/effect/spawner/randomarcade, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"bdq" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 +"bdu" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/digital_clock/directional/north, /turf/open/floor/iron/white, -/area/medical/sleeper) +/area/medical/medbay/central) "bdv" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=HOP2"; @@ -4836,22 +4644,22 @@ /obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/iron, /area/quartermaster/warehouse) +"bdT" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/medical/virology) "bdU" = ( /obj/structure/closet/crate/medical, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/iron, /area/quartermaster/warehouse) -"bdW" = ( -/obj/item/clothing/gloves/color/rainbow, -/obj/item/clothing/head/soft/rainbow, -/obj/item/clothing/shoes/sneakers/rainbow, -/obj/item/clothing/under/color/rainbow, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/port) "bee" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; @@ -4888,9 +4696,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "ber" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, /area/hallway/primary/starboard) "bes" = ( @@ -4929,24 +4735,6 @@ /obj/machinery/light, /turf/open/floor/iron, /area/hallway/primary/starboard) -"beF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/plating, -/area/maintenance/fore) "beM" = ( /obj/structure/chair{ dir = 1 @@ -5080,9 +4868,34 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"bfp" = ( +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "bfv" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) +"bfw" = ( +/obj/machinery/advanced_airlock_controller{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/catwalk_floor, +/area/hallway/secondary/exit) "bfG" = ( /obj/machinery/door/window/southright{ dir = 4; @@ -5153,6 +4966,15 @@ "bfV" = ( /turf/closed/wall/r_wall, /area/science/robotics/lab) +"bfX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "bgc" = ( /turf/closed/wall/r_wall, /area/science/lab) @@ -5202,23 +5024,6 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron, /area/quartermaster/office) -"bgB" = ( -/obj/structure/disposalpipe/sorting/unsorted/flip{ - dir = 1 - }, -/turf/closed/wall, -/area/quartermaster/sorting) -"bgF" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/closet/crate/freezer/blood, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "bgG" = ( /obj/machinery/airalarm/directional/west{ pixel_x = -22 @@ -5236,26 +5041,22 @@ /obj/item/book/granter/spell/smoke/lesser, /turf/open/floor/iron/dark, /area/chapel/office) -"bgN" = ( -/turf/open/floor/iron/dark, -/area/engine/gravity_generator) -"bgZ" = ( -/obj/machinery/stasis, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +"bgL" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/white, -/area/medical/sleeper) -"bhb" = ( -/obj/machinery/sleeper, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/junction{ dir = 1 }, -/turf/open/floor/iron/white, -/area/medical/sleeper) +/turf/open/floor/plating, +/area/maintenance/aft) +"bgN" = ( +/turf/open/floor/iron/dark, +/area/engine/gravity_generator) "bhh" = ( /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -5270,48 +5071,6 @@ }, /turf/open/floor/iron/techmaint, /area/security/prison) -"bhj" = ( -/obj/machinery/button/door{ - id = "chemistry_shutters"; - name = "Chemistry shutters"; - pixel_x = -24; - pixel_y = -6; - req_one_access_txt = "5; 33" - }, -/obj/machinery/chem_dispenser, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) -"bhl" = ( -/obj/machinery/chem_master, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) -"bhm" = ( -/obj/structure/table/glass, -/obj/item/book/manual/wiki/grenades, -/obj/item/screwdriver{ - pixel_x = 2; - pixel_y = 18 - }, -/obj/item/stack/cable_coil/random, -/obj/item/grenade/chem_grenade, -/obj/item/stack/cable_coil/random, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "bhp" = ( /obj/structure/table/glass, /obj/item/stack/ducts/fifty, @@ -5453,21 +5212,6 @@ }, /turf/closed/wall, /area/quartermaster/sorting) -"bhY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "bhZ" = ( /obj/machinery/door/window/eastleft{ icon_state = "right"; @@ -5501,22 +5245,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/research) -"bio" = ( -/obj/machinery/vending/wallmed{ - pixel_x = -28 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) -"bip" = ( -/obj/effect/landmark/start/paramedic, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "biq" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -5568,24 +5296,6 @@ }, /turf/open/floor/iron, /area/quartermaster/office) -"bix" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/eastright{ - name = "Chemistry Desk"; - req_access_txt = "33" - }, -/obj/machinery/door/poddoor/preopen{ - id = "chemistry_shutters"; - name = "Chemistry shutters" - }, -/obj/machinery/cell_charger, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/medical/apothecary) -"biy" = ( -/obj/effect/landmark/start/chemist, -/turf/open/floor/iron/white, -/area/medical/apothecary) "biC" = ( /obj/machinery/light{ dir = 1 @@ -5766,10 +5476,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/central) -"bjK" = ( -/obj/machinery/stasis, -/turf/open/floor/iron/white, -/area/medical/sleeper) "bjP" = ( /obj/machinery/computer/mech_bay_power_console{ dir = 8 @@ -5784,17 +5490,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) -"bjX" = ( -/obj/machinery/smartfridge/chemistry/preloaded, -/turf/closed/wall, -/area/medical/apothecary) -"bjY" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "bjZ" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/stripes/line{ @@ -5850,36 +5545,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/quartermaster/storage) -"bkL" = ( -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/iron/white, -/area/medical/sleeper) -"bkO" = ( -/obj/machinery/chem_master, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) -"bkP" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) -"bkQ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/aft) "bkT" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -5889,6 +5554,18 @@ }, /turf/open/floor/plating, /area/maintenance/central) +"bkY" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "blg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -5901,12 +5578,6 @@ /obj/item/book/manual/wiki/plumbing, /turf/open/floor/iron/white, /area/medical/chemistry) -"blh" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "blk" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate" @@ -5915,12 +5586,6 @@ /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, /area/security/warden) -"bll" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "blu" = ( /obj/machinery/computer/mech_bay_power_console{ dir = 4 @@ -6058,6 +5723,25 @@ "bmo" = ( /turf/closed/wall, /area/crew_quarters/heads/hop) +"bmp" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "bmr" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/hop) @@ -6074,9 +5758,6 @@ "bmx" = ( /turf/closed/wall, /area/crew_quarters/heads/captain) -"bmG" = ( -/turf/open/floor/iron/white, -/area/medical/sleeper) "bmH" = ( /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay"; @@ -6096,20 +5777,6 @@ /obj/structure/bed, /turf/open/floor/iron/freezer, /area/medical/virology) -"bmN" = ( -/obj/machinery/button/door{ - id = "chemistry_shutters"; - name = "Chemistry shutters"; - pixel_x = -24; - pixel_y = 6; - req_one_access_txt = "5; 33" - }, -/obj/machinery/chem_dispenser, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "bmP" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -6124,11 +5791,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ai_monitored/storage/eva) -"bmV" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/smartfridge/chemistry, -/turf/closed/wall, -/area/medical/apothecary) "bnb" = ( /obj/machinery/recharge_station, /turf/open/floor/iron, @@ -6235,38 +5897,9 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"bof" = ( -/turf/closed/wall, -/area/medical/medbay/central) -"boi" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/security/checkpoint/medical) -"boj" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/security/checkpoint/medical) "bok" = ( /turf/closed/wall, /area/medical/apothecary) -"bol" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "bon" = ( /turf/closed/wall/r_wall, /area/medical/genetics) @@ -6343,14 +5976,25 @@ }, /turf/open/floor/iron, /area/quartermaster/office) +"boO" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/hydroponics) "boR" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/quartermaster/office) -"bpk" = ( -/obj/structure/closet/secure_closet/captains, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain) "bpn" = ( /obj/structure/chair{ pixel_y = -2 @@ -6376,6 +6020,18 @@ }, /turf/open/floor/iron, /area/quartermaster/office) +"bpE" = ( +/obj/item/cigbutt{ + pixel_x = 9; + pixel_y = -3 + }, +/obj/item/chair/plastic, +/obj/item/coin/bananium{ + pixel_x = 6; + pixel_y = 9 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "bpL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -6423,18 +6079,6 @@ /obj/item/stock_parts/cell/high/plus, /turf/open/floor/iron, /area/science/robotics/lab) -"bpV" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "bpX" = ( /turf/open/floor/iron/white/side, /area/science/research) @@ -6522,59 +6166,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) -"bqO" = ( -/obj/machinery/computer/operating{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/sleeper) -"bqP" = ( -/obj/machinery/door/airlock/medical{ - name = "Medbay Reception"; - req_access_txt = "5" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/sleeper) -"bqR" = ( -/obj/structure/table/glass, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/white, -/area/medical/sleeper) -"bqS" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) -"bqT" = ( -/obj/machinery/smartfridge/chemistry, -/turf/closed/wall, -/area/medical/sleeper) -"bqV" = ( -/obj/structure/table/glass, -/obj/item/storage/box/disks{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/machinery/airalarm/directional/north, -/obj/item/storage/box/monkeycubes{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "brc" = ( /obj/structure/chair, /turf/open/floor/iron/white, @@ -6585,10 +6176,6 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) -"bri" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/chemistry) "brm" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -6676,10 +6263,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/robotics/lab) -"bsx" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/sleeper) "bsK" = ( /obj/structure/closet/secure_closet/hop, /obj/machinery/power/apc/auto_name/directional/east{ @@ -6721,40 +6304,12 @@ dir = 9 }, /area/science/research) -"btf" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "bth" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron/tech, /area/security/prison/shielded) -"btk" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/table, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/reagent_containers/glass/bottle/charcoal{ - pixel_x = -4; - pixel_y = -3 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "btp" = ( /turf/open/floor/plating, /area/maintenance/starboard) @@ -6794,16 +6349,26 @@ }, /turf/open/floor/iron/white, /area/science/research) -"btV" = ( -/obj/structure/table, -/obj/item/folder/white{ +"btX" = ( +/obj/machinery/door/poddoor/preopen{ + id = "chemistry_shutters"; + name = "Chemistry shutters" + }, +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/window/northleft{ + dir = 4; + icon_state = "right"; + name = "Chemistry Desk"; + req_access_txt = "5; 33" + }, +/obj/item/paper_bin, +/obj/item/pen{ pixel_x = 4; - pixel_y = -3 + pixel_y = -4 }, -/obj/item/pen, -/obj/item/reagent_containers/syringe, -/turf/open/floor/iron/white, -/area/medical/chemistry) +/turf/open/floor/iron/dark, +/area/medical/apothecary) "btZ" = ( /turf/closed/wall, /area/security/checkpoint/medical) @@ -6880,26 +6445,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/quartermaster/storage) -"bvh" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 5; - pixel_y = 30 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"bvn" = ( -/obj/effect/turf_decal/box, -/obj/machinery/plumbing/bottle_dispenser{ +"buE" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/chemistry) +/turf/open/floor/iron, +/area/hydroponics) "bvu" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -7011,14 +6562,14 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/heads/captain) -"bxc" = ( -/obj/machinery/chem_heater, -/obj/machinery/light, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +"bxa" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/apothecary) +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, +/turf/open/floor/plating, +/area/maintenance/aft) "bxe" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/shrink_ccw{ dir = 4 @@ -7069,6 +6620,13 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) +"bxq" = ( +/obj/structure/mopbucket, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/mapping_helpers/tile_breaker, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "bxu" = ( /turf/closed/wall, /area/quartermaster/qm) @@ -7097,17 +6655,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) -"bxN" = ( -/obj/structure/cable/yellow, -/obj/machinery/power/apc/highcap/fifteen_k{ - name = "Medbay Central APC"; - pixel_y = -24 - }, -/obj/item/storage/box/gloves, -/obj/structure/table, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "bxV" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -7216,6 +6763,18 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"byO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/holopad, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "byU" = ( /obj/machinery/light, /turf/open/floor/iron, @@ -7231,28 +6790,16 @@ /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, /area/security/prison) -"bzi" = ( -/obj/machinery/light{ +"bzb" = ( +/obj/structure/chair/wood{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/window/reinforced/tinted{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"bzl" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 5; - pixel_y = 30 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/obj/structure/window/reinforced, +/turf/open/floor/wood, +/area/crew_quarters/theatre/backstage) "bzs" = ( /turf/closed/wall, /area/maintenance/aft) @@ -7325,10 +6872,6 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) -"bzK" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/medbay/central) "bzL" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, @@ -7355,23 +6898,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) -"bzV" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/security/checkpoint/medical) -"bzW" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/security/checkpoint/medical) "bAb" = ( /obj/structure/chair/office{ dir = 8 @@ -7379,16 +6905,6 @@ /obj/effect/landmark/start/shaft_miner, /turf/open/floor/iron, /area/quartermaster/miningdock) -"bAl" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "bAw" = ( /turf/open/floor/plating, /area/maintenance/aft) @@ -7432,47 +6948,42 @@ }, /turf/open/floor/wood, /area/security/detectives_office) -"bAV" = ( -/obj/structure/frame/computer{ - dir = 4 +"bAK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/obj/item/circuitboard/computer/operating, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) -"bBc" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/southleft{ - dir = 1; - name = "Chemistry Desk"; - req_access_txt = "33" +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) +"bAY" = ( +/obj/structure/chair/fancy/comfy{ + color = "#666666"; + dir = 1 }, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/medical/apothecary) -"bBf" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/turf_decal/tile/black/fourcorners, -/obj/machinery/camera/motion/directional/west, -/turf/open/floor/iron/grid/steel, -/area/ai_monitored/storage/eva) +/obj/item/radio/intercom{ + pixel_x = -26; + pixel_y = 29 + }, +/obj/effect/landmark/start/captain, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "bBi" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/open/floor/iron, /area/hallway/primary/central) -"bBm" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +"bBr" = ( +/obj/machinery/biogenerator, +/obj/machinery/door/window/northleft{ + name = "Hydroponics Desk"; + req_access_txt = "35" }, -/turf/open/floor/iron/white, -/area/medical/cryo) +/turf/open/floor/plating, +/area/hydroponics) "bBu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7485,15 +6996,6 @@ dir = 9 }, /area/science/research) -"bBQ" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/open/floor/iron, -/area/medical/genetics) "bBS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ dir = 4; @@ -7587,6 +7089,14 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"bCm" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/surgery) "bCo" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -7595,62 +7105,12 @@ }, /turf/open/floor/iron, /area/quartermaster/miningdock) -"bCp" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, -/area/hallway/primary/aft) "bCq" = ( /turf/closed/wall, /area/maintenance/port/aft) "bCs" = ( /turf/closed/wall, /area/storage/tech) -"bCB" = ( -/obj/structure/bed, -/obj/item/bedsheet/medical, -/obj/machinery/iv_drip, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"bCO" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/cryo) -"bCR" = ( -/obj/structure/table, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/item/clothing/neck/stethoscope, -/obj/item/storage/box/bodybags, -/obj/item/radio/intercom{ - pixel_y = 20 - }, -/turf/open/floor/iron/white, -/area/medical/storage) -"bCY" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "bDb" = ( /turf/closed/wall/r_wall, /area/science/xenobiology) @@ -7726,31 +7186,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) -"bDJ" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/bodycontainer/morgue{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "bDL" = ( /obj/structure/bodycontainer/morgue, /turf/open/floor/iron/dark, /area/medical/morgue) -"bDO" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "bDR" = ( /obj/effect/turf_decal/bot_white/left, /obj/structure/closet/crate/silvercrate, @@ -7764,29 +7203,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/science/storage) -"bEh" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) -"bEk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) -"bEl" = ( -/obj/machinery/door/window/westleft{ - name = "Monkey Pen"; - req_access_txt = "9" - }, -/turf/open/floor/iron, -/area/medical/genetics) "bEm" = ( /turf/open/floor/engine, /area/science/xenobiology) @@ -7803,21 +7219,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/science/storage) -"bEr" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "bEs" = ( /turf/closed/wall, /area/science/mixing) @@ -7851,6 +7252,15 @@ }, /turf/open/floor/iron, /area/science/mixing) +"bEP" = ( +/obj/machinery/holopad{ + pixel_y = 16 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/storage) "bER" = ( /obj/structure/closet/secure_closet/quartermaster, /obj/machinery/airalarm/directional/north{ @@ -7861,9 +7271,6 @@ }, /turf/open/floor/iron, /area/quartermaster/qm) -"bFi" = ( -/turf/open/floor/iron/dark, -/area/medical/morgue) "bFu" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ @@ -7875,27 +7282,10 @@ /obj/structure/grille/broken, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"bFG" = ( -/obj/effect/landmark/start/geneticist, -/turf/open/floor/iron/white, -/area/medical/genetics) -"bFH" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/mob/living/carbon/monkey, +"bFO" = ( +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron, -/area/medical/genetics) -"bFL" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/area/hallway/primary/starboard) "bFQ" = ( /obj/structure/sign/warning/nosmoking{ pixel_x = -32 @@ -7921,6 +7311,19 @@ }, /turf/open/floor/iron, /area/science/mixing) +"bGb" = ( +/obj/machinery/dna_scannernew, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) "bGc" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -7939,11 +7342,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, /area/science/test_area) -"bGk" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/scientist, -/turf/open/floor/iron/white, -/area/science/mixing) "bGn" = ( /obj/structure/closet/secure_closet/miner, /turf/open/floor/iron, @@ -7956,6 +7354,23 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/port/aft) +"bGt" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/machinery/airalarm/directional/south{ + pixel_y = -22 + }, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Storage"; + req_access_txt = "5" + }, +/turf/open/floor/iron/dark, +/area/medical/storage) "bGz" = ( /obj/structure/table/reinforced, /obj/item/wrench, @@ -7985,42 +7400,11 @@ }, /turf/open/floor/carpet, /area/vacant_room/office) -"bGT" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/iron/white, -/area/medical/cryo) -"bGU" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/cryo) -"bGV" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/cryo) "bGY" = ( /obj/machinery/portable_atmospherics/scrubber/huge, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/science/storage) -"bHb" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/iron, -/area/medical/genetics) "bHd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8058,16 +7442,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) -"bHs" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron, -/area/science/mixing) "bHv" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -8097,26 +7471,6 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/hallway/primary/aft) -"bHT" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/storage) -"bHW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "bIe" = ( /obj/structure/disposalpipe/segment, /obj/machinery/status_display/evac{ @@ -8127,13 +7481,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"bIk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "bIm" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -8149,16 +7496,6 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) -"bIo" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1; - name = "Connector Port (Air Supply)" - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/cryo) "bIr" = ( /turf/closed/wall, /area/medical/cryo) @@ -8204,9 +7541,6 @@ dir = 5 }, /area/science/research) -"bII" = ( -/turf/open/floor/iron/white, -/area/medical/storage) "bIP" = ( /obj/structure/chair/fancy/comfy{ color = "#666666" @@ -8281,6 +7615,19 @@ /obj/item/multitool, /turf/open/floor/iron, /area/quartermaster/office) +"bJp" = ( +/obj/machinery/computer/crew{ + dir = 8 + }, +/obj/effect/turf_decal/tile/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "bJu" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -8354,6 +7701,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, /area/science/xenobiology) +"bJK" = ( +/obj/machinery/door/poddoor/preopen{ + id = "maint3" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/fore) "bJL" = ( /obj/machinery/door/window/southleft{ dir = 1; @@ -8456,12 +7809,6 @@ /obj/machinery/vendor/mining, /turf/open/floor/iron, /area/quartermaster/miningdock) -"bKH" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "bKN" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -8489,6 +7836,22 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/science/xenobiology) +"bKZ" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/machinery/door/poddoor/preopen{ + id = "quarantineshutters"; + name = "Quarantine Shutters" + }, +/turf/open/floor/iron, +/area/medical/medbay/lobby) "bLa" = ( /obj/machinery/door/window/southleft{ name = "Test Chamber"; @@ -8555,19 +7918,6 @@ /obj/item/beacon, /turf/open/floor/plating/airless, /area/science/test_area) -"bLq" = ( -/obj/item/target/alien/anchored, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/camera/preset/toxins{ - dir = 4 - }, -/turf/open/floor/plating{ - initial_gas_mix = "o2=0.01;n2=0.01;TEMP=293.15"; - luminosity = 2 - }, -/area/science/test_area) "bLr" = ( /turf/closed/indestructible{ desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; @@ -8627,15 +7977,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/engine/atmos) -"bLV" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/storage) "bLZ" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; @@ -8661,16 +8002,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/genetics) -"bMd" = ( -/turf/open/floor/iron/white, -/area/medical/genetics) -"bMh" = ( -/obj/structure/chair/stool, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/white, -/area/science/xenobiology) "bMi" = ( /turf/open/floor/iron/white, /area/science/xenobiology) @@ -8914,13 +8245,6 @@ "bNd" = ( /turf/closed/wall/r_wall, /area/medical/virology) -"bNh" = ( -/obj/structure/closet/secure_closet/medical3, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/storage) "bNq" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -8955,15 +8279,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"bND" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) "bNE" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, @@ -9117,10 +8432,6 @@ /obj/machinery/holopad, /turf/open/floor/iron/white, /area/science/xenobiology) -"bOz" = ( -/obj/structure/chair/stool, -/turf/open/floor/iron/white, -/area/science/xenobiology) "bOD" = ( /obj/structure/chair/office{ dir = 8 @@ -9251,10 +8562,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/aft) -"bPp" = ( -/obj/structure/closet/secure_closet/medical3, -/turf/open/floor/iron/white, -/area/medical/storage) "bPw" = ( /obj/machinery/light/small{ dir = 8 @@ -9467,6 +8774,15 @@ }, /turf/open/floor/iron/dark/corner, /area/engine/atmos) +"bQm" = ( +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) +"bQn" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/medical/morgue) "bQs" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; @@ -9508,10 +8824,6 @@ /obj/structure/sign/poster/official/no_erp, /turf/closed/wall, /area/crew_quarters/dorms) -"bQF" = ( -/obj/machinery/rnd/production/techfab/department/medical, -/turf/open/floor/iron/white, -/area/medical/storage) "bQT" = ( /obj/structure/closet/bombcloset, /turf/open/floor/iron/white, @@ -9568,17 +8880,28 @@ }, /turf/open/floor/iron/dark/corner, /area/engine/atmos) -"bRv" = ( -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/security/checkpoint/medical) "bRx" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/engine/atmos) +"bRy" = ( +/obj/machinery/door/airlock{ + name = "Kitchen Coldroom"; + req_access_txt = "28" + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen/coldroom) "bRA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -9629,18 +8952,6 @@ }, /turf/open/floor/engine/vacuum, /area/engine/atmos) -"bRM" = ( -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/cable_coil, -/obj/item/flashlight/lamp, -/obj/item/flashlight/lamp/green, -/obj/structure/table/wood, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) "bRO" = ( /turf/closed/wall, /area/medical/storage) @@ -9785,21 +9096,14 @@ /turf/open/floor/iron, /area/engine/atmos) "bSD" = ( -/obj/structure/table, -/obj/item/storage/box/syringes{ - pixel_y = 5 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/item/reagent_containers/syringe{ - pixel_x = 6; - pixel_y = -3 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/item/reagent_containers/syringe, -/turf/open/floor/iron/white, -/area/medical/chemistry) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "bSF" = ( /obj/machinery/light{ dir = 8 @@ -9937,6 +9241,22 @@ }, /turf/open/floor/iron, /area/engine/break_room) +"bTi" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13, prison") + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron/techmaint, +/area/security/prison/shielded) "bTp" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, @@ -10149,10 +9469,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"bUD" = ( -/obj/machinery/vending/cigarette, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "bUE" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -10379,13 +9695,6 @@ }, /turf/open/floor/engine/n2o, /area/engine/atmos) -"bWe" = ( -/obj/effect/turf_decal/box, -/obj/machinery/plumbing/output{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "bWi" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10401,9 +9710,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"bWj" = ( -/turf/closed/wall, -/area/crew_quarters/heads/cmo) "bWk" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, @@ -10457,12 +9763,6 @@ "bWr" = ( /turf/open/floor/iron/white, /area/science/research) -"bWs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) "bWB" = ( /obj/machinery/telecomms/processor/preset_four, /turf/open/floor/circuit/green, @@ -10544,15 +9844,6 @@ }, /turf/open/floor/plating, /area/tcommsat/computer) -"bWJ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating{ - burnt = 1 - }, -/area/maintenance/starboard/fore) "bWL" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ @@ -10595,6 +9886,22 @@ dir = 1 }, /area/engine/atmos) +"bWP" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Hydroponics Maintenance"; + req_access_txt = "35" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "bWQ" = ( /turf/closed/wall/r_wall, /area/security/checkpoint/engineering) @@ -10674,6 +9981,19 @@ }, /turf/open/floor/iron, /area/science/mixing) +"bXv" = ( +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "bXz" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 @@ -10779,13 +10099,6 @@ }, /turf/open/floor/engine/plasma, /area/engine/atmos) -"bYe" = ( -/obj/effect/landmark/start/medical_doctor, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "bYf" = ( /obj/structure/table/reinforced, /obj/machinery/button/door{ @@ -10884,14 +10197,6 @@ "bYH" = ( /turf/closed/wall, /area/engine/break_room) -"bYI" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, -/area/hallway/primary/aft) "bYL" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -10979,6 +10284,16 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"bYZ" = ( +/obj/item/toy/cards/deck{ + pixel_x = 1; + pixel_y = 13 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood, +/obj/structure/table/wood, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/bar/atrium) "bZb" = ( /obj/machinery/light{ dir = 4 @@ -11105,6 +10420,14 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/chief) +"bZG" = ( +/obj/structure/closet/secure_closet/hydroponics, +/obj/structure/window{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/ridged/steel, +/area/hydroponics) "bZH" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 @@ -11184,17 +10507,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"bZS" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "bZT" = ( /mob/living/carbon/monkey, /turf/open/floor/iron/freezer, @@ -11275,12 +10587,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"cad" = ( -/obj/structure/table/wood/poker, -/obj/item/clothing/mask/cigarette/cigar, -/obj/item/toy/cards/deck, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "cak" = ( /obj/machinery/door/airlock{ name = "Private Restroom" @@ -11362,13 +10668,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"caH" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 - }, -/obj/structure/chair/stool, -/turf/open/floor/iron, -/area/engine/atmos) "caJ" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -11392,16 +10691,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/freezer, /area/medical/virology) -"caQ" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/storage/box/medsprays, -/obj/item/hand_labeler, -/turf/open/floor/iron/white, -/area/medical/chemistry) "caV" = ( /obj/machinery/door/window/northleft{ base_state = "right"; @@ -11685,15 +10974,72 @@ }, /turf/open/floor/engine/co2, /area/engine/atmos) -"ccE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +"ccO" = ( +/obj/structure/table, +/obj/item/reagent_containers/glass/bottle/morphine{ + pixel_x = -4; + pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/item/reagent_containers/glass/bottle/chloralhydrate, +/obj/item/reagent_containers/glass/bottle/toxin{ + pixel_x = 6; + pixel_y = 8 }, -/turf/open/floor/iron/white, -/area/medical/virology) +/obj/item/reagent_containers/glass/bottle/morphine{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/facid{ + name = "fluorosulfuric acid bottle"; + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/reagent_containers/syringe{ + pixel_y = 5 + }, +/obj/item/reagent_containers/dropper, +/obj/machinery/airalarm/all_access{ + dir = 4; + pixel_x = -24 + }, +/obj/machinery/button/ignition{ + id = "executionburn"; + name = "Justice Ignition Switch"; + pixel_x = -25; + pixel_y = 36 + }, +/obj/machinery/button/door{ + id = "executionfireblast"; + name = "Justice Area Lockdown"; + pixel_x = -25; + pixel_y = 26; + req_access_txt = "2" + }, +/obj/item/assembly/signaler{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/machinery/button/flasher{ + id = "justiceflash"; + name = "Justice Flash Control"; + pixel_x = -36; + pixel_y = 36; + req_access_txt = "1" + }, +/obj/machinery/button/door{ + id = "SecJusticeChamber"; + layer = 4; + name = "Justice Vent Control"; + pixel_x = -36; + pixel_y = 26; + req_access_txt = "3" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/security/execution/transfer) "ccP" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, @@ -11986,14 +11332,6 @@ }, /turf/open/floor/iron/white, /area/science/robotics/lab) -"ceB" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 6 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/engine/atmos) "ceD" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -12014,15 +11352,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"ceI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/iron/white, -/area/medical/virology) "ceJ" = ( /obj/structure/transit_tube/horizontal, /obj/structure/lattice/catwalk, @@ -12035,6 +11364,10 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"ceP" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/iron/dark, +/area/medical/surgery) "ceR" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plating, @@ -12047,6 +11380,22 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/port/aft) +"cfa" = ( +/obj/structure/table/glass, +/obj/item/folder/white, +/obj/item/stamp/cmo, +/obj/item/clothing/glasses/hud/health, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "cfb" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/chief) @@ -12077,25 +11426,20 @@ "cfj" = ( /turf/closed/wall, /area/maintenance/disposal/incinerator) -"cfk" = ( -/obj/item/storage/box/masks, -/obj/item/reagent_containers/spray/cleaner, -/obj/structure/table, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"cfn" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +"cfm" = ( +/obj/machinery/dna_scannernew, +/obj/machinery/requests_console{ + department = "Genetics"; + name = "Genetics Requests Console"; + pixel_y = -30 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/iron, -/area/hallway/secondary/service) +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white, +/area/medical/genetics) "cfr" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 @@ -12126,6 +11470,10 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"cfC" = ( +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron/white, +/area/medical/apothecary) "cfD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ @@ -12188,27 +11536,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"cfY" = ( -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/chemistry) -"cfZ" = ( -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"cga" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "cge" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/suit/jacket/letterman_nanotrasen, @@ -12351,14 +11678,6 @@ }, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) -"chp" = ( -/obj/machinery/light, -/obj/effect/turf_decal/box, -/obj/machinery/plumbing/output{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "chq" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -12469,6 +11788,15 @@ }, /turf/open/space, /area/solar/port/aft) +"chN" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/virology) "chU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -12507,6 +11835,26 @@ "cig" = ( /turf/closed/wall, /area/engine/engineering) +"cij" = ( +/obj/structure/chair/stool/bar/directional/west, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) +"cik" = ( +/obj/machinery/computer/arcade/orion_trail{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/airalarm/directional/west, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "cil" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -12643,24 +11991,10 @@ }, /turf/open/floor/iron/dark, /area/gateway) -"cjq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics) "cjx" = ( /obj/machinery/vending/cigarette, /turf/open/floor/iron, /area/hallway/primary/central) -"cjA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/white, -/area/medical/virology) "cjB" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 @@ -12717,6 +12051,14 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/aft) +"ckl" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Hydroponics"; + req_one_access_txt = "35;28" + }, +/turf/open/floor/iron, +/area/hydroponics) "cko" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, @@ -12859,6 +12201,10 @@ /obj/machinery/cell_charger, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"clD" = ( +/obj/effect/mapping_helpers/tile_breaker, +/turf/open/floor/wood/big, +/area/maintenance/aft) "clH" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/general/hidden{ @@ -13155,6 +12501,14 @@ }, /turf/closed/wall, /area/maintenance/disposal/incinerator) +"cow" = ( +/obj/item/radio/intercom{ + dir = 8; + pixel_x = 28 + }, +/obj/machinery/chem_heater, +/turf/open/floor/iron/white, +/area/medical/apothecary) "coU" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment, @@ -13185,18 +12539,6 @@ }, /turf/open/space, /area/space/nearstation) -"cpf" = ( -/obj/structure/chair/fancy/comfy{ - color = "#666666"; - dir = 1 - }, -/obj/item/radio/intercom{ - pixel_x = -26; - pixel_y = 29 - }, -/obj/effect/landmark/start/captain, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain) "cpi" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -13204,6 +12546,19 @@ }, /turf/open/space, /area/solar/starboard/aft) +"cpm" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "cpq" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron, @@ -13222,6 +12577,16 @@ }, /turf/open/floor/iron, /area/maintenance/aft) +"cpC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "cpJ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -13303,19 +12668,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"cqi" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/south{ - areastring = "/area/engine/supermatter" - }, -/obj/structure/cable/yellow, -/turf/open/floor/engine, -/area/engine/engineering) "cqj" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/button/door{ @@ -13477,6 +12829,13 @@ /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/engine/engineering) +"crb" = ( +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "crc" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -13534,25 +12893,6 @@ }, /turf/closed/wall/r_wall, /area/engine/supermatter) -"crw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"cry" = ( -/obj/structure/closet/emcloset, -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13, engine") - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "crA" = ( /obj/structure/transit_tube_pod, /obj/structure/transit_tube/station/reverse/flipped{ @@ -13744,25 +13084,21 @@ }, /turf/open/floor/iron, /area/security/brig) -"csq" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/genetics) -"csr" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "css" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/space, /area/space/nearstation) +"cst" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/genetics) "csu" = ( /obj/structure/closet/firecloset, /turf/open/floor/iron/dark, @@ -13799,6 +13135,22 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"csE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "csH" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -13865,18 +13217,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"csV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "ctc" = ( /obj/machinery/light{ dir = 1 @@ -13919,16 +13259,6 @@ "ctv" = ( /turf/closed/wall/r_wall, /area/space/nearstation) -"ctA" = ( -/mob/living/carbon/monkey, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron, -/area/medical/genetics) "ctE" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, @@ -13947,41 +13277,10 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/bridge) -"ctL" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron, -/area/medical/genetics) -"ctN" = ( -/obj/machinery/computer/operating{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) -"ctQ" = ( -/obj/structure/bed, -/obj/item/bedsheet/medical, -/obj/machinery/iv_drip, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "ctR" = ( /obj/structure/sign/warning/radiation/rad_area, /turf/closed/wall, /area/engine/engineering) -"ctV" = ( -/mob/living/carbon/monkey, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron, -/area/medical/genetics) "ctY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -14001,26 +13300,10 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"cug" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/cryo) "cui" = ( /obj/machinery/recharge_station, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/service) -"cum" = ( -/mob/living/carbon/monkey, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron, -/area/medical/genetics) "cun" = ( /obj/structure/showcase/cyborg/old{ dir = 4; @@ -14051,43 +13334,9 @@ /obj/machinery/holopad, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/service) -"cuI" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/iron/white, -/area/medical/cryo) -"cuJ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/white, -/area/medical/cryo) -"cuX" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Autopsy"; - req_access_txt = "5" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "cva" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) -"cvb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "cvc" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat/service) @@ -14113,15 +13362,6 @@ }, /turf/open/floor/iron/dark, /area/security/prison) -"cvf" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1; - name = "Connector Port (Air Supply)" - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/cryo) "cvj" = ( /turf/closed/wall, /area/ai_monitored/turret_protected/aisat/hallway) @@ -14132,22 +13372,6 @@ /obj/structure/grille, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) -"cvq" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) -"cvw" = ( -/obj/machinery/dna_scannernew, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "cvx" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom{ @@ -14178,54 +13402,15 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/quartermaster/office) -"cvM" = ( -/obj/machinery/computer/cloning{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "cvO" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cvW" = ( -/obj/machinery/clonepod/prefilled, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "cvX" = ( /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) -"cwf" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/medical_cloning{ - pixel_y = 6 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) -"cwg" = ( -/obj/structure/table, -/obj/item/storage/box/rxglasses{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/bodybags, -/obj/item/pen, -/turf/open/floor/iron/white, -/area/medical/genetics) -"cwk" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/open/floor/noslip/white, -/area/medical/genetics) "cwl" = ( /obj/item/radio/intercom{ pixel_x = -30 @@ -14485,6 +13670,22 @@ /obj/machinery/meter, /turf/open/floor/iron/dark, /area/engine/engineering) +"czI" = ( +/obj/machinery/vending/wallmed{ + pixel_x = -1; + pixel_y = -32 + }, +/obj/structure/closet/secure_closet/personal/patient, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/white, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "czJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/effect/spawner/structure/window/reinforced, @@ -14506,10 +13707,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"czU" = ( -/obj/structure/bookcase/random, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) "czZ" = ( /obj/structure/chair, /obj/structure/disposalpipe/segment{ @@ -14532,10 +13729,6 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) -"cAg" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "cAl" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -14663,23 +13856,16 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "cAR" = ( -/obj/machinery/light{ - dir = 8 +/obj/structure/table/greyscale, +/obj/item/storage/fancy/cigarettes/cigpack_robust{ + pixel_x = -3 + }, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = 2; + pixel_y = 3 }, /turf/open/floor/plating, /area/maintenance/aft) -"cAY" = ( -/obj/structure/disposalpipe/junction/flip, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/virology) "cAZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -14690,11 +13876,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/maintenance/aft) -"cBg" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plating, -/area/hydroponics) "cBi" = ( /obj/effect/landmark/event_spawn, /obj/effect/decal/cleanable/dirt, @@ -14840,21 +14021,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/engine/engineering) -"cBQ" = ( -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics) -"cBS" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "cBZ" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -14922,6 +14088,16 @@ /obj/machinery/deepfryer, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) +"cCu" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/medical/surgery) "cCA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -14999,6 +14175,16 @@ /obj/item/pipe_dispenser, /turf/open/floor/engine, /area/engine/engineering) +"cDi" = ( +/obj/structure/table, +/obj/machinery/vending/wallmed{ + name = "Emergency NanoMed"; + pixel_y = 28; + use_power = 0 + }, +/obj/item/book/manual/wiki/surgery, +/turf/open/floor/iron/white, +/area/medical/surgery) "cDj" = ( /obj/structure/cable{ icon_state = "2-8" @@ -15127,6 +14313,12 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"cDU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "cDZ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -15490,13 +14682,6 @@ /obj/machinery/atmospherics/pipe/manifold/general/visible, /turf/open/floor/iron/dark, /area/engine/engineering) -"cFD" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "cFI" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -15537,27 +14722,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"cFN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engine/engineering) -"cFP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 - }, -/obj/machinery/camera/autoname/directional/north{ - network = list("ss13","engine") - }, -/turf/open/floor/engine, -/area/engine/engineering) "cFR" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -15597,18 +14761,16 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"cGa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +"cFW" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 + dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/medical/morgue) "cGc" = ( /obj/machinery/door/airlock/maintenance{ id_tag = "commissarydoor"; @@ -15682,6 +14844,12 @@ /obj/machinery/light, /turf/open/floor/iron/dark, /area/engine/engineering) +"cGn" = ( +/obj/machinery/iv_drip, +/obj/structure/bed/roller, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "cGq" = ( /obj/structure/table/reinforced, /obj/machinery/recharger{ @@ -15735,30 +14903,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plating/airless, /area/engine/engineering) -"cGN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) -"cGR" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = -2; - pixel_y = 2 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "cGS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -16011,19 +15155,6 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/dorms) -"cIx" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Recovery Room" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "cIO" = ( /obj/item/paper/fluff/jobs/security/beepsky_mom, /turf/open/floor/plating, @@ -16059,20 +15190,10 @@ }, /turf/open/floor/iron, /area/quartermaster/office) -"cJn" = ( -/obj/machinery/button/door{ - id = "rnd"; - name = "Shutters Control Button"; - pixel_x = -6; - pixel_y = 24; - req_access_txt = "47" - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/white, -/area/science/lab) +"cJr" = ( +/obj/machinery/camera/directional/east, +/turf/open/floor/iron, +/area/hallway/primary/central) "cJv" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line, @@ -16097,22 +15218,6 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) -"cJD" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/sorting/mail{ - sortType = 23 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/iron, -/area/maintenance/aft) "cJR" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -16122,13 +15227,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"cJS" = ( -/obj/structure/table, -/obj/item/storage/box/bodybags, -/obj/item/pen, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron/dark, -/area/medical/morgue) "cKg" = ( /obj/structure/chair/office, /obj/effect/landmark/start/assistant, @@ -16137,6 +15235,15 @@ }, /turf/open/floor/wood, /area/library) +"cKh" = ( +/obj/item/kirbyplants{ + icon_state = "plant-10" + }, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "cKj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -16162,6 +15269,19 @@ }, /turf/open/floor/catwalk_floor, /area/quartermaster/exploration_dock) +"cKr" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/crew_quarters/theatre) +"cKs" = ( +/obj/structure/fluff/hedge/opaque, +/turf/open/floor/wood/big, +/area/crew_quarters/bar/atrium) "cKv" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc/auto_name/directional/south{ @@ -16173,6 +15293,18 @@ /obj/item/hand_labeler, /turf/open/floor/wood, /area/vacant_room/office) +"cKB" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13, engine") + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 2 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft) "cLa" = ( /obj/structure/chair/office/light{ dir = 4 @@ -16194,21 +15326,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) -"cLh" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/engine, -/area/engine/engineering) "cLp" = ( /obj/structure/railing{ dir = 8 @@ -16221,44 +15338,42 @@ }, /turf/open/floor/prison, /area/security/prison) -"cLs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +"cMg" = ( +/obj/structure/lattice, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13", "minisat") }, -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/lootdrop/grille_or_trash, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","minisat") }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) +/turf/open/space, +/area/space/nearstation) "cMm" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/engine/engineering) -"cMp" = ( -/obj/item/radio/intercom{ - pixel_y = 20 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "cMw" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /obj/item/storage/fancy/donut_box, /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) +"cMx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "cMD" = ( /turf/closed/wall/r_wall, /area/engine/supermatter) @@ -16331,18 +15446,12 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"cOp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +"cOn" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/beer, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "cOt" = ( /obj/structure/sign/departments/minsky/medical/medical2{ pixel_y = -32 @@ -16352,6 +15461,10 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) +"cOv" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/apothecary) "cOx" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -16448,6 +15561,26 @@ }, /turf/open/floor/iron, /area/quartermaster/warehouse) +"cQc" = ( +/obj/machinery/vending/cigarette, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/wood, +/area/medical/break_room) +"cQf" = ( +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/chem_master, +/turf/open/floor/iron/white, +/area/medical/apothecary) "cQm" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -16466,11 +15599,6 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) -"cQz" = ( -/obj/structure/table/optable, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/sleeper) "cQR" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -16483,6 +15611,39 @@ }, /turf/open/floor/iron/white, /area/science/mixing/chamber) +"cQS" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/landmark/start/cook, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) +"cQZ" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "cRa" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate, @@ -16650,6 +15811,11 @@ }, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) +"cUp" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/vending/wardrobe/gene_wardrobe, +/turf/open/floor/iron/white, +/area/medical/genetics) "cUs" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -16722,6 +15888,13 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/prison, /area/security/prison) +"cUX" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "cVb" = ( /turf/closed/wall, /area/hallway/secondary/service) @@ -16756,16 +15929,6 @@ /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, /area/security/prison/shielded) -"cVw" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark, -/area/hydroponics) "cVy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -16797,12 +15960,6 @@ }, /turf/open/floor/engine, /area/science/explab) -"cWC" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/iron, -/area/engine/engineering) "cWH" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -16818,11 +15975,25 @@ }, /turf/open/floor/iron, /area/security/checkpoint/engineering) +"cWS" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood/corner, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) +"cXa" = ( +/obj/structure/chair/stool/directional/north, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "cXc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"cXE" = ( +/turf/closed/wall, +/area/medical/break_room) "cYD" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/stripes/line{ @@ -16840,21 +16011,19 @@ }, /turf/open/floor/iron/dark, /area/security/prison) -"cZt" = ( -/obj/machinery/door/airlock{ - name = "Theatre Backstage"; - req_access_txt = "46" +"cZC" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, -/area/crew_quarters/theatre) -"cZK" = ( -/turf/closed/wall, -/area/medical/sleeper) +/area/hallway/primary/aft) +"cZF" = ( +/turf/closed/wall/r_wall, +/area/crew_quarters/heads/captain/private) "dad" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -16922,24 +16091,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/security/courtroom) -"dbc" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/northleft{ - name = "Hydroponics Desk"; - req_access_txt = "35" - }, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen, -/turf/open/floor/iron, -/area/hydroponics) -"dbF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "dbN" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -16956,21 +16107,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) -"dbX" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "dbZ" = ( /obj/structure/chair/fancy, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -17046,6 +16182,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"ddl" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "ded" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -17085,6 +16229,20 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) +"deD" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 1 + }, +/obj/machinery/chem_dispenser/mutagensaltpetersmall, +/turf/open/floor/iron, +/area/hydroponics) +"deN" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/dresser, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "deS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -17092,6 +16250,17 @@ }, /turf/open/floor/iron, /area/science/storage) +"dfc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "cmoprivacy"; + name = "Office Privacy Shutters" + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/crew_quarters/heads/cmo) "dfd" = ( /obj/machinery/computer/telecomms/server{ dir = 4; @@ -17127,24 +16296,37 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port) -"dfK" = ( -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) -"dfV" = ( -/obj/machinery/button/door{ - id = "quarantineshutters"; - name = "Quarantine Lockdown"; - pixel_x = -23; - req_access_txt = "39" - }, +"dfB" = ( +/obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "0-4" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/turf/open/floor/plating, +/area/maintenance/fore/secondary) +"dfC" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/carpet/blue, +/area/medical/break_room) +"dfI" = ( +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/virology) +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) +"dfK" = ( +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "dgj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -17154,21 +16336,6 @@ dir = 10 }, /area/science/research) -"dgq" = ( -/obj/structure/closet/secure_closet/security/med, -/obj/machinery/power/apc/auto_name/directional/east{ - pixel_x = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/airalarm/directional/south{ - pixel_y = -22 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "dgz" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -17179,6 +16346,36 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/primary/central) +"dgD" = ( +/obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) +"dhf" = ( +/obj/structure/rack, +/obj/item/multitool, +/obj/item/analyzer, +/obj/item/geiger_counter, +/turf/open/floor/iron/white, +/area/science/explab) "dhN" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -17206,6 +16403,29 @@ /obj/item/book/manual/wiki/sopcommand, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) +"diq" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Service Maintenance"; + req_access_txt = null; + req_one_access_txt = "25;26;35;28;22;37;46;38" + }, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) +"diA" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/obj/effect/mapping_helpers/tile_breaker, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "diC" = ( /obj/machinery/button/door{ id = "evashutter"; @@ -17230,16 +16450,6 @@ }, /turf/open/floor/iron/white, /area/science/mixing/chamber) -"diM" = ( -/obj/structure/table_frame, -/obj/item/radio/intercom{ - pixel_y = 20 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "djk" = ( /obj/structure/table, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -17251,6 +16461,16 @@ }, /turf/open/floor/iron, /area/security/checkpoint/supply) +"djp" = ( +/obj/machinery/button/door{ + id = "kitchencounter"; + name = "Kitchen Counter Shutters"; + pixel_x = -24; + pixel_y = -24; + req_access_txt = "28" + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "djs" = ( /obj/structure/closet/secure_closet/security/sec, /obj/item/clothing/mask/balaclava, @@ -17301,27 +16521,16 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) +"djY" = ( +/obj/structure/cable/yellow, +/obj/machinery/vending/coffee, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "dkp" = ( /obj/effect/turf_decal/bot_white/left, /turf/open/floor/engine/light, /area/engine/gravity_generator) -"dkv" = ( -/obj/machinery/camera/directional/north, -/obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, -/turf/open/floor/iron/dark, -/area/medical/morgue) -"dla" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "dlw" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -17354,18 +16563,15 @@ }, /turf/open/floor/iron, /area/tcommsat/computer) -"dlN" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +"dlB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/iron, -/area/security/checkpoint/medical) +/area/hallway/primary/starboard) "dlZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -17375,6 +16581,9 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"dmb" = ( +/turf/open/floor/iron/dark, +/area/medical/storage) "dmo" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17384,25 +16593,6 @@ }, /turf/open/floor/circuit, /area/science/robotics/mechbay) -"dmt" = ( -/obj/machinery/computer/slot_machine, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/status_display/evac{ - pixel_x = 32 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"dmK" = ( -/obj/machinery/holopad, -/turf/open/floor/iron/white, -/area/medical/storage) -"dmQ" = ( -/obj/structure/reagent_dispensers/cooking_oil, -/obj/machinery/camera/directional/north, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "dmT" = ( /turf/open/floor/iron/dark, /area/security/brig) @@ -17418,6 +16608,14 @@ }, /turf/open/floor/iron, /area/security/checkpoint/auxiliary) +"dnm" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "dnu" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -17451,6 +16649,12 @@ dir = 8 }, /area/crew_quarters/dorms) +"doi" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/storage) "doy" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "meetingshutter"; @@ -17483,6 +16687,11 @@ /obj/effect/landmark/start/detective, /turf/open/floor/carpet/green, /area/security/detectives_office) +"doP" = ( +/obj/effect/turf_decal/bot/left, +/obj/machinery/food_cart, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "doR" = ( /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; @@ -17494,6 +16703,16 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/xenobiology) +"doS" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/captain) "doX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -17521,6 +16740,30 @@ /obj/item/book/manual/wiki/sopscience, /turf/open/floor/iron/white, /area/science/lab) +"dpA" = ( +/obj/machinery/button/door{ + id = "rnd"; + name = "Shutters Control Button"; + pixel_x = -6; + pixel_y = 24; + req_access_txt = "47" + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "rnd"; + name = "Shutters Control Button"; + pixel_x = -6; + pixel_y = 24; + req_access_txt = "47" + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/white, +/area/science/lab) "dpE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ dir = 1 @@ -17607,13 +16850,16 @@ /obj/structure/reagent_dispensers/peppertank/directional/south, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) -"dsg" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +"dsd" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/effect/landmark/start/geneticist, -/turf/open/floor/iron/white, -/area/medical/genetics) +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) "dss" = ( /obj/machinery/holopad, /obj/structure/cable/yellow{ @@ -17745,33 +16991,11 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"dvf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Dormitories Maintenance"; - req_access_txt = "12" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) -"dvS" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/yellow, -/turf/open/floor/plating, -/area/maintenance/aft) +"dvH" = ( +/obj/effect/landmark/prisonspawn, +/obj/structure/chair/stool/directional/south, +/turf/open/floor/prison, +/area/security/prison) "dvV" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/turretid{ @@ -17807,6 +17031,10 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) +"dwm" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/ridged/steel, +/area/hydroponics) "dwn" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -17831,6 +17059,16 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) +"dws" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/button/door/directional/north{ + id = "Toilet1"; + name = "Toilet Lock Button" + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "dwA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17880,17 +17118,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) -"dxg" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "dxw" = ( /turf/closed/wall/r_wall, /area/hallway/primary/central) @@ -17902,6 +17129,32 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, /turf/open/space, /area/space/nearstation) +"dxB" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/window/northright{ + dir = 2; + name = "First-Aid Supplies"; + req_access_txt = "5" + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/effect/loot_jobscale/medical/first_aid_kit{ + pixel_x = -5 + }, +/obj/effect/loot_jobscale/medical/medkits{ + pixel_x = 7; + pixel_y = 8 + }, +/turf/open/floor/iron/dark, +/area/medical/storage) "dxE" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/computer/security/telescreen/vault{ @@ -17910,26 +17163,24 @@ /obj/machinery/photocopier, /turf/open/floor/wood, /area/crew_quarters/heads/hop) -"dxY" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" +"dxW" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) +"dyt" = ( /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 }, /turf/open/floor/iron, -/area/crew_quarters/fitness) -"dyB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/surgery) +/area/hallway/primary/starboard) "dyE" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -17971,15 +17222,13 @@ }, /turf/open/floor/iron, /area/tcommsat/computer) -"dzZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +"dAi" = ( +/obj/machinery/door/window/eastright{ + name = "Theatre Stage"; + dir = 2 }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) +/turf/open/floor/wood, +/area/crew_quarters/theatre/backstage) "dAs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -18038,10 +17287,12 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/courtroom) -"dBA" = ( -/obj/machinery/suit_storage_unit/captain, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) +"dBz" = ( +/obj/machinery/door/poddoor/preopen{ + id = "maint2" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/fore) "dBV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -18057,6 +17308,12 @@ }, /turf/open/floor/iron, /area/security/brig) +"dBZ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/carpet, +/area/crew_quarters/theatre) "dCJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18105,6 +17362,19 @@ }, /turf/open/floor/prison, /area/security/prison) +"dDk" = ( +/obj/machinery/door/poddoor/preopen{ + id = "maint1" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/fore) "dDm" = ( /obj/item/storage/secure/safe{ pixel_x = 5; @@ -18156,6 +17426,14 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"dEh" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, +/obj/effect/turf_decal/loading_area, +/turf/open/floor/iron/white, +/area/medical/virology) "dEo" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/spawner/structure/window/reinforced, @@ -18164,6 +17442,17 @@ }, /turf/open/floor/plating, /area/engine/atmos) +"dEq" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_green/half/contrasted, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/hydroponics) "dEx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -18193,6 +17482,14 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) +"dES" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/camera/directional/north, +/obj/machinery/vending/wardrobe/bar_wardrobe, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "dFp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -18215,15 +17512,15 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/chapel/main) -"dFY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +"dGz" = ( +/obj/machinery/light{ + dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/machinery/photocopier, +/obj/effect/turf_decal/bot, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/wood, +/area/medical/break_room) "dGF" = ( /turf/closed/wall/r_wall, /area/science/mixing/chamber) @@ -18259,15 +17556,6 @@ }, /turf/open/floor/carpet/green, /area/security/detectives_office) -"dHi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "dHz" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -18292,6 +17580,19 @@ }, /turf/open/floor/iron/white, /area/security/brig) +"dHD" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/medical/storage) "dHO" = ( /obj/machinery/door/airlock/engineering{ name = "Port Bow Solar Access"; @@ -18320,6 +17621,20 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/heads/hor) +"dHY" = ( +/obj/effect/turf_decal/tile/white/opposingcorners, +/obj/effect/turf_decal/tile/white{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Desk"; + req_access_txt = "5" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "dIa" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -18458,6 +17773,17 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) +"dKn" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/structure/table, +/obj/item/paper/fluff/holodeck/disclaimer, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "dKr" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -18476,15 +17802,24 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) -"dKA" = ( -/obj/effect/turf_decal/tile/dark_blue{ - dir = 8 +"dLc" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/light_switch{ - pixel_x = -28 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, -/turf/open/floor/iron, -/area/hallway/primary/central) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/button/door{ + id = "quarantineshutters"; + name = "Quarantine Lockdown"; + pixel_x = -23; + req_access_txt = "39" + }, +/turf/open/floor/iron/white, +/area/medical/virology) "dLe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18494,13 +17829,6 @@ }, /turf/open/floor/carpet, /area/quartermaster/exploration_prep) -"dLu" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/chair/stool/directional/south, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "dLv" = ( /obj/machinery/computer/bank_machine, /obj/effect/turf_decal/bot_white, @@ -18560,6 +17888,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/engineering) +"dMw" = ( +/turf/open/floor/plating/dirt/jungle, +/area/medical/genetics) "dMB" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -18621,6 +17952,16 @@ }, /turf/open/floor/iron/white, /area/science/lab) +"dNA" = ( +/obj/structure/table/reinforced, +/obj/structure/desk_bell, +/obj/machinery/door/poddoor/shutters{ + id = "kitchencounter"; + name = "Kitchen Shutters" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "dNR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -18631,20 +17972,6 @@ }, /turf/open/floor/iron/dark, /area/teleporter) -"dNV" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/maintenance/aft) "dNW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -18656,10 +17983,6 @@ /obj/structure/bed, /turf/open/floor/iron/white, /area/medical/virology) -"dOz" = ( -/obj/effect/turf_decal/pool/corner, -/turf/open/floor/iron, -/area/crew_quarters/fitness) "dOA" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, @@ -18682,35 +18005,29 @@ /obj/effect/spawner/lootdrop/maintenance/six, /turf/open/floor/iron, /area/quartermaster/warehouse) -"dOO" = ( -/obj/machinery/airalarm/directional/west{ - pixel_x = -22 - }, -/obj/machinery/light/small{ - dir = 8 +"dOI" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/donkpockets, +/obj/machinery/door/poddoor/shutters{ + id = "kitchencounter"; + name = "Kitchen Shutters" }, -/obj/machinery/chem_master/condimaster{ - desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; - name = "HoochMaster Deluxe"; - pixel_x = -4 +/obj/machinery/door/firedoor, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) +"dOL" = ( +/obj/structure/bodycontainer/morgue, +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/turf/open/floor/wood, -/area/crew_quarters/bar) +/turf/open/floor/iron/dark, +/area/medical/morgue) "dOV" = ( /obj/machinery/computer/shuttle_flight/custom_shuttle/exploration{ dir = 8 }, /turf/open/floor/iron, /area/quartermaster/exploration_dock) -"dOZ" = ( -/obj/machinery/computer/card/minor/cmo{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "dPd" = ( /obj/structure/transit_tube/curved/flipped{ dir = 1 @@ -18726,29 +18043,12 @@ }, /turf/open/floor/iron/freezer, /area/medical/virology) -"dPi" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "dPl" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, /turf/open/floor/iron/dark, /area/security/main) -"dPm" = ( -/obj/structure/closet/secure_closet/CMO, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "dPv" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -18810,18 +18110,21 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/hallway/secondary/entry) -"dPS" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Bar Maintenance"; - req_one_access_txt = "12;25;26;35;28;22;37;46;38" - }, -/obj/structure/disposalpipe/segment, +"dQb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "dQz" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/spawner/lootdrop/maintenance, @@ -18843,23 +18146,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) -"dRs" = ( -/obj/machinery/light/small, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) -"dRw" = ( -/obj/structure/chair/stool/bar/directional/west, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "dRx" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd2"; @@ -18881,6 +18167,37 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/hop) +"dRW" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/dorms) +"dSa" = ( +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/door/poddoor/preopen{ + id = "quarantineshutters"; + name = "Quarantine Shutters" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "medbay_front_door"; + name = "Medbay"; + req_access_txt = "5" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/medbay/lobby) "dSm" = ( /obj/machinery/conveyor{ dir = 4; @@ -18893,12 +18210,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/quartermaster/storage) -"dSJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +"dSt" = ( +/obj/structure/disposalpipe/segment{ dir = 1 }, -/turf/open/floor/iron/white, -/area/medical/chemistry) +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/medical/morgue) "dTb" = ( /obj/machinery/advanced_airlock_controller{ pixel_y = 24 @@ -18911,6 +18231,15 @@ }, /turf/open/floor/catwalk_floor, /area/quartermaster/storage) +"dTf" = ( +/obj/machinery/door/airlock{ + name = "Bar - Kitchen"; + req_one_access_txt = "25,28,35" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/crew_quarters/bar) "dTA" = ( /obj/machinery/holopad, /obj/effect/landmark/event_spawn, @@ -18927,19 +18256,6 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"dTH" = ( -/obj/machinery/computer/cryopod{ - pixel_y = 25 - }, -/obj/machinery/cryopod{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/white, -/area/medical/cryo) "dTK" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -18950,6 +18266,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) +"dTM" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/med_data/laptop, +/obj/machinery/door/poddoor/preopen{ + id = "quarantineshutters"; + name = "Quarantine Shutters" + }, +/turf/open/floor/iron, +/area/medical/medbay/lobby) "dTU" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -18960,19 +18285,14 @@ }, /turf/open/floor/iron/white/corner, /area/hallway/secondary/exit) -"dTW" = ( -/obj/structure/bed/roller, -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13, engine") - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +"dTZ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Theatre Stage"; + req_one_access_txt = "46" }, -/turf/open/floor/iron/white, -/area/medical/sleeper) +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) "dUa" = ( /obj/machinery/power/apc/auto_name/directional/north{ pixel_y = 24 @@ -18998,26 +18318,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) -"dUl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = -27; - use_power = 0 - }, -/obj/structure/bed/roller, -/obj/machinery/camera{ - c_tag = "Security - Medbay"; - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/techmaint, -/area/security/brig) "dUn" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -19092,25 +18392,10 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"dVI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/effect/landmark/start/paramedic, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/medical/storage) "dVW" = ( /obj/effect/turf_decal/tile/red, /turf/open/floor/iron/dark, /area/security/brig) -"dWa" = ( -/obj/effect/landmark/start/bartender, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "dWn" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/tile/green{ @@ -19121,16 +18406,22 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) -"dWS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +"dWo" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/turf/open/floor/iron, -/area/hydroponics) +/obj/structure/disposalpipe/segment, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) +"dWr" = ( +/obj/item/food/grown/banana, +/obj/structure/flora/ausbushes/fullgrass, +/turf/open/floor/grass/no_border, +/area/medical/genetics) "dWV" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -19140,16 +18431,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"dXe" = ( -/obj/effect/spawner/randomvend/snack, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "dXA" = ( /obj/machinery/status_display/evac{ pixel_x = -32 @@ -19205,6 +18486,12 @@ }, /turf/open/floor/iron, /area/vacant_room/commissary) +"dYi" = ( +/obj/effect/turf_decal/siding/white/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "dYn" = ( /obj/structure/filingcabinet, /obj/machinery/light_switch{ @@ -19222,6 +18509,15 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"dZa" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/ausbushes/fullgrass, +/turf/open/floor/grass/no_border, +/area/crew_quarters/bar/atrium) "dZe" = ( /obj/item/radio/intercom{ pixel_y = -29 @@ -19402,6 +18698,28 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"ebA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "ecA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -19422,6 +18740,40 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"ecV" = ( +/obj/structure/table/reinforced, +/obj/item/pen, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/obj/item/folder/white, +/obj/machinery/door/window/brigdoor{ + dir = 8; + id = "medcell"; + name = "Medical Cell"; + req_access_txt = "63" + }, +/obj/machinery/door/window/southright{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) +"ecZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "edc" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -19437,12 +18789,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) -"ede" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "edw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -19465,6 +18811,9 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/port) +"edA" = ( +/turf/open/floor/grass/no_border, +/area/medical/genetics) "edB" = ( /obj/structure/table, /obj/item/t_scanner, @@ -19494,6 +18843,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/security/warden) +"eef" = ( +/obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "eek" = ( /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; @@ -19548,6 +18904,15 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"efq" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "kitchencounter"; + name = "Kitchen Shutters" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "efv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -19602,6 +18967,11 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"efR" = ( +/turf/open/floor/iron/white/side{ + dir = 5 + }, +/area/crew_quarters/kitchen) "egz" = ( /obj/structure/table, /obj/machinery/airalarm/directional/south{ @@ -19640,6 +19010,13 @@ }, /turf/open/floor/iron/white, /area/science/research) +"ehe" = ( +/obj/machinery/dna_scannernew, +/obj/machinery/light, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/genetics) "ehg" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -19649,6 +19026,25 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/catwalk_floor, /area/maintenance/port/fore) +"ehC" = ( +/obj/machinery/vending/cola, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/dark, +/area/medical/morgue) +"ehY" = ( +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/table, +/turf/open/floor/iron/white, +/area/medical/chemistry) "eif" = ( /obj/structure/table/wood, /obj/item/pen, @@ -19663,39 +19059,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"eiB" = ( -/obj/machinery/requests_console{ - department = "Cargo Bay"; - departmentType = 2; - pixel_x = -30 - }, -/obj/machinery/computer/bounty{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/quartermaster/qm) -"eiC" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "eja" = ( /obj/effect/turf_decal/bot, /obj/machinery/computer/nanite_chamber_control{ @@ -19740,6 +19103,12 @@ }, /turf/open/floor/iron, /area/maintenance/aft) +"eke" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/turf/closed/wall, +/area/maintenance/aft) "ekw" = ( /obj/effect/turf_decal/siding/thinplating_new/corner{ dir = 4 @@ -19915,6 +19284,19 @@ "enz" = ( /turf/open/floor/iron/techmaint, /area/crew_quarters/fitness) +"eoC" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/storage) "eoN" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -19939,37 +19321,25 @@ }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) -"epq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +"epn" = ( +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/bot, +/obj/structure/closet/secure_closet/medical3, +/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ - dir = 1 + dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/medical/storage) "epI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/iron, /area/science/nanite) -"epP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/chair{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "eqc" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -19997,6 +19367,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) +"eqr" = ( +/obj/effect/turf_decal/tile/blue, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "eqt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -20050,6 +19425,18 @@ }, /turf/open/floor/prison, /area/security/prison) +"erv" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/sorting/mail{ + sortType = 26 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "erE" = ( /obj/machinery/vending/wallmed{ pixel_x = -25 @@ -20100,19 +19487,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"etn" = ( -/obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain) "eto" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -20163,15 +19537,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/research) -"etI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +"etH" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/wood{ + broken = 1 + }, +/area/crew_quarters/heads/captain) "etK" = ( /obj/structure/table, /obj/machinery/door/window{ @@ -20194,15 +19570,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) -"etZ" = ( -/obj/structure/table/glass, -/obj/item/storage/belt/medical, -/obj/item/storage/box/medipens, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "euh" = ( /obj/machinery/gateway/centerstation, /turf/open/floor/engine, @@ -20214,13 +19581,6 @@ /obj/machinery/atmospherics/pipe/simple, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"euJ" = ( -/obj/machinery/camera/directional/north, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "euU" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -20262,6 +19622,19 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"evS" = ( +/obj/item/food/grown/banana, +/obj/structure/flora/ausbushes/fullgrass, +/mob/living/carbon/monkey, +/turf/open/floor/grass/no_border, +/area/medical/genetics) +"evY" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "ewc" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 8 @@ -20287,6 +19660,15 @@ }, /turf/open/floor/iron/white, /area/science/research) +"ewj" = ( +/obj/machinery/door/window/eastright{ + base_state = "left"; + dir = 2; + icon_state = "left"; + name = "Holodeck Controls" + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre/backstage) "ewu" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -20311,21 +19693,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"ewK" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "ewN" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -20358,6 +19725,19 @@ }, /turf/open/floor/wood, /area/security/detectives_office) +"exA" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8; + name = "Genie"; + sortType = 23 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/aft) "exD" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -20390,18 +19770,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) -"eye" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "eyf" = ( /obj/machinery/power/apc/auto_name/directional/east{ pixel_x = 24 @@ -20440,6 +19808,23 @@ }, /turf/open/floor/wood, /area/library) +"eyD" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/dark, +/area/medical/morgue) +"eyI" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "eyM" = ( /obj/machinery/mineral/ore_redemption{ input_dir = 2; @@ -20483,17 +19868,12 @@ dir = 4 }, /area/chapel/main) -"ezK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/light, +"ezE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/surgery) +/turf/open/floor/iron/dark, +/area/medical/storage) "ezL" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -20526,11 +19906,10 @@ }, /turf/open/floor/iron/dark, /area/security/prison) -"eAF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/cryo) +"eAk" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted, +/turf/open/floor/iron, +/area/hydroponics) "eAJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -20581,6 +19960,26 @@ }, /turf/open/floor/wood, /area/vacant_room/office) +"eBo" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) +"eBM" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white, +/area/medical/surgery) "eBT" = ( /obj/machinery/portable_atmospherics/pump, /turf/open/floor/iron, @@ -20649,15 +20048,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"eDu" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/pool/corner{ - dir = 8 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) "eDD" = ( /obj/machinery/light/small{ dir = 8 @@ -20681,13 +20071,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"eEd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "eEs" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 8 @@ -20707,6 +20090,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"eFx" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/carpet, +/area/crew_quarters/theatre) "eFB" = ( /obj/machinery/computer/station_alert, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -20726,22 +20115,25 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/security/main) +"eFJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "eFM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/engine, /area/gateway) -"eGg" = ( -/obj/structure/kitchenspike, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) -"eGr" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "eGt" = ( /obj/machinery/light_switch{ pixel_x = -22 @@ -20758,6 +20150,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"eGM" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/structure/chair/fancy/bench{ + pixel_y = 13 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "eHb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20871,15 +20272,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/tcommsat/computer) -"eIg" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "eIi" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -20920,29 +20312,13 @@ /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, /area/ai_monitored/security/armory) -"eJC" = ( -/obj/effect/turf_decal/loading_area, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) -"eJE" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"eJN" = ( -/obj/structure/table/glass, -/obj/item/storage/box/rxglasses, -/obj/item/radio/intercom{ - pixel_y = 20 - }, -/obj/machinery/camera/directional/north, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +"eJG" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 1 }, -/turf/open/floor/iron/white, -/area/medical/genetics) +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/iron/dark, +/area/maintenance/aft) "eJS" = ( /obj/machinery/door/airlock/command{ name = "Teleport Access"; @@ -20965,18 +20341,10 @@ }, /turf/open/floor/iron/dark, /area/teleporter) -"eJW" = ( -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) +"eJV" = ( +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/fore) "eKo" = ( /obj/structure/rack, /obj/item/storage/belt/utility, @@ -20988,24 +20356,9 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"eKr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/maintenance/aft) +"eKZ" = ( +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "eLa" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; @@ -21047,6 +20400,43 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/bridge) +"eLy" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"eLz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/science/mixing) "eLO" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -21085,6 +20475,17 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"eMk" = ( +/obj/machinery/chem_dispenser, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron/white, +/area/medical/apothecary) +"eMl" = ( +/obj/structure/disposalpipe/sorting/unsorted/flip{ + dir = 1 + }, +/turf/closed/wall, +/area/quartermaster/sorting) "eMm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -21100,26 +20501,20 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"eML" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "kitchencounter"; + name = "Kitchen Shutters" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "eMP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/fore/secondary) -"eMU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) "eMZ" = ( /obj/machinery/light{ dir = 4 @@ -21172,6 +20567,54 @@ }, /turf/open/floor/prison, /area/security/prison) +"eNw" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/machinery/computer/secure_data{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) +"eNz" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/cryo_cell, +/turf/open/floor/iron/dark, +/area/medical/cryo) +"eND" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail/flip{ + sortType = 12 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) +"eNI" = ( +/obj/machinery/light_switch{ + pixel_x = -7; + pixel_y = 26 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "CloningDoor"; + name = "Genetics Lab"; + req_access_txt = "9" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/medical/genetics) "eOa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -21231,27 +20674,11 @@ }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) -"ePv" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/anesthetic_machine, -/turf/open/floor/iron/white, -/area/medical/surgery) "ePA" = ( /obj/machinery/light/small, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"ePJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "ePV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -21285,14 +20712,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"eQn" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/structure/curtain, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/sleeper) "eQI" = ( /obj/effect/turf_decal/bot, /obj/machinery/hydroponics/constructable, @@ -21312,6 +20731,11 @@ }, /turf/open/floor/wood, /area/library) +"eQQ" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/chair/stool/directional/north, +/turf/open/floor/plating, +/area/maintenance/solars/port/fore) "eRh" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -21351,14 +20775,6 @@ /obj/structure/grille, /turf/open/space/basic, /area/space/nearstation) -"eRA" = ( -/obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "eRB" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/red/line, @@ -21409,6 +20825,21 @@ }, /turf/open/floor/plating, /area/maintenance/fore) +"eSl" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "eSn" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron, @@ -21424,6 +20855,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) +"eSw" = ( +/obj/machinery/firealarm/directional/east, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "eSA" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/condiment/flour, @@ -21436,6 +20874,20 @@ }, /turf/open/floor/prison, /area/security/prison) +"eSF" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hydroponics) +"eTm" = ( +/obj/machinery/vending/cola, +/turf/open/floor/iron, +/area/hallway/primary/starboard) +"eTp" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/crew_quarters/kitchen) "eTq" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -21511,24 +20963,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"eUm" = ( -/obj/structure/table/glass, -/obj/item/storage/box/syringes, -/obj/item/clothing/glasses/science{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/clothing/glasses/science, -/obj/item/radio/intercom{ - dir = 8; - pixel_x = 28 - }, -/obj/item/hand_labeler, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "eUt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -21541,6 +20975,26 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"eUF" = ( +/obj/machinery/biogenerator, +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -25 + }, +/turf/open/floor/iron, +/area/hydroponics) +"eUP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "eVa" = ( /obj/machinery/camera/directional/north, /turf/open/floor/engine/vacuum, @@ -21574,20 +21028,29 @@ dir = 9 }, /area/science/research) +"eWt" = ( +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/obj/machinery/door/window/northleft{ + name = "Kitchen Delivery"; + req_access_txt = "28"; + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) +"eWv" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/closed/wall, +/area/quartermaster/sorting) "eWC" = ( /turf/closed/wall, /area/maintenance/central) -"eWJ" = ( -/obj/structure/table/glass, -/obj/item/storage/firstaid/regular{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "eWV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -21659,19 +21122,6 @@ /obj/item/clothing/gloves/artifact_pinchers, /turf/open/floor/iron/white, /area/science/explab) -"eYe" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, -/area/hallway/primary/aft) "eYm" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -21694,6 +21144,31 @@ }, /turf/open/floor/iron/dark, /area/tcommsat/computer) +"eYx" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/maintenance/fore) +"eYH" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/hydroponics) "eYL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -21730,6 +21205,23 @@ }, /turf/open/floor/iron, /area/quartermaster/miningdock) +"eZu" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/disposaloutlet, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/white, +/area/medical/virology) "eZz" = ( /obj/item/assembly/timer{ pixel_x = 5; @@ -21801,21 +21293,6 @@ }, /turf/open/floor/iron, /area/security/courtroom) -"faE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/port) "fbS" = ( /obj/structure/table, /obj/item/storage/box/chemimp{ @@ -21871,6 +21348,19 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) +"fdy" = ( +/obj/item/target/alien/anchored, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/camera/preset/toxins{ + dir = 4 + }, +/turf/open/floor/plating{ + initial_gas_mix = "o2=0.01;n2=0.01;TEMP=293.15"; + luminosity = 2 + }, +/area/science/test_area) "fdL" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -21895,6 +21385,16 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"fdP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/machinery/newscaster{ + pixel_x = -30; + pixel_y = 1 + }, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "few" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21925,18 +21425,17 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) -"feR" = ( -/obj/effect/turf_decal/tile/red{ +"ffd" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 +/obj/effect/turf_decal/tile/dark_green, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 2 }, /turf/open/floor/iron, -/area/hallway/primary/fore) +/area/hydroponics) "ffm" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -21956,24 +21455,13 @@ /obj/item/stack/medical/gauze, /turf/open/floor/iron/dark, /area/bridge) -"ffw" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/turf/closed/wall, -/area/maintenance/starboard/aft) -"ffL" = ( -/obj/structure/table, -/obj/machinery/microwave{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/machinery/airalarm/directional/north, -/obj/machinery/light{ - dir = 1 +"ffM" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "ffW" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -21984,17 +21472,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/gravity_generator) -"fgo" = ( -/obj/machinery/vending/wardrobe/chem_wardrobe, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/light_switch{ - pixel_x = 26; - pixel_y = 8 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "fgq" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line{ @@ -22017,6 +21494,13 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"fgR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "fgT" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -22037,23 +21521,38 @@ /obj/item/storage/fancy/donut_box, /turf/open/floor/carpet, /area/security/brig) -"fhu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +"fhl" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, /turf/open/floor/iron, -/area/crew_quarters/dorms) -"fhv" = ( -/obj/effect/landmark/start/paramedic, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/area/hydroponics) +"fhA" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/cigarettes/cigars{ + pixel_y = 6 + }, +/obj/item/storage/fancy/cigarettes/cigars/cohiba{ + pixel_y = 3 + }, +/obj/item/storage/fancy/cigarettes/cigars/havana, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/item/toy/figure/bartender, +/obj/machinery/status_display/evac{ + pixel_x = 32 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "fhF" = ( /obj/effect/spawner/randomvend/snack, /obj/effect/turf_decal/tile/red, @@ -22077,19 +21576,6 @@ "fhP" = ( /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) -"fhT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "fhY" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -22111,23 +21597,31 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"fiy" = ( -/obj/machinery/newscaster{ - pixel_x = -30 - }, -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 +"fiA" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron, -/area/security/checkpoint/medical) +/area/hallway/primary/central) "fiG" = ( /obj/effect/spawner/randomvend/cola, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) +"fiR" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/effect/landmark/start/chemist, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/structure/chair/office/light, +/turf/open/floor/iron/white, +/area/medical/apothecary) "fjc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -22201,19 +21695,6 @@ }, /turf/open/floor/iron/grid/steel, /area/gateway) -"fkv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/port) "fkM" = ( /obj/structure/sink{ dir = 4; @@ -22232,6 +21713,21 @@ /obj/effect/turf_decal/bot/right, /turf/open/floor/iron/dark, /area/security/execution/transfer) +"fkU" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"fkY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "flc" = ( /obj/item/assembly/prox_sensor{ pixel_x = -4; @@ -22254,13 +21750,6 @@ }, /turf/open/floor/iron/white, /area/science/mixing) -"fle" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "flF" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -22306,6 +21795,18 @@ }, /turf/open/floor/iron/dark, /area/security/prison) +"fmN" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "fnS" = ( /obj/machinery/door/airlock/security/glass{ name = "Anti Radiation shielded room" @@ -22321,28 +21822,19 @@ }, /turf/open/floor/iron/techmaint, /area/security/prison/shielded) -"fod" = ( -/obj/machinery/button/door{ - desc = "A remote control switch for the medbay foyer."; - id = "MedbayFoyer"; - name = "Medbay Doors Control"; - normaldoorcontrol = 1; - pixel_x = -26; - req_access_txt = "5" - }, -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/item/book/manual/wiki/security_space_law, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "foC" = ( /obj/item/bedsheet/red, /turf/open/floor/plating, /area/maintenance/fore) +"foG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/surgery) "foO" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -22362,6 +21854,13 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) +"fpk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/directional/south, +/turf/open/floor/iron, +/area/hallway/primary/port) "fpM" = ( /obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; @@ -22443,6 +21942,15 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) +"fqC" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/junglebush/b, +/obj/structure/flora/ausbushes/fullgrass, +/turf/open/floor/grass/no_border, +/area/crew_quarters/bar/atrium) "fqQ" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -22465,6 +21973,17 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/iron, /area/crew_quarters/locker) +"frD" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/maintenance/aft) "frE" = ( /obj/structure/disposaloutlet{ dir = 1 @@ -22477,23 +21996,19 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/wood, /area/library) -"fsG" = ( -/obj/structure/bed/roller, -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/medical/virology) -"fsH" = ( -/obj/structure/chair{ - dir = 4 +"fsl" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall, +/area/maintenance/aft) +"fsA" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "cmoprivacy"; + name = "Office Privacy Shutters" }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/turf/open/floor/plating, +/area/crew_quarters/heads/cmo) "fsO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -22506,14 +22021,6 @@ }, /turf/open/floor/iron/tech, /area/ai_monitored/storage/eva) -"fsV" = ( -/obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron, -/area/crew_quarters/fitness) "fto" = ( /obj/structure/closet/crate/bin, /obj/effect/turf_decal/tile/red/anticorner/contrasted, @@ -22537,18 +22044,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/virology) -"fud" = ( -/obj/machinery/power/apc/auto_name/directional/west{ - pixel_x = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/iron/white, -/area/science/xenobiology) "ful" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -22559,6 +22054,20 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"fup" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "fuF" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/structure/window/reinforced{ @@ -22604,6 +22113,16 @@ }, /turf/open/floor/prison, /area/security/prison) +"fvl" = ( +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hydroponics) "fvo" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ dir = 1 @@ -22613,6 +22132,16 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/aft) +"fvG" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"fwd" = ( +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 8 + }, +/turf/open/floor/wood/big, +/area/maintenance/aft) "fwG" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -22625,13 +22154,6 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) -"fwN" = ( -/obj/structure/kitchenspike, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "fwQ" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -22663,6 +22185,15 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) +"fwV" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/hydroponics) "fxf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -22723,6 +22254,27 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) +"fyp" = ( +/obj/item/computer_hardware/hard_drive/role/medical{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/computer_hardware/hard_drive/role/medical{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/computer_hardware/hard_drive/role/medical, +/obj/item/computer_hardware/hard_drive/role/chemistry{ + pixel_y = 2 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = -31 + }, +/obj/item/gun/syringe, +/obj/effect/turf_decal/tile/dark_blue, +/obj/structure/table, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "fyr" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -22734,30 +22286,34 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/security/brig) -"fyv" = ( -/obj/machinery/airalarm/directional/north{ - pixel_y = 25 +"fyT" = ( +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) +"fyV" = ( +/obj/machinery/nuclearbomb/beer, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) +"fyX" = ( +/obj/machinery/holopad{ + pixel_y = 16 }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) -"fzD" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/effect/landmark/start/cook, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) +"fzt" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"fzJ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 1 }, -/obj/effect/landmark/start/chemist, -/turf/open/floor/iron/white, -/area/medical/apothecary) +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/dark, +/area/medical/morgue) "fzQ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22800,6 +22356,18 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) +"fAO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "fAZ" = ( /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; @@ -22835,20 +22403,20 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"fBg" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) "fBh" = ( /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass, /area/hallway/secondary/command) +"fBq" = ( +/obj/machinery/door/airlock{ + name = "Bar"; + req_access_txt = "25" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "fBK" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -22929,6 +22497,10 @@ }, /turf/open/floor/engine/o2, /area/engine/atmos) +"fCG" = ( +/obj/effect/turf_decal/stripes, +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/fore) "fDa" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 5 @@ -22937,6 +22509,24 @@ /obj/structure/disposalpipe/segment, /turf/open/space, /area/space/nearstation) +"fDn" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/sign/warning/securearea{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "fDt" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -22947,6 +22537,25 @@ }, /turf/open/floor/iron/techmaint, /area/security/brig) +"fDE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/virology/glass{ + id_tag = "Viro1"; + name = "Virology Testing and Treatment"; + req_access_txt = "39" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, +/turf/open/floor/iron/white, +/area/medical/virology) "fDG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -22960,6 +22569,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) +"fDL" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "fDZ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -23013,16 +22633,6 @@ }, /turf/open/floor/plating, /area/engine/atmos) -"fEN" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, -/obj/machinery/power/apc/auto_name/directional/east{ - pixel_x = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "fEW" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -23038,12 +22648,28 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"fFu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +"fEY" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/sleeper) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/mapping_helpers/tile_breaker, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "fFA" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "MiniSat Maintenance"; @@ -23054,17 +22680,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) -"fFJ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "fFN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -23074,10 +22689,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"fGf" = ( -/obj/structure/closet/secure_closet/hydroponics, -/turf/open/floor/iron, -/area/hydroponics) "fGg" = ( /obj/machinery/computer/security/hos, /obj/item/radio/intercom{ @@ -23137,31 +22748,15 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) -"fGQ" = ( -/obj/machinery/computer/crew{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) -"fHE" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 21 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +"fGZ" = ( +/obj/effect/decal/cleanable/food/plant_smudge, +/obj/effect/turf_decal/tile/dark_green/opposingcorners{ + dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/hydroponics) "fHJ" = ( /obj/machinery/computer/atmos_control/tank/air_tank{ dir = 1 @@ -23181,6 +22776,14 @@ /obj/item/stack/rods, /turf/open/space, /area/space) +"fIh" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "fIi" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -23196,6 +22799,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) +"fIL" = ( +/obj/effect/spawner/structure/window, +/obj/structure/curtain, +/turf/open/floor/plating, +/area/medical/cryo) "fIX" = ( /obj/machinery/bluespace_beacon, /obj/effect/turf_decal/stripes/line{ @@ -23209,6 +22817,11 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) +"fJb" = ( +/obj/item/toy/beach_ball/holoball, +/obj/machinery/light/floor, +/turf/open/floor/wood/big, +/area/maintenance/aft) "fJh" = ( /obj/machinery/computer/security/mining, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -23216,6 +22829,20 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"fJx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "fJy" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, @@ -23231,10 +22858,9 @@ }, /turf/open/floor/iron/white, /area/science/explab) -"fJJ" = ( -/obj/structure/chair/stool, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +"fJP" = ( +/turf/closed/wall, +/area/medical/genetics) "fJY" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/structure/table, @@ -23245,17 +22871,23 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/hallway/primary/central) -"fKs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) "fLd" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/security/checkpoint/auxiliary) +"fLh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/effect/landmark/start/bartender, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "fLl" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/holopad, @@ -23304,6 +22936,25 @@ }, /turf/open/floor/iron, /area/quartermaster/miningdock) +"fMD" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4; + sortType = 30 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "fMY" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -23327,6 +22978,21 @@ }, /turf/open/floor/iron, /area/quartermaster/office) +"fNP" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 1 + }, +/obj/machinery/vending/hydroseeds{ + slogan_delay = 700 + }, +/turf/open/floor/iron, +/area/hydroponics) +"fOt" = ( +/mob/living/simple_animal/hostile/retaliate/goat{ + name = "Pete" + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "fOT" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 @@ -23346,12 +23012,52 @@ /obj/machinery/vending/cigarette, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"fPk" = ( +"fPb" = ( +/obj/structure/window/reinforced, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/storage) +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/security/checkpoint/medical) +"fPc" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/radio/intercom/directional/south, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness) +"fPd" = ( +/obj/effect/turf_decal/tile/red/anticorner_ramp/contrasted{ + dir = 4 + }, +/obj/structure/sign/warning/radiation_shelter{ + pixel_x = 1; + pixel_y = 33 + }, +/obj/effect/landmark/prisonspawn, +/obj/effect/turf_decal/tile/red/anticorner_ramp/contrasted{ + dir = 4 + }, +/obj/structure/sign/warning/radiation_shelter{ + pixel_x = 1; + pixel_y = 33 + }, +/obj/effect/landmark/prisonspawn, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13, prison") + }, +/turf/open/floor/prison, +/area/security/prison) "fPr" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -23403,25 +23109,11 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"fPQ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"fQm" = ( -/obj/effect/landmark/start/cook, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +"fPX" = ( +/obj/structure/ore_box, +/obj/effect/spawner/lootdrop/glowstick, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "fQq" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 1 @@ -23468,27 +23160,12 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/engine/atmos) -"fRf" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/syringe/antiviral, -/obj/item/storage/firstaid/regular{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/reagent_containers/glass/bottle/charcoal{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +"fRe" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/sleeper) +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "fRr" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -23573,18 +23250,18 @@ /obj/machinery/meter, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat/atmos) -"fTj" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ +"fTE" = ( +/obj/structure/window/reinforced{ dir = 4 }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass/no_border, +/area/crew_quarters/bar/atrium) "fTL" = ( /obj/machinery/light/small{ dir = 4 @@ -23632,6 +23309,20 @@ }, /turf/open/floor/iron/dark, /area/tcommsat/computer) +"fUm" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/door/window/eastright{ + name = "Hydroponics Delivery"; + req_access_txt = "35" + }, +/obj/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/hydroponics) "fUp" = ( /obj/machinery/light{ dir = 1 @@ -23646,16 +23337,21 @@ dir = 1 }, /area/hallway/secondary/entry) -"fUy" = ( -/obj/structure/chair, -/obj/machinery/airalarm/directional/north{ - pixel_y = 23 +"fUs" = ( +/obj/structure/sign/departments/minsky/medical/clone/cloning2{ + pixel_x = 32 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"fUv" = ( +/obj/effect/landmark/start/scientist, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/medical/surgery) +/obj/structure/chair/stool/directional/north, +/turf/open/floor/iron/white, +/area/science/lab) "fUA" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -23676,22 +23372,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"fUC" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "fUG" = ( /obj/machinery/button/door{ id = "ceprivacy"; @@ -23721,6 +23401,25 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"fUQ" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "fUR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -23739,34 +23438,6 @@ }, /turf/open/floor/iron, /area/science/storage) -"fUY" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/catwalk_floor, -/area/hallway/secondary/exit) -"fVk" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/maintenance/aft) "fVm" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line, @@ -23824,16 +23495,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"fWO" = ( -/obj/item/radio/intercom{ - pixel_x = -27 - }, -/obj/structure/closet/firecloset, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "fWS" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -23885,13 +23546,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/central) -"fYc" = ( -/obj/machinery/computer/pandemic, -/obj/structure/sign/departments/minsky/medical/virology/virology1{ - pixel_y = 29 - }, -/turf/open/floor/iron/white, -/area/medical/virology) "fYs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23983,6 +23637,21 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron, /area/security/brig) +"fZM" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "fZY" = ( /obj/effect/turf_decal/bot_white/right, /obj/structure/closet/crate/goldcrate, @@ -24002,6 +23671,26 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"gat" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/medical/glass{ + name = "Plumbing Factory"; + req_access_txt = "5; 33" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/storage) "gaF" = ( /obj/machinery/light_switch{ pixel_x = 24; @@ -24056,16 +23745,92 @@ }, /turf/open/floor/carpet/grimy, /area/chapel/office) -"gbR" = ( -/obj/machinery/holopad, +"gbs" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4; + sortType = 16 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"gcw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/iron/white, -/area/medical/chemistry) +/area/medical/medbay/lobby) +"gcJ" = ( +/obj/effect/turf_decal/tile/dark_green, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/iron, +/area/hydroponics) "gcR" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 6 }, /turf/open/floor/iron, /area/engine/atmos) +"gcS" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/tile/white/opposingcorners, +/obj/effect/turf_decal/tile/white{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/stasis{ + dir = 1 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) +"gcZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "gda" = ( /obj/structure/table/reinforced, /obj/item/pen, @@ -24077,29 +23842,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/wood, /area/vacant_room/office) -"gdp" = ( -/obj/structure/table, -/obj/item/computer_hardware/hard_drive/role/medical{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/computer_hardware/hard_drive/role/medical{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/computer_hardware/hard_drive/role/medical, -/obj/item/computer_hardware/hard_drive/role/chemistry{ - pixel_y = 2 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -31 - }, -/obj/item/gun/syringe, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "gdq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -24173,6 +23915,18 @@ /obj/structure/closet/emcloset, /turf/open/floor/iron, /area/hallway/primary/starboard) +"gdZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "gef" = ( /obj/structure/railing{ dir = 10; @@ -24190,10 +23944,21 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"geG" = ( -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron, -/area/hydroponics) +"geE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/sign/departments/minsky/engineering/atmospherics{ + pixel_y = -32 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "geH" = ( /obj/structure/rack, /obj/effect/turf_decal/stripes/line{ @@ -24220,6 +23985,22 @@ }, /turf/open/floor/iron/dark, /area/teleporter) +"gfB" = ( +/obj/machinery/computer/crew, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 1 + }, +/obj/machinery/requests_console/directional/north, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) +"gfU" = ( +/obj/machinery/light, +/obj/item/kirbyplants/random, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/crew_quarters/kitchen) "gfW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24235,18 +24016,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"ggq" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/westright{ - dir = 1; - name = "Hydroponics Desk"; - req_access_txt = "35" - }, -/obj/structure/desk_bell{ - pixel_x = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "ggr" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -24268,19 +24037,6 @@ }, /turf/open/floor/iron/freezer, /area/medical/virology) -"ggQ" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/hydroponics) "gho" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, @@ -24290,12 +24046,6 @@ /obj/effect/spawner/lootdrop/maintenance/five, /turf/open/floor/iron, /area/quartermaster/warehouse) -"ghp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/storage) "ghL" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/table, @@ -24312,17 +24062,6 @@ }, /turf/open/floor/iron, /area/quartermaster/qm) -"gia" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "gik" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -24394,6 +24133,17 @@ dir = 9 }, /area/science/research) +"gjH" = ( +/obj/effect/turf_decal/tile/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/camera/directional/north, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "gjR" = ( /obj/machinery/light/small, /obj/machinery/computer/turbine_computer{ @@ -24439,14 +24189,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"gkL" = ( -/obj/machinery/washing_machine, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) "gkT" = ( /obj/machinery/door/airlock/public/glass{ name = "Visitation" @@ -24490,6 +24232,61 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"glX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"gmx" = ( +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -27 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/dark, +/area/medical/cryo) +"gmN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"gmP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/caution/stand_clear, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/medbay/central) "gnc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24615,16 +24412,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"goV" = ( -/obj/machinery/camera/directional/north{ - network = list("ss13","rd") - }, -/turf/open/floor/engine, -/area/science/explab) -"goW" = ( -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "goX" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -24729,21 +24516,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"grA" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "grI" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -24773,25 +24545,13 @@ }, /turf/open/floor/plating, /area/engine/atmos) -"grR" = ( -/obj/structure/table, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +"grT" = ( +/obj/machinery/airalarm/directional/north{ + pixel_y = 25 }, -/obj/machinery/fax/service, +/obj/effect/turf_decal/siding/thinplating_new, /turf/open/floor/iron, -/area/hallway/secondary/service) -"grZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/area/hallway/primary/starboard) "gst" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/corner, @@ -24806,6 +24566,44 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) +"gsw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) +"gsG" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood, +/obj/item/reagent_containers/food/drinks/britcup{ + pixel_x = 7; + pixel_y = 10 + }, +/obj/item/storage/box/matches{ + pixel_x = -5; + pixel_y = 7 + }, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/bar/atrium) +"gsK" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/structure/chair/fancy/sofa/old/left{ + dir = 4 + }, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/bar/atrium) "gsP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -24816,16 +24614,12 @@ }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) -"gsW" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +"gta" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 }, -/obj/effect/landmark/start/geneticist, /turf/open/floor/iron/white, -/area/medical/genetics) +/area/medical/chemistry) "gto" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -24851,30 +24645,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) -"gtP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "gtQ" = ( /obj/structure/chair/fancy/comfy{ dir = 1 }, /turf/open/floor/carpet, /area/hallway/secondary/entry) -"gtR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) "gui" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -24882,13 +24658,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/aft) -"gut" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/blue{ +"gum" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Plasma Outlet Pump" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron/dark/side{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/cryo) +/area/engine/atmos) "guu" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -24908,6 +24689,15 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) +"guF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "guI" = ( /obj/structure/chair/fancy/bench{ dir = 8 @@ -24929,17 +24719,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"gvI" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/machinery/light_switch{ - pixel_y = 26 - }, -/turf/open/floor/iron/dark, -/area/hydroponics) "gwm" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -24963,22 +24742,32 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) -"gwy" = ( -/obj/machinery/camera/autoname/directional/south{ - c_tag = "Captain's Quarters" +"gwz" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/obj/structure/table/wood, -/obj/item/clothing/gloves/color/black, -/obj/item/lighter{ - pixel_x = -8; - pixel_y = 4 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_x = 2; - pixel_y = 10 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/medical/morgue) +"gwA" = ( +/obj/machinery/door/airlock/command{ + name = "Captain's Quarters"; + req_access_txt = "20" }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "gwE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -24988,6 +24777,12 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"gwU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "gxm" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -25029,20 +24824,16 @@ /obj/structure/closet/wardrobe/white, /turf/open/floor/iron, /area/crew_quarters/locker) -"gxL" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/closet/crate/freezer/surplus_limbs, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +"gxC" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 }, +/obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/white, -/area/medical/cryo) +/area/medical/virology) "gxO" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -25056,6 +24847,20 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"gxP" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible, +/turf/open/floor/iron, +/area/science/xenobiology) "gxV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -25071,6 +24876,27 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"gyt" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_green{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hydroponics) +"gyW" = ( +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"gyZ" = ( +/obj/structure/table/wood, +/obj/machinery/newscaster{ + pixel_x = 30 + }, +/turf/open/floor/wood, +/area/medical/break_room) "gzc" = ( /obj/structure/table, /obj/item/storage/toolbox/emergency, @@ -25082,6 +24908,25 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) +"gzd" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/junglebush/b, +/turf/open/floor/grass/no_border, +/area/crew_quarters/bar/atrium) +"gzx" = ( +/obj/structure/table/glass, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) +"gzG" = ( +/obj/structure/chair/stool/bar/directional/north, +/turf/open/floor/iron/white/side, +/area/crew_quarters/kitchen) "gzH" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -25153,21 +24998,6 @@ }, /turf/open/floor/iron/tech, /area/security/prison/shielded) -"gAn" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "gAq" = ( /obj/structure/curtain, /obj/effect/turf_decal/delivery/white, @@ -25192,13 +25022,34 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) -"gBy" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/light{ - dir = 4 +"gAS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron, -/area/hallway/primary/central) +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"gBj" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/cigar, +/obj/item/clothing/mask/cigarette/cigar{ + pixel_x = 6 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/carpet/black, +/area/crew_quarters/bar/atrium) "gBM" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -25206,14 +25057,34 @@ }, /turf/open/floor/iron/white, /area/security/brig) -"gBO" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 +"gBT" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 }, -/obj/effect/turf_decal/loading_area, -/turf/open/floor/iron/white, -/area/medical/virology) +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table, +/obj/machinery/smartfridge/disks{ + pixel_y = 2 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -25 + }, +/turf/open/floor/iron, +/area/hydroponics) +"gBV" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/siding/thinplating_new, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "gCm" = ( /obj/structure/table/wood, /obj/machinery/fax{ @@ -25291,6 +25162,19 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/engine/engineering) +"gDA" = ( +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/structure/table, +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/iron, +/area/hydroponics) "gDB" = ( /obj/effect/landmark/xeno_spawn, /obj/effect/turf_decal/caution{ @@ -25335,18 +25219,32 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/port) -"gEk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, +"gEo" = ( +/obj/effect/mapping_helpers/airlock/unres, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron, -/area/science/mixing) +/obj/machinery/door/poddoor/preopen{ + id = "quarantineshutters"; + name = "Quarantine Shutters" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayFoyer"; + name = "Medbay"; + req_access_txt = "5" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/medbay/lobby) "gEs" = ( /obj/machinery/door/airlock/maintenance{ name = "Firefighting Equipment"; @@ -25361,6 +25259,29 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"gEz" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Gas to Filter" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/engine{ + dir = 8; + pixel_x = -23 + }, +/turf/open/floor/engine, +/area/engine/supermatter) +"gEH" = ( +/obj/machinery/door/airlock/medical{ + name = "Observation" + }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/surgery) "gEO" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -25378,21 +25299,20 @@ }, /turf/open/floor/iron/dark, /area/security/warden) -"gEU" = ( -/obj/structure/table/reinforced, -/obj/item/lighter, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"gFg" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ +"gFv" = ( +/obj/structure/chair/fancy/comfy{ + color = "#596479"; + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 24 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/captain) "gFw" = ( /turf/open/floor/prison/dark, /area/security/prison) @@ -25459,22 +25379,34 @@ /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, /area/security/prison) -"gHK" = ( +"gHy" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/firealarm/directional/east, +/obj/structure/closet/bombcloset/security, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/firealarm/directional/east, +/obj/structure/closet/bombcloset/security, +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","security") + }, +/turf/open/floor/iron/dark, +/area/security/execution/transfer) +"gHJ" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) -"gIb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/vending/autodrobe, +/obj/machinery/airalarm/directional/east, +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/sleeper) +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) "gId" = ( /obj/structure/cable/yellow, /obj/structure/cable/yellow{ @@ -25493,6 +25425,9 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"gIl" = ( +/turf/open/floor/carpet/grimy, +/area/hallway/primary/starboard) "gIA" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -25529,14 +25464,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) -"gJc" = ( -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/machinery/camera/directional/north, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "gJg" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -25554,6 +25481,11 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) +"gJj" = ( +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "gJm" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -25576,6 +25508,22 @@ }, /turf/open/floor/carpet/royalblack, /area/lawoffice) +"gJx" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft) "gJM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -25609,6 +25557,18 @@ }, /turf/open/floor/iron/dark, /area/teleporter) +"gKm" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/catwalk_floor, +/area/maintenance/starboard/fore) "gKu" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -25628,6 +25588,17 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"gKU" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar/atrium) "gLd" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -25661,6 +25632,10 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"gLL" = ( +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "gLU" = ( /obj/machinery/door/poddoor/incinerator_atmos_aux, /turf/open/floor/engine/vacuum, @@ -25677,10 +25652,26 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) +"gMi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/fancy/sofa/corp/right{ + dir = 8 + }, +/turf/open/floor/carpet/black, +/area/crew_quarters/bar/atrium) "gMk" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/central) +"gMl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "gMz" = ( /obj/structure/window/reinforced{ dir = 1 @@ -25711,6 +25702,16 @@ }, /turf/open/floor/iron, /area/construction/mining/aux_base) +"gNN" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/structure/chair/fancy/bench{ + pixel_y = 13 + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "gOf" = ( /obj/effect/landmark/start/station_engineer, /obj/effect/turf_decal/stripes/corner{ @@ -25737,11 +25738,35 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/engine/engineering) +"gOt" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/checker, +/area/maintenance/starboard/fore) "gPp" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/item/pool/pool_noodle, /turf/open/floor/iron, /area/crew_quarters/fitness) +"gPt" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "gPu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/carpet/purple, @@ -25758,21 +25783,18 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) +"gPN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "gQd" = ( /turf/closed/wall, /area/quartermaster/exploration_dock) -"gQG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) "gQJ" = ( /obj/machinery/power/solar{ id = "portsolar"; @@ -25788,13 +25810,16 @@ /obj/structure/girder, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"gRe" = ( -/obj/structure/table/optable, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +"gRb" = ( +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/iron/white, -/area/medical/surgery) +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "gRw" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -25817,14 +25842,12 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) -"gSi" = ( -/obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "28" +"gRD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/kitchen) +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "gSu" = ( /obj/machinery/camera/autoname/directional/west{ network = list("ss13, engine") @@ -25841,6 +25864,15 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) +"gTf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/tile_breaker, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "gTu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, @@ -25880,13 +25912,6 @@ /obj/effect/spawner/randomvend/snack, /turf/open/floor/iron, /area/hallway/primary/central) -"gUG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "gUK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, @@ -25912,13 +25937,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"gVE" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/cryo) "gVW" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -25969,15 +25987,15 @@ "gWM" = ( /turf/closed/wall, /area/medical/surgery) -"gWY" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 +"gWQ" = ( +/obj/structure/bodycontainer/crematorium{ + id = "crematoriumChapel" }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/structure/bodycontainer/crematorium{ + id = "crematoriumChapel" }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/turf/open/floor/iron/dark, +/area/chapel/office) "gXf" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -26036,6 +26054,16 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/secondary/entry) +"gYi" = ( +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) +"gYB" = ( +/obj/structure/curtain/directional{ + dir = 8 + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/medical/surgery) "gYM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -26053,21 +26081,16 @@ }, /turf/open/floor/plating, /area/hallway/secondary/command) -"gZz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +"gZv" = ( +/obj/structure/chair/fancy/bench{ + dir = 8; + pixel_x = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron, -/area/science/mixing) +/turf/open/floor/iron/dark, +/area/medical/morgue) "gZG" = ( /obj/machinery/computer/pandemic, /turf/open/floor/iron/white, @@ -26096,6 +26119,18 @@ }, /turf/open/floor/iron, /area/quartermaster/miningdock) +"gZU" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "haa" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26141,17 +26176,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) -"hbd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/landmark/start/botanist, -/turf/open/floor/iron, -/area/hydroponics) "hbp" = ( /obj/machinery/suit_storage_unit/security, /obj/effect/turf_decal/bot/left, @@ -26205,15 +26229,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"hcs" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "hcu" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -26231,30 +26246,10 @@ /obj/machinery/door/firedoor, /turf/open/floor/engine, /area/engine/engineering) -"hcD" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/aft) -"hcL" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +"hcQ" = ( +/obj/structure/sign/departments/minsky/supply/hydroponics2, +/turf/closed/wall, +/area/hydroponics) "hcR" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall/r_wall, @@ -26266,14 +26261,6 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"hdg" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6" - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "hdh" = ( /obj/machinery/light{ dir = 1 @@ -26283,6 +26270,20 @@ }, /turf/open/floor/iron/white, /area/science/research) +"hdj" = ( +/obj/structure/table/reinforced, +/obj/item/food/pie/cream, +/obj/machinery/door/window/eastleft{ + name = "Kitchen Window"; + req_access_txt = "28" + }, +/obj/machinery/door/window/eastleft{ + dir = 8; + name = "Bar Window"; + req_access_txt = "25" + }, +/turf/open/floor/iron, +/area/crew_quarters/bar) "hem" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -26321,16 +26322,21 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) -"heN" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, -/turf/open/floor/iron/dark, -/area/medical/morgue) -"heZ" = ( -/obj/structure/table/wood/poker, -/obj/item/toy/cards/deck, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +"heT" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "hff" = ( /obj/machinery/button/door{ id = "Dorm6"; @@ -26344,20 +26350,11 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/dorms) -"hfj" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Main Hall"; - req_access_txt = "5" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/sleeper) +"hfh" = ( +/obj/effect/turf_decal/siding/wood, +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/medical/exam_room) "hfq" = ( /obj/machinery/button/door{ id = "Prisongate"; @@ -26435,15 +26432,47 @@ }, /turf/open/floor/iron/white, /area/medical/surgery) -"hgw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, +"hgj" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/carpet/blue, +/area/medical/break_room) +"hgk" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/white, -/area/medical/cryo) +/area/medical/genetics/cloning) "hha" = ( /obj/machinery/digital_clock, /turf/closed/wall, /area/hallway/secondary/exit) +"hhc" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/white/opposingcorners, +/obj/effect/turf_decal/tile/white{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) +"hhG" = ( +/turf/closed/wall, +/area/medical/exam_room) "hid" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ dir = 4 @@ -26525,21 +26554,40 @@ /obj/machinery/vending/medical, /turf/open/floor/iron/white, /area/medical/virology) -"hjw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "hjM" = ( /obj/machinery/light{ dir = 8 }, /turf/open/floor/iron, /area/quartermaster/exploration_dock) +"hjP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4; + sortType = 21 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"hkB" = ( +/obj/structure/table/wood, +/obj/item/storage/box/beanbag{ + pixel_y = 9 + }, +/obj/item/storage/box/beanbag{ + pixel_y = 4 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/siding/wood/corner, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "hkC" = ( /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Maintenance"; @@ -26601,19 +26649,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"hlE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/storage) "hlW" = ( /obj/machinery/firealarm{ dir = 4; @@ -26624,13 +26659,13 @@ /obj/item/stack/rods/fifty, /turf/open/floor/iron, /area/storage/tools) -"hmL" = ( -/obj/machinery/light_switch{ - pixel_x = 21; - pixel_y = 22 +"hmQ" = ( +/obj/structure/fluff/hedge/opaque, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +/turf/open/floor/wood/big, +/area/crew_quarters/bar/atrium) "hmR" = ( /obj/structure/chair/office{ dir = 1 @@ -26640,16 +26675,10 @@ }, /turf/open/floor/carpet/royalblack, /area/lawoffice) -"hmY" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 5; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) +"hnc" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "hnp" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26667,21 +26696,6 @@ }, /turf/open/floor/circuit/telecomms, /area/tcommsat/server) -"hny" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "hnD" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line, @@ -26701,6 +26715,14 @@ /obj/item/stack/spacecash/c200, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"hnR" = ( +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "hob" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -26787,9 +26809,33 @@ dir = 8 }, /area/engine/atmos) +"hpQ" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = -32 + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "hqh" = ( /turf/open/floor/iron/white, /area/medical/virology) +"hqm" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/south{ + areastring = "/area/engine/supermatter" + }, +/obj/structure/cable/yellow, +/turf/open/floor/engine, +/area/engine/engineering) "hqw" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on, /turf/open/floor/engine, @@ -26816,13 +26862,12 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) -"hqI" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 +"hqT" = ( +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/white/side{ + dir = 1 }, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron, -/area/hallway/primary/aft) +/area/crew_quarters/kitchen) "hqX" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -26886,6 +26931,22 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/storage/tech) +"hss" = ( +/obj/machinery/light, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/tile/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "hsH" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -26893,6 +26954,12 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai_upload) +"hsL" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/genetics) "hsU" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26906,6 +26973,12 @@ }, /turf/open/floor/iron, /area/storage/tools) +"hsW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "hsZ" = ( /obj/structure/sign/departments/evac{ pixel_y = 32 @@ -26928,6 +27001,18 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/service) +"htt" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) +"htB" = ( +/obj/machinery/camera/autoname/directional/south, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/wood, +/area/medical/break_room) "htE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -26937,6 +27022,27 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) +"htR" = ( +/obj/machinery/door/poddoor/preopen{ + id = "chemistry_shutters"; + name = "Chemistry shutters" + }, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/machinery/door/window/eastright{ + base_state = "left"; + icon_state = "left"; + name = "Chemistry Desk"; + req_access_txt = "33" + }, +/turf/open/floor/iron/dark, +/area/medical/apothecary) "hua" = ( /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; @@ -26980,6 +27086,12 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"hvs" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "hvx" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/table/glass, @@ -27008,13 +27120,6 @@ }, /turf/open/floor/carpet, /area/vacant_room/office) -"hwc" = ( -/obj/machinery/light, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "hwp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 6 @@ -27036,13 +27141,6 @@ }, /turf/open/floor/plating, /area/maintenance/central) -"hwu" = ( -/obj/machinery/light/small, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "hwz" = ( /obj/machinery/cryopod{ dir = 4 @@ -27073,6 +27171,16 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) +"hxp" = ( +/obj/machinery/door/window/westleft{ + name = "Monkey Pen"; + pixel_y = 1; + req_access_txt = "9"; + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/genetics) "hxw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -27109,6 +27217,51 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/heads/captain) +"hyl" = ( +/obj/machinery/door/airlock/medical/glass{ + id_tag = "GeneticsDoor"; + name = "Cloning"; + req_access_txt = "5; 68" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) +"hyt" = ( +/obj/item/wrench, +/obj/item/stack/sheet/glass{ + amount = 30 + }, +/obj/item/stack/sheet/iron{ + amount = 30 + }, +/obj/item/stack/cable_coil/random, +/obj/item/stack/cable_coil/random, +/obj/structure/closet, +/obj/item/vending_refill/cigarette, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "hyI" = ( /obj/machinery/cryopod{ dir = 4 @@ -27118,6 +27271,18 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) +"hyV" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/turf/open/floor/engine, +/area/engine/supermatter) "hzb" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -27139,6 +27304,24 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/central) +"hzF" = ( +/obj/item/hand_labeler{ + pixel_x = -9; + pixel_y = 13 + }, +/obj/structure/table/glass, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 4 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "hzN" = ( /obj/machinery/light{ dir = 1 @@ -27159,12 +27342,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"hAq" = ( -/obj/structure/noticeboard{ - pixel_y = -27 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "hAw" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, @@ -27219,6 +27396,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/engine/atmos) +"hBS" = ( +/obj/structure/table/wood, +/obj/item/paicard, +/obj/machinery/camera/directional/north, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "hBW" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/northright{ @@ -27256,6 +27440,10 @@ }, /turf/open/floor/carpet/grimy, /area/chapel/office) +"hCa" = ( +/obj/effect/spawner/lootdrop/glowstick, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "hCs" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -27299,6 +27487,26 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"hCV" = ( +/obj/machinery/door/airlock/grunge{ + name = "Morgue"; + req_one_access_txt = "5" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "hDc" = ( /obj/machinery/door/airlock/maintenance{ name = "Library Maintenance"; @@ -27371,33 +27579,6 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"hDG" = ( -/obj/machinery/door/poddoor/preopen{ - id = "maint1" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"hEc" = ( -/obj/item/kirbyplants/random, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "hEh" = ( /obj/machinery/light/small{ dir = 1 @@ -27415,6 +27596,22 @@ }, /turf/open/floor/plating, /area/maintenance/central) +"hEZ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "hFx" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; @@ -27426,6 +27623,17 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"hFE" = ( +/obj/structure/table/reinforced, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/obj/machinery/door/poddoor/preopen{ + id = "quarantineshutters"; + name = "Quarantine Shutters" + }, +/turf/open/floor/iron, +/area/medical/medbay/lobby) "hFT" = ( /mob/living/simple_animal/hostile/retaliate/goose/vomit, /turf/open/floor/plating, @@ -27462,6 +27670,18 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"hHA" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/medical_cloning{ + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) "hHC" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -27474,17 +27694,14 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"hHX" = ( -/obj/structure/chair, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/machinery/camera/directional/north, -/obj/item/radio/intercom{ - pixel_y = 20 +"hHJ" = ( +/obj/item/storage/pill_bottle/dice, +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/medical/surgery) +/obj/structure/table/wood, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/bar/atrium) "hIb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -27503,15 +27720,6 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, /turf/open/space, /area/space/nearstation) -"hIk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "hII" = ( /obj/machinery/atmospherics/components/binary/valve/layer2{ dir = 4 @@ -27531,15 +27739,6 @@ }, /turf/open/floor/iron, /area/ai_monitored/security/armory) -"hJs" = ( -/obj/machinery/computer/operating{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "hJw" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -27569,6 +27768,21 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/locker) +"hJD" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/storage) "hJG" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -27620,15 +27834,19 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"hKj" = ( +"hKb" = ( /obj/structure/disposalpipe/segment{ - dir = 10 + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "1-2" }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "hKs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -27660,12 +27878,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"hKV" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "hLk" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -27682,6 +27894,10 @@ }, /turf/open/floor/iron/techmaint, /area/storage/tech) +"hLp" = ( +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron/white, +/area/science/xenobiology) "hLz" = ( /obj/machinery/power/compressor{ comp_id = "incineratorturbine"; @@ -27700,15 +27916,14 @@ "hLJ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/punching_bag, +/obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/crew_quarters/fitness) -"hLW" = ( -/obj/machinery/smartfridge/organ, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) +"hLO" = ( +/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/dark, +/area/medical/cryo) "hLZ" = ( /obj/structure/rack, /obj/effect/turf_decal/delivery, @@ -27795,6 +28010,10 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/iron/tech, /area/maintenance/fore/secondary) +"hNP" = ( +/obj/machinery/airalarm/directional/east, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "hNV" = ( /obj/structure/bed, /obj/item/clothing/suit/jacket/straight_jacket, @@ -27819,6 +28038,14 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"hOd" = ( +/obj/machinery/light, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white, +/area/medical/chemistry) "hOe" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -27844,6 +28071,13 @@ }, /turf/open/floor/carpet, /area/vacant_room/office) +"hOj" = ( +/obj/effect/turf_decal/tile/dark_green/opposingcorners{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/opposingcorners, +/turf/open/floor/iron, +/area/hydroponics) "hOk" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate" @@ -27880,6 +28114,16 @@ }, /turf/open/floor/carpet, /area/security/brig) +"hOI" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "hOL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/west, @@ -27898,6 +28142,16 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"hOV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/fancy/sofa/old/right{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/bar/atrium) "hOZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -27914,11 +28168,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"hPg" = ( -/obj/machinery/light, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/surgery) "hPy" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -27969,6 +28218,14 @@ }, /turf/open/floor/iron/techmaint, /area/engine/engineering) +"hQe" = ( +/obj/machinery/door/airlock/medical{ + name = "Operating Theatre"; + req_access_txt = "45" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/medical/morgue) "hQf" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; @@ -27983,22 +28240,6 @@ /obj/machinery/telecomms/bus/preset_three, /turf/open/floor/circuit/green/telecomms, /area/tcommsat/server) -"hQn" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/sign/departments/minsky/research/genetics{ - pixel_x = -32 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/maintenance/aft) "hQB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -28023,6 +28264,15 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, /area/security/prison) +"hQE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "hQH" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -28044,6 +28294,19 @@ }, /turf/open/floor/iron, /area/security/brig) +"hRc" = ( +/obj/item/storage/secure/safe/directional/west, +/turf/open/floor/plating, +/area/maintenance/aft) +"hRk" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "hRz" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/item/radio/intercom{ @@ -28062,47 +28325,12 @@ }, /turf/open/floor/iron, /area/security/checkpoint/engineering) -"hRS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) "hRX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/carpet/orange, /area/crew_quarters/dorms) -"hSh" = ( -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"hSk" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Morgue Maintenance"; - req_access_txt = "6" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/aft) "hSo" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 8 @@ -28137,46 +28365,14 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/hallway/primary/fore) -"hTg" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/white, -/area/security/checkpoint/medical) -"hTk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/effect/landmark/start/paramedic, -/turf/open/floor/iron/dark, -/area/medical/surgery) -"hTF" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +"hSX" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/tile/black/fourcorners, +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/tile/black/fourcorners, +/obj/machinery/camera/motion/directional/west, +/turf/open/floor/iron/grid/steel, +/area/ai_monitored/storage/eva) "hTX" = ( /obj/structure/bed/dogbed/walter, /mob/living/simple_animal/pet/dog/bullterrier/walter, @@ -28197,6 +28393,9 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) +"hUm" = ( +/turf/closed/wall, +/area/crew_quarters/bar/atrium) "hUF" = ( /obj/machinery/door/airlock/security{ aiControlDisabled = 1; @@ -28220,9 +28419,6 @@ }, /turf/open/floor/iron/dark, /area/security/prison) -"hVa" = ( -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "hVk" = ( /obj/machinery/door/airlock/command{ name = "Conference Room"; @@ -28258,6 +28454,11 @@ }, /turf/open/floor/wood, /area/security/detectives_office) +"hVW" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/holopad, +/turf/open/floor/wood, +/area/medical/exam_room) "hWb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -28273,6 +28474,24 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"hWf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/turf/open/floor/engine, +/area/engine/engineering) +"hWq" = ( +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/mapping_helpers/tile_breaker, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "hWw" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -28293,6 +28512,13 @@ }, /turf/open/floor/iron/white, /area/quartermaster/exploration_prep) +"hWy" = ( +/obj/effect/turf_decal/pool/corner, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "hWE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -28432,6 +28658,11 @@ }, /turf/open/floor/iron, /area/janitor) +"hYu" = ( +/obj/effect/turf_decal/stripes/line, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "hYG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -28448,6 +28679,10 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"hYO" = ( +/obj/item/cardboard_cutout/adaptive/chess/queen, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "hYQ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -28507,23 +28742,6 @@ /obj/item/cigbutt/roach, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"hZm" = ( -/obj/machinery/keycard_auth{ - pixel_x = 24 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/button/door{ - id = "quarantineshutters"; - name = "Quarantine Lockdown"; - pixel_x = 24; - pixel_y = -10; - req_access_txt = "39" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "hZG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28562,13 +28780,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"iau" = ( -/obj/effect/turf_decal/tile/dark_red/anticorner/contrasted{ - dir = 8 - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/dark, -/area/bridge) "iaG" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -28624,22 +28835,6 @@ }, /turf/open/floor/wood, /area/lawoffice) -"icf" = ( -/obj/structure/table/glass, -/obj/item/folder/white, -/obj/item/radio/headset/headset_med, -/obj/machinery/requests_console{ - department = "Genetics"; - name = "Genetics Requests Console"; - pixel_y = 30 - }, -/obj/item/storage/pill_bottle/mutadone, -/obj/item/storage/pill_bottle/mannitol, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "ict" = ( /obj/machinery/light_switch{ pixel_x = -22 @@ -28649,10 +28844,6 @@ }, /turf/open/floor/iron, /area/quartermaster/exploration_dock) -"icF" = ( -/obj/structure/chair/stool/directional/west, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "icS" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, @@ -28667,6 +28858,39 @@ }, /turf/open/floor/prison, /area/security/prison) +"idb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Bar Backroom"; + req_access_txt = "25" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) +"idA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) "iea" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -28751,27 +28975,25 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"ifq" = ( +"ifr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/cryo) -"ifu" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/power/apc/highcap/fifteen_k{ - dir = 8; - name = "Medbay Central APC"; - pixel_x = -24 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, /turf/open/floor/iron/white, -/area/medical/virology) +/area/medical/medbay/central) "ifH" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -28781,6 +29003,23 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) +"ifS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4; + sortType = 16 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "ifY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -28887,6 +29126,22 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/teleporter) +"ihI" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Hydroponics Backroom"; + req_access_txt = "35" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/hydroponics) "ihP" = ( /obj/machinery/light/small{ dir = 4 @@ -28908,6 +29163,18 @@ }, /turf/open/floor/iron, /area/security/checkpoint/auxiliary) +"iid" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/tile/blue, +/obj/item/radio/intercom{ + pixel_y = 20 + }, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) "iis" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -28926,6 +29193,17 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"iiu" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/landmark/start/randommaint/psychiatrist, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/wood, +/area/medical/exam_room) "iiF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -28964,6 +29242,17 @@ /obj/item/stack/sheet/iron/fifty, /turf/open/floor/iron/dark, /area/engine/engineering) +"ijd" = ( +/obj/effect/mapping_helpers/tile_breaker, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/checker, +/area/hallway/secondary/service) "ijs" = ( /obj/machinery/door/airlock/public/glass{ name = "Chapel" @@ -29031,6 +29320,26 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) +"ikk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) +"ikq" = ( +/obj/structure/chair/stool/directional/east, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "ikw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -29089,6 +29398,18 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"ikP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "ilh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -29109,6 +29430,19 @@ }, /turf/open/floor/iron/dark, /area/security/prison) +"ilm" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron, +/area/hydroponics) "ilv" = ( /obj/machinery/light{ dir = 4 @@ -29118,22 +29452,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) -"ilz" = ( -/obj/machinery/airalarm/directional/south{ - pixel_y = -22 - }, -/obj/structure/table, -/obj/item/reagent_containers/glass/bottle/salglu_solution{ - pixel_x = -5; - pixel_y = 10 - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/item/storage/box/pillbottles, -/turf/open/floor/iron/white, -/area/medical/chemistry) "ilC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -29187,30 +29505,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"imi" = ( -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/catwalk_floor, -/area/hallway/secondary/exit) -"imn" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) "imz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -29249,6 +29543,14 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"inq" = ( +/obj/item/broken_bottle, +/obj/effect/decal/cleanable/glass, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "ins" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -29275,26 +29577,39 @@ }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) -"ioc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, +"inT" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /turf/open/floor/iron/white, -/area/medical/genetics) -"ioz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/area/medical/patients_rooms) +"inY" = ( +/obj/machinery/light/small{ + dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/light_switch{ + pixel_x = 27 + }, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) +"ioy" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/effect/landmark/start/assistant, +/obj/structure/chair/fancy/sofa/old/right{ dir = 8 }, -/turf/open/floor/iron/white, -/area/medical/apothecary) +/turf/open/floor/carpet/green, +/area/crew_quarters/bar/atrium) +"ioB" = ( +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/medical/surgery) "ioE" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -29312,22 +29627,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) -"ioP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/camera/autoname/directional/north{ - network = list("ss13","engine") - }, -/turf/open/floor/engine, -/area/engine/supermatter) -"ioR" = ( -/obj/machinery/door/airlock{ - id_tag = "Toilet2"; - name = "Toilet Unit #2" - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) +"ipn" = ( +/obj/item/stack/medical/gauze, +/obj/item/stack/medical/bruise_pack, +/obj/item/stack/medical/ointment, +/obj/effect/turf_decal/tile/blue, +/obj/structure/table, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "ips" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -29355,18 +29662,6 @@ }, /turf/open/floor/carpet, /area/security/brig) -"ipM" = ( -/obj/structure/table/reinforced, -/obj/structure/desk_bell{ - pixel_y = 8 - }, -/obj/item/reagent_containers/food/drinks/britcup{ - desc = "Kingston's personal cup."; - pixel_x = 10; - pixel_y = -4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "ipZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/door/poddoor/preopen{ @@ -29396,12 +29691,11 @@ dir = 4 }, /area/engine/atmos) -"iqN" = ( -/obj/machinery/chem_master/condimaster{ - name = "CondiMaster Neo" - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +"iqj" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/chair/stool/directional/north, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) "iri" = ( /obj/machinery/door/airlock{ id_tag = "Dorm2"; @@ -29448,6 +29742,15 @@ /obj/effect/turf_decal/loading_area, /turf/open/floor/iron/dark, /area/science/nanite) +"iss" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/closet/secure_closet/bar{ + req_access_txt = "25" + }, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "isy" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/tile/red{ @@ -29491,6 +29794,11 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/engine, /area/gateway) +"isM" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/camera/directional/north, +/turf/open/floor/iron/ridged/steel, +/area/hydroponics) "isN" = ( /obj/effect/turf_decal/siding/wideplating/dark, /obj/structure/chair/fancy/comfy{ @@ -29513,23 +29821,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"itx" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"itF" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "iue" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -29553,17 +29844,6 @@ /obj/effect/turf_decal/bot_white/right, /turf/open/floor/engine/light, /area/engine/gravity_generator) -"iuO" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "iuQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -29588,6 +29868,12 @@ }, /turf/open/floor/iron/dark, /area/gateway) +"ivh" = ( +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 6 + }, +/turf/open/floor/wood/big, +/area/maintenance/aft) "ivk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -29604,22 +29890,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"ivp" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/medical/virology) "ivt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -29642,6 +29912,10 @@ }, /turf/open/floor/prison, /area/security/prison) +"ivR" = ( +/obj/structure/chair/stool/directional/west, +/turf/open/floor/plating, +/area/maintenance/port/fore) "ivT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -29751,23 +30025,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) -"ixo" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/medicine, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/reagent_containers/spray/cleaner, -/obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/item/glove_box, -/turf/open/floor/iron/white, -/area/medical/storage) "ixA" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ @@ -29775,13 +30032,15 @@ }, /turf/open/space, /area/space/nearstation) -"ixC" = ( -/obj/structure/disposalpipe/segment, +"ixK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, -/turf/open/floor/wood, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "ixO" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -29804,17 +30063,6 @@ dir = 8 }, /area/engine/atmos) -"ixX" = ( -/obj/machinery/door/window/westleft{ - name = "plumbing factory duct access"; - red_alert_access = 1; - req_access_txt = "5; 33" - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "iyk" = ( /obj/machinery/door/airlock/public/glass{ name = "Visitation" @@ -29850,6 +30098,21 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"iAe" = ( +/obj/structure/table/optable, +/obj/item/surgical_drapes{ + pixel_x = -1 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 5; + pixel_y = -32 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron/white, +/area/medical/surgery) "iBE" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/end{ @@ -29872,6 +30135,17 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"iBK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "iBQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -29919,14 +30193,6 @@ }, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) -"iCP" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "iDc" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -29944,15 +30210,6 @@ }, /turf/open/floor/iron/dark, /area/security/detectives_office) -"iDg" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "iDo" = ( /obj/machinery/light/small{ dir = 1 @@ -29984,6 +30241,17 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"iDQ" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "iDZ" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 4; @@ -30018,6 +30286,13 @@ }, /turf/open/floor/iron, /area/science/mixing) +"iEs" = ( +/obj/effect/turf_decal/tile/dark_blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "iEJ" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod One" @@ -30027,6 +30302,17 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) +"iEM" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/crew_quarters/kitchen) "iEP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -30035,6 +30321,22 @@ dir = 8 }, /area/engine/atmos) +"iEW" = ( +/obj/structure/chair/stool/directional/west, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/prison, +/area/security/prison) "iFl" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -30047,21 +30349,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"iFs" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "iFx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -30078,15 +30365,6 @@ }, /turf/open/floor/carpet, /area/hallway/secondary/entry) -"iGe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "iGx" = ( /obj/machinery/airalarm/directional/west{ pixel_x = -23 @@ -30097,6 +30375,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) +"iGU" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/storage) "iGZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -30119,6 +30404,22 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/engine/engineering) +"iHK" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/holopad{ + pixel_x = 16 + }, +/turf/open/floor/iron/dark, +/area/medical/cryo) "iHL" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -30254,6 +30555,30 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/crew_quarters/fitness) +"iJZ" = ( +/obj/machinery/door/poddoor/preopen{ + id = "maint2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/fore) +"iKc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/poddoor/preopen{ + id = "quarantineshutters"; + name = "Quarantine Shutters" + }, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/iron/dark, +/area/medical/medbay/lobby) "iKk" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, @@ -30316,18 +30641,6 @@ /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, /area/security/prison) -"iLN" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/science/mixing/chamber) "iMv" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, @@ -30348,18 +30661,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"iMY" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "iNa" = ( /obj/machinery/light{ dir = 8 @@ -30376,12 +30677,28 @@ }, /turf/open/space/basic, /area/space/nearstation) +"iNn" = ( +/obj/structure/sign/departments/minsky/research/research{ + pixel_x = 32 + }, +/obj/structure/sign/departments/minsky/research/research{ + pixel_x = 32 + }, +/obj/machinery/camera/autoname/directional/east, +/obj/effect/spawner/randomvend/cola, +/turf/open/floor/iron, +/area/maintenance/aft) "iNG" = ( /obj/machinery/newscaster{ pixel_y = 32 }, /turf/open/floor/wood, /area/vacant_room/office) +"iNK" = ( +/obj/machinery/chem_master, +/obj/machinery/light, +/turf/open/floor/iron/white, +/area/medical/apothecary) "iNO" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; @@ -30404,6 +30721,18 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/hallway/secondary/entry) +"iOl" = ( +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/item/radio/intercom{ + pixel_x = -32 + }, +/obj/effect/turf_decal/tile/red/fourcorners/contrasted, +/obj/item/radio/intercom{ + pixel_x = -32 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/prison, +/area/security/prison) "iOO" = ( /obj/machinery/door/window/eastleft{ dir = 8; @@ -30455,6 +30784,25 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) +"iPB" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/obj/structure/filingcabinet, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) +"iPF" = ( +/obj/machinery/anesthetic_machine, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/obj/structure/closet/secure_closet/medical2, +/turf/open/floor/iron/white, +/area/medical/surgery) "iPN" = ( /obj/machinery/camera/autoname/directional/east{ network = list("ss13, security") @@ -30510,41 +30858,42 @@ }, /turf/open/floor/iron, /area/security/brig) -"iQs" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/aft) "iQx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"iQy" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Surgery Maintenance"; - req_access_txt = "45" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/aft) +"iQJ" = ( +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable/yellow, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) "iQT" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/medical/medbay/lobby) +"iQZ" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/toy/cards/deck{ + pixel_x = -10; + pixel_y = 6 + }, +/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6{ + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "iRe" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -30582,21 +30931,6 @@ }, /turf/open/floor/iron/dark, /area/storage/tech) -"iRs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) "iRw" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/vending/wardrobe/det_wardrobe, @@ -30609,16 +30943,10 @@ }, /turf/open/floor/wood, /area/library) -"iRL" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/light_switch{ - pixel_x = 1; - pixel_y = 26 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +"iRT" = ( +/obj/effect/spawner/room/fivexfour, +/turf/open/floor/plating, +/area/maintenance/aft) "iRW" = ( /obj/machinery/aug_manipulator, /turf/open/floor/iron/dark, @@ -30629,17 +30957,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"iRZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron, -/area/crew_quarters/theatre) "iSm" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -30672,6 +30989,26 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) +"iTi" = ( +/obj/machinery/suit_storage_unit/cmo, +/obj/machinery/button/door{ + id = "cmoprivacy"; + name = "Privacy Shutters Toggle"; + pixel_y = 22 + }, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) +"iTK" = ( +/obj/machinery/vending/coffee, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, +/area/medical/break_room) "iTO" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -30714,6 +31051,33 @@ }, /turf/open/floor/wood, /area/lawoffice) +"iUg" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/science/explab) +"iUl" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/machinery/camera/directional/south, +/obj/structure/closet/crate/wooden/toy, +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) "iUs" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -30728,55 +31092,28 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) -"iUQ" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/eastright{ - base_state = "left"; - icon_state = "left"; - name = "Chemistry Desk"; - req_access_txt = "33" - }, -/obj/machinery/door/poddoor/preopen{ - id = "chemistry_shutters"; - name = "Chemistry shutters" - }, -/obj/machinery/door/firedoor, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen, -/turf/open/floor/plating, -/area/medical/apothecary) -"iVg" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +"iUM" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 }, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "1-8" }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) -"iVk" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/structure/barricade/wooden/crude, -/obj/machinery/door/airlock/maintenance{ - id_tag = "commissarydoor"; - req_one_access_txt = "12;63;48;50" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/starboard/fore) +"iVo" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "iVN" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -30826,20 +31163,6 @@ }, /turf/open/floor/plating, /area/maintenance/central) -"iXc" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "iXf" = ( /obj/item/radio/intercom{ pixel_x = -25 @@ -30851,10 +31174,6 @@ dir = 1 }, /area/hallway/secondary/exit) -"iXm" = ( -/obj/machinery/iv_drip, -/turf/open/floor/iron/white, -/area/medical/sleeper) "iXG" = ( /obj/machinery/modular_computer/console/preset/curator{ dir = 1 @@ -30872,12 +31191,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/locker) -"iXW" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) "iXY" = ( /obj/structure/chair/office{ dir = 1 @@ -30930,18 +31243,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"iYL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "iYP" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -30953,25 +31254,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"iYQ" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Theatre Maintenance"; - req_access_txt = "46" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "iYT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -30984,17 +31266,6 @@ /obj/structure/chair/office, /turf/open/floor/carpet/royalblack, /area/lawoffice) -"iZs" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "iZV" = ( /obj/machinery/door/airlock/public/glass{ name = "Garden" @@ -31023,6 +31294,18 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"jai" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "jaC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -31074,16 +31357,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) -"jbP" = ( -/obj/structure/chair/stool, -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13, engine") - }, -/obj/machinery/light_switch{ - pixel_x = -28 - }, -/turf/open/floor/plating, -/area/maintenance/solars/starboard/aft) "jbW" = ( /obj/machinery/computer/communications, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -31136,6 +31409,17 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/central) +"jcY" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/extinguisher_cabinet{ + pixel_x = 5; + pixel_y = 30 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "jcZ" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -31182,6 +31466,12 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"jeh" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/surgery) "jeB" = ( /obj/structure/table, /obj/machinery/recharger{ @@ -31324,6 +31614,28 @@ }, /turf/open/floor/iron, /area/security/checkpoint/supply) +"jgX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/plasticflaps/opaque, +/obj/machinery/door/window/northleft{ + dir = 8; + icon_state = "right"; + name = "Plumbing Factory"; + req_access_txt = "5; 33" + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "jhe" = ( /obj/structure/chair{ dir = 4 @@ -31331,6 +31643,18 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark, /area/security/main) +"jhf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/holopad, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "jhy" = ( /obj/machinery/computer/shuttle_flight/mining{ dir = 8 @@ -31359,10 +31683,6 @@ "jhL" = ( /turf/open/floor/iron/white, /area/medical/apothecary) -"jia" = ( -/obj/machinery/icecream_vat, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "jij" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -31377,6 +31697,10 @@ /obj/structure/transit_tube/horizontal, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) +"jil" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "jim" = ( /obj/effect/turf_decal/bot, /obj/machinery/navbeacon{ @@ -31390,16 +31714,22 @@ }, /turf/open/floor/iron, /area/science/lab) -"jiz" = ( -/obj/structure/table/reinforced, -/obj/item/wrench/medical, -/obj/machinery/airalarm/directional/south{ - pixel_y = -22 +"jip" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/item/crowbar, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/cryo) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_blue, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "jiA" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -31412,6 +31742,10 @@ }, /turf/open/floor/iron/white, /area/science/lab) +"jiW" = ( +/obj/structure/chair, +/turf/open/floor/plating/rust, +/area/maintenance/aft) "jjp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -31422,6 +31756,15 @@ }, /turf/open/floor/iron, /area/quartermaster/exploration_dock) +"jjA" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/checker, +/area/hallway/secondary/service) "jjV" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -31441,6 +31784,14 @@ }, /turf/open/floor/wood, /area/security/detectives_office) +"jks" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/energybar, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "jkw" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -31459,12 +31810,39 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) +"jkS" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron/dark, +/area/science/server) "jkW" = ( /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, /turf/open/floor/iron/techmaint, /area/security/prison/shielded) +"jlh" = ( +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/glass/bucket, +/obj/structure/sign/poster/contraband/missing_gloves{ + pixel_x = -32 + }, +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron, +/area/hallway/secondary/service) "jlI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -31489,12 +31867,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) -"jlW" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/aft) "jmC" = ( /obj/structure/table, /obj/item/crowbar/large, @@ -31517,6 +31889,22 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"jmI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "jmM" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/firealarm{ @@ -31532,6 +31920,29 @@ }, /turf/open/floor/iron/dark, /area/security/prison) +"jnn" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/sign/warning/deathsposal{ + pixel_x = -32 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/sign/warning/deathsposal{ + pixel_x = -32 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/white, +/area/medical/virology) +"jnC" = ( +/obj/machinery/rnd/production/techfab/department/medical, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/medical/storage) "jnE" = ( /obj/machinery/door/airlock/science{ name = "exploration preparation room"; @@ -31552,10 +31963,14 @@ }, /turf/open/floor/iron, /area/maintenance/starboard) -"jnT" = ( -/obj/effect/spawner/randomarcade, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +"jnN" = ( +/obj/structure/chair/fancy/sofa/old/left{ + color = "#742925"; + dir = 1 + }, +/obj/item/toy/plush/moth/witchwing, +/turf/open/floor/carpet/green, +/area/medical/exam_room) "joe" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, @@ -31587,27 +32002,6 @@ }, /turf/open/floor/iron, /area/quartermaster/miningdock) -"jow" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"joA" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = 30 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/white, -/area/medical/virology) "joD" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -31621,6 +32015,29 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"joU" = ( +/obj/machinery/holopad{ + pixel_y = -16 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white, +/area/medical/surgery) +"jpg" = ( +/obj/machinery/digital_clock/directional/north, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "jpp" = ( /obj/structure/railing{ dir = 4 @@ -31645,6 +32062,17 @@ }, /turf/open/floor/iron, /area/security/brig) +"jpv" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/carpet/grimy, +/area/hallway/primary/starboard) "jpE" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -31660,6 +32088,27 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"jqv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/carpet/grimy, +/area/crew_quarters/bar) +"jqO" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/grenades, +/obj/item/screwdriver{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/stack/cable_coil/random, +/obj/item/grenade/chem_grenade, +/obj/item/stack/cable_coil/random, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/turf/open/floor/iron/white, +/area/medical/apothecary) "jqR" = ( /obj/structure/cable{ icon_state = "1-2" @@ -31684,10 +32133,63 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron, /area/security/courtroom) -"jrP" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/medical/surgery) +"jrk" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/stripes, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/fore) +"jrM" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"jsc" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/hallway/primary/aft) +"jsf" = ( +/obj/effect/turf_decal/box, +/obj/machinery/plumbing/output{ + dir = 4 + }, +/obj/machinery/door/window/westleft{ + name = "plumbing factory duct access"; + red_alert_access = 1; + req_access_txt = "5; 33"; + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/storage) "jsj" = ( /obj/machinery/meter, /obj/effect/decal/cleanable/dirt, @@ -31751,7 +32253,9 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "jui" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/fitness) "jul" = ( @@ -31782,6 +32286,30 @@ /obj/item/reagent_containers/blood/OPlus, /turf/open/floor/iron/white, /area/security/brig) +"juH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4; + name = "Security Junction"; + sortType = 7 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) +"juI" = ( +/obj/machinery/computer/cloning{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) "juV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -31824,24 +32352,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) -"jvu" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/junction, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/maintenance/starboard) "jvM" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -31928,39 +32438,91 @@ }, /turf/open/floor/iron/grid/steel, /area/ai_monitored/turret_protected/ai_upload) -"jwX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +"jwT" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass/no_border, +/area/crew_quarters/bar/atrium) +"jxh" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/structure/cable/yellow, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = 11 + }, +/obj/item/radio/off, +/obj/item/restraints/handcuffs{ + pixel_y = 11 + }, +/obj/machinery/recharger{ + pixel_x = -10 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) +"jxw" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/effect/landmark/start/paramedic, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) -"jxk" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/junction, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/maintenance/starboard) +"jxG" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/light/small, /turf/open/floor/plating, -/area/maintenance/aft) -"jxC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/area/maintenance/starboard/fore) +"jxI" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/chair/stool/directional/west, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"jxJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_x = -6; + pixel_y = 1 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +/obj/item/book/manual/hydroponics_pod_people{ + pixel_x = 10 + }, +/obj/item/paper/guides/jobs/hydroponics, +/turf/open/floor/iron, +/area/hydroponics) "jyd" = ( /obj/machinery/door/airlock/research/glass{ name = "Robotics Lab"; @@ -32149,6 +32711,13 @@ }, /turf/open/floor/iron/white, /area/science/research) +"jAP" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/white, +/area/medical/chemistry) "jAQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -32173,23 +32742,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) -"jBl" = ( -/obj/structure/grille/broken, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/window{ - dir = 4 - }, -/obj/structure/window, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating{ - burnt = 1 - }, -/area/maintenance/starboard/fore) "jBp" = ( /obj/machinery/door/airlock/mining/glass{ name = "Cargo Office"; @@ -32223,10 +32775,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) -"jCo" = ( -/obj/structure/chair/stool/directional/south, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "jCq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -32243,6 +32791,25 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) +"jCy" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/surgery) +"jCz" = ( +/obj/machinery/holopad, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/tile/dark_blue, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "jCI" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -32261,22 +32828,16 @@ }, /turf/open/floor/iron/goonplaque, /area/security/brig) -"jDk" = ( -/obj/structure/table, -/obj/item/aiModule/reset, -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +"jDj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/camera/motion/directional/south{ - network = list("aiupload") +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/turf/open/floor/iron/grid/steel, -/area/ai_monitored/turret_protected/ai_upload) +/mob/living/carbon/monkey/punpun, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "jDW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -32293,6 +32854,19 @@ }, /turf/open/floor/iron/dark, /area/gateway) +"jEK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "jEL" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -32309,6 +32883,12 @@ /obj/structure/sign/warning/fire, /turf/closed/wall, /area/maintenance/disposal/incinerator) +"jFI" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "jFK" = ( /obj/machinery/door/airlock/external{ name = "External Access"; @@ -32357,21 +32937,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"jGB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/aft) "jGH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -32514,6 +33079,24 @@ }, /turf/open/floor/iron, /area/tcommsat/computer) +"jJU" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"jJX" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "jKn" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 @@ -32542,12 +33125,13 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"jKY" = ( -/obj/structure/chair{ +"jLe" = ( +/obj/effect/turf_decal/trimline/dark_red/line{ dir = 1 }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +/obj/effect/turf_decal/trimline/white/corner, +/turf/open/floor/wood/big, +/area/maintenance/aft) "jLl" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible{ dir = 4 @@ -32563,6 +33147,13 @@ }, /turf/open/floor/iron/freezer, /area/medical/virology) +"jLH" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "jLJ" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -32603,6 +33194,15 @@ "jLS" = ( /turf/open/floor/iron/white, /area/medical/chemistry) +"jLW" = ( +/obj/structure/window/reinforced, +/obj/effect/turf_decal/siding/wood, +/obj/structure/chair/fancy/comfy{ + color = "#666666"; + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "jMc" = ( /obj/structure/chair/office{ dir = 4 @@ -32623,28 +33223,6 @@ }, /turf/open/floor/carpet/grimy, /area/ai_monitored/turret_protected/aisat_interior) -"jMo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) -"jMr" = ( -/obj/machinery/computer/slot_machine, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "jMP" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 @@ -32677,6 +33255,19 @@ /obj/item/stack/cable_coil, /turf/open/floor/iron/dark, /area/engine/engineering) +"jNp" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) +"jND" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark, +/area/medical/cryo) "jNY" = ( /obj/machinery/computer/station_alert, /obj/item/radio/intercom{ @@ -32694,6 +33285,13 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"jOt" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/obj/effect/turf_decal/tile/dark_green{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hydroponics) "jOv" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; @@ -32723,6 +33321,19 @@ }, /turf/open/floor/engine/light, /area/engine/engineering) +"jOE" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/door/airlock{ + name = "Bar - Kitchen"; + req_one_access = "28;25"; + req_one_access_txt = "25,28,35" + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "jOR" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -32741,6 +33352,21 @@ }, /turf/open/floor/iron, /area/science/robotics/mechbay) +"jPb" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/hydroponics) "jPm" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -32751,6 +33377,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) +"jPq" = ( +/obj/effect/turf_decal/trimline/white/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_red/line, +/turf/open/floor/wood/big, +/area/maintenance/aft) "jPs" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -32799,6 +33432,19 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) +"jPP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "jPS" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -32809,17 +33455,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"jQe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/theatre) "jQf" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -32851,6 +33486,17 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) +"jQJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "jRC" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 9 @@ -32863,13 +33509,6 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"jRJ" = ( -/obj/machinery/vending/boozeomat, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "jSj" = ( /obj/structure/sign/warning/electricshock{ pixel_y = 32 @@ -32904,6 +33543,24 @@ }, /turf/open/floor/iron, /area/ai_monitored/security/armory) +"jSZ" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/rust, +/area/maintenance/aft) +"jTm" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/turf/open/floor/engine, +/area/engine/engineering) "jTo" = ( /obj/machinery/computer/secure_data, /obj/machinery/requests_console{ @@ -32931,17 +33588,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"jTM" = ( -/obj/structure/displaycase{ - desc = "A display case with a mortar straight from a museum. You might be in a big trouble if you need to use this."; - name = "archaic tool display case"; - start_showpiece_type = /obj/item/reagent_containers/glass/mortar - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "jTP" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -32981,6 +33627,12 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"jUv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/carpet/grimy, +/area/crew_quarters/bar) "jUS" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -33011,56 +33663,31 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/hallway/primary/central) -"jVC" = ( -/obj/structure/disposalpipe/segment{ +"jVz" = ( +/obj/structure/closet/secure_closet/CMO, +/obj/machinery/light{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/effect/turf_decal/tile/dark_blue{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "jVE" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/grass/jungle/b, /turf/open/floor/grass, /area/hallway/secondary/command) -"jVI" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "35" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +"jVH" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "jVQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) -"jVS" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/cryo) "jWa" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/layer_manifold/visible{ @@ -33081,6 +33708,16 @@ }, /turf/open/floor/iron, /area/security/courtroom) +"jWo" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/surgery) "jWu" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -33120,22 +33757,6 @@ }, /turf/open/floor/iron, /area/construction/mining/aux_base) -"jWJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/light_switch{ - pixel_x = 1; - pixel_y = -24 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "jWS" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -33150,17 +33771,82 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/starboard) -"jXE" = ( -/obj/machinery/door/window/southleft{ - name = "Kitchen Delivery"; - req_access_txt = "28" +"jXy" = ( +/obj/machinery/light_switch{ + pixel_x = 28 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) +"jXT" = ( +/obj/effect/turf_decal/tile/white, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/storage/box/masks{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/storage/box/bodybags{ + pixel_y = 5 }, -/obj/effect/turf_decal/delivery, /obj/structure/window/reinforced{ dir = 8 }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) +"jXY" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green/opposingcorners, /turf/open/floor/iron, -/area/crew_quarters/kitchen/coldroom) +/area/maintenance/starboard/fore) +"jYG" = ( +/obj/item/instrument/accordion, +/obj/item/instrument/banjo, +/obj/item/instrument/bikehorn, +/obj/item/instrument/eguitar, +/obj/item/instrument/glockenspiel, +/obj/item/instrument/guitar, +/obj/item/instrument/harmonica, +/obj/item/instrument/musicalmoth, +/obj/item/instrument/piano_synth, +/obj/item/instrument/recorder, +/obj/item/instrument/saxophone, +/obj/item/instrument/trombone, +/obj/item/instrument/trumpet, +/obj/item/instrument/violin, +/obj/structure/closet/crate/wooden, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/firealarm/directional/east, +/obj/structure/sign/poster/contraband/clown{ + pixel_y = -32 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) "jYJ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -33182,6 +33868,23 @@ }, /turf/open/floor/iron/dark, /area/tcommsat/computer) +"jYP" = ( +/obj/machinery/door/airlock/grunge{ + name = "Morgue"; + req_one_access_txt = "6;4;29" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "quarantineshutters"; + name = "Quarantine Shutters" + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/medical/morgue) "jYS" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -33195,20 +33898,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/nuke_storage) -"jYV" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 1 - }, -/obj/machinery/camera/autoname/directional/south{ - network = list("ss13","engine") - }, -/turf/open/floor/engine, -/area/engine/engineering) "jYW" = ( /turf/open/floor/glass/reinforced, /area/science/nanite) @@ -33239,10 +33928,26 @@ broken = 1 }, /area/maintenance/starboard/aft) -"jZl" = ( -/obj/machinery/camera/directional/north, -/turf/open/floor/wood, -/area/crew_quarters/bar) +"jZp" = ( +/obj/machinery/button/door{ + id = "quarantineshutters"; + name = "Quarantine Lockdown"; + pixel_x = 24; + req_access_txt = "39" + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/turf/open/floor/iron/white, +/area/medical/virology) +"jZx" = ( +/obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, +/obj/machinery/holopad{ + pixel_x = 16 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "jZP" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -33281,17 +33986,6 @@ }, /turf/open/floor/iron, /area/quartermaster/office) -"kbe" = ( -/obj/structure/table, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" - }, -/obj/effect/loot_jobscale/medical/medkits, -/turf/open/floor/iron/white, -/area/medical/storage) "kbn" = ( /obj/machinery/door/window{ base_state = "leftsecure"; @@ -33324,18 +34018,15 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"kbO" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/head/hats/tophat, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"kbR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +"kbW" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "kch" = ( /turf/closed/wall/r_wall, /area/quartermaster/exploration_prep) @@ -33363,13 +34054,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"kcC" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "kcG" = ( /obj/machinery/telecomms/processor/preset_three, /turf/open/floor/circuit/green/telecomms, @@ -33384,11 +34068,39 @@ "kcM" = ( /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) +"kcQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "kdn" = ( /obj/effect/turf_decal/box/corners, /obj/machinery/camera/autoname/directional/east, /turf/open/floor/engine, /area/science/explab) +"kdx" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 8 + }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hydroponics) "kdD" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -33410,6 +34122,26 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"kdQ" = ( +/obj/machinery/door/airlock/research{ + name = "Toxins Launch Room"; + req_access_txt = "7" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron, +/area/science/mixing) "keg" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -33428,6 +34160,15 @@ }, /turf/open/floor/plating, /area/maintenance/fore) +"keh" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hydroponics) "keR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, @@ -33443,21 +34184,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/heads/captain) -"kff" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/sign/warning/securearea{ - pixel_y = -32 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/aft) "kfk" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -33467,6 +34193,19 @@ dir = 8 }, /area/crew_quarters/dorms) +"kfp" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "kfB" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -33474,17 +34213,23 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) -"kfH" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/spawner/xmastree, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +"kfS" = ( +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/aft) "kgL" = ( /obj/structure/reagent_dispensers/watertank, /obj/machinery/light/small{ @@ -33519,12 +34264,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/space, /area/maintenance/disposal/incinerator) -"khg" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "khn" = ( /obj/machinery/rnd/production/protolathe/department/engineering, /obj/effect/turf_decal/tile/yellow{ @@ -33550,6 +34289,10 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) +"khB" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron, +/area/hallway/primary/central) "khO" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -33559,6 +34302,18 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) +"kiZ" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) +"kjj" = ( +/obj/machinery/vending/boozeomat, +/turf/closed/wall, +/area/crew_quarters/bar) "kjp" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Office"; @@ -33600,10 +34355,23 @@ }, /turf/open/floor/engine, /area/gateway) -"klA" = ( -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/cryo) +"kll" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) +"klE" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "klN" = ( /obj/effect/turf_decal/tile/dark_blue{ dir = 4 @@ -33622,6 +34390,19 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/plating, /area/maintenance/port/aft) +"kmr" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/white, +/area/medical/surgery) "kmA" = ( /obj/effect/turf_decal/siding/wideplating_new/dark, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -33640,6 +34421,26 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) +"kmG" = ( +/obj/machinery/requests_console{ + department = "Kitchen"; + departmentType = 2; + pixel_y = 30 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/chem_master/condimaster{ + desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; + name = "HoochMaster Deluxe"; + pixel_x = -4 + }, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) +"kmK" = ( +/obj/machinery/camera/autoname{ + dir = 6 + }, +/turf/open/floor/carpet/green, +/area/medical/exam_room) "kmL" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -33694,36 +34495,6 @@ /obj/structure/reagent_dispensers/peppertank/directional/north, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"kmU" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/research{ - name = "Genetics Research Access"; - req_access_txt = "9" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/maintenance/aft) -"knn" = ( -/mob/living/simple_animal/pet/dog/corgi/Ian, -/obj/effect/turf_decal/siding/wood, -/obj/structure/bed/dogbed/ian, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/light_switch{ - pixel_x = 27 - }, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/wood, -/area/crew_quarters/heads/hop) "kns" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -33768,6 +34539,15 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/locker) +"knU" = ( +/obj/structure/closet/secure_closet/personal/patient, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "koe" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -33829,12 +34609,22 @@ /obj/machinery/light/small, /turf/open/floor/engine/n2, /area/engine/atmos) +"kph" = ( +/obj/machinery/camera/directional/north{ + network = list("ss13","rd") + }, +/turf/open/floor/engine, +/area/science/explab) "kpk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) +"kpy" = ( +/obj/machinery/processor, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "kpH" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -33847,27 +34637,39 @@ }, /turf/open/floor/prison/dark, /area/security/prison) -"kqm" = ( -/obj/structure/table/glass, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +"kqk" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted, +/obj/machinery/seed_extractor, +/turf/open/floor/iron, +/area/hydroponics) +"kqv" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/item/book/manual/wiki/sopcommand, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) +/obj/effect/turf_decal/stripes, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "kqw" = ( /obj/structure/disposalpipe/segment{ dir = 6 }, /turf/closed/wall, /area/maintenance/starboard/aft) +"kqx" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/catwalk_floor/iron, +/area/engine/atmos) "kqP" = ( /obj/item/radio/intercom{ pixel_y = 25 @@ -33881,16 +34683,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"krd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/closet/firecloset, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "krJ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -33913,6 +34705,66 @@ }, /turf/open/floor/iron, /area/science/storage) +"krR" = ( +/obj/item/clothing/glasses/science{ + pixel_x = 10; + pixel_y = 12 + }, +/obj/item/reagent_containers/dropper{ + pixel_x = -6; + pixel_y = 11 + }, +/obj/item/reagent_containers/dropper{ + pixel_x = -6; + pixel_y = 11 + }, +/obj/structure/table/glass, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/item/clothing/glasses/science{ + pixel_x = 10; + pixel_y = 12 + }, +/obj/item/assembly/timer{ + pixel_x = 10; + pixel_y = -3 + }, +/obj/item/assembly/timer{ + pixel_x = 9; + pixel_y = -3 + }, +/obj/item/assembly/timer{ + pixel_x = 9; + pixel_y = -3 + }, +/obj/item/assembly/timer{ + pixel_x = 9; + pixel_y = -3 + }, +/obj/item/assembly/igniter{ + pixel_x = -7; + pixel_y = -2 + }, +/obj/item/assembly/igniter{ + pixel_x = -7; + pixel_y = -2 + }, +/obj/item/assembly/igniter{ + pixel_x = -7; + pixel_y = -2 + }, +/obj/item/assembly/igniter{ + pixel_x = -7; + pixel_y = -2 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron/white, +/area/medical/apothecary) "krW" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -33992,16 +34844,24 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/hallway/primary/aft) -"ksO" = ( +"ksS" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /obj/structure/disposalpipe/segment{ - dir = 5 + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "ksU" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -34012,12 +34872,31 @@ }, /turf/open/floor/prison, /area/security/prison) +"kta" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "ktb" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"ktd" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/medical/morgue) "kte" = ( /obj/structure/chair{ dir = 1 @@ -34026,24 +34905,17 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron/dark, /area/security/brig) -"ktp" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, +"ktv" = ( +/obj/structure/chair/office/light, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 + dir = 9 }, -/obj/machinery/light{ - dir = 4 +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, /turf/open/floor/iron/white, -/area/medical/virology) +/area/medical/genetics) "kty" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -34060,23 +34932,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/science/robotics/lab) -"ktB" = ( -/obj/structure/chair/stool/directional/west, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/prison, -/area/security/prison) "ktF" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment{ @@ -34084,6 +34939,15 @@ }, /turf/open/space/basic, /area/space/nearstation) +"ktH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/hydroponics) "ktK" = ( /obj/machinery/door/airlock/public/glass{ name = "Dormitory" @@ -34137,6 +35001,26 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/virology) +"kuS" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/security/checkpoint/medical) +"kve" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/vending/medical{ + pixel_x = -2 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "kvi" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -34146,6 +35030,11 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) +"kvq" = ( +/obj/machinery/gibber, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "kvF" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -34174,6 +35063,24 @@ /obj/item/xenoartifact, /turf/open/floor/iron/white, /area/science/explab) +"kvS" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "kwh" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -34201,6 +35108,19 @@ }, /turf/open/floor/iron, /area/science/mixing) +"kwB" = ( +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/obj/effect/turf_decal/tile/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "kwK" = ( /obj/structure/table/reinforced, /obj/item/assembly/igniter{ @@ -34221,21 +35141,19 @@ }, /turf/open/floor/iron/white, /area/science/mixing) -"kwW" = ( -/obj/machinery/door/airlock/medical{ - name = "Autopsy Room A"; - req_access_txt = "6;5" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/dark, -/area/medical/morgue) "kxG" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, /turf/open/floor/iron/dark, /area/security/main) +"kxR" = ( +/obj/machinery/smartfridge/organ, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/surgery) "kys" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron, @@ -34277,22 +35195,27 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"kzi" = ( -/obj/machinery/airalarm/server{ - dir = 8; - pixel_x = -22 +"kzk" = ( +/obj/structure/chair/fancy/sofa/old/left{ + dir = 4 }, -/obj/machinery/light/small{ - dir = 8 +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, -/turf/open/floor/iron/dark/telecomms, -/area/science/server) -"kzn" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +/turf/open/floor/carpet/green, +/area/crew_quarters/bar/atrium) +"kzC" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/captain) "kzD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, @@ -34311,6 +35234,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/detectives_office) +"kAh" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "kAi" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -34330,12 +35261,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/crew_quarters/dorms) -"kAz" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "kAD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -34353,23 +35278,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) -"kBF" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/aft) "kBL" = ( /obj/effect/turf_decal/siding/wideplating_new{ dir = 8 @@ -34387,6 +35295,28 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/security/brig) +"kBS" = ( +/turf/open/floor/carpet/green, +/area/medical/exam_room) +"kCc" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","engine") + }, +/turf/open/floor/engine, +/area/engine/engineering) "kCf" = ( /obj/machinery/airalarm/directional/north{ pixel_y = 25 @@ -34487,50 +35417,12 @@ }, /turf/open/floor/iron/grid/steel, /area/teleporter) -"kDP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "kEj" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Distro to Waste" }, /turf/open/floor/iron, /area/engine/atmos) -"kEq" = ( -/obj/structure/chair/office/light, -/obj/effect/landmark/start/chief_medical_officer, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) -"kEB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"kEC" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/turf/open/floor/iron, -/area/hallway/secondary/service) "kEM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -34575,6 +35467,14 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"kFl" = ( +/obj/effect/landmark/start/medical_doctor, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/chair/fancy/corp, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "kFm" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -34582,6 +35482,25 @@ }, /turf/open/floor/plating, /area/storage/tech) +"kFv" = ( +/obj/effect/turf_decal/box, +/obj/machinery/door/window/westleft{ + name = "plumbing factory duct access"; + red_alert_access = 1; + req_access_txt = "5; 33"; + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/plumbing/output{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/storage) "kFw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -34591,6 +35510,11 @@ }, /turf/open/floor/iron, /area/science/nanite) +"kFE" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "kFU" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Laser Room"; @@ -34606,6 +35530,40 @@ /obj/machinery/door/firedoor, /turf/open/floor/engine, /area/engine/engineering) +"kGk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Dormitories Maintenance"; + req_access_txt = "12" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) +"kGB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "kGH" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -34637,6 +35595,16 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/carpet/grimy, /area/security/brig) +"kGX" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "kHh" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -34655,6 +35623,14 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/teleporter) +"kHr" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/medical/morgue) "kHz" = ( /obj/item/radio/intercom{ pixel_y = 20 @@ -34664,18 +35640,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"kHF" = ( -/obj/machinery/light_switch{ - pixel_x = -28 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "kHG" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 @@ -34704,6 +35668,27 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) +"kIg" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/vending/medical, +/turf/open/floor/iron/dark, +/area/medical/surgery) +"kIz" = ( +/obj/machinery/iv_drip, +/obj/structure/bed/roller, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) +"kIB" = ( +/obj/effect/turf_decal/trimline/dark_red/line, +/obj/effect/turf_decal/trimline/white/corner{ + dir = 4 + }, +/turf/open/floor/wood/big, +/area/maintenance/aft) "kIF" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -34745,18 +35730,42 @@ }, /turf/open/floor/iron, /area/quartermaster/miningdock) +"kIP" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/chair/fancy/sofa/corp{ + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/crew_quarters/bar/atrium) +"kIY" = ( +/obj/structure/table, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = 7 + }, +/obj/item/storage/backpack/duffelbag/med/implant, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/surgery) "kJe" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/quartermaster/exploration_prep) -"kJp" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +"kJk" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 + dir = 1 }, -/turf/open/floor/iron/white, -/area/medical/genetics) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail/flip{ + sortType = 24 + }, +/turf/open/floor/iron, +/area/science/mixing) "kJu" = ( /obj/machinery/door/window/eastright{ base_state = "left"; @@ -34833,6 +35842,17 @@ dir = 9 }, /area/science/research) +"kKx" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/fore) "kKK" = ( /obj/structure/rack, /obj/item/storage/box/rubbershot{ @@ -34862,20 +35882,16 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"kKN" = ( -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/gun/ballistic/shotgun/doublebarrel, -/obj/structure/table/wood, -/obj/item/stack/spacecash/c10, -/obj/item/stack/spacecash/c100, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 +"kKW" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/machinery/door/airlock{ + id_tag = "Toilet1"; + name = "Toilet Unit #1" }, -/turf/open/floor/wood, -/area/crew_quarters/bar) +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "kLd" = ( /obj/machinery/power/apc/auto_name/directional/south{ pixel_y = -24 @@ -34904,17 +35920,6 @@ }, /turf/open/floor/iron, /area/quartermaster/qm) -"kMc" = ( -/obj/machinery/door/window/westleft{ - name = "plumbing factory duct access"; - red_alert_access = 1; - req_access_txt = "5; 33" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "kMl" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/dark_blue, @@ -34958,26 +35963,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"kMQ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/iron, -/area/hydroponics) -"kMV" = ( -/obj/machinery/computer/secure_data{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "kMX" = ( /obj/structure/window/reinforced{ dir = 1; @@ -34990,6 +35975,15 @@ }, /turf/open/floor/iron/freezer, /area/medical/virology) +"kNg" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/cell_charger, +/obj/structure/table, +/obj/item/stock_parts/cell/high/plus, +/turf/open/floor/iron/white, +/area/medical/chemistry) "kNn" = ( /obj/machinery/light{ dir = 4 @@ -35012,23 +36006,18 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"kNI" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +"kNz" = ( +/obj/structure/table/glass, +/obj/item/pen, +/obj/item/clothing/neck/stethoscope, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/crew_quarters/theatre) +/mob/living/simple_animal/pet/cat/Runtime, +/obj/item/book/manual/wiki/sopmedical, +/obj/effect/turf_decal/tile/dark_blue, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "kNO" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -35120,6 +36109,12 @@ /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass, /area/hallway/secondary/command) +"kPQ" = ( +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "kPV" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "hopshutter"; @@ -35131,17 +36126,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/hop) -"kPZ" = ( -/obj/effect/landmark/xeno_spawn, -/obj/item/bikehorn/rubberducky, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) "kQa" = ( /obj/item/clipboard{ pixel_y = 7 @@ -35163,6 +36147,10 @@ }, /turf/open/floor/carpet/grimy, /area/vacant_room/office) +"kQe" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "kQk" = ( /obj/machinery/airalarm/directional/north{ pixel_y = 23 @@ -35192,6 +36180,28 @@ }, /turf/open/floor/iron, /area/science/robotics/mechbay) +"kRe" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/machinery/vending/cigarette, +/obj/structure/sign/poster/contraband/lusty_xenomorph{ + pixel_y = 32 + }, +/obj/structure/sign/poster/contraband/have_a_puff{ + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) +"kRh" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/iron, +/area/maintenance/aft) "kRq" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -35212,14 +36222,6 @@ }, /turf/open/floor/iron/dark, /area/security/warden) -"kRy" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/hydroponics) "kRz" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -35227,6 +36229,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/engineering) +"kRC" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/surgery) "kRI" = ( /turf/open/floor/carpet/grimy, /area/chapel/office) @@ -35253,6 +36262,9 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) +"kSk" = ( +/turf/open/floor/iron, +/area/crew_quarters/fitness) "kSu" = ( /obj/structure/table/wood, /obj/item/storage/crayons, @@ -35291,6 +36303,15 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) +"kSJ" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "kSK" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -35318,6 +36339,18 @@ }, /turf/open/space/basic, /area/space) +"kTN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "kTY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -35335,6 +36368,19 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) +"kUi" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/button/door/directional/north{ + id = "maint3"; + name = "Blast Door Control C" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "kUk" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/general/visible, @@ -35355,15 +36401,12 @@ }, /turf/open/floor/iron/dark, /area/chapel/office) -"kUw" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 +"kUB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/area/engine/atmos) +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "kUE" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -35396,15 +36439,6 @@ }, /turf/open/floor/iron, /area/quartermaster/exploration_dock) -"kVI" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen"; - name = "kitchen shutters" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "kVJ" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -35454,25 +36488,14 @@ }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) -"kVZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) -"kWa" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/medical/virology) +"kVS" = ( +/obj/structure/closet/crate, +/obj/item/food/canned/beans, +/obj/item/food/canned/beans, +/obj/item/food/canned/beans, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "kWu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -35535,19 +36558,59 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"kYi" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +"kYh" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/wood, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) +"kYS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/vending/wallmed{ + name = "Emergency NanoMed"; + pixel_y = -27; + use_power = 0 + }, +/obj/structure/bed/roller, +/obj/machinery/camera{ + c_tag = "Security - Medbay"; + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/techmaint, +/area/security/brig) "kYY" = ( /obj/machinery/washing_machine, /obj/effect/turf_decal/bot, /turf/open/floor/prison, /area/security/prison) +"kZy" = ( +/obj/effect/turf_decal/tile/white, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "kZO" = ( /obj/machinery/door/airlock/command{ name = "Head of Personnel"; @@ -35607,16 +36670,6 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/dorms) -"lag" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "laO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/camera/autoname/directional/east, @@ -35628,10 +36681,39 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) +"laP" = ( +/obj/machinery/door/poddoor/preopen{ + id = "maint1" + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/fore) +"lbf" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/prison, +/area/security/prison) "lbh" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, /area/medical/virology) +"lbz" = ( +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "lbA" = ( /obj/structure/sign/warning/vacuum/external{ pixel_x = -32 @@ -35660,11 +36742,29 @@ }, /turf/open/floor/iron/dark, /area/science/nanite) +"lcs" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/crew_quarters/theatre/backstage) "lcy" = ( /turf/open/floor/plating{ broken = 1 }, /area/maintenance/port/fore) +"lcT" = ( +/obj/effect/landmark/start/assistant, +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron, +/area/storage/primary) "lcX" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 @@ -35672,6 +36772,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) +"lcZ" = ( +/obj/structure/bookcase/random, +/obj/machinery/airalarm/directional/north{ + pixel_y = 23 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain/private) "ldd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -35679,15 +36786,6 @@ }, /turf/open/floor/plating, /area/storage/tech) -"ldf" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -31 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "ldn" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -35723,6 +36821,21 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/medical/medbay/central) +"ldH" = ( +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 10 + }, +/turf/open/floor/wood/big, +/area/maintenance/aft) +"ldN" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/engine/atmos) "ldU" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 @@ -35816,21 +36929,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) -"lhC" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"lhK" = ( -/obj/effect/landmark/start/paramedic, -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "lhM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -35943,6 +37041,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/gravity_generator) +"liU" = ( +/obj/structure/bed, +/obj/item/bedsheet/clown, +/obj/effect/landmark/start/clown, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre/backstage) "ljg" = ( /obj/structure/chair/fancy/comfy{ color = "#666666" @@ -36011,6 +37118,10 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) +"lkz" = ( +/obj/machinery/suit_storage_unit/captain, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain/private) "lkE" = ( /obj/structure/sink{ dir = 8; @@ -36097,10 +37208,12 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"lme" = ( -/obj/effect/spawner/randomvend/cola, -/turf/open/floor/wood, -/area/crew_quarters/bar) +"lmm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "lmn" = ( /obj/structure/disposalpipe/junction/flip{ dir = 4 @@ -36123,12 +37236,16 @@ }, /turf/open/floor/iron, /area/security/brig) -"lmy" = ( -/obj/machinery/camera/directional/north, -/turf/open/floor/iron/white/corner{ +"lmv" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + name = "Connector Port (Air Supply)" + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/light{ dir = 1 }, -/area/hallway/primary/starboard) +/turf/open/floor/iron/dark, +/area/medical/cryo) "lmF" = ( /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 @@ -36152,15 +37269,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) -"lmH" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "lna" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -36201,39 +37309,26 @@ }, /turf/open/floor/plating, /area/engine/atmos) -"lnD" = ( -/obj/structure/chair/office, -/turf/open/floor/iron/dark, -/area/security/warden) -"lnJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"lnB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, /turf/open/floor/iron/white, -/area/medical/medbay/central) -"lnK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) +/area/medical/genetics) +"lnD" = ( +/obj/structure/chair/office, +/turf/open/floor/iron/dark, +/area/security/warden) "lnP" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -36274,16 +37369,6 @@ /obj/effect/turf_decal/siding/thinplating_new, /turf/open/floor/iron, /area/hallway/secondary/entry) -"lok" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "lom" = ( /obj/machinery/door/airlock/command/glass{ name = "Chief Engineer"; @@ -36303,20 +37388,41 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/crew_quarters/heads/chief) -"loN" = ( -/obj/structure/chair, -/obj/machinery/light{ +"loo" = ( +/obj/effect/decal/cleanable/generic, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/landmark/start/assistant, +/obj/structure/chair/fancy/sofa/old/left{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/bar/atrium) +"loD" = ( +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_y = 7 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = 7; + pixel_y = 7 }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/item/storage/pill_bottle/mannitol, +/obj/structure/table/glass, +/turf/open/floor/iron/dark, +/area/medical/cryo) +"loR" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "loU" = ( /obj/structure/table/glass, /obj/item/hatchet, @@ -36349,12 +37455,15 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) -"lpZ" = ( -/obj/structure/chair/stool{ - pixel_y = 8 +"lpS" = ( +/obj/structure/bed, +/obj/item/bedsheet/mime, +/obj/effect/landmark/start/mime, +/obj/machinery/light/small{ + dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/turf/open/floor/wood, +/area/crew_quarters/theatre/backstage) "lqg" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -36397,14 +37506,6 @@ /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, /area/quartermaster/miningdock) -"lqD" = ( -/obj/effect/turf_decal/tile/green/half/contrasted, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron, -/area/crew_quarters/fitness) "lqE" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 5 @@ -36413,39 +37514,11 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"lqG" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/sign/warning/deathsposal{ - pixel_x = -32 - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/white, -/area/medical/virology) "lqJ" = ( /obj/structure/table/wood, /obj/item/flashlight/lantern, /turf/open/floor/iron/dark, /area/chapel/main) -"lqR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - name = "Security Junction"; - sortType = 7 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) "lrg" = ( /obj/structure/girder, /obj/structure/grille, @@ -36491,14 +37564,10 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"lto" = ( -/obj/machinery/airalarm/mixingchamber{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/door/firedoor, +"lsV" = ( +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, -/area/science/mixing/chamber) +/area/medical/medbay/lobby) "ltr" = ( /obj/item/kirbyplants/random, /obj/structure/cable/yellow{ @@ -36535,6 +37604,19 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall, /area/maintenance/disposal/incinerator) +"lum" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "lur" = ( /obj/machinery/magnetic_controller{ autolink = 1; @@ -36546,15 +37628,6 @@ }, /turf/open/floor/iron, /area/science/explab) -"luu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/chemistry) "lvf" = ( /obj/machinery/door/airlock/public/glass{ name = "Cell 3" @@ -36566,19 +37639,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/prison) -"lvq" = ( -/obj/machinery/button/door{ - id = "quarantineshutters"; - name = "Quarantine Lockdown"; - pixel_x = 24; - req_access_txt = "39" - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/turf/open/floor/iron/white, -/area/medical/virology) "lvx" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "MiniSat Maintenance"; @@ -36589,21 +37649,17 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) -"lvM" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +"lvS" = ( +/obj/structure/closet/crate/freezer/blood, +/obj/effect/turf_decal/bot, +/obj/structure/cable/yellow, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/dark, +/area/medical/storage) "lvX" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -36654,40 +37710,10 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"lxa" = ( -/obj/structure/table/glass, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/dropper, -/obj/item/hand_labeler, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "lxj" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/crew_quarters/locker) -"lxp" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/landmark/start/depsec/medical, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "lxt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -36704,6 +37730,21 @@ }, /turf/open/floor/iron, /area/security/brig) +"lxF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) +"lxI" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/structure/filingcabinet, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/wood, +/area/medical/exam_room) "lxL" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -36746,6 +37787,14 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) +"lyC" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/item/food/pie/cream, +/turf/open/floor/carpet/green, +/area/crew_quarters/bar/atrium) "lzi" = ( /obj/structure/window/reinforced{ dir = 8 @@ -36759,6 +37808,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) +"lzr" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "lzG" = ( /obj/machinery/light{ dir = 1 @@ -36768,6 +37823,19 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"lzK" = ( +/obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/medical/morgue) +"lzP" = ( +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "lzR" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/suit/burgundy, @@ -36776,12 +37844,6 @@ }, /turf/open/floor/carpet/orange, /area/crew_quarters/dorms) -"lAb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain) "lAd" = ( /obj/effect/landmark/blobstart, /obj/machinery/atmospherics/components/binary/pump{ @@ -36795,10 +37857,26 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/science/xenobiology) -"lAI" = ( +"lAD" = ( +/obj/effect/turf_decal/pool/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness) +"lAJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/obj/machinery/door/airlock{ + name = "Unisex Showers" + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/toilet) "lAK" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -36916,6 +37994,17 @@ /obj/structure/closet/firecloset, /turf/open/floor/iron, /area/engine/engineering) +"lBv" = ( +/obj/structure/bed/roller, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/medical/virology) "lBz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -36923,6 +38012,18 @@ }, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) +"lBC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "lBJ" = ( /obj/item/radio/intercom{ pixel_x = -25 @@ -36933,6 +38034,12 @@ }, /turf/open/floor/iron, /area/security/checkpoint/science) +"lBV" = ( +/obj/item/reagent_containers/glass/bucket, +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/tile/dark_green/half/contrasted, +/turf/open/floor/iron, +/area/hydroponics) "lBW" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -37000,22 +38107,6 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"lCW" = ( -/obj/machinery/door/airlock{ - name = "Kitchen cold room"; - req_access_txt = "28" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen) "lDg" = ( /obj/structure/cable{ icon_state = "1-2" @@ -37119,19 +38210,15 @@ }, /turf/open/floor/iron, /area/quartermaster/office) -"lGi" = ( -/obj/structure/table, -/obj/item/hand_labeler, -/obj/item/gun/syringe, -/obj/structure/extinguisher_cabinet{ - pixel_y = -31 +"lGD" = ( +/obj/machinery/computer/cargo/request{ + dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/item/crowbar, -/obj/item/book/manual/wiki/sopmedical, -/turf/open/floor/iron/white, +/turf/open/floor/iron/dark, /area/medical/storage) "lGV" = ( /obj/effect/turf_decal/stripes/line{ @@ -37218,15 +38305,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/gravity_generator) -"lJv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/bodycontainer/morgue{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "lJA" = ( /obj/machinery/status_display/evac, /turf/closed/wall/r_wall, @@ -37247,6 +38325,18 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) +"lJF" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/cryo) "lJH" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -37260,23 +38350,6 @@ /obj/effect/loot_jobscale/armoury/disabler, /turf/open/floor/iron, /area/ai_monitored/security/armory) -"lKm" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "barShutters"; - name = "bar shutters"; - pixel_x = 4; - pixel_y = 28 - }, -/obj/machinery/light_switch{ - pixel_x = -6; - pixel_y = 26 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "lKH" = ( /obj/structure/chair/office{ dir = 1 @@ -37295,6 +38368,19 @@ }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) +"lKT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron/white, +/area/medical/apothecary) +"lKU" = ( +/obj/structure/holohoop{ + dir = 8 + }, +/turf/open/floor/wood/big, +/area/maintenance/aft) "lKX" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, @@ -37323,13 +38409,6 @@ }, /turf/open/floor/wood, /area/lawoffice) -"lLK" = ( -/obj/structure/table/reinforced, -/obj/structure/desk_bell{ - pixel_x = 8 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "lMa" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -37356,21 +38435,18 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/aisat/service) -"lMk" = ( -/obj/structure/disposalpipe/segment, +"lMx" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "lMB" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -37395,6 +38471,21 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"lMV" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/structure/closet/crate, +/obj/effect/turf_decal/bot, +/obj/item/knife, +/obj/item/paint/green, +/obj/item/pushbroom, +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/iron, +/area/hallway/secondary/service) "lMZ" = ( /obj/machinery/power/solar_control{ id = "auxsolareast"; @@ -37444,33 +38535,24 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"lOa" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "lOe" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/central) -"lOh" = ( -/obj/machinery/light/small, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "lOA" = ( /obj/structure/filingcabinet{ pixel_x = 8 }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) -"lOF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/structure/reagent_dispensers/peppertank/directional/east, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "lPH" = ( /obj/structure/dresser, /turf/open/floor/carpet/orange, @@ -37501,10 +38583,37 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) +"lQd" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Storage"; + req_access_txt = "5" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, +/area/medical/break_room) "lQt" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/science/mixing) +"lQu" = ( +/obj/structure/chair/stool/directional/south, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "lQv" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/structure/cable/yellow{ @@ -37552,6 +38661,21 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/captain) +"lSx" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/engine, +/area/engine/engineering) "lTj" = ( /obj/machinery/power/apc/auto_name/directional/south{ pixel_y = -24 @@ -37571,13 +38695,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"lTB" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/vending/wardrobe/chef_wardrobe, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "lTL" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -37587,19 +38704,6 @@ }, /turf/open/floor/wood, /area/library) -"lTO" = ( -/obj/machinery/computer/operating{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "lUw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -37623,12 +38727,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/aisat/atmos) -"lUQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "lUX" = ( /obj/structure/closet{ name = "Evidence Closet" @@ -37656,6 +38754,11 @@ }, /turf/open/floor/iron/techmaint, /area/security/prison) +"lVX" = ( +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "lWt" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -37687,6 +38790,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/gateway) +"lWM" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "lWQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -37696,13 +38807,6 @@ }, /turf/open/floor/iron, /area/ai_monitored/security/armory) -"lWX" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hydroponics) "lXJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37733,44 +38837,6 @@ }, /turf/open/floor/iron, /area/tcommsat/computer) -"lYs" = ( -/obj/structure/lattice, -/obj/machinery/camera/autoname/directional/east{ - network = list("ss13","minisat") - }, -/turf/open/space, -/area/space/nearstation) -"lYu" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/iron, -/area/hallway/secondary/service) -"lYy" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - sortType = 18 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "lYS" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -37787,14 +38853,22 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"lZj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +"lYV" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/turf/open/floor/iron/white, -/area/medical/genetics) +/obj/structure/cable/yellow, +/obj/structure/table, +/obj/structure/bedsheetbin, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/structure/cable/yellow, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "lZw" = ( /obj/machinery/light{ dir = 8 @@ -37832,17 +38906,14 @@ }, /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) -"maL" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +"maS" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "maW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -37853,21 +38924,6 @@ }, /turf/open/floor/iron, /area/quartermaster/warehouse) -"mbn" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/maintenance/fore) "mbo" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -37917,6 +38973,40 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/janitor) +"mcS" = ( +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Head of Security's Desk"; + departmentType = 5; + name = "Head of Security RC"; + pixel_y = 30 + }, +/obj/structure/table/wood, +/obj/item/storage/box/seccarts{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/storage/box/deputy, +/obj/item/toy/figure/hos, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Head of Security's Desk"; + departmentType = 5; + name = "Head of Security RC"; + pixel_y = 30 + }, +/obj/structure/table/wood, +/obj/item/storage/box/seccarts{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/storage/box/deputy, +/obj/item/toy/figure/hos, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","security") + }, +/turf/open/floor/carpet/red, +/area/crew_quarters/heads/hos) "mcV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -37925,8 +39015,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/research) -"mdr" = ( -/obj/machinery/nuclearbomb/beer, +"mde" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mdu" = ( @@ -37970,17 +39068,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"mee" = ( -/obj/machinery/airalarm/directional/west{ - pixel_x = -22 - }, -/obj/structure/closet/crate/wooden/toy, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/theatre) "met" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -38047,6 +39134,13 @@ "mgt" = ( /turf/closed/wall, /area/crew_quarters/cryopods) +"mgv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/chair/stool/bar/directional/north, +/turf/open/floor/glass/reinforced, +/area/crew_quarters/bar/atrium) "mgE" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -38058,6 +39152,10 @@ }, /turf/open/floor/plating, /area/bridge/meeting_room) +"mgK" = ( +/obj/structure/closet/secure_closet/captains, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "mgQ" = ( /obj/machinery/door/airlock{ name = "Cyborg Recharging station" @@ -38087,6 +39185,22 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"mhw" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/machinery/newscaster{ + pixel_x = -30; + pixel_y = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "mia" = ( /obj/effect/turf_decal/bot_white, /turf/open/floor/engine/light, @@ -38168,10 +39282,6 @@ /obj/machinery/computer/warrant, /turf/open/floor/wood, /area/lawoffice) -"mjr" = ( -/obj/machinery/vending/wardrobe/bar_wardrobe, -/turf/open/floor/wood, -/area/crew_quarters/bar) "mjx" = ( /obj/machinery/firealarm{ dir = 1; @@ -38184,6 +39294,9 @@ dir = 4 }, /obj/machinery/light, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -38253,14 +39366,47 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"mkY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 +"mkR" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 4 + }, +/obj/machinery/light, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, /turf/open/floor/iron, -/area/hallway/primary/starboard) +/area/hydroponics) +"mkS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable/yellow, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable/yellow, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable/yellow, +/obj/machinery/camera/autoname/directional/east, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron, +/area/science/mixing/chamber) +"mkW" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "mls" = ( /obj/structure/table/wood, /obj/item/storage/crayons, @@ -38306,15 +39452,6 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"mmx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "mmy" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -38350,17 +39487,14 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) -"mnh" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" +"mnd" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/aft) +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron, +/area/hallway/primary/central) "mnn" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -38422,19 +39556,6 @@ }, /turf/closed/wall, /area/maintenance/aft) -"mos" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "mov" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -38444,6 +39565,23 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"moB" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock{ + name = "Service Hall"; + req_one_access_txt = "22;25;26;28;35;37;38;46" + }, +/turf/open/floor/iron/checker, +/area/hallway/secondary/service) "mpg" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room"; @@ -38451,19 +39589,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) -"mpm" = ( -/obj/machinery/door/poddoor/preopen{ - id = "maint3" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "mpr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38488,6 +39613,14 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) +"mqa" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/machinery/airalarm/directional/north, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/grass/no_border, +/area/medical/genetics) "mqh" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -38557,6 +39690,16 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"msJ" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/button/door/directional/north{ + id = "Toilet2"; + name = "Toilet Lock Button" + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "msO" = ( /obj/item/kirbyplants/random, /obj/machinery/power/apc/auto_name/directional/west{ @@ -38627,28 +39770,6 @@ /obj/effect/landmark/start/warden, /turf/open/floor/iron/dark, /area/security/warden) -"mtS" = ( -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics) -"mtZ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "muj" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -38667,39 +39788,17 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/security/prison) -"mvz" = ( -/obj/structure/table/reinforced, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"mvX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = -31 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) -"mvY" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +"muT" = ( +/obj/structure/table, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) +"mvI" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/aft) +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "mwi" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 1 @@ -38725,6 +39824,19 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"mwu" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "mxi" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -38743,6 +39855,18 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, /area/security/prison) +"myI" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "myL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -38787,6 +39911,13 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"mzV" = ( +/obj/effect/turf_decal/trimline/white/line, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 1 + }, +/turf/open/floor/wood/big, +/area/maintenance/aft) "mAa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -38799,12 +39930,32 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) +"mAc" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/port) "mAe" = ( /obj/structure/disposalpipe/segment{ dir = 6 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"mAf" = ( +/obj/machinery/vending/wallmed{ + name = "Emergency NanoMed"; + pixel_y = -27; + use_power = 0 + }, +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/surgery) "mAg" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 @@ -38961,6 +40112,31 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/fore) +"mCl" = ( +/obj/structure/table/wood, +/obj/item/lipstick/random{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/lipstick/random{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/flashlight/lamp/bananalamp{ + pixel_y = 3 + }, +/obj/item/toy/figure/clown{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/structure/mirror{ + pixel_y = 28 + }, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre/backstage) "mCy" = ( /obj/machinery/light_switch{ pixel_x = 25; @@ -39038,13 +40214,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/engine/light, /area/engine/gravity_generator) -"mEc" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/plating, -/area/crew_quarters/heads/cmo) "mEd" = ( /obj/machinery/advanced_airlock_controller{ dir = 8; @@ -39058,23 +40227,6 @@ }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) -"mEp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/medical/glass{ - name = "Plumbing Factory"; - req_access_txt = "5; 33" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/chemistry) "mEz" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/structure/filingcabinet/chestdrawer, @@ -39126,13 +40278,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) -"mGt" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "mGw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -39156,6 +40301,21 @@ }, /turf/open/floor/plating, /area/teleporter) +"mGN" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "mGR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/power/apc/auto_name/directional/east{ @@ -39267,13 +40427,33 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) -"mKA" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +"mKv" = ( +/obj/machinery/airalarm/server{ + dir = 4; + pixel_x = -22 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/iron/dark/telecomms, +/area/science/server) +"mKM" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ - dir = 1 + dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"mKP" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port) "mLo" = ( /obj/machinery/light_switch{ pixel_y = 28 @@ -39290,19 +40470,6 @@ }, /turf/open/floor/iron/solarpanel/airless, /area/solar/starboard/fore) -"mLt" = ( -/obj/machinery/airalarm/directional/north, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"mLG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/iron/white, -/area/medical/chemistry) "mLR" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/arrivals_external{ @@ -39338,6 +40505,18 @@ /obj/effect/landmark/blobstart, /turf/open/floor/engine, /area/science/explab) +"mNg" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 1 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 12; + pixel_y = 3 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/hydroponics) "mNm" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 8 @@ -39385,11 +40564,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) -"mNS" = ( -/obj/effect/landmark/event_spawn, -/obj/structure/chair/stool/bar/directional/south, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "mOf" = ( /obj/item/storage/box/bodybags, /obj/item/reagent_containers/syringe{ @@ -39504,12 +40678,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/security/warden) -"mQp" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "mQw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -39519,18 +40687,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"mQy" = ( -/obj/structure/table, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -3; - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "mQN" = ( /obj/machinery/status_display/evac{ pixel_x = 32 @@ -39589,6 +40745,15 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) +"mRO" = ( +/obj/structure/closet/secure_closet/medical3, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/storage) "mRT" = ( /obj/structure/table/wood, /obj/item/paper/fluff{ @@ -39620,19 +40785,6 @@ }, /turf/open/floor/plating, /area/storage/emergency/port) -"mSs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/iron/white, -/area/medical/cryo) -"mSX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "mTm" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -39644,6 +40796,19 @@ }, /turf/open/floor/iron/dark, /area/teleporter) +"mTz" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Fitness Maintenance"; + req_access_txt = "12" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "mTL" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -39677,22 +40842,6 @@ }, /turf/open/floor/iron, /area/science/mixing) -"mUm" = ( -/obj/structure/window/reinforced, -/mob/living/carbon/monkey, -/obj/effect/spawner/structure/window/reinforced, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/iron, -/area/medical/genetics) -"mUT" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/camera/directional/south, -/turf/open/floor/iron/white/corner, -/area/hallway/secondary/entry) "mUU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -39782,6 +40931,16 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) +"mWL" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/crew_quarters/theatre/backstage) "mXe" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -39809,11 +40968,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) -"mXl" = ( -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "mXu" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -39859,15 +41013,6 @@ }, /turf/open/floor/plating, /area/security/brig) -"mXU" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "mXY" = ( /obj/machinery/computer/security, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -39915,6 +41060,19 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) +"mYQ" = ( +/obj/structure/disposalpipe/junction/flip, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/airalarm/directional/west, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/white, +/area/medical/virology) "mYR" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" @@ -40025,24 +41183,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) -"nai" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"nal" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "naN" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -40106,22 +41246,6 @@ "ncb" = ( /turf/open/floor/carpet/grimy, /area/ai_monitored/turret_protected/aisat_interior) -"ncc" = ( -/obj/structure/table/glass, -/obj/item/folder/white, -/obj/item/stamp/cmo, -/obj/item/clothing/glasses/hud/health, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "ncy" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -40133,6 +41257,21 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) +"ncJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/medical/virology) +"ncP" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/vending/wardrobe/chef_wardrobe, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "ncX" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 @@ -40157,6 +41296,16 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) +"ndg" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) "ndh" = ( /obj/structure/table, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -40203,6 +41352,23 @@ }, /turf/open/floor/iron, /area/security/checkpoint/auxiliary) +"ndM" = ( +/obj/machinery/keycard_auth{ + pixel_x = 24 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/button/door{ + id = "quarantineshutters"; + name = "Quarantine Lockdown"; + pixel_x = 24; + pixel_y = -10; + req_access_txt = "39" + }, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "ndP" = ( /obj/structure/chair/fancy/sofa/old/right{ color = "#742925" @@ -40211,6 +41377,21 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/wood, /area/security/detectives_office) +"ndT" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "ndU" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -40232,6 +41413,11 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre) +"nez" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/chair/stool/bar/directional/north, +/turf/open/floor/glass/reinforced, +/area/crew_quarters/bar/atrium) "neC" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 @@ -40257,17 +41443,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) -"neT" = ( -/obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "nfd" = ( /obj/structure/table/reinforced, /obj/machinery/recharger{ @@ -40295,22 +41470,6 @@ /obj/machinery/teleport/hub, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) -"ngt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/obj/machinery/light/small, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "ngx" = ( /obj/machinery/power/terminal{ dir = 1 @@ -40325,16 +41484,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) -"ngG" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=2"; - freq = 1400; - location = "Kitchen" - }, -/obj/structure/plasticflaps/opaque, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/crew_quarters/kitchen/coldroom) "ngR" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -40356,16 +41505,14 @@ }, /turf/open/floor/iron/white, /area/security/brig) -"nht" = ( -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ +"nhK" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/obj/machinery/status_display/evac{ - pixel_x = -32 - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/dark, -/area/hallway/secondary/command) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "nhM" = ( /obj/structure/table, /obj/item/book/manual/wiki/xenoarchaeology, @@ -40406,10 +41553,24 @@ }, /turf/open/floor/iron, /area/quartermaster/office) -"niV" = ( -/obj/machinery/holopad, -/turf/open/floor/iron/dark, -/area/medical/surgery) +"njb" = ( +/obj/structure/cable/yellow, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/plating, +/area/maintenance/aft) +"njw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "njy" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -40447,12 +41608,6 @@ }, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) -"njT" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "nkq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -40505,21 +41660,27 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat/hallway) -"nlp" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "nlx" = ( /obj/structure/table, /obj/machinery/fax/cargo, /turf/open/floor/iron, /area/quartermaster/office) +"nly" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/tile/white, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/computer/operating{ + dir = 4 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "nlO" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -40539,6 +41700,14 @@ }, /turf/open/floor/iron, /area/quartermaster/office) +"nlS" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/wood, +/area/medical/break_room) "nmk" = ( /obj/machinery/airlock_sensor/incinerator_toxmix{ pixel_y = 24 @@ -40625,28 +41794,25 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"noD" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/light_switch{ - pixel_x = -22; - pixel_y = 1 - }, -/obj/machinery/airalarm/directional/west{ - pixel_x = -32 - }, -/turf/open/floor/iron/white, -/area/medical/virology) -"noE" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) "noK" = ( /obj/structure/girder, /turf/open/floor/iron/dark, /area/engine/engineering) +"noM" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/checker, +/area/maintenance/starboard/fore) "noN" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -40699,15 +41865,23 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) -"npd" = ( -/obj/structure/table/glass, -/obj/item/storage/backpack/duffelbag/med/surgery, +"npm" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/camera/directional/south, +/obj/machinery/light_switch{ + pixel_y = -25 + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) +"npq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, /obj/effect/turf_decal/tile/blue{ - dir = 8 + dir = 1 }, -/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, -/area/medical/morgue) +/area/medical/storage) "npw" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -40809,14 +41983,14 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/vacant_room/commissary) -"nrJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 +"nrO" = ( +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/structure/table/optable, +/obj/machinery/light_switch{ + pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/medical/genetics) +/turf/open/floor/iron/dark, +/area/medical/morgue) "nso" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -40852,6 +42026,32 @@ }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) +"nsI" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/camera/motion/directional/east{ + network = list("aiupload") + }, +/obj/item/kirbyplants/photosynthetic{ + layer = 3.1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/ai_monitored/turret_protected/ai_upload) "nti" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -40877,16 +42077,6 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) -"ntB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "ntQ" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -40897,6 +42087,16 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, /area/security/execution/transfer) +"ntV" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 1 + }, +/obj/machinery/chem_master/condimaster{ + desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments."; + name = "BrewMaster 2199" + }, +/turf/open/floor/iron, +/area/hydroponics) "ntX" = ( /obj/machinery/atmospherics/components/binary/valve/digital{ name = "Waste Release" @@ -40915,6 +42115,23 @@ /obj/effect/turf_decal/arrows, /turf/open/floor/iron, /area/security/brig) +"nue" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) +"nup" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/carpet/grimy, +/area/crew_quarters/bar) "nux" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -40935,18 +42152,6 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"nuF" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "nuK" = ( /obj/effect/landmark/start/assistant, /obj/effect/landmark/event_spawn, @@ -40969,11 +42174,11 @@ }, /turf/open/floor/iron, /area/vacant_room/commissary) -"nvn" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/camera/directional/north, -/turf/open/floor/iron/dark, -/area/hydroponics) +"nvm" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/plating/dirt/jungle, +/area/medical/genetics) "nvN" = ( /obj/structure/chair/office{ dir = 4 @@ -40981,19 +42186,6 @@ /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron, /area/engine/atmos) -"nvQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/holopad, -/obj/structure/closet/secure_closet/medicaldanger{ - anchored = 1 - }, -/obj/item/gun/syringe, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "nvT" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -41050,23 +42242,19 @@ }, /turf/open/floor/iron, /area/crew_quarters/locker) -"nws" = ( -/obj/machinery/door/window/eastleft{ - dir = 2; - name = "Medical Delivery"; - req_access_txt = "5" +"nwu" = ( +/obj/machinery/holopad{ + pixel_y = -16 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/tile/white, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/storage) +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "nxj" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -41142,6 +42330,21 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"nyQ" = ( +/obj/machinery/door/firedoor, +/obj/structure/curtain, +/obj/effect/turf_decal/caution/stand_clear, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/cryo) "nyR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -41169,13 +42372,22 @@ }, /turf/open/floor/iron/dark/side, /area/engine/atmos) -"nAK" = ( -/obj/machinery/newscaster{ - pixel_y = -28 +"nzX" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"nAF" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "nAP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -41317,17 +42529,6 @@ /obj/item/flashlight/lamp, /turf/open/floor/iron/dark, /area/security/brig) -"nCW" = ( -/obj/structure/disposalpipe/segment, -/obj/item/radio/intercom{ - pixel_x = 25 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "nCY" = ( /obj/structure/table, /obj/machinery/fax/eng, @@ -41344,6 +42545,19 @@ /obj/structure/closet/secure_closet/engineering_personal, /turf/open/floor/iron, /area/engine/engineering) +"nDi" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "nDl" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -41356,33 +42570,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"nDv" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/table, -/obj/item/reagent_containers/hypospray/medipen/dexalin{ - pixel_x = -5; - pixel_y = -2 - }, -/obj/item/reagent_containers/hypospray/medipen/dexalin{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/storage/pill_bottle/epinephrine{ - pixel_x = 10; - pixel_y = 5 - }, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/dropper, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "nDF" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -41393,38 +42580,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/engine, /area/engine/engineering) -"nDS" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/machinery/light/small, -/obj/machinery/newscaster{ - pixel_x = 32 - }, -/obj/machinery/button/door{ - id = "Toilet1"; - name = "Lock Control"; - normaldoorcontrol = 1; - pixel_x = -24; - specialfunctions = 4 - }, -/obj/machinery/button/door{ - id = "Toilet1"; - name = "Lock Control"; - normaldoorcontrol = 1; - pixel_y = 24; - specialfunctions = 4 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) -"nDU" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Surgery Observation" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark, -/area/medical/surgery) "nEc" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -41464,14 +42619,6 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"nEm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/closet/emcloset, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "nEu" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/blue{ @@ -41543,13 +42690,18 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) -"nFD" = ( -/obj/machinery/suit_storage_unit/cmo, -/obj/effect/turf_decal/tile/blue/opposingcorners{ +"nFA" = ( +/obj/machinery/light, +/obj/machinery/cryopod{ dir = 1 }, +/obj/machinery/computer/cryopod{ + pixel_x = -31; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) +/area/medical/patients_rooms) "nFI" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -41586,36 +42738,34 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"nGk" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +"nGa" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet/grimy, -/area/chapel/office) -"nGo" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/fitness) -"nGr" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/light_switch{ + pixel_y = -25 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 }, +/turf/open/floor/iron, +/area/crew_quarters/fitness) +"nGk" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/carpet/grimy, +/area/chapel/office) "nGx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -41634,6 +42784,27 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) +"nGC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) +"nGG" = ( +/obj/effect/landmark/start/medical_doctor, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/storage) +"nGJ" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "nHi" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, @@ -41667,11 +42838,6 @@ }, /turf/open/floor/iron/dark, /area/security/warden) -"nIJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/medical/genetics) "nIK" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -41679,6 +42845,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/central) +"nIQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "nJl" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -41688,10 +42863,6 @@ }, /turf/open/floor/wood, /area/library) -"nJp" = ( -/obj/machinery/camera/directional/east, -/turf/open/floor/iron, -/area/hallway/primary/central) "nJq" = ( /obj/structure/chair/fancy/comfy{ color = "#742925" @@ -41738,15 +42909,6 @@ /obj/item/assembly/signaler, /turf/open/floor/iron/dark, /area/bridge) -"nKn" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/engine/atmos) "nKD" = ( /obj/machinery/light/small{ dir = 4 @@ -41757,15 +42919,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/storage/art) -"nKE" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "nKI" = ( /obj/machinery/advanced_airlock_controller{ pixel_y = 24 @@ -41797,16 +42950,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) -"nKQ" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) "nKT" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -41898,6 +43041,25 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/engine/engineering) +"nNF" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance{ + name = "Kitchen Maintenance"; + req_access_txt = "28" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "nNL" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -41918,12 +43080,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"nNY" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) "nOb" = ( /obj/structure/closet/l3closet/scientist, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -41938,6 +43094,19 @@ /obj/structure/closet/firecloset, /turf/open/floor/iron/dark, /area/science/nanite) +"nOq" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "nOH" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -41948,6 +43117,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron, /area/crew_quarters/fitness) "nOS" = ( @@ -41978,6 +43150,13 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) +"nPq" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "nPr" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -42000,35 +43179,20 @@ }, /turf/open/floor/plating, /area/hallway/primary/central) -"nPC" = ( -/obj/structure/closet/secure_closet/freezer/cream_pie, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/theatre) -"nPP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"nPX" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate/hydroponics, +/obj/item/clothing/head/utility/beekeeper_head, +/obj/item/clothing/suit/utility/beekeeper_suit, +/obj/item/clothing/mask/vape, +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ dir = 1 }, -/obj/effect/landmark/start/medical_doctor, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/medical/storage) -"nQd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/machinery/light_switch{ + pixel_y = 28 }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) +/turf/open/floor/iron, +/area/hydroponics) "nQy" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -42063,19 +43227,6 @@ }, /turf/open/floor/iron, /area/engine/break_room) -"nQV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "nQW" = ( /obj/structure/table/wood, /obj/item/clothing/under/misc/burial, @@ -42098,19 +43249,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness) -"nRm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"nRo" = ( -/obj/structure/chair, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "nRu" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -42136,6 +43274,47 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, /turf/open/space, /area/space/nearstation) +"nRK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) +"nRV" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 8 + }, +/obj/machinery/requests_console{ + department = "Hydroponics"; + departmentType = 2; + pixel_y = 30 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hydroponics) +"nSq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "nSt" = ( /obj/machinery/airalarm/directional/west{ pixel_x = -22 @@ -42161,26 +43340,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"nSG" = ( -/obj/machinery/computer/security/telescreen/cmo{ - dir = 1; - pixel_y = -24 - }, -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) -"nSK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "nTf" = ( /obj/machinery/camera/autoname/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -42218,6 +43377,32 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) +"nTH" = ( +/obj/structure/table, +/obj/item/aiModule/reset, +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/firealarm/directional/south, +/obj/structure/table, +/obj/item/aiModule/reset, +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/camera/motion/directional/south{ + network = list("aiupload") + }, +/turf/open/floor/iron/grid/steel, +/area/ai_monitored/turret_protected/ai_upload) "nTL" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -42257,13 +43442,15 @@ /obj/structure/table/wood, /turf/open/floor/carpet/grimy, /area/vacant_room/office) -"nUH" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 +"nVi" = ( +/obj/machinery/light{ + dir = 4 }, -/obj/structure/closet/secure_closet/medical2, -/turf/open/floor/iron/white, -/area/medical/surgery) +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "nVj" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -42283,6 +43470,14 @@ }, /turf/open/floor/iron, /area/quartermaster/miningdock) +"nVY" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "nWd" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -42302,6 +43497,11 @@ }, /turf/open/floor/iron, /area/crew_quarters/locker) +"nWo" = ( +/obj/effect/landmark/start/scientist, +/obj/structure/chair/stool/directional/east, +/turf/open/floor/iron/white, +/area/science/mixing) "nWr" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -42339,6 +43539,18 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"nWY" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/surgery) "nXc" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -42381,6 +43593,16 @@ }, /turf/open/floor/iron/dark, /area/chapel/office) +"nXt" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron, +/area/hydroponics) "nXF" = ( /obj/effect/turf_decal/delivery, /obj/structure/curtain, @@ -42389,33 +43611,35 @@ }, /turf/open/floor/noslip/standard, /area/security/prison) -"nYd" = ( -/obj/item/radio/intercom{ - pixel_x = -27 - }, -/obj/structure/table, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 7; - pixel_y = -3 - }, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 +"nXU" = ( +/obj/machinery/holopad, +/obj/machinery/button/door{ + desc = "A remote control switch for the medbay foyer."; + id = "MedbayFoyer"; + name = "Medbay Left Doors Control"; + normaldoorcontrol = 1; + pixel_x = 25; + pixel_y = -24; + req_access_txt = "5" }, -/obj/item/reagent_containers/glass/bottle/charcoal{ - pixel_x = -4; - pixel_y = -3 +/obj/machinery/button/door{ + id = "medbay_front_door"; + name = "Medbay Right Doors Control"; + normaldoorcontrol = 1; + req_access_txt = "5"; + dir = 4; + pixel_y = -24; + pixel_x = 39 }, -/obj/machinery/light{ +/obj/effect/turf_decal/tile/white, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, /turf/open/floor/iron/white, -/area/medical/sleeper) +/area/medical/medbay/lobby) "nYz" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "hopshutter"; @@ -42428,6 +43652,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/hop) +"nYO" = ( +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/item/shard, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "nYQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -42453,6 +43682,23 @@ }, /turf/open/floor/engine, /area/gateway) +"nYV" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/carpet/blue, +/area/medical/break_room) +"nZc" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "nZo" = ( /obj/machinery/button/door{ id = "quarantineshutters"; @@ -42471,33 +43717,27 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"nZz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +"nZs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/prison, -/area/security/prison) -"nZJ" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, +/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/structure/cable/yellow{ - icon_state = "1-4" + icon_state = "1-2" }, /turf/open/floor/iron/white, -/area/medical/medbay/central) -"oau" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/light{ +/area/medical/surgery) +"nZz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/hydroponics) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/prison, +/area/security/prison) "oax" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/status_display/ai{ @@ -42512,19 +43752,17 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) -"obi" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 9 +"obj" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/machinery/firealarm/directional/north, +/obj/machinery/camera/autoname/directional/north, +/obj/structure/sign/departments/minsky/security/security{ + pixel_y = 32 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/turf/open/floor/iron/dark, +/area/medical/morgue) "obl" = ( /obj/machinery/washing_machine, /obj/effect/turf_decal/stripes/line{ @@ -42577,15 +43815,12 @@ /obj/structure/chair/stool/directional/south, /turf/open/floor/prison, /area/security/prison) -"obT" = ( -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 10 +"obY" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 }, /turf/open/floor/iron/dark, -/area/crew_quarters/heads/captain) +/area/medical/morgue) "oda" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -42627,6 +43862,19 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, /area/tcommsat/computer) +"odz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "odH" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -42660,13 +43908,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"oee" = ( -/obj/structure/table, -/obj/machinery/plantgenes{ - pixel_y = 6 - }, -/turf/open/floor/iron, -/area/hydroponics) "oei" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty, @@ -42688,6 +43929,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/aft) +"oeG" = ( +/obj/structure/grille, +/obj/structure/window, +/obj/structure/window{ + dir = 8 + }, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) +"oeY" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow, +/turf/open/floor/plating, +/area/security/checkpoint/medical) "ofh" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -42722,6 +43976,19 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) +"ofK" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "ofL" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 @@ -42742,6 +44009,14 @@ broken = 1 }, /area/maintenance/starboard/aft) +"ofM" = ( +/obj/effect/decal/cleanable/blood/footprints{ + dir = 4; + pixel_x = 6; + pixel_y = 7 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "ofT" = ( /obj/machinery/computer/bounty, /turf/open/floor/iron, @@ -42755,30 +44030,18 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"ogj" = ( -/obj/structure/chair/stool/bar/directional/south, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"ogD" = ( -/obj/machinery/door/poddoor/preopen{ - id = "maint2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "ogJ" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 }, /turf/open/floor/iron, /area/hallway/primary/central) +"ogQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "ohc" = ( /obj/machinery/camera/autoname/directional/south, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -42807,10 +44070,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/atmos) -"ohF" = ( -/obj/machinery/light, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "ohG" = ( /obj/machinery/door/airlock{ id_tag = "Dorm3"; @@ -42859,39 +44118,6 @@ }, /turf/open/floor/prison/dark, /area/security/prison) -"oiT" = ( -/obj/machinery/shower{ - dir = 8 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/noslip/white, -/area/medical/sleeper) -"ojc" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 32 - }, -/obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/glass/rag, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"ojl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "ojA" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/shrink_cw{ @@ -42905,13 +44131,11 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) -"ojT" = ( -/obj/machinery/chem_master, -/obj/structure/sign/departments/minsky/medical/chemistry/chemical1{ - pixel_y = 29 - }, -/turf/open/floor/iron/white, -/area/medical/virology) +"ojH" = ( +/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/medical/cryo) "oka" = ( /obj/machinery/light/small{ dir = 4 @@ -42923,16 +44147,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"oke" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "okf" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ dir = 5 @@ -42946,21 +44160,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/main) +"oks" = ( +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron/white, +/area/science/mixing) "okA" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/dark_blue/half/contrasted, /turf/open/floor/iron/dark, /area/bridge) -"okQ" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/dark, -/area/science/server) "okX" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -42970,12 +44178,6 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) -"oli" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "olu" = ( /obj/structure/railing/corner, /obj/structure/railing/corner{ @@ -42993,20 +44195,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) -"olY" = ( -/obj/item/radio/intercom{ - pixel_y = 20 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/vending/medical{ - pixel_x = -2 - }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/digital_clock/directional/east, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "omb" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -5; @@ -43014,35 +44202,31 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) -"omo" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "omw" = ( /obj/structure/sign/map/left{ pixel_y = 32 }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"onp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +"omL" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 }, -/obj/machinery/light{ - dir = 4 +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"omV" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance"; + req_access_txt = "5" }, -/obj/machinery/power/apc/auto_name/directional/east{ - pixel_x = 24 +/obj/structure/disposalpipe/segment{ + dir = 1 }, -/obj/structure/cable/yellow, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron, -/area/science/mixing/chamber) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plating, +/area/maintenance/aft) "onS" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -43075,6 +44259,16 @@ /obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/iron/freezer, /area/medical/virology) +"oou" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/structure/chair/fancy/sofa/old/right{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/bar/atrium) "oov" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -43142,6 +44336,28 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron, /area/crew_quarters/dorms) +"opv" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "opC" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/landmark/blobstart, @@ -43155,11 +44371,6 @@ /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/iron, /area/engine/atmos) -"opT" = ( -/obj/structure/table, -/obj/item/kitchen/fork, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "oqq" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -43244,6 +44455,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) +"orW" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/sign/poster/contraband/clown{ + pixel_y = -32 + }, +/turf/open/floor/iron/checker, +/area/hallway/secondary/service) "osc" = ( /obj/machinery/newscaster{ pixel_x = -30 @@ -43268,37 +44488,37 @@ }, /turf/open/floor/iron/dark, /area/gateway) +"osx" = ( +/obj/effect/mapping_helpers/dead_body_placer, +/obj/structure/closet, +/obj/effect/decal/cleanable/blood/gibs, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "osA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/open/floor/iron, /area/crew_quarters/dorms) -"osO" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +"osN" = ( +/obj/item/kirbyplants{ + icon_state = "plant-10" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron/white, -/area/medical/genetics) +/area/medical/medbay/lobby) "osQ" = ( /obj/structure/chair/office/light{ dir = 1 }, /turf/open/floor/iron/white, /area/science/robotics/lab) -"ota" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Main Hall"; - req_access_txt = "5" - }, -/obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/sleeper) "otj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -43407,10 +44627,6 @@ }, /turf/open/floor/iron/freezer, /area/medical/virology) -"ovd" = ( -/obj/structure/chair, -/turf/open/floor/iron/dark, -/area/medical/surgery) "ovo" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -43419,16 +44635,14 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, /area/security/execution/transfer) -"ovr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"ovq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/central) "ovQ" = ( @@ -43452,11 +44666,6 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"owj" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/prisonspawn, -/turf/open/floor/prison, -/area/security/prison) "owl" = ( /obj/structure/chair/office{ dir = 8 @@ -43469,15 +44678,53 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) -"owQ" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 +"owx" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "N2 Outlet Pump" + }, +/turf/open/floor/iron/dark/side, +/area/engine/atmos) +"owA" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/shovel/spade, +/obj/item/reagent_containers/glass/bucket, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -4; + pixel_y = 4 }, +/obj/item/multitool{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/turf/open/floor/iron, +/area/hydroponics) +"owM" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/cable/yellow{ - icon_state = "0-4" + icon_state = "4-8" }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) +"oxe" = ( +/obj/machinery/requests_console{ + department = "Cargo Bay"; + departmentType = 2; + pixel_x = -30 + }, +/obj/machinery/computer/bounty{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/quartermaster/qm) "oxh" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 @@ -43491,21 +44738,41 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/hallway/secondary/entry) -"oxC" = ( +"oyc" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "psypriv"; + name = "Psycology Shutters" + }, +/turf/open/floor/plating, +/area/medical/exam_room) +"oyg" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 + dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/turf/open/floor/plating, +/area/maintenance/aft) +"oyx" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ - icon_state = "0-2" + icon_state = "1-2" }, -/obj/machinery/camera/autoname/directional/north{ - network = list("ss13, prison") +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/turf/open/floor/iron/techmaint, -/area/security/prison/shielded) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "oyM" = ( /obj/machinery/atmospherics/pipe/manifold/general/hidden{ dir = 4 @@ -43519,16 +44786,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"ozf" = ( -/obj/structure/closet/secure_closet/freezer/meat, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "ozl" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, @@ -43554,6 +44811,17 @@ /obj/item/storage/fancy/candle_box, /turf/open/floor/iron/dark, /area/chapel/main) +"ozw" = ( +/obj/item/gun/syringe, +/obj/structure/closet/secure_closet/medicaldanger{ + anchored = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/surgery) "ozx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -43607,20 +44875,6 @@ /mob/living/basic/cockroach, /turf/open/floor/wood, /area/vacant_room/office) -"oAt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "oAu" = ( /obj/structure/flora/grass/jungle/b, /turf/open/floor/grass, @@ -43642,6 +44896,21 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/main) +"oAZ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "oBf" = ( /obj/structure/cable{ icon_state = "4-8" @@ -43726,27 +44995,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) -"oDx" = ( -/obj/structure/chair, -/obj/structure/sign/warning/nosmoking{ - pixel_x = -28 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/medical/surgery) -"oDz" = ( -/obj/structure/bedsheetbin, -/obj/structure/table, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/airalarm/directional/south{ - pixel_y = -22 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) "oDF" = ( /obj/machinery/light, /turf/open/floor/plating, @@ -43769,6 +45017,17 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/vacant_room/commissary) +"oER" = ( +/obj/structure/chair/office/light, +/obj/effect/landmark/start/chief_medical_officer, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) +"oES" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "oFh" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -43819,12 +45078,34 @@ }, /turf/open/space/basic, /area/space) -"oGY" = ( +"oGj" = ( +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/hallway/primary/central) +"oGM" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ - dir = 8 + dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"oGT" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/medical/virology) +"oHH" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 4 + }, +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron, +/area/hydroponics) "oHZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -43838,12 +45119,6 @@ }, /turf/open/floor/iron, /area/science/storage) -"oIm" = ( -/obj/structure/chair/office/light{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "oIq" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -43856,72 +45131,29 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) -"oJg" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/bottle/morphine{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/reagent_containers/glass/bottle/chloralhydrate, -/obj/item/reagent_containers/glass/bottle/toxin{ - pixel_x = 6; - pixel_y = 8 +"oIT" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/item/reagent_containers/glass/bottle/morphine{ - pixel_x = 5; - pixel_y = 1 +/obj/effect/turf_decal/tile/white/opposingcorners, +/obj/effect/turf_decal/tile/white{ + dir = 4 }, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/glass/bottle/facid{ - name = "fluorosulfuric acid bottle"; - pixel_x = -3; - pixel_y = 6 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/item/reagent_containers/syringe{ +/obj/item/clothing/neck/stethoscope{ pixel_y = 5 }, -/obj/item/reagent_containers/dropper, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/button/ignition{ - id = "executionburn"; - name = "Justice Ignition Switch"; - pixel_x = -25; - pixel_y = 36 - }, -/obj/machinery/button/door{ - id = "executionfireblast"; - name = "Justice Area Lockdown"; - pixel_x = -25; - pixel_y = 26; - req_access_txt = "2" - }, -/obj/item/assembly/signaler{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/machinery/button/flasher{ - id = "justiceflash"; - name = "Justice Flash Control"; - pixel_x = -36; - pixel_y = 36; - req_access_txt = "1" - }, -/obj/machinery/button/door{ - id = "SecJusticeChamber"; - layer = 4; - name = "Justice Vent Control"; - pixel_x = -36; - pixel_y = 26; - req_access_txt = "3" +/obj/item/reagent_containers/dropper{ + pixel_y = 6 }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 +/obj/structure/table/glass, +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/security/execution/transfer) +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "oJk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -43934,13 +45166,6 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) -"oJs" = ( -/obj/machinery/vending/cigarette, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "oJC" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -43953,6 +45178,22 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"oJG" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "oJI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -43964,18 +45205,6 @@ /obj/machinery/light, /turf/open/floor/iron/white, /area/medical/virology) -"oKc" = ( -/obj/structure/bodycontainer/crematorium{ - id = "crematoriumChapel" - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/iron/dark, -/area/chapel/office) "oKn" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -44025,6 +45254,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/science/explab) +"oKB" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "oKH" = ( /obj/effect/spawner/randomvend/cola, /obj/effect/turf_decal/tile/red, @@ -44047,44 +45282,15 @@ }, /turf/open/floor/wood, /area/vacant_room/office) -"oKV" = ( -/obj/machinery/telecomms/broadcaster/preset_left, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/airalarm/server{ - dir = 8; - pixel_x = -22 - }, -/turf/open/floor/circuit/telecomms, -/area/tcommsat/server) -"oLb" = ( -/obj/effect/turf_decal/tile/red/anticorner_ramp/contrasted{ - dir = 4 - }, -/obj/structure/sign/warning/radiation_shelter{ - pixel_x = 1; - pixel_y = 33 - }, -/obj/effect/landmark/prisonspawn, -/obj/machinery/camera/autoname/directional/north{ - network = list("ss13, prison") - }, -/turf/open/floor/prison, -/area/security/prison) +"oLg" = ( +/turf/closed/wall, +/area/crew_quarters/theatre/backstage) "oLE" = ( /obj/structure/disposalpipe/segment{ dir = 10 }, /turf/open/floor/iron/dark, /area/chapel/main) -"oLG" = ( -/obj/machinery/status_display/evac{ - layer = 4; - pixel_y = 32 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "oLO" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -44095,6 +45301,12 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"oLR" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "oMw" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 10 @@ -44134,18 +45346,6 @@ }, /turf/open/floor/iron/white, /area/science/robotics/lab) -"oNQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "oNS" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -44158,6 +45358,21 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"oOk" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "oOo" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44170,19 +45385,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"oOt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "oOA" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -44193,19 +45395,6 @@ }, /turf/open/floor/iron/dark, /area/gateway) -"oOE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) "oPg" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -44215,6 +45404,26 @@ }, /turf/open/floor/prison, /area/security/prison) +"oPh" = ( +/obj/structure/disposalpipe/sorting/mail{ + dir = 4; + sortType = 20 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "oPj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44234,13 +45443,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) -"oQw" = ( -/obj/machinery/camera/autoname/directional/south, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) "oQN" = ( /obj/machinery/seed_extractor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -44273,6 +45475,22 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"oRz" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 8 + }, +/obj/machinery/status_display/evac{ + pixel_x = -32 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 8 + }, +/obj/machinery/status_display/evac{ + pixel_x = -32 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/dark, +/area/hallway/secondary/command) "oRK" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -44290,6 +45508,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/engine/engineering) +"oRM" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/maintenance/aft) "oRW" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -44297,6 +45526,13 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/white, /area/medical/chemistry) +"oSc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "oSi" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/end, @@ -44387,16 +45623,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/virology) -"oTM" = ( -/obj/machinery/holopad, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) +"oTT" = ( +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/closet, +/turf/open/floor/plating, +/area/maintenance/aft) "oTV" = ( /obj/machinery/advanced_airlock_controller{ dir = 4; @@ -44428,24 +45659,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) -"oUG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "oUI" = ( /obj/effect/landmark/start/brig_physician, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -44467,6 +45680,15 @@ }, /turf/open/floor/iron, /area/quartermaster/miningdock) +"oUR" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "oVd" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44563,18 +45785,6 @@ /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/iron/dark/side, /area/engine/atmos) -"oWZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "oXj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44630,13 +45840,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"oZm" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "oZu" = ( /obj/structure/chair/fancy/comfy{ dir = 1 @@ -44658,6 +45861,19 @@ }, /turf/open/floor/iron/techmaint, /area/ai_monitored/storage/eva) +"oZJ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"pac" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "paf" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/firealarm/directional/south, @@ -44714,6 +45930,12 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/vacant_room/commissary) +"pbA" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "pbP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -44729,12 +45951,53 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) +"pdl" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "pdt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, /turf/open/floor/iron, /area/security/courtroom) +"pdH" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 5; + pixel_y = -32 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) +"pdL" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "pdM" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 @@ -44765,15 +46028,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"pdV" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/white, -/area/medical/cryo) "pef" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -44785,6 +46039,27 @@ }, /turf/open/floor/plating, /area/security/execution/transfer) +"pet" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/reagent_dispensers/beerkeg, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) +"peP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/storage) "peR" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -44811,18 +46086,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) -"peX" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/iron, -/area/hydroponics) "pfg" = ( /obj/effect/turf_decal/bot_white/right, /obj/machinery/ore_silo, @@ -44853,6 +46116,22 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"pgo" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4; + sortType = 17 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "pgs" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "meetingshutter"; @@ -44950,6 +46229,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/security/warden) +"phL" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "barcounter"; + name = "Bar Counter Shutters" + }, +/obj/structure/displaycase/forsale/kitchen, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "pic" = ( /obj/machinery/button/door{ id = "Disposal Exit"; @@ -44984,23 +46273,28 @@ }, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) -"pio" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/blue{ +"piw" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner{ dir = 8 }, /turf/open/floor/iron, -/area/crew_quarters/theatre) +/area/hallway/primary/starboard) "piD" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/open/floor/iron, /area/science/mixing) +"piR" = ( +/obj/structure/closet/secure_closet/hydroponics, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/ridged/steel, +/area/hydroponics) +"pjF" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/machinery/camera/directional/north, +/turf/open/floor/grass/no_border, +/area/medical/genetics) "pjI" = ( /obj/structure/table, /obj/item/clothing/head/soft/grey{ @@ -45013,6 +46307,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/crew_quarters/locker) +"pkl" = ( +/obj/machinery/griddle, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "pks" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -45025,36 +46326,61 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"pky" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/light_switch{ - pixel_y = -26 - }, -/turf/open/floor/iron/white, -/area/medical/cryo) "plg" = ( /obj/effect/turf_decal/box/corners{ dir = 8 }, /turf/open/floor/engine, /area/science/explab) -"plq" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen"; - name = "kitchen shutters" - }, -/obj/structure/displaycase/forsale/kitchen, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +"plh" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/grille, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "plr" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/security/courtroom) +"plw" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/crew_quarters/theatre/backstage) +"pmc" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_x = -27 + }, +/turf/open/floor/iron/dark, +/area/medical/cryo) +"pmh" = ( +/obj/structure/chair/fancy/comfy{ + color = "#596479" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/carpet/blue, +/area/medical/break_room) "pmx" = ( /obj/structure/sign/warning/electricshock{ pixel_y = -32 @@ -45103,6 +46429,32 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"pnk" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Dormitory" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) +"pno" = ( +/obj/machinery/light, +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/medical/surgery) "pnq" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 9 @@ -45110,17 +46462,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"pnv" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "pnC" = ( /obj/structure/sign/warning/electricshock{ pixel_y = -32 @@ -45143,6 +46484,17 @@ /obj/structure/closet/l3closet/virology, /turf/open/floor/iron/white, /area/medical/virology) +"pnK" = ( +/obj/machinery/vending/cola, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/hallway/primary/aft) "pnL" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -45175,14 +46527,6 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"pof" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "pom" = ( /obj/machinery/light_switch{ pixel_y = 28 @@ -45246,6 +46590,21 @@ /mob/living/simple_animal/crab/Coffee, /turf/open/floor/iron/white, /area/science/lab) +"ppf" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance{ + name = "Bar Storage Maintenance"; + req_access_txt = "25" + }, +/turf/open/floor/plating, +/area/crew_quarters/bar) "pps" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ @@ -45278,6 +46637,20 @@ }, /turf/open/floor/iron/checker, /area/engine/break_room) +"pqa" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 1 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/glass/bucket, +/obj/machinery/light{ + bulb_colour = "#22bfa2"; + bulb_vacuum_colour = "#22bfa2"; + dir = 4; + nightshift_light_color = "#22bfa2" + }, +/turf/open/floor/iron, +/area/hydroponics) "pqq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood{ @@ -45357,16 +46730,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"prm" = ( -/obj/structure/table/optable, -/obj/item/radio/intercom{ - pixel_y = 20 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "prn" = ( /obj/structure/lattice, /obj/machinery/camera/autoname/directional/east{ @@ -45374,36 +46737,12 @@ }, /turf/open/space, /area/space/nearstation) -"prx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/port) -"prA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"prs" = ( +/obj/effect/turf_decal/siding/wood{ dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "prI" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -45429,18 +46768,21 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/prison/dark, /area/security/prison) -"prR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "psc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /turf/open/floor/iron/dark, /area/security/main) +"psd" = ( +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) +"psk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "psr" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -45460,19 +46802,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"psy" = ( -/obj/machinery/iv_drip, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "psE" = ( /obj/structure/table, /obj/machinery/door/window{ @@ -45504,15 +46833,20 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"ptj" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 +"pta" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, -/area/hydroponics) +/area/crew_quarters/fitness) +"pti" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/white, +/area/medical/apothecary) "ptl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -45522,41 +46856,28 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) -"ptw" = ( -/obj/structure/chair/stool, +"ptm" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, /turf/open/floor/iron/white, -/area/science/mixing) -"ptV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"ptW" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 +/area/medical/medbay/central) +"ptU" = ( +/obj/structure/table/wood, +/obj/machinery/light/small{ + dir = 8 }, -/obj/structure/cable/yellow, -/obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_y = 7 +/obj/machinery/recharger{ + pixel_y = 2 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 7 +/obj/machinery/light/small{ + dir = 8 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 +/obj/machinery/recharger{ + pixel_y = 2 }, -/obj/item/storage/pill_bottle/mannitol, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/cryo) +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "puf" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -45572,6 +46893,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"puo" = ( +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/tile_breaker, +/turf/open/floor/wood/big, +/area/maintenance/aft) "pur" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -45617,9 +46945,37 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"pvA" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "pwt" = ( /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"pww" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "pwN" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/structure/lattice, @@ -45656,10 +47012,22 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/maintenance/fore/secondary) -"pxI" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/fitness) +"pxC" = ( +/obj/structure/table, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_y = 3 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 13; + pixel_y = 5 + }, +/obj/item/watertank, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hydroponics) "pxL" = ( /obj/structure/sign/directions/engineering{ pixel_x = -32; @@ -45695,6 +47063,12 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"pxR" = ( +/obj/item/storage/firstaid/regular, +/obj/machinery/camera/autoname/directional/north, +/obj/structure/table, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "pyc" = ( /mob/living/simple_animal/bot/floorbot, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -45710,6 +47084,36 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"pyn" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/white/opposingcorners, +/obj/effect/turf_decal/tile/white{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) +"pyv" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/captain) "pyy" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -45742,18 +47146,21 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai_upload) -"pyN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"pyC" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" }, -/turf/open/floor/iron/white, -/area/medical/genetics) +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) "pyS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -45782,6 +47189,27 @@ }, /turf/open/floor/iron, /area/science/storage) +"pzb" = ( +/obj/machinery/door/firedoor, +/obj/structure/curtain, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/caution/stand_clear, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/cryo) "pzf" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -45792,15 +47220,27 @@ }, /turf/open/floor/iron/white, /area/science/research) -"pAb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +"pzK" = ( +/obj/structure/window/reinforced, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 }, +/obj/structure/closet/secure_closet/brig{ + id = "medcell"; + name = "Medical Cell Locker" + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) +"pAd" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + dir = 5 }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "pAr" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -45812,18 +47252,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/storage/tech) -"pAs" = ( -/obj/machinery/door/airlock/medical{ - name = "Medbay Reception"; - req_access_txt = "5" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "pAC" = ( /obj/machinery/telecomms/server/presets/supply, /turf/open/floor/circuit/green/telecomms, @@ -45855,6 +47283,17 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) +"pBk" = ( +/obj/item/radio/intercom{ + pixel_x = -29; + pixel_y = -2 + }, +/obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "pBn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -45864,21 +47303,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"pBA" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/disposalpipe/junction/flip{ - dir = 2 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "pBH" = ( /obj/structure/table/wood, /obj/machinery/recharger{ @@ -45976,6 +47400,10 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/science/nanite) +"pDz" = ( +/obj/effect/turf_decal/tile/green/opposingcorners, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "pDB" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, @@ -46033,20 +47461,22 @@ }, /turf/open/floor/iron, /area/security/checkpoint/science) -"pDQ" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ +"pEg" = ( +/obj/structure/chair/fancy/corp{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/machinery/button/door{ + id = "medpriv1"; + name = "Psycology Shutters Control"; + pixel_x = -27; + pixel_y = 1 }, -/turf/open/floor/plating, -/area/maintenance/aft) +/mob/living/simple_animal/pet/cat{ + name = "Josito"; + dir = 4 + }, +/turf/open/floor/carpet/green, +/area/medical/exam_room) "pEm" = ( /obj/machinery/requests_console{ department = "Cargo Bay"; @@ -46059,31 +47489,6 @@ }, /turf/open/floor/iron, /area/quartermaster/office) -"pEr" = ( -/obj/structure/musician/piano{ - icon_state = "piano" - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) -"pEv" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - sortType = 30 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "pEC" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -46122,20 +47527,6 @@ }, /turf/open/floor/plating, /area/security/brig) -"pFj" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/table, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/fax/med, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "pFn" = ( /obj/machinery/door/airlock/command{ name = "Teleport Access"; @@ -46154,6 +47545,29 @@ dir = 8 }, /area/teleporter) +"pGd" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Medbay Security Post"; + req_access_txt = "63" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "pGq" = ( /obj/machinery/light{ dir = 8 @@ -46187,11 +47601,6 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) -"pGI" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow, -/turf/open/floor/plating, -/area/crew_quarters/heads/cmo) "pGT" = ( /obj/structure/chair{ dir = 8; @@ -46205,6 +47614,28 @@ }, /turf/open/floor/iron, /area/security/courtroom) +"pGW" = ( +/obj/machinery/button/door{ + id = "maint2"; + name = "Blast Door Control B"; + pixel_x = -28; + pixel_y = 4 + }, +/obj/machinery/button/door{ + id = "maint1"; + name = "Blast Door Control A"; + pixel_x = -28; + pixel_y = -6 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/fore) "pHs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -46226,6 +47657,14 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"pHK" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/ausbushes/brflowers, +/turf/open/floor/grass/no_border, +/area/crew_quarters/bar/atrium) "pHN" = ( /obj/machinery/suit_storage_unit/security, /obj/machinery/light/small, @@ -46278,14 +47717,17 @@ /obj/machinery/recharger, /turf/open/floor/iron/dark, /area/bridge) -"pJk" = ( -/obj/machinery/light{ +"pJi" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/iron/white/corner{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/area/hallway/primary/starboard) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "pJv" = ( /turf/open/floor/grass, /area/hallway/primary/central) @@ -46334,21 +47776,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/science/robotics/lab) -"pKd" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "pKe" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -46385,6 +47812,15 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) +"pLg" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "barcounter"; + name = "Bar Counter Shutters" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "pLn" = ( /obj/machinery/conveyor/inverted{ dir = 5; @@ -46392,13 +47828,37 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"pLt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +"pLr" = ( /obj/structure/cable/yellow{ - icon_state = "2-8" + icon_state = "1-2" }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 2; + name = "Genie"; + sortType = 23 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/maintenance/aft) +"pLs" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/white/opposingcorners, +/obj/effect/turf_decal/tile/white{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "pLw" = ( /obj/machinery/camera/autoname/directional/south{ network = list("ss13, security") @@ -46446,16 +47906,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) -"pMt" = ( -/obj/structure/bed/roller, -/obj/machinery/airalarm/directional/north{ - pixel_y = 23 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "pNe" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46485,6 +47935,35 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"pNP" = ( +/obj/structure/table/wood, +/obj/item/toy/cards/deck, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood, +/area/medical/break_room) +"pNZ" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 6 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/engine/atmos) +"pOb" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/captain) "pOk" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -46515,14 +47994,6 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"pOt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "pOu" = ( /obj/effect/turf_decal/bot, /obj/machinery/hydroponics/constructable, @@ -46533,6 +48004,12 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/security/prison) +"pOB" = ( +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/crew_quarters/kitchen) "pPb" = ( /obj/machinery/firealarm{ dir = 1; @@ -46540,6 +48017,17 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"pPl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/crew_quarters/kitchen) "pPy" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line, @@ -46574,22 +48062,6 @@ }, /turf/open/floor/iron/dark, /area/teleporter) -"pQf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/vending/wardrobe/medi_wardrobe, -/turf/open/floor/iron/white, -/area/medical/storage) "pQr" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -46597,6 +48069,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/engineering) +"pQy" = ( +/obj/effect/mapping_helpers/tile_breaker, +/obj/effect/turf_decal/trimline/dark_red/line, +/obj/effect/turf_decal/trimline/white/line{ + dir = 1 + }, +/turf/open/floor/wood/big, +/area/maintenance/aft) "pQE" = ( /obj/structure/chair/office, /obj/structure/extinguisher_cabinet{ @@ -46610,6 +48090,13 @@ }, /turf/open/floor/prison, /area/security/prison) +"pRp" = ( +/obj/effect/turf_decal/tile/dark_green{ + dir = 8 + }, +/obj/machinery/vending/hydronutrients, +/turf/open/floor/iron, +/area/hydroponics) "pRy" = ( /obj/structure/showcase/cyborg/old{ dir = 8; @@ -46623,6 +48110,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) +"pRR" = ( +/obj/structure/chair/stool/bar/directional/west, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "pSb" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, @@ -46711,6 +48202,41 @@ broken = 1 }, /area/maintenance/starboard/aft) +"pTd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) +"pTf" = ( +/mob/living/simple_animal/pet/dog/corgi/Ian, +/obj/effect/turf_decal/siding/wood, +/obj/structure/bed/dogbed/ian, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/light_switch{ + pixel_x = 27 + }, +/mob/living/simple_animal/pet/dog/corgi/Ian, +/obj/effect/turf_decal/siding/wood, +/obj/structure/bed/dogbed/ian, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/light_switch{ + pixel_x = 27 + }, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/wood, +/area/crew_quarters/heads/hop) "pTk" = ( /obj/machinery/light{ dir = 8 @@ -46778,26 +48304,17 @@ }, /turf/open/floor/iron, /area/security/brig) -"pVb" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 +"pUQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes{ + dir = 8 }, -/turf/closed/wall, -/area/quartermaster/sorting) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "pVd" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/quartermaster/office) -"pVe" = ( -/obj/structure/filingcabinet, -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "pVk" = ( /obj/structure/cable/yellow, /obj/machinery/power/apc/auto_name/directional/west{ @@ -46829,54 +48346,25 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"pWd" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/light_switch{ - pixel_x = -28 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "pWe" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"pWi" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/public/glass{ - name = "Fitness" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 +"pWh" = ( +/obj/machinery/light{ + dir = 8 }, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) -"pWy" = ( -/obj/machinery/light_switch{ - pixel_x = 28 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, +/obj/structure/chair/fancy/corp, +/obj/item/radio/intercom/directional/north, +/obj/effect/landmark/start/paramedic, /turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) +/area/medical/medbay/lobby) "pWI" = ( /turf/open/floor/carpet/green, /area/security/detectives_office) @@ -46972,11 +48460,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"pYH" = ( -/obj/structure/bed, -/obj/item/bedsheet/captain, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain) "pYS" = ( /obj/machinery/door/airlock/security/glass{ name = "Equipment Room"; @@ -47004,13 +48487,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"pYY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "pZs" = ( /obj/structure/table, /obj/item/storage/backpack/duffelbag/sec/surgery{ @@ -47019,20 +48495,13 @@ /obj/item/clothing/gloves/color/latex, /turf/open/floor/iron/dark, /area/science/robotics/lab) -"pZz" = ( -/obj/machinery/requests_console{ - department = "Bar"; - departmentType = 2; - pixel_x = 30; - receive_ore_updates = 1 - }, -/obj/structure/table, -/obj/machinery/chem_dispenser/drinks{ +"pZJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/medical/storage) "pZR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -47047,18 +48516,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"qap" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, +"qal" = ( +/obj/machinery/airalarm/directional/east, /turf/open/floor/plating, -/area/maintenance/aft) +/area/maintenance/starboard/fore) "qas" = ( /obj/structure/tank_dispenser, /turf/open/floor/iron/white, @@ -47069,6 +48530,20 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"qaC" = ( +/obj/structure/closet/crate/wooden, +/obj/item/clothing/under/costume/gondola, +/obj/item/clothing/under/costume/jabroni, +/obj/item/clothing/under/costume/mech_suit/blue, +/obj/item/clothing/under/costume/mech_suit/white, +/obj/item/clothing/under/costume/villain, +/obj/item/clothing/suit/hooded/ian_costume, +/obj/item/clothing/suit/costume/pirate/captain, +/obj/item/clothing/head/costume/rabbitears, +/obj/item/clothing/suit/costume/madsci, +/obj/item/clothing/under/costume/russian_officer, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "qaI" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -47086,6 +48561,18 @@ /obj/machinery/light, /turf/open/floor/iron/techmaint, /area/gateway) +"qbJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/genetics) "qbL" = ( /obj/structure/cable{ icon_state = "1-4" @@ -47098,15 +48585,6 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) -"qbQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "qcu" = ( /obj/machinery/firealarm{ dir = 8; @@ -47116,14 +48594,6 @@ dir = 9 }, /area/science/research) -"qcI" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - sortType = 16 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "qcK" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 5; @@ -47137,12 +48607,10 @@ }, /turf/open/floor/iron/white/corner, /area/hallway/secondary/exit) -"qcV" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +"qcS" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) "qdU" = ( @@ -47207,6 +48675,30 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"qgf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) +"qgs" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "qgK" = ( /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, @@ -47231,6 +48723,14 @@ }, /turf/open/floor/iron, /area/science/explab) +"qhk" = ( +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hydroponics) "qho" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -47239,21 +48739,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, /area/security/warden) -"qhu" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "qhI" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -47285,20 +48770,35 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/storage/tech) -"qiJ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - name = "Bar Storage Maintenance"; - req_access_txt = "25" +"qif" = ( +/obj/machinery/light/small{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/effect/turf_decal/stripes/corner, +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/science/mixing) +"qiD" = ( +/obj/machinery/computer/med_data, +/obj/effect/turf_decal/tile/dark_blue, +/obj/machinery/computer/med_data, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) +"qiH" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron, /area/maintenance/starboard/fore) "qiN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -47342,18 +48842,19 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/lobby) -"qkk" = ( +"qkh" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 + dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "qkq" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /obj/structure/displaycase/captain, @@ -47370,10 +48871,6 @@ }, /turf/open/floor/iron/dark, /area/storage/tech) -"qlf" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/hydroponics) "qlo" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -47390,18 +48887,20 @@ }, /turf/open/floor/iron, /area/security/brig) +"qlI" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow, +/turf/open/floor/iron/dark, +/area/chapel/office) "qmd" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) -"qmf" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -31 - }, -/obj/machinery/camera/autoname/directional/south, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/genetics) "qmj" = ( /obj/effect/turf_decal/tile/green/anticorner/contrasted, /obj/machinery/atmospherics/pipe/manifold/green/visible, @@ -47420,11 +48919,30 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"qng" = ( -/obj/structure/disposalpipe/segment, +"qmy" = ( +/obj/effect/turf_decal/siding/white/corner, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/crew_quarters/kitchen) +"qmD" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Storage"; + req_access_txt = "5" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/white, -/area/medical/genetics) +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/storage) "qnn" = ( /obj/structure/rack, /obj/item/storage/box/teargas{ @@ -47446,15 +48964,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"qnv" = ( -/obj/machinery/sleeper{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "qnH" = ( /obj/structure/closet/secure_closet/hos, /obj/item/clothing/head/hats/hos/beret, @@ -47496,6 +49005,22 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/vacant_room/commissary) +"qoi" = ( +/obj/structure/grille, +/turf/open/floor/plating, +/area/maintenance/aft) +"qor" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/barricade/wooden/crude, +/obj/machinery/door/airlock/maintenance{ + id_tag = "commissarydoor"; + req_one_access_txt = "12;63;48;50" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/turf/open/floor/plating, +/area/maintenance/port) "qoy" = ( /obj/machinery/computer/communications{ dir = 4 @@ -47588,25 +49113,12 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) -"qpZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +"qqh" = ( +/obj/structure/chair{ dir = 8 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/virology/glass{ - id_tag = "Viro1"; - name = "Virology Testing and Treatment"; - req_access_txt = "39" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, -/turf/open/floor/iron/white, -/area/medical/virology) +/turf/open/floor/iron/dark, +/area/medical/surgery) "qqM" = ( /obj/effect/turf_decal/siding/dark_blue, /obj/structure/cable/yellow{ @@ -47645,6 +49157,20 @@ }, /turf/open/floor/iron, /area/quartermaster/qm) +"qrt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "qrJ" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -47665,26 +49191,32 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness) -"qsl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, +"qsq" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"qsy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/airlock/public/glass{ + name = "Fitness" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, -/area/hydroponics) +/area/crew_quarters/dorms) +"qsr" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "barcounter"; + name = "Bar Counter Shutters" + }, +/obj/item/clothing/head/hats/tophat, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "qsK" = ( /obj/machinery/light, /obj/structure/sign/warning/electricshock{ @@ -47709,6 +49241,16 @@ }, /turf/open/floor/grass, /area/security/prison) +"qto" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "qtv" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -47787,12 +49329,24 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/quartermaster/exploration_dock) +"qva" = ( +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/fore) "qvA" = ( /obj/structure/bed/roller, /obj/machinery/airalarm/directional/south, /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/white, /area/medical/virology) +"qvO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hydroponics) "qvR" = ( /obj/item/radio/off, /obj/item/crowbar, @@ -47823,6 +49377,13 @@ /obj/structure/disposalpipe/junction, /turf/open/floor/iron, /area/hallway/primary/starboard) +"qwC" = ( +/obj/structure/holohoop{ + dir = 4 + }, +/obj/effect/mapping_helpers/tile_breaker, +/turf/open/floor/wood/big, +/area/maintenance/aft) "qwD" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 @@ -47900,18 +49461,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"qxO" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "qxR" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -47924,21 +49473,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"qxV" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "qxY" = ( /obj/effect/turf_decal/siding/wideplating_new/dark/corner{ dir = 1 @@ -47956,6 +49490,26 @@ }, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) +"qyd" = ( +/obj/machinery/advanced_airlock_controller{ + pixel_y = 24 + }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/catwalk_floor, +/area/hallway/secondary/exit) +"qyo" = ( +/obj/structure/chair/fancy/plastic, +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/turf/open/floor/iron/checker, +/area/hallway/secondary/service) "qyw" = ( /obj/machinery/washing_machine, /obj/machinery/light, @@ -47964,6 +49518,17 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/locker) +"qyD" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/genetics) "qyK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -47980,15 +49545,28 @@ }, /turf/open/floor/iron, /area/vacant_room/commissary) -"qyT" = ( -/obj/machinery/computer/cargo{ - dir = 4 +"qyP" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) +"qzt" = ( +/obj/structure/chair/stool/directional/north, +/turf/open/floor/prison, +/area/security/prison) +"qzz" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/mapping_helpers/tile_breaker, /turf/open/floor/iron, -/area/quartermaster/qm) +/area/maintenance/starboard/fore) "qzT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -48072,6 +49650,12 @@ }, /turf/open/floor/iron, /area/quartermaster/qm) +"qBj" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/crew_quarters/theatre) "qBA" = ( /obj/machinery/power/apc/auto_name/directional/east{ pixel_x = 24 @@ -48080,6 +49664,13 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron/dark, /area/security/execution/transfer) +"qBE" = ( +/obj/effect/turf_decal/siding/white/corner{ + dir = 8 + }, +/obj/structure/chair/stool/bar/directional/north, +/turf/open/floor/iron/white/corner, +/area/crew_quarters/kitchen) "qBF" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -48165,6 +49756,19 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) +"qCQ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron/white, +/area/medical/apothecary) +"qCR" = ( +/obj/structure/sign/plaques/deempisi{ + pixel_x = -32 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "qDd" = ( /obj/item/radio/intercom{ pixel_y = -29 @@ -48172,25 +49776,26 @@ /obj/machinery/light/small, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) +"qDH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) +"qDY" = ( +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "qEl" = ( /obj/structure/table, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, /turf/open/floor/iron, /area/storage/art) -"qEw" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "qEB" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -48217,13 +49822,6 @@ }, /turf/open/floor/iron/dark, /area/science/nanite) -"qEQ" = ( -/obj/effect/landmark/start/botanist, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hydroponics) "qET" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -48232,15 +49830,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) -"qFe" = ( -/obj/effect/landmark/start/clown, -/obj/structure/chair/stool/directional/west, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/theatre) "qFi" = ( /obj/machinery/light/small{ dir = 4 @@ -48357,6 +49946,15 @@ }, /turf/open/floor/iron, /area/engine/break_room) +"qIg" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "qIl" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -48390,6 +49988,19 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/vacant_room/commissary) +"qJk" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "qJm" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -48416,6 +50027,19 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"qJw" = ( +/obj/structure/disposalpipe/segment, +/obj/item/radio/intercom{ + pixel_x = 25 + }, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_x = 25 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "qJK" = ( /obj/machinery/status_display/evac{ pixel_x = -32 @@ -48603,6 +50227,20 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"qMt" = ( +/obj/structure/table, +/obj/item/storage/box/rxglasses{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/bodybags, +/obj/item/pen, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) "qMv" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -48616,10 +50254,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"qMz" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "qMH" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral{ @@ -48636,18 +50270,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) -"qNd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "qNw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -48691,16 +50313,18 @@ "qOk" = ( /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness) -"qOI" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +"qOp" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Plumbing Factory Maintenance"; + req_access_txt = "5" }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/door/poddoor/preopen{ + id = "quarantineshutters"; + name = "Quarantine Shutters" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white, -/area/medical/medbay/central) +/area/maintenance/aft) "qPq" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -48713,6 +50337,14 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) +"qPv" = ( +/obj/machinery/computer/slot_machine, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "qPz" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ dir = 4 @@ -48733,6 +50365,10 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) +"qPL" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/genetics/cloning) "qPT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -48751,10 +50387,6 @@ }, /turf/open/floor/wood, /area/library) -"qQi" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron/white, -/area/medical/chemistry) "qQG" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line, @@ -48777,14 +50409,30 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) -"qRv" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/janitor, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +"qRO" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"qSd" = ( +/obj/effect/turf_decal/siding/white/corner{ dir = 4 }, /turf/open/floor/iron, -/area/janitor) +/area/hallway/primary/starboard) "qSv" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -48795,13 +50443,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"qSx" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/medical/virology) "qSy" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -48810,26 +50451,25 @@ /obj/machinery/light, /turf/open/floor/iron, /area/hallway/primary/fore) -"qSU" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 +"qSG" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/obj/machinery/disposal/bin, -/obj/machinery/camera/autoname/directional/south, -/obj/machinery/light_switch{ - pixel_y = -26 +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/open/floor/iron/white, -/area/medical/storage) -"qSV" = ( -/obj/machinery/vending/medical{ - pixel_x = -2 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) "qTo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/tank/plasma{ @@ -48861,18 +50501,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/research) -"qTP" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen"; - name = "kitchen shutters" - }, -/obj/machinery/door/firedoor, -/obj/structure/desk_bell{ - pixel_x = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "qUb" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -48880,6 +50508,15 @@ /obj/item/beacon, /turf/open/floor/iron, /area/hallway/secondary/entry) +"qUe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "qUg" = ( /turf/open/floor/iron/white, /area/medical/surgery) @@ -48906,18 +50543,6 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) -"qUA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "qUC" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -49063,6 +50688,19 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/engine, /area/science/explab) +"qXc" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/machinery/fax/service, +/obj/structure/table, +/obj/machinery/airalarm/directional/north, +/obj/machinery/camera/directional/north, +/turf/open/floor/iron, +/area/hallway/secondary/service) "qXk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -49080,6 +50718,25 @@ /obj/effect/turf_decal/bot, /turf/open/floor/prison/dark, /area/security/prison) +"qXI" = ( +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayFoyer"; + name = "Medbay"; + req_access_txt = "5" + }, +/obj/machinery/door/poddoor/preopen{ + id = "quarantineshutters"; + name = "Quarantine Shutters" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/caution/stand_clear, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/medbay/lobby) "qXP" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 10 @@ -49087,11 +50744,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) -"qYb" = ( -/mob/living/simple_animal/bot/cleanbot/medbay, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "qYd" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ @@ -49140,20 +50792,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"qZc" = ( -/obj/structure/table/wood, -/obj/structure/mirror{ - pixel_x = -28 - }, -/obj/item/flashlight/lamp/bananalamp{ - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/theatre) "qZd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -49225,6 +50863,18 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"raS" = ( +/obj/machinery/computer/security/telescreen/cmo{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "rbK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -49247,6 +50897,22 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai_upload) +"rbT" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/checker, +/area/hallway/secondary/service) +"rbX" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "rbY" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -49256,19 +50922,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"rbZ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/catwalk_floor/iron, -/area/engine/atmos) "rcc" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible{ dir = 4 @@ -49291,18 +50944,6 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) -"rcl" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/sorting/mail{ - sortType = 26 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) "rcC" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -49319,20 +50960,11 @@ }, /turf/open/floor/iron, /area/security/brig) -"rcH" = ( -/obj/machinery/computer/crew, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Medical Officer's Desk"; - departmentType = 5; - name = "Chief Medical Officer RC"; - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) +"rcL" = ( +/obj/structure/flora/grass/jungle, +/mob/living/carbon/monkey, +/turf/open/floor/plating/dirt/jungle, +/area/medical/genetics) "rcN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49390,6 +51022,22 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"rdm" = ( +/obj/machinery/iv_drip, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/bed{ + dir = 8 + }, +/obj/item/bedsheet/medical, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/iron/dark, +/area/medical/surgery) "rds" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -49407,22 +51055,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) -"rdv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "rdy" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -49450,6 +51082,14 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"rdI" = ( +/obj/effect/landmark/start/janitor, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron, +/area/janitor) "rea" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/directional, @@ -49476,17 +51116,20 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/research) -"rek" = ( -/obj/structure/disposalpipe/segment, +"ren" = ( +/obj/machinery/camera/autoname/directional/south, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 10 }, /obj/structure/cable/yellow{ - icon_state = "1-8" + icon_state = "2-8" }, -/turf/open/floor/iron/dark, -/area/chapel/office) +/turf/open/floor/iron, +/area/crew_quarters/fitness) "rew" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -49520,16 +51163,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/aisat/service) -"reA" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "reG" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/tile/yellow{ @@ -49558,6 +51191,12 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) +"reU" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "reY" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -49565,6 +51204,17 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"reZ" = ( +/obj/structure/table/wood, +/obj/item/storage/pill_bottle/dice{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/carpet/blue, +/area/medical/break_room) "rfh" = ( /obj/structure/grille/broken, /obj/effect/spawner/lootdrop/glowstick, @@ -49588,19 +51238,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"rfG" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "rfH" = ( /obj/structure/closet/crate/bin, /obj/item/food/donut/chaos, @@ -49672,6 +51309,14 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) +"rgU" = ( +/obj/machinery/vending/custom, +/obj/machinery/door/window/eastleft{ + name = "Hydroponics Desk"; + req_access_txt = "35" + }, +/turf/open/floor/plating, +/area/crew_quarters/kitchen) "rgY" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -49689,17 +51334,22 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) -"rhc" = ( -/obj/structure/displaycase{ - desc = "A display case with a pestle straight from a museum. You might be in a big trouble if you need to use this."; - name = "archaic tool display case"; - start_showpiece_type = /obj/item/pestle +"rhm" = ( +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) +"rhu" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/chemistry) +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/engine/atmos) "rhC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49829,13 +51479,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"rlg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/cryo) "rli" = ( /obj/structure/closet/secure_closet/detective, /obj/item/clothing/under/rank/security/detective{ @@ -49921,6 +51564,11 @@ }, /turf/open/floor/carpet/green, /area/chapel/main) +"rmj" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/gloves, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "rmz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -49952,6 +51600,26 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/secondary/entry) +"rmM" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/light, +/turf/open/floor/iron/white, +/area/medical/chemistry) +"rmU" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/crew_quarters/theatre/backstage) "rnd" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=QM"; @@ -50018,34 +51686,30 @@ /obj/item/clothing/head/utility/welding, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) +"rnU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/punching_bag, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "roc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/iron, /area/hallway/secondary/exit) -"rog" = ( -/obj/structure/table, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/pill_bottle/dice, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"rov" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +"roW" = ( +/obj/effect/turf_decal/tile/white{ + dir = 1 }, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/white/corner{ +/obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/area/hallway/secondary/entry) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "rpg" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, @@ -50194,6 +51858,25 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"rsd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) "rse" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; @@ -50229,6 +51912,36 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/gravity_generator) +"rsU" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/table/glass, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/medical/cryo) +"rsW" = ( +/obj/machinery/shower{ + dir = 4; + name = "emergency shower" + }, +/obj/effect/turf_decal/bot, +/obj/structure/extinguisher_cabinet{ + pixel_x = -27 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/noslip/white, +/area/medical/patients_rooms) "rsX" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/door/poddoor/preopen{ @@ -50347,6 +52060,12 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/iron, /area/engine/engineering) +"ruo" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "ruF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -50354,12 +52073,40 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) +"ruJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) +"ruM" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/aft) "ruS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, /turf/open/floor/carpet/grimy, /area/chapel/office) +"ruT" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/structure/chair/stool/bar/directional/north, +/turf/open/floor/glass/reinforced, +/area/crew_quarters/bar/atrium) "rvd" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Power Storage"; @@ -50390,6 +52137,12 @@ }, /turf/open/floor/iron, /area/security/brig) +"rvC" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "rvO" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -50433,6 +52186,17 @@ }, /turf/open/floor/plating, /area/maintenance/fore) +"rwZ" = ( +/obj/structure/disposalpipe/sorting/mail{ + dir = 2; + sortType = 18 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "rxf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50451,12 +52215,10 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"rxC" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/item/storage/fancy/donut_box, -/obj/structure/table, -/turf/open/floor/iron/dark, -/area/crew_quarters/fitness) +"rxA" = ( +/obj/effect/turf_decal/stripes, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "rxG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -50505,6 +52267,10 @@ /obj/structure/flora/rock/pile, /turf/open/floor/grass, /area/hallway/primary/central) +"ryN" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "rzf" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/binary/pump{ @@ -50519,24 +52285,42 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/research) -"rzm" = ( +"rzw" = ( /obj/structure/disposalpipe/segment{ dir = 5 }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/button/door{ + id = "QuarantineB"; + name = "Quarantine Bolts B"; + normaldoorcontrol = 1; + pixel_x = 8; + pixel_y = -21; + req_one_access_txt = "39;40;45"; + specialfunctions = 4 + }, +/obj/machinery/button/door{ + id = "QuarantineA"; + name = "Quarantine Bolts A"; + normaldoorcontrol = 1; + pixel_x = -8; + pixel_y = -21; + req_one_access_txt = "39;40;45"; + specialfunctions = 4 }, /obj/structure/cable/yellow{ - icon_state = "1-4" + icon_state = "4-8" }, -/turf/open/floor/plating, -/area/maintenance/aft) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "rzy" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -50549,6 +52333,26 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"rzF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) +"rzX" = ( +/obj/machinery/light_switch{ + pixel_x = 26; + pixel_y = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/east, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white, +/area/medical/apothecary) "rAb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -50562,6 +52366,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/secondary/exit) +"rAe" = ( +/obj/structure/closet/wardrobe/mixed, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/under/pants/jeans, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"rAs" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/white, +/area/medical/chemistry) "rAw" = ( /obj/machinery/light{ dir = 1 @@ -50572,6 +52389,10 @@ }, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) +"rBd" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/turf/open/floor/iron/white, +/area/medical/chemistry) "rBg" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -50587,16 +52408,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/port) -"rBC" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/central) "rCa" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -50618,15 +52429,17 @@ }, /turf/open/floor/iron, /area/tcommsat/computer) -"rCg" = ( -/obj/structure/table/glass, -/obj/item/storage/box/bodybags, +"rCb" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/blue{ - dir = 8 + dir = 1 }, -/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, -/area/medical/morgue) +/area/medical/storage) "rCK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -50656,6 +52469,23 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) +"rCV" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/crew_quarters/kitchen) "rDe" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible, @@ -50678,17 +52508,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/fore) -"rDo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "rDy" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -50697,23 +52516,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/engine/engineering) -"rDE" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"rDG" = ( -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wideplating/dark, -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/captain) "rDO" = ( /obj/effect/turf_decal/siding/thinplating_new, /turf/open/floor/carpet, @@ -50753,6 +52555,29 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"rEo" = ( +/obj/item/reagent_containers/glass/bottle/salglu_solution{ + pixel_x = -8; + pixel_y = 10 + }, +/obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/reagentgrinder{ + pixel_y = 6; + pixel_x = 3 + }, +/obj/item/reagent_containers/glass/bottle/epinephrine{ + pixel_x = -8; + pixel_y = 3 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "rEE" = ( /obj/structure/table, /obj/item/razor, @@ -50781,14 +52606,34 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, /area/security/brig) -"rFg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +"rFl" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "1-8" }, -/turf/open/floor/iron/white, -/area/medical/sleeper) +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/storage/crayons{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/item/storage/crayons{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) "rFN" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -50847,6 +52692,16 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"rGK" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "rGN" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -50891,19 +52746,24 @@ /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass, /area/hallway/primary/central) -"rHy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +"rHS" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-4" }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/checker, +/area/maintenance/starboard/fore) "rHU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -50930,22 +52790,55 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"rIV" = ( -/obj/structure/table/wood, -/obj/machinery/requests_console{ - department = "Theatre"; - name = "theatre RC"; - pixel_x = -32 +"rIm" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/item/food/baguette, -/obj/item/toy/dummy, -/obj/machinery/light_switch{ - pixel_y = 26 +/obj/machinery/door/airlock/medical{ + name = "Psychologist" }, -/turf/open/floor/iron/white/side{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/area/crew_quarters/theatre) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/medical/exam_room) +"rIZ" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Air to Mix" + }, +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/engine/atmos) +"rJd" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "rJf" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -51046,6 +52939,19 @@ /obj/structure/cable, /turf/open/floor/iron/solarpanel/airless, /area/solar/starboard/aft) +"rLF" = ( +/obj/machinery/button/door{ + id = "barcounter"; + name = "Bar Counter Shutters"; + pixel_y = -24; + req_access_txt = "25"; + pixel_x = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "rLL" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -51077,6 +52983,16 @@ }, /turf/open/floor/iron, /area/storage/primary) +"rLZ" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 8 + }, +/obj/structure/table, +/obj/machinery/plantgenes{ + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/hydroponics) "rMa" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate" @@ -51204,6 +53120,22 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/atmos) +"rOO" = ( +/obj/structure/table/wood, +/obj/item/taperecorder{ + pixel_x = -5; + pixel_y = 5 + }, +/turf/open/floor/carpet/green, +/area/medical/exam_room) +"rOP" = ( +/obj/effect/turf_decal/siding/white/corner{ + dir = 8 + }, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/crew_quarters/kitchen) "rOW" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -51269,13 +53201,6 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/gravity_generator) -"rPX" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/plating, -/area/maintenance/fore) "rQp" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/closet/firecloset, @@ -51322,17 +53247,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/secondary/entry) -"rQZ" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "rRb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -51393,14 +53307,6 @@ }, /turf/open/floor/iron, /area/science/explab) -"rRQ" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron, -/area/hallway/primary/central) "rRU" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -51423,15 +53329,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) -"rSk" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/mob/living/simple_animal/hostile/retaliate/goat{ - name = "Pete" - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "rSm" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -51444,20 +53341,6 @@ /obj/machinery/telecomms/server/presets/engineering, /turf/open/floor/circuit/green/telecomms, /area/tcommsat/server) -"rSC" = ( -/obj/machinery/door/airlock{ - name = "Service Hall"; - req_one_access_txt = "22;25;26;28;35;37;38;46" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/hallway/secondary/service) "rSI" = ( /obj/structure/sign/warning/vacuum/external{ pixel_x = 32 @@ -51468,6 +53351,13 @@ }, /turf/open/floor/plating, /area/engine/engineering) +"rSQ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/chair/stool/bar/directional/west, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "rST" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -51475,6 +53365,12 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) +"rTc" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "rTf" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -51508,18 +53404,11 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/xenobiology) -"rTK" = ( -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/iron, -/area/science/mixing) +"rTO" = ( +/obj/structure/table, +/obj/item/taperecorder, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "rUj" = ( /obj/machinery/camera/autoname/directional/east{ network = list("ss13","prison") @@ -51537,12 +53426,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"rUC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "rUR" = ( /obj/structure/chair{ dir = 4 @@ -51552,6 +53435,10 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) +"rUV" = ( +/obj/machinery/vending/dinnerware, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "rVa" = ( /obj/machinery/camera/directional/north, /obj/structure/disposalpipe/segment{ @@ -51590,17 +53477,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"rVD" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/firealarm/directional/east, -/obj/structure/closet/bombcloset/security, -/obj/machinery/camera/autoname/directional/east{ - network = list("ss13","security") - }, -/turf/open/floor/iron/dark, -/area/security/execution/transfer) "rVI" = ( /obj/structure/cable{ icon_state = "1-2" @@ -51613,18 +53489,15 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) -"rWw" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +"rWC" = ( +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop{ + pixel_x = -2; + pixel_y = 3; + dir = 8 }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) +/turf/open/floor/wood, +/area/medical/exam_room) "rWK" = ( /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ @@ -51634,21 +53507,14 @@ /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, /area/crew_quarters/heads/hos) +"rWM" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/curtain/bounty, +/turf/open/floor/plating, +/area/crew_quarters/theatre) "rWR" = ( /turf/closed/wall, /area/quartermaster/exploration_prep) -"rWT" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/light_switch{ - pixel_x = 27 - }, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain) "rXf" = ( /obj/structure/closet/secure_closet/injection{ name = "educational injections"; @@ -51660,6 +53526,22 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, /area/security/execution/transfer) +"rXh" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/opposingcorners, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "rXA" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51667,13 +53549,31 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"rYa" = ( -/obj/structure/chair, +"rXD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) +"rXI" = ( +/obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/medical/morgue) +"rYh" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_green/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hydroponics) "rYs" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -51686,15 +53586,14 @@ /obj/structure/sign/departments/minsky/research/research, /turf/closed/wall/r_wall, /area/science/lab) -"rYB" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 +"rYC" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "quarantineshutters"; + name = "Quarantine Shutters" }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) +/turf/open/floor/iron/dark, +/area/medical/medbay/lobby) "rYF" = ( /obj/structure/cable{ icon_state = "2-4" @@ -51725,23 +53624,22 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"rYT" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/cable/yellow{ - icon_state = "0-8" +"rYO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/iron, -/area/hydroponics) -"rYU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/obj/item/cigbutt/cigarbutt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "rZb" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -51759,6 +53657,16 @@ }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) +"rZp" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -27 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "rZC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -51830,6 +53738,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) +"sae" = ( +/obj/structure/closet, +/obj/effect/spawner/lootdrop/donkpockets, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "saV" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -51863,6 +53777,17 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) +"sbE" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark, +/area/medical/morgue) "sca" = ( /obj/machinery/newscaster{ pixel_y = 33 @@ -51938,6 +53863,22 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/plating, /area/hallway/secondary/entry) +"sdu" = ( +/obj/machinery/camera/autoname/directional/south{ + c_tag = "Captain's Quarters" + }, +/obj/structure/table/wood, +/obj/item/clothing/gloves/color/black, +/obj/item/lighter{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/storage/fancy/cigarettes/cigars/havana{ + pixel_x = 2; + pixel_y = 10 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain/private) "sdv" = ( /obj/structure/table/wood, /obj/item/storage/fancy/cigarettes{ @@ -51980,26 +53921,12 @@ "sei" = ( /turf/open/floor/engine, /area/science/explab) -"seN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) -"sfj" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/plating, -/area/maintenance/aft) +"sfk" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "sfp" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 @@ -52012,20 +53939,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"sgi" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "sgs" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 @@ -52085,20 +53998,28 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/engineering) -"sih" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +"sip" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 + dir = 10 }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 + }, +/obj/machinery/camera/autoname/directional/north, +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 + }, +/turf/open/floor/iron/white, +/area/medical/virology) "siD" = ( /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron, @@ -52165,6 +54086,13 @@ }, /turf/open/floor/iron/white, /area/science/robotics/lab) +"siZ" = ( +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/white/line, +/turf/open/floor/wood/big, +/area/maintenance/aft) "sjb" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -52265,6 +54193,16 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/prison/dark, /area/security/prison) +"skB" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/camera/preset/toxins, +/turf/open/floor/plating/airless, +/area/science/test_area) "skM" = ( /obj/machinery/airalarm/directional/east, /obj/item/kirbyplants/random, @@ -52285,34 +54223,18 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"slG" = ( -/obj/structure/closet, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/light_switch{ - pixel_y = -26 +"slr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, -/turf/open/floor/iron/white, -/area/medical/genetics) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/science/mixing) "smJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -52323,15 +54245,12 @@ }, /turf/open/floor/iron/dark, /area/science/nanite) -"sne" = ( -/obj/machinery/airalarm/directional/north, -/obj/machinery/light/small{ +"snf" = ( +/obj/effect/turf_decal/pool{ dir = 1 }, -/obj/machinery/camera/directional/north, -/obj/machinery/chem_master/condimaster, /turf/open/floor/iron, -/area/hydroponics) +/area/crew_quarters/fitness) "snr" = ( /obj/structure/lattice/catwalk/over, /obj/structure/cable/yellow{ @@ -52342,11 +54261,19 @@ }, /turf/open/floor/plating, /area/maintenance/central) -"snw" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +"snx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/medical/morgue) "snB" = ( @@ -52426,6 +54353,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) +"spa" = ( +/obj/structure/window/reinforced, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "spf" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27; @@ -52436,6 +54371,19 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"spg" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "spm" = ( /obj/machinery/door/airlock/security/glass{ name = "Holding Area"; @@ -52473,6 +54421,22 @@ }, /turf/open/floor/iron/dark, /area/teleporter) +"spz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) +"spA" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/medbay/central) "spF" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "hopqueue"; @@ -52514,12 +54478,9 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"sqB" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) +"sqz" = ( +/turf/closed/wall/r_wall, +/area/medical/genetics/cloning) "sqF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -52535,6 +54496,14 @@ }, /turf/open/floor/engine, /area/science/explab) +"sqR" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/white, +/area/medical/chemistry) "sqV" = ( /obj/machinery/light{ dir = 4 @@ -52556,6 +54525,10 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) +"srF" = ( +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/medical/storage) "srI" = ( /obj/machinery/newscaster{ pixel_y = 33 @@ -52588,6 +54561,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/bridge/meeting_room) +"ssw" = ( +/obj/structure/closet/secure_closet/freezer/kitchen, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "ssH" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -52608,13 +54585,15 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/security/courtroom) -"ssN" = ( -/obj/structure/closet/crate/freezer/blood, -/obj/effect/turf_decal/tile/blue{ +"ssR" = ( +/obj/machinery/computer/cargo{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/quartermaster/qm) "stf" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -52652,25 +54631,6 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/fore/secondary) -"svb" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Plumbing Factory Maintenance"; - req_access_txt = "5" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/maintenance/aft) "svw" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=AIW"; @@ -52678,6 +54638,13 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"svA" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "swm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -52703,44 +54670,26 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"sxa" = ( -/obj/structure/table/wood, -/obj/structure/mirror{ - pixel_x = -28 - }, -/obj/item/lipstick/random{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/lipstick/random{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white/side{ - dir = 4 +"swO" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 }, -/area/crew_quarters/theatre) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "sxm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/iron, /area/hydroponics/garden) -"sxt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +"sxo" = ( +/obj/structure/disposalpipe/junction/yjunction{ dir = 8 }, -/turf/open/floor/iron, -/area/hydroponics) +/turf/open/floor/wood, +/area/medical/break_room) "sxy" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /obj/item/flashlight/flare{ @@ -52782,6 +54731,21 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/engine/engineering) +"syz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) "syA" = ( /obj/effect/turf_decal/siding/wood{ layer = 1 @@ -52825,6 +54789,16 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/security/checkpoint/supply) +"syZ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/structure/chair/fancy/sofa/corp/left{ + dir = 4 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/carpet/black, +/area/crew_quarters/bar/atrium) "szk" = ( /obj/machinery/flasher/portable, /obj/effect/turf_decal/stripes/line{ @@ -52846,63 +54820,6 @@ }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/quartermaster/exploration_dock) -"szC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/medical/storage) -"szF" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/button/door{ - id = "QuarantineB"; - name = "Quarantine Bolts B"; - normaldoorcontrol = 1; - pixel_x = 8; - pixel_y = -21; - req_one_access_txt = "39;40;45"; - specialfunctions = 4 - }, -/obj/machinery/button/door{ - id = "QuarantineA"; - name = "Quarantine Bolts A"; - normaldoorcontrol = 1; - pixel_x = -8; - pixel_y = -21; - req_one_access_txt = "39;40;45"; - specialfunctions = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"szW" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white, -/obj/item/pen, -/obj/item/reagent_containers/glass/bottle/epinephrine, -/obj/item/reagent_containers/glass/bottle/charcoal{ - pixel_x = -4; - pixel_y = -3 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "sAj" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 8 @@ -52921,17 +54838,6 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) -"sAt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/crew_quarters/theatre) "sAB" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -53008,22 +54914,21 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/starboard) -"sBP" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/mime, +"sBT" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/cable/yellow{ - icon_state = "1-4" + icon_state = "1-2" }, -/turf/open/floor/iron/white/side{ - dir = 4 +/obj/machinery/door/airlock/maintenance{ + name = "Crematorium Maintenance"; + req_access_txt = "27" }, -/area/crew_quarters/theatre) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "sCg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -53063,6 +54968,24 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"sCA" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/camera/directional/south, +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) +"sCP" = ( +/obj/effect/mapping_helpers/tile_breaker, +/obj/effect/turf_decal/trimline/white/line{ + dir = 4 + }, +/turf/open/floor/wood/big, +/area/maintenance/aft) "sCT" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/effect/spawner/structure/window/reinforced, @@ -53147,6 +55070,32 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) +"sEv" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/sopservice{ + pixel_x = 11; + pixel_y = 6 + }, +/obj/item/shovel/spade, +/obj/item/stack/sheet/mineral/copper{ + amount = 5 + }, +/obj/item/reagent_containers/glass/bucket, +/obj/item/storage/toolbox/drone, +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/structure/sign/poster/contraband/red_rum{ + pixel_y = 32 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "sEx" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -53173,6 +55122,10 @@ }, /turf/open/floor/iron/solarpanel/airless, /area/solar/port/fore) +"sEG" = ( +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "sER" = ( /obj/structure/railing, /obj/structure/railing{ @@ -53191,6 +55144,19 @@ dir = 8 }, /area/storage/tech) +"sES" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 37 + }, +/turf/open/floor/iron/white, +/area/medical/genetics) "sET" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, @@ -53245,15 +55211,6 @@ }, /turf/open/floor/iron, /area/security/checkpoint/science) -"sFY" = ( -/obj/machinery/iv_drip, -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "sGk" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -53282,6 +55239,14 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) +"sGv" = ( +/obj/machinery/telecomms/processor/preset_exploration, +/obj/machinery/airalarm/server{ + dir = 4; + pixel_x = -28 + }, +/turf/open/floor/circuit/telecomms/server, +/area/quartermaster/exploration_dock) "sGB" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -53304,6 +55269,20 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"sGW" = ( +/obj/machinery/camera/directional/north, +/turf/open/floor/wood, +/area/crew_quarters/theatre) +"sHa" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/carpet, +/area/crew_quarters/theatre) "sHc" = ( /obj/machinery/gateway{ dir = 4 @@ -53316,6 +55295,32 @@ "sHg" = ( /turf/closed/wall/r_wall, /area/storage/tech) +"sHz" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) +"sHA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/medical/cryo) "sHM" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/orange/visible/layer2{ @@ -53323,6 +55328,19 @@ }, /turf/open/space, /area/space/nearstation) +"sIw" = ( +/obj/machinery/light_switch{ + pixel_x = -28 + }, +/obj/structure/chair/fancy/sofa/old/right{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/west, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "sIA" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -53388,6 +55406,19 @@ /obj/effect/turf_decal/numbers/two_nine, /turf/open/floor/prison, /area/security/prison) +"sIU" = ( +/obj/machinery/door/window/brigdoor/westleft{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "sJi" = ( /obj/machinery/flasher/portable, /obj/effect/turf_decal/stripes/line{ @@ -53426,14 +55457,6 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) -"sJI" = ( -/obj/structure/sign/departments/minsky/research/research{ - pixel_x = 32 - }, -/obj/effect/spawner/randomvend/cola, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron, -/area/maintenance/aft) "sJJ" = ( /obj/machinery/door/airlock/security{ name = "Equipment Room"; @@ -53448,6 +55471,30 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"sJK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/table, +/obj/item/food/dough{ + pixel_y = 1 + }, +/obj/item/food/piedough, +/obj/item/food/dough{ + pixel_x = -4 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) +"sJP" = ( +/obj/machinery/vending/medical{ + pixel_x = -2 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "sJS" = ( /obj/item/radio/intercom{ pixel_y = -35 @@ -53466,6 +55513,15 @@ }, /turf/open/floor/iron, /area/quartermaster/qm) +"sKo" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/structure/chair/fancy/sofa/corp/corner/concave{ + dir = 8 + }, +/turf/open/floor/carpet/black, +/area/crew_quarters/bar/atrium) "sKq" = ( /obj/structure/closet, /obj/structure/disposalpipe/segment{ @@ -53520,6 +55576,28 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/iron, /area/engine/engineering) +"sLO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/crew_quarters/dorms) +"sMn" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/medical/surgery) "sMt" = ( /obj/structure/sink{ dir = 8; @@ -53601,6 +55679,16 @@ }, /turf/open/floor/plating, /area/quartermaster/miningdock) +"sNL" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) "sNN" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 @@ -53612,12 +55700,6 @@ /obj/structure/pool_ladder, /turf/open/indestructible/sound/pool/end, /area/crew_quarters/fitness) -"sNZ" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "sOe" = ( /obj/structure/chair/office{ dir = 8 @@ -53641,17 +55723,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/security/prison) -"sOG" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "sPc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -53670,18 +55741,6 @@ }, /turf/open/floor/iron, /area/science/nanite) -"sPu" = ( -/obj/machinery/camera/directional/north, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/crew_quarters/theatre) "sPB" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -53763,17 +55822,14 @@ }, /turf/open/floor/plating, /area/security/execution/transfer) -"sQx" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" +"sQq" = ( +/obj/structure/aquarium, +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +/turf/open/floor/wood, +/area/medical/exam_room) "sQE" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /obj/item/clothing/head/utility/hardhat/orange{ @@ -53799,6 +55855,24 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) +"sQZ" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "sRc" = ( /obj/machinery/button/door{ id = "robotics"; @@ -53877,16 +55951,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) -"sRO" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "sRV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -53923,11 +55987,6 @@ }, /turf/open/floor/carpet, /area/vacant_room/office) -"sSZ" = ( -/obj/structure/chair, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "sTt" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/tile/black/fourcorners, @@ -53950,17 +56009,6 @@ }, /turf/open/floor/carpet/orange, /area/crew_quarters/dorms) -"sTO" = ( -/obj/item/kirbyplants/random, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "sTP" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /obj/machinery/atmospherics/components/binary/pump{ @@ -54051,6 +56099,15 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"sVx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "sVR" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 @@ -54063,13 +56120,6 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"sVT" = ( -/obj/structure/chair/stool, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/science/robotics/lab) "sWn" = ( /obj/machinery/airalarm/directional/north{ pixel_y = 23 @@ -54079,6 +56129,12 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"sWO" = ( +/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/medical/cryo) "sWW" = ( /obj/machinery/telecomms/broadcaster/preset_exploration, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -54115,24 +56171,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"sXR" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "sXV" = ( /obj/structure/sign/departments/minsky/engineering/telecommmunications{ pixel_x = -32 @@ -54156,31 +56194,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) -"sYl" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Plasma Outlet Pump" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/engine/atmos) "sYn" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"sYt" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/morgue) "sYx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ @@ -54217,13 +56236,10 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) -"sZf" = ( -/obj/machinery/door/airlock{ - id_tag = "Toilet1"; - name = "Toilet Unit #1" - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) +"sZa" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "sZo" = ( /obj/item/storage/secure/safe{ pixel_x = 6; @@ -54250,9 +56266,49 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"taf" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/tile/white, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/bed/roller, +/obj/item/bedsheet/medical, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) +"tam" = ( +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = -30 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/vending/wardrobe/sec_wardrobe, +/obj/machinery/light_switch/directional/west{ + pixel_y = -7 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "tav" = ( /turf/closed/wall, /area/vacant_room/commissary) +"taw" = ( +/obj/effect/turf_decal/trimline/white/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 1 + }, +/turf/open/floor/wood/big, +/area/maintenance/aft) "taz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54270,12 +56326,47 @@ /obj/machinery/digital_clock/directional/east, /turf/open/floor/iron, /area/engine/break_room) +"taQ" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) +"tbq" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/structure/dresser, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) "tcd" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, /turf/open/floor/iron, /area/security/brig) +"tci" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "tct" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -54337,19 +56428,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"tdh" = ( -/obj/structure/bed/dogbed/runtime, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "tdj" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -54489,16 +56567,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"teF" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Fitness Maintenance"; - req_access_txt = "12" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) "teG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -54525,8 +56593,15 @@ "teR" = ( /obj/structure/weightmachine, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/crew_quarters/fitness) +"tff" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "tfu" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 @@ -54554,16 +56629,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/engineering) -"tfI" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "tfO" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -54618,6 +56683,12 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"tgj" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "tgl" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -54639,6 +56710,18 @@ dir = 1 }, /area/hallway/secondary/exit) +"tgq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/structure/chair/fancy/sofa/old/left{ + dir = 8 + }, +/obj/machinery/camera/directional/south, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/carpet/green, +/area/crew_quarters/bar/atrium) "tgu" = ( /obj/structure/rack, /obj/item/lighter, @@ -54678,15 +56761,22 @@ }, /turf/open/floor/prison, /area/security/prison) -"thS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +"tgY" = ( +/obj/machinery/shower{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/extinguisher_cabinet{ + pixel_y = -31 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = -31 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) +"tho" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) @@ -54706,32 +56796,11 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"tin" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) -"tiP" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) -"tjb" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/white, -/area/medical/virology) +"tiU" = ( +/obj/machinery/vending/wardrobe/hydro_wardrobe, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/ridged/steel, +/area/hydroponics) "tjd" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -54790,6 +56859,18 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/warden) +"tku" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "tkF" = ( /obj/machinery/light/small{ dir = 4 @@ -54798,6 +56879,13 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"tkK" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_red/line, +/turf/open/floor/wood/big, +/area/maintenance/aft) "tkN" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -54806,18 +56894,10 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, /area/hallway/primary/aft) -"tln" = ( -/obj/machinery/power/apc/auto_name/directional/east{ - pixel_x = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) +"tlH" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/open/floor/grass/no_border, +/area/medical/genetics) "tlM" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/tile/black/fourcorners, @@ -54861,6 +56941,23 @@ }, /turf/open/floor/carpet, /area/vacant_room/office) +"tna" = ( +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/obj/structure/closet/crate/wooden, +/obj/item/clothing/under/costume/gangster, +/obj/item/clothing/under/costume/gangster/purple, +/obj/item/clothing/under/costume/geisha, +/obj/item/clothing/suit/hooded/renault_costume, +/obj/item/clothing/suit/hooded/carp_costume, +/obj/item/clothing/head/costume/santa, +/obj/item/clothing/under/costume/lobster, +/obj/item/clothing/head/costume/lobsterhat, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "tnx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -54882,12 +56979,6 @@ dir = 4 }, /area/engine/atmos) -"tod" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "top" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -54917,6 +57008,16 @@ }, /turf/open/floor/iron/freezer, /area/medical/virology) +"toE" = ( +/obj/effect/turf_decal/tile/white, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "tpc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/tile/red{ @@ -54942,6 +57043,13 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/teleporter) +"tpt" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "tpu" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -54992,21 +57100,24 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/security/checkpoint/science) -"tqv" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, +"tqF" = ( +/turf/closed/wall/r_wall, +/area/maintenance/fore/secondary) +"tqH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 + dir = 5 }, -/turf/open/floor/iron/white, -/area/medical/virology) -"tqF" = ( -/turf/closed/wall/r_wall, -/area/maintenance/fore/secondary) +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port) "tqU" = ( /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ dir = 1 @@ -55045,6 +57156,23 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) +"trH" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/chair/fancy/sofa/old/left{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) +"trK" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "tsb" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -55055,31 +57183,18 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"tsf" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13, engine") - }, -/turf/open/floor/iron, -/area/hallway/primary/aft) -"tsI" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +"tsi" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + name = "Connector Port (Air Supply)" }, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/light_switch{ - pixel_y = -25 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/medical/cryo) "tsJ" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -55090,6 +57205,16 @@ }, /turf/open/space, /area/space/nearstation) +"tsL" = ( +/obj/structure/barricade/wooden/crude, +/obj/structure/grille/broken, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Dunking Zone Airlock"; + req_access_txt = "12" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "tsM" = ( /obj/structure/closet/secure_closet/genpop, /obj/structure/railing{ @@ -55200,6 +57325,17 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"tur" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_green/half/contrasted, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/turf/open/floor/iron, +/area/hydroponics) "tus" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 @@ -55224,15 +57360,6 @@ }, /turf/open/floor/carpet, /area/hallway/secondary/entry) -"tuJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) "tvf" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box{ @@ -55273,19 +57400,6 @@ }, /turf/open/floor/carpet, /area/library) -"twb" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/iron, -/area/hydroponics) "twf" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -55369,6 +57483,26 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"txx" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/port) +"txK" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 8 + }, +/turf/open/floor/wood/big, +/area/maintenance/aft) +"txT" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "txZ" = ( /obj/item/radio/intercom{ dir = 4; @@ -55397,6 +57531,12 @@ /obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/open/floor/plating, /area/maintenance/central) +"tyn" = ( +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "typ" = ( /obj/structure/chair/wood/normal{ dir = 1 @@ -55419,6 +57559,10 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"tyw" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/crew_quarters/bar/atrium) "tyx" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -55435,6 +57579,18 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning, /turf/open/floor/iron/dark, /area/bridge/meeting_room) +"tyR" = ( +/obj/item/wrench/medical, +/obj/item/crowbar, +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/airalarm/directional/south, +/obj/structure/table/glass, +/turf/open/floor/iron/dark, +/area/medical/cryo) "tyT" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -55499,24 +57655,39 @@ }, /obj/structure/weightmachine/weightlifter, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/crew_quarters/fitness) -"tzK" = ( -/obj/effect/turf_decal/siding/thinplating_new/corner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/dorms) "tAf" = ( /obj/machinery/light/small, /turf/open/floor/engine/o2, /area/engine/atmos) +"tAl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) +"tAn" = ( +/obj/structure/sign/poster/official/cleanliness, +/turf/closed/wall, +/area/medical/medbay/lobby) +"tAr" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/bed, +/obj/item/bedsheet/green, +/obj/effect/landmark/start/bartender, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "tAB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55542,13 +57713,6 @@ /obj/structure/flora/rock/jungle, /turf/open/floor/grass, /area/hallway/secondary/command) -"tAG" = ( -/obj/machinery/door/window/southright{ - name = "Bar Door"; - req_one_access_txt = "25;28" - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "tAH" = ( /obj/machinery/advanced_airlock_controller{ pixel_y = 24 @@ -55561,6 +57725,14 @@ }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) +"tAZ" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/crew_quarters/kitchen) "tBb" = ( /obj/structure/table/reinforced, /obj/item/computer_hardware/hard_drive/role/engineering{ @@ -55625,32 +57797,6 @@ }, /turf/open/floor/iron/techmaint, /area/security/prison/shielded) -"tBN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"tCh" = ( -/obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_access_txt = "6;5" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "tCH" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -55673,6 +57819,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/virology) +"tCY" = ( +/obj/machinery/camera/autoname/directional/east, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/white, +/area/medical/genetics) "tDp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -55698,6 +57852,13 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"tDx" = ( +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hydroponics) "tDA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -55709,27 +57870,6 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/hor) -"tDM" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = "GeneticsDoor"; - name = "Cloning"; - req_access_txt = "5; 68" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/genetics) "tEj" = ( /obj/machinery/computer/objective{ dir = 8 @@ -55744,26 +57884,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"tEq" = ( -/obj/structure/table, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -31 - }, -/obj/item/clothing/head/utility/hardhat/cakehat, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"tEr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "tEs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -55814,10 +57934,33 @@ }, /turf/open/floor/iron/techmaint, /area/storage/tech) +"tEW" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/sign/departments/medbay/alt{ + pixel_y = -31; + pixel_x = 31 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "tFe" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/port) +"tFf" = ( +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/crew_quarters/kitchen) "tFh" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=8"; @@ -55829,12 +57972,30 @@ /obj/structure/plasticflaps/opaque, /turf/open/floor/iron, /area/security/brig) +"tFo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/chair/fancy/sofa/old/right{ + dir = 4 + }, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/bar/atrium) "tFw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /turf/open/floor/iron, /area/storage/primary) +"tFP" = ( +/obj/item/kirbyplants/random, +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "tGc" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -55851,6 +58012,18 @@ }, /turf/open/floor/engine, /area/science/explab) +"tGD" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood, +/area/medical/exam_room) "tGF" = ( /obj/machinery/ntnet_relay, /obj/structure/cable/yellow{ @@ -55902,15 +58075,6 @@ }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) -"tHf" = ( -/obj/structure/chair, -/obj/machinery/airalarm/directional/east, -/obj/machinery/camera/autoname/directional/east, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "tHw" = ( /obj/machinery/airalarm/directional/north{ pixel_y = 23 @@ -55938,6 +58102,32 @@ }, /turf/open/floor/prison, /area/security/prison) +"tHI" = ( +/obj/machinery/button/door{ + id = "chemistry_shutters"; + name = "Chemistry shutters"; + pixel_x = -24; + pixel_y = -6; + req_one_access_txt = "5; 33" + }, +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_y = 13; + pixel_x = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/item/storage/box/medsprays{ + pixel_y = 13; + pixel_x = -6 + }, +/obj/item/storage/box/pillbottles{ + pixel_x = -6 + }, +/obj/item/storage/box/syringes{ + pixel_x = 7 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "tHS" = ( /obj/item/paper_bin{ pixel_x = -4; @@ -55969,17 +58159,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"tIi" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "tIl" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -55992,6 +58171,19 @@ }, /turf/open/floor/wood, /area/security/detectives_office) +"tIw" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/newscaster{ + pixel_x = -30 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "tIx" = ( /obj/machinery/computer/card/minor/ce{ dir = 4 @@ -56005,24 +58197,6 @@ "tIA" = ( /turf/closed/wall, /area/science/explab) -"tID" = ( -/obj/machinery/button/door{ - id = "Toilet2"; - name = "Lock Control"; - normaldoorcontrol = 1; - pixel_y = 24; - specialfunctions = 4 - }, -/obj/effect/landmark/start/assistant, -/obj/machinery/newscaster{ - pixel_x = 32 - }, -/obj/structure/toilet{ - dir = 8 - }, -/obj/machinery/light/small, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) "tIE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -56033,6 +58207,21 @@ }, /turf/open/floor/iron/white, /area/science/explab) +"tIL" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "tIO" = ( /obj/machinery/atmospherics/components/binary/pump/on{ name = "Waste Out" @@ -56042,12 +58231,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"tIW" = ( -/obj/structure/table, -/obj/item/kitchen/rollingpin, -/obj/item/book/manual/wiki/sopservice, -/turf/open/floor/iron, -/area/hallway/secondary/service) "tJd" = ( /obj/machinery/airalarm/directional/north{ pixel_y = 23 @@ -56080,13 +58263,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/locker) -"tJV" = ( -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wideplating/dark, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/captain) "tKd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -56114,6 +58290,14 @@ }, /turf/open/floor/iron/white, /area/science/mixing/chamber) +"tKy" = ( +/obj/structure/chair/fancy/sofa/old/right{ + color = "#742925"; + dir = 1 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/carpet/green, +/area/medical/exam_room) "tKA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -56134,6 +58318,17 @@ }, /turf/open/floor/iron/dark, /area/teleporter) +"tKV" = ( +/obj/machinery/telecomms/broadcaster/preset_left, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/airalarm/server{ + dir = 4; + pixel_x = -22 + }, +/turf/open/floor/circuit/telecomms, +/area/tcommsat/server) "tLg" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 8 @@ -56172,6 +58367,13 @@ }, /turf/open/floor/iron/dark, /area/storage/tech) +"tLy" = ( +/obj/structure/chair/fancy/comfy{ + color = "#596479" + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/wood, +/area/medical/break_room) "tLN" = ( /obj/structure/table, /obj/item/paper_bin, @@ -56207,6 +58409,13 @@ }, /turf/open/floor/iron, /area/security/checkpoint/supply) +"tMd" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/chair/stool/directional/north, +/turf/open/floor/iron/white, +/area/science/xenobiology) "tMe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -56219,12 +58428,13 @@ dir = 1 }, /area/chapel/main) -"tMg" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +"tMn" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/turf/open/floor/iron/white, -/area/medical/cryo) +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "tMw" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -56265,13 +58475,6 @@ }, /turf/open/floor/carpet/grimy, /area/security/brig) -"tMY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron, -/area/hydroponics) "tNa" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -56283,13 +58486,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"tNy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +"tNl" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 }, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/iron/white, -/area/medical/surgery) +/obj/structure/table/glass, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "tNE" = ( /turf/open/floor/holofloor/plating, /area/holodeck/prison) @@ -56315,6 +58518,10 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"tOI" = ( +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "tOU" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ @@ -56376,21 +58583,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) -"tPt" = ( -/obj/machinery/vending/wardrobe/gene_wardrobe, -/obj/structure/extinguisher_cabinet{ - pixel_x = 5; - pixel_y = 30 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/machinery/light_switch{ - pixel_x = -7; - pixel_y = 26 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "tPK" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -56424,14 +58616,42 @@ /obj/machinery/status_display/supply, /turf/closed/wall, /area/quartermaster/storage) -"tRo" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 +"tQv" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/turf/open/floor/iron/white, -/area/medical/surgery) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) +"tQY" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/window/reinforced, +/turf/open/floor/wood, +/area/crew_quarters/theatre/backstage) +"tRF" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port) "tRI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -56452,6 +58672,12 @@ dir = 9 }, /area/science/research) +"tSm" = ( +/obj/structure/table, +/obj/item/storage/box/matches, +/obj/item/storage/fancy/cigarettes, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "tSr" = ( /obj/machinery/power/apc/auto_name/directional/east{ pixel_x = 24 @@ -56501,6 +58727,22 @@ }, /turf/open/floor/plating, /area/maintenance/fore) +"tSP" = ( +/obj/structure/table/wood, +/obj/item/toy/dummy, +/obj/item/food/baguette, +/obj/item/toy/figure/mime{ + pixel_x = -10; + pixel_y = -1 + }, +/obj/structure/mirror{ + pixel_y = 28 + }, +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre/backstage) "tSQ" = ( /obj/structure/window/reinforced{ dir = 8 @@ -56520,10 +58762,26 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/courtroom) -"tST" = ( -/obj/structure/chair/stool, -/turf/open/floor/prison, -/area/security/prison) +"tSU" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/chair/fancy/bench{ + pixel_y = 13 + }, +/obj/machinery/airalarm/directional/north, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) +"tSV" = ( +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "tTq" = ( /turf/open/floor/carpet, /area/hallway/secondary/entry) @@ -56538,19 +58796,6 @@ dir = 8 }, /area/engine/atmos) -"tTL" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) -"tTS" = ( -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/dark, -/area/medical/morgue) "tTU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -56579,6 +58824,17 @@ }, /turf/open/floor/prison, /area/security/prison) +"tUw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/storage) "tUC" = ( /obj/structure/table/reinforced, /obj/item/kitchen/rollingpin, @@ -56591,33 +58847,27 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"tVl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +"tVm" = ( +/obj/structure/table/glass, +/obj/item/storage/pill_bottle/mannitol{ + pixel_x = -6 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/storage/pill_bottle/mutadone{ + pixel_x = -6 }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ +/obj/structure/window/reinforced{ dir = 1 }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) -"tVy" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/structure/chair{ +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/item/storage/box/monkeycubes{ + pixel_x = 8; + pixel_y = -2 + }, /turf/open/floor/iron/white, -/area/medical/apothecary) +/area/medical/genetics) "tVE" = ( /obj/structure/window/reinforced{ dir = 8 @@ -56655,6 +58905,24 @@ }, /turf/open/floor/wood, /area/lawoffice) +"tXd" = ( +/obj/machinery/door/airlock/medical{ + name = "Autopsy Room A"; + req_access_txt = "5" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/medical/morgue) +"tXo" = ( +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "tXy" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -56670,26 +58938,13 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"tXQ" = ( -/obj/machinery/button/door{ - desc = "A remote control switch for the medbay foyer."; - id = "MedbayFoyer"; - name = "Medbay Doors Control"; - normaldoorcontrol = 1; - pixel_x = 26; - req_access_txt = "5" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) -"tXR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +"tXO" = ( +/obj/effect/turf_decal/pool{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/structure/chair/stool/directional/west, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "tXX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -56727,13 +58982,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"tYh" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1; - name = "N2 Outlet Pump" - }, -/turf/open/floor/iron/dark/side, -/area/engine/atmos) "tYC" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -56773,6 +59021,25 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"tYZ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, +/turf/open/floor/iron/white, +/area/medical/virology) "tZg" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -56786,28 +59053,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, /area/security/prison) -"tZy" = ( -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/light_switch{ - pixel_x = -28 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) -"tZA" = ( -/obj/machinery/door/airlock/medical{ - name = "Autopsy Room B"; - req_access_txt = "6;5" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/dark, -/area/medical/morgue) "tZZ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -56820,6 +59065,18 @@ }, /turf/open/floor/iron, /area/quartermaster/miningdock) +"uah" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/requests_console{ + department = "Theatre"; + name = "theatre RC"; + pixel_x = -32 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/theatre/backstage) "uas" = ( /obj/machinery/light/small{ dir = 1 @@ -56842,6 +59099,15 @@ }, /turf/open/floor/iron, /area/security/brig) +"ube" = ( +/obj/machinery/shower{ + dir = 4; + name = "emergency shower" + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/noslip/white, +/area/medical/patients_rooms) "ubw" = ( /obj/effect/turf_decal/bot, /obj/machinery/firealarm{ @@ -56851,13 +59117,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/science/nanite) -"ubL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/camera/directional/south, -/turf/open/floor/iron, -/area/hallway/primary/port) "ubO" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -56874,12 +59133,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"ubU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "ubW" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -56887,18 +59140,6 @@ }, /turf/open/floor/wood, /area/security/detectives_office) -"ucv" = ( -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) -"ucP" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "ucY" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -56971,18 +59212,10 @@ /obj/item/stock_parts/cell/high, /turf/open/floor/iron/techmaint, /area/ai_monitored/storage/eva) -"ueA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) +"uea" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "ueB" = ( /obj/vehicle/ridden/secway, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -56995,17 +59228,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"ueF" = ( -/obj/machinery/door/airlock{ - name = "Unisex Showers" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/crew_quarters/toilet) "ueK" = ( /obj/structure/noticeboard{ dir = 1; @@ -57014,17 +59236,6 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/engine/break_room) -"ueQ" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/effect/landmark/start/geneticist, -/turf/open/floor/iron/white, -/area/medical/genetics) "ufk" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -57087,24 +59298,13 @@ }, /turf/open/floor/prison, /area/security/prison) -"ugn" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Dormitory" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/door/firedoor, +"ugv" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/effect/turf_decal/stripes/closeup, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron, -/area/crew_quarters/dorms) +/area/crew_quarters/fitness) "ugE" = ( /obj/machinery/newscaster{ pixel_y = -32 @@ -57116,6 +59316,14 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line, /turf/open/floor/iron/dark, /area/bridge) +"ugH" = ( +/obj/structure/closet/secure_closet/medical3, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/airalarm/directional/west, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/dark, +/area/medical/storage) "ugK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -57241,6 +59449,10 @@ /obj/effect/loot_jobscale/armoury/riot_shotgun, /turf/open/floor/iron, /area/ai_monitored/security/armory) +"ukb" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/crew_quarters/bar/atrium) "ukk" = ( /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ dir = 4 @@ -57297,14 +59509,6 @@ }, /turf/open/floor/iron/white, /area/medical/apothecary) -"ulU" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/scientist, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/science/lab) "ulX" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -57312,43 +59516,13 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"ulZ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/sorting/mail/flip{ - sortType = 12 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) -"umf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ +"umv" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, /turf/open/floor/iron/white, -/area/medical/medbay/central) -"umi" = ( -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +/area/medical/apothecary) "umA" = ( /obj/structure/toilet, /obj/machinery/status_display/door_timer{ @@ -57389,27 +59563,11 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/aft) -"unu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) -"unz" = ( -/obj/structure/table, -/obj/machinery/door/window/northright{ - dir = 4; - name = "First-Aid Supplies"; - red_alert_access = 1; - req_access_txt = "5" - }, -/obj/effect/loot_jobscale/medical/medkits, -/turf/open/floor/iron/white, -/area/medical/storage) +"uny" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/curtain/bounty, +/turf/open/floor/plating, +/area/crew_quarters/bar) "unH" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -57434,6 +59592,48 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) +"unM" = ( +/obj/machinery/power/apc/auto_name/directional/west{ + pixel_x = -24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/yellow, +/turf/open/floor/iron/white, +/area/science/xenobiology) +"unQ" = ( +/obj/structure/table/reinforced, +/obj/machinery/dish_drive{ + pixel_y = 5 + }, +/obj/machinery/door/poddoor/shutters{ + id = "barcounter"; + name = "Bar Counter Shutters" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) +"unS" = ( +/obj/machinery/computer/arcade/battle{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) +"unZ" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/sign/departments/medbay/alt{ + pixel_y = -31; + pixel_x = -31 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "uoc" = ( /obj/machinery/light{ dir = 8 @@ -57461,6 +59661,25 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"uoj" = ( +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, +/turf/open/floor/plating, +/area/maintenance/aft) +"uok" = ( +/obj/machinery/light, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/glasses/eyepatch, +/obj/item/clothing/mask/muzzle, +/obj/item/clothing/glasses/blindfold, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/obj/structure/table, +/turf/open/floor/iron/dark, +/area/medical/surgery) "uos" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -57560,6 +59779,12 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/dorms) +"ura" = ( +/obj/machinery/computer/operating{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "ure" = ( /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/fullgrass, @@ -57576,13 +59801,6 @@ }, /turf/open/floor/grass, /area/crew_quarters/dorms) -"uro" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "urq" = ( /obj/structure/table, /obj/item/storage/crayons, @@ -57623,6 +59841,26 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/heads/hor) +"urK" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/theatre) +"urV" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/bedsheetbin{ + pixel_x = 2 + }, +/turf/open/floor/iron/dark, +/area/medical/surgery) "urW" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -57643,6 +59881,11 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line, /turf/open/floor/iron/dark, /area/hallway/primary/central) +"usc" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "usl" = ( /obj/structure/sign/warning/securearea{ pixel_x = 32 @@ -57661,23 +59904,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/xenobiology) -"usC" = ( -/obj/structure/table, -/obj/machinery/vending/wallmed{ - pixel_x = -28 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/item/glove_box, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_y = 8 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "usF" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/door/airlock/command{ @@ -57700,10 +59926,6 @@ dir = 8 }, /area/engine/atmos) -"usO" = ( -/obj/machinery/digital_clock/directional/south, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "utF" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -57719,17 +59941,46 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"uve" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +"utM" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) +"uue" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "uvs" = ( /obj/machinery/power/solar_control{ id = "auxsolareast"; @@ -57740,20 +59991,10 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) -"uvx" = ( -/obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/surgery) +"uvw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "uvN" = ( /obj/item/radio/intercom{ pixel_y = 22 @@ -57799,6 +60040,14 @@ }, /turf/open/floor/plating, /area/security/courtroom) +"uxg" = ( +/obj/machinery/washing_machine, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "uxq" = ( /obj/structure/chair{ dir = 8; @@ -57823,53 +60072,34 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) -"uxB" = ( -/obj/machinery/button/door{ - id = "maint2"; - name = "Blast Door Control B"; - pixel_x = -28; - pixel_y = 4 - }, -/obj/machinery/button/door{ - id = "maint1"; - name = "Blast Door Control A"; - pixel_x = -28; - pixel_y = -6 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "uxM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /turf/open/floor/iron, /area/quartermaster/storage) -"uyQ" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +"uxO" = ( +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 9 }, -/obj/item/kirbyplants/photosynthetic{ - layer = 3.1 +/obj/effect/mapping_helpers/tile_breaker, +/turf/open/floor/wood/big, +/area/maintenance/aft) +"uyr" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/obj/machinery/light{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/machinery/airalarm/directional/east, -/obj/machinery/camera/motion/directional/east{ - network = list("aiupload") +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/turf/open/floor/iron/dark, -/area/ai_monitored/turret_protected/ai_upload) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "uyT" = ( /obj/structure/chair/fancy, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -57920,6 +60150,18 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"uzT" = ( +/obj/item/radio/intercom{ + pixel_y = 25 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/iron, +/area/science/mixing) "uzV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -57990,35 +60232,11 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/prison, /area/security/prison) -"uBZ" = ( -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Security's Desk"; - departmentType = 5; - name = "Head of Security RC"; - pixel_y = 30 - }, -/obj/structure/table/wood, -/obj/item/storage/box/seccarts{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/storage/box/deputy, -/obj/item/toy/figure/hos, -/obj/machinery/camera/autoname/directional/north{ - network = list("ss13","security") - }, -/turf/open/floor/carpet/red, -/area/crew_quarters/heads/hos) -"uCp" = ( -/obj/structure/table, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/effect/loot_jobscale/medical/medkits, -/turf/open/floor/iron/white, -/area/medical/storage) +"uBL" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/siding/thinplating_new/corner, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "uCI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -58070,24 +60288,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/engine/atmos) -"uDt" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/prison, -/area/security/prison) "uDB" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -58100,28 +60300,35 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) +"uDZ" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=2"; + freq = 1400; + location = "Hydroponics" + }, +/obj/structure/plasticflaps/opaque, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/hydroponics) "uEw" = ( /obj/structure/cable{ icon_state = "2-8" }, /turf/open/floor/iron, /area/engine/engineering) +"uEC" = ( +/obj/machinery/chem_heater, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "uEE" = ( /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/hallway/primary/central) -"uEG" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Gas to Filter" - }, -/obj/machinery/airalarm/engine{ - dir = 8; - pixel_x = -23 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine, -/area/engine/supermatter) "uEI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -58167,14 +60374,41 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"uGr" = ( -/obj/machinery/gibber, -/obj/machinery/airalarm/kitchen_cold_room{ - dir = 4; - pixel_x = 22 +"uFq" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 4 }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +/obj/effect/decal/cleanable/dirt, +/obj/item/glove_box{ + pixel_x = -7; + pixel_y = 2 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) +"uFr" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/storage/box/disks{ + pixel_x = 1; + pixel_y = 2 + }, +/turf/open/floor/iron/white, +/area/medical/genetics) +"uFK" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "uGA" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -58213,15 +60447,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) -"uGZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) "uHd" = ( /obj/structure/chair/office/light{ dir = 4 @@ -58232,6 +60457,19 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"uHk" = ( +/obj/machinery/door/poddoor/preopen{ + id = "maint3" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/maintenance/starboard/fore) "uHQ" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 5; @@ -58272,21 +60510,6 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron/white, /area/science/research) -"uIO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/sign/departments/minsky/engineering/atmospherics{ - pixel_y = -32 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) "uJd" = ( /obj/machinery/light/small, /obj/machinery/airalarm/directional/south{ @@ -58295,6 +60518,13 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/security/courtroom) +"uJl" = ( +/obj/machinery/light_switch{ + pixel_x = -28 + }, +/obj/machinery/smartfridge/chemistry, +/turf/closed/wall, +/area/medical/apothecary) "uJp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -58304,19 +60534,6 @@ }, /turf/open/floor/iron, /area/engine/break_room) -"uJP" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "uJV" = ( /obj/structure/cable{ icon_state = "1-4" @@ -58329,6 +60546,18 @@ }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) +"uKd" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "uKv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58397,23 +60626,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/gravity_generator) -"uMw" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, -/obj/machinery/camera/autoname/directional/east, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) -"uMI" = ( -/obj/structure/table, -/obj/item/storage/backpack/duffelbag/med/implant{ - pixel_y = 8 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "uMN" = ( /obj/effect/turf_decal/delivery/red, /obj/machinery/door/firedoor, @@ -58473,17 +60685,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/security/prison) -"uOw" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "uOz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -58516,15 +60717,6 @@ }, /turf/open/floor/iron, /area/quartermaster/office) -"uPa" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/item/pen, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "uPo" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod One" @@ -58611,6 +60803,10 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"uQL" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/iron/checker, +/area/crew_quarters/bar/atrium) "uRa" = ( /obj/machinery/light/small, /obj/machinery/camera/autoname/directional/south{ @@ -58677,6 +60873,18 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) +"uSC" = ( +/obj/structure/window/reinforced, +/obj/effect/turf_decal/siding/wood, +/obj/structure/musician/piano{ + icon_state = "piano" + }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = -31 + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "uSR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -58695,9 +60903,33 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/hallway/primary/fore) +"uUq" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "uUy" = ( /turf/open/floor/iron, /area/science/mixing) +"uUP" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "uUS" = ( /obj/item/radio/intercom/chapel{ pixel_x = 26 @@ -58737,6 +60969,12 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/iron, /area/crew_quarters/locker) +"uVQ" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/structure/fluff/hedge/opaque, +/obj/effect/turf_decal/siding/wood/corner, +/turf/open/floor/wood/big, +/area/crew_quarters/bar/atrium) "uWa" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -58776,6 +61014,12 @@ }, /turf/open/floor/iron/dark, /area/security/warden) +"uWg" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "uWk" = ( /obj/machinery/door/airlock/external{ name = "Cargo Escape Airlock" @@ -58791,12 +61035,18 @@ }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) -"uWn" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +"uWw" = ( +/obj/machinery/door/poddoor/preopen{ + id = "chemistry_shutters"; + name = "Chemistry shutters" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + name = "Chemistry Lab"; + req_access_txt = "5; 33" }, /turf/open/floor/iron/white, -/area/medical/cryo) +/area/medical/apothecary) "uWO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -58866,27 +61116,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"uYr" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"uYs" = ( -/obj/machinery/vending/wallmed{ - pixel_x = -28 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "uYw" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -58908,6 +61137,31 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"uYF" = ( +/obj/effect/turf_decal/stripes/box, +/obj/structure/sign/poster/contraband/fun_police{ + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/machinery/rnd/production/techfab/department/service, +/turf/open/floor/iron, +/area/hallway/secondary/service) +"uYQ" = ( +/obj/machinery/camera/directional/south, +/turf/open/floor/iron, +/area/hallway/primary/starboard) +"uYV" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/crew_quarters/theatre) "uZc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -58920,6 +61174,18 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"uZe" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "uZo" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -58955,20 +61221,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) -"vay" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "vaO" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -58982,6 +61234,17 @@ }, /turf/open/floor/prison, /area/security/prison) +"vba" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/vending/medical{ + pixel_x = -2 + }, +/obj/machinery/vending/medical{ + pixel_x = -2 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/medical/storage) "vbg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/donkpockets, @@ -58998,15 +61261,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/brig) -"vbQ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "vbT" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -59043,23 +61297,6 @@ }, /turf/open/floor/iron, /area/quartermaster/qm) -"vck" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=4"; - dir = 4; - freq = 1400; - location = "Medbay" - }, -/obj/structure/plasticflaps/opaque, -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/medical/storage) "vdd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -59075,6 +61312,14 @@ dir = 5 }, /area/science/research) +"vdp" = ( +/obj/machinery/vending/wardrobe/chem_wardrobe, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "vdA" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -59084,6 +61329,15 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"vdG" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/vending/wardrobe/medi_wardrobe, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/medical/storage) "vdT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -59093,6 +61347,17 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"vel" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) +"vem" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/virology) "veo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -59189,6 +61454,21 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/crew_quarters/heads/hop) +"vgk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, +/area/medical/break_room) "vgo" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/structure/cable/yellow{ @@ -59206,6 +61486,22 @@ /obj/machinery/camera/directional/north, /turf/open/floor/engine, /area/science/xenobiology) +"vgA" = ( +/obj/structure/rack, +/obj/item/storage/box/donkpockets, +/obj/item/stack/package_wrap, +/obj/item/book/manual/chef_recipes{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/radio/intercom{ + pixel_y = 25 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "vgU" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/open/floor/iron/dark, @@ -59214,6 +61510,19 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/hallway/secondary/command) +"vhB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "vhT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -59243,13 +61552,6 @@ dir = 9 }, /area/science/research) -"vil" = ( -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) "vim" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -59284,20 +61586,6 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/iron, /area/crew_quarters/locker) -"vjh" = ( -/obj/structure/table/glass, -/obj/machinery/reagentgrinder, -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "vjl" = ( /obj/structure/table/reinforced, /obj/item/storage/bag/tray, @@ -59307,6 +61595,21 @@ }, /turf/open/floor/prison, /area/security/prison) +"vjJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/turf/open/floor/carpet/grimy, +/area/crew_quarters/bar) "vjP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/wood, @@ -59341,6 +61644,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"vko" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/medical/storage) "vkq" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /obj/effect/turf_decal/siding/dark_blue{ @@ -59368,6 +61679,15 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) +"vkx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/effect/turf_decal/tile/blue, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark, +/area/medical/surgery) "vkC" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, @@ -59491,26 +61811,9 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/hor) -"vmz" = ( -/obj/machinery/door/airlock/research{ - name = "Toxins Launch Room"; - req_access_txt = "7" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, +"vmv" = ( /turf/open/floor/iron, -/area/science/mixing) +/area/maintenance/aft) "vmB" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/stripes/corner{ @@ -59570,6 +61873,13 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"vmZ" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "vnk" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -59612,6 +61922,18 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"voa" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/chair/fancy/bench{ + pixel_y = 13 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "voe" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/bot, @@ -59643,6 +61965,69 @@ }, /turf/open/floor/iron, /area/security/brig) +"voG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"vpf" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = -9; + pixel_y = 5 + }, +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_x = -9 + }, +/obj/item/storage/box/papersack{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/machinery/camera/directional/north, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "vpk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -59652,6 +62037,16 @@ }, /turf/open/floor/iron/white, /area/science/explab) +"vpD" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/light, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "vpP" = ( /obj/machinery/door/poddoor{ id = "SecJusticeChamber"; @@ -59672,6 +62067,17 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"vqa" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) +"vqg" = ( +/obj/structure/cable/yellow, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "vqk" = ( /obj/machinery/airalarm/directional/west{ pixel_x = -22 @@ -59685,6 +62091,18 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) +"vqN" = ( +/obj/structure/table/wood, +/obj/item/gun/ballistic/shotgun/doublebarrel, +/obj/item/stack/spacecash/c1{ + pixel_y = 11 + }, +/obj/item/stack/spacecash/c100{ + pixel_y = 10 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "vqV" = ( /obj/structure/mirror{ pixel_x = 28 @@ -59764,6 +62182,22 @@ }, /turf/open/floor/iron/white, /area/science/research) +"vrZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/tile/green/opposingcorners, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "vsg" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -59772,6 +62206,24 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/hallway/primary/central) +"vsA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "vsD" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -59833,6 +62285,15 @@ }, /turf/open/floor/iron, /area/ai_monitored/security/armory) +"vtG" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/medical/exam_room) "vtH" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 10 @@ -59855,12 +62316,24 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"vud" = ( +/obj/effect/spawner/lootdrop/gloves, +/obj/structure/reagent_dispensers/watertank/high, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "vuz" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/bowl, /obj/item/kitchen/fork, /turf/open/floor/prison, /area/security/prison) +"vuA" = ( +/obj/structure/noticeboard{ + dir = 4; + pixel_x = -27 + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "vuV" = ( /turf/open/floor/plating{ broken = 1 @@ -59878,39 +62351,54 @@ }, /turf/open/floor/iron/grid/steel, /area/gateway) -"vvH" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/dark, -/area/hydroponics) -"vvL" = ( +"vvj" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Service Maintenance"; + req_access_txt = null; + req_one_access_txt = "25;26;35;28;22;37;46;38" + }, /obj/structure/cable/yellow{ - icon_state = "0-8" + icon_state = "1-2" }, -/obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/plating, -/area/maintenance/fore/secondary) +/area/maintenance/starboard/fore) +"vvx" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "vvN" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"vvT" = ( +/obj/structure/closet/crate/freezer/surplus_limbs, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/medical/storage) "vwb" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, /obj/item/latexballon, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"vwT" = ( -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +"vwl" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/structure/chair/fancy/sofa/corp/corner/concave{ + dir = 1 }, -/turf/open/floor/iron, -/area/crew_quarters/theatre) +/obj/machinery/airalarm/directional/south, +/turf/open/floor/carpet/black, +/area/crew_quarters/bar/atrium) "vwZ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -59922,25 +62410,17 @@ }, /turf/open/floor/iron, /area/storage/tools) -"vxf" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/bucket, -/obj/item/stack/sheet/mineral/copper{ - amount = 5 +"vxO" = ( +/obj/effect/landmark/start/botanist, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/item/shovel/spade, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/secondary/service) -"vxH" = ( -/obj/machinery/light_switch{ - pixel_x = -28 - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/white, -/area/medical/chemistry) +/area/hydroponics) "vyv" = ( /obj/structure/chair/fancy/bench/right, /obj/machinery/camera/autoname/directional/south{ @@ -59958,21 +62438,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/break_room) -"vyA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) -"vyQ" = ( -/obj/item/kirbyplants/random, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "vzi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -60000,16 +62465,50 @@ /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/iron, /area/engine/engineering) -"vzx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +"vzw" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light_switch{ + pixel_x = -22; + pixel_y = 1 + }, +/obj/machinery/airalarm/directional/west{ + pixel_x = -32 }, /turf/open/floor/iron/white, -/area/medical/cryo) +/area/medical/virology) +"vzS" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "vAb" = ( /obj/structure/chair/stool/directional/west, /turf/open/floor/iron, /area/crew_quarters/locker) +"vAf" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock{ + name = "Service Hall"; + req_one_access_txt = "22;25;26;28;35;37;38;46" + }, +/turf/open/floor/iron/checker, +/area/hallway/secondary/service) "vAh" = ( /obj/machinery/door/window{ name = "SMES Chamber"; @@ -60023,6 +62522,32 @@ }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) +"vAk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"vAp" = ( +/obj/effect/turf_decal/tile/white, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/computer/crew, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "vAu" = ( /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -60036,6 +62561,15 @@ }, /turf/open/floor/catwalk_floor, /area/quartermaster/exploration_dock) +"vBa" = ( +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "vBe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -60055,6 +62589,22 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/lab) +"vBQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) +"vBZ" = ( +/obj/effect/turf_decal/tile/blue, +/obj/structure/chair/fancy/corp, +/obj/effect/landmark/start/paramedic, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "vCa" = ( /obj/structure/chair/fancy/comfy{ color = "#596479"; @@ -60066,16 +62616,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) -"vCb" = ( -/obj/machinery/rnd/production/techfab/department/service, -/turf/open/floor/iron, -/area/hallway/secondary/service) -"vCl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "vCo" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -60085,12 +62625,48 @@ }, /turf/open/floor/prison, /area/security/prison) +"vCs" = ( +/obj/structure/closet, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) "vCt" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, /turf/open/floor/iron, /area/science/mixing) +"vCD" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = 4; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain/private) "vCJ" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -60104,6 +62680,17 @@ }, /turf/open/floor/iron/techmaint, /area/gateway) +"vCM" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Desk"; + req_access_txt = "5" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "vCQ" = ( /obj/effect/turf_decal/siding/wideplating_new{ dir = 1 @@ -60114,13 +62701,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/storage/tech) -"vDf" = ( -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/obj/machinery/camera/directional/north, -/turf/open/floor/wood, -/area/crew_quarters/theatre) "vDl" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -60149,6 +62729,19 @@ }, /turf/open/floor/wood, /area/lawoffice) +"vEj" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "vES" = ( /obj/structure/plasticflaps, /turf/open/floor/plating, @@ -60273,15 +62866,6 @@ }, /turf/open/floor/iron/dark/side, /area/engine/atmos) -"vGn" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "vGA" = ( /obj/structure/window/reinforced{ dir = 8 @@ -60351,6 +62935,15 @@ dir = 10 }, /area/science/research) +"vHr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "vHu" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -60370,22 +62963,33 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"vIj" = ( -/obj/machinery/computer/med_data, -/obj/machinery/airalarm/directional/north{ - pixel_y = 23 +"vId" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "vIL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/iron/white, /area/science/explab) +"vIR" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "vIU" = ( /obj/machinery/hydroponics/soil, /obj/machinery/light{ @@ -60409,6 +63013,19 @@ }, /turf/open/floor/carpet, /area/hallway/secondary/entry) +"vJp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) +"vJt" = ( +/obj/effect/turf_decal/tile/dark_blue, +/obj/structure/bed/dogbed/runtime, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "vJw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -60428,6 +63045,13 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"vJC" = ( +/obj/effect/landmark/start/chemist, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "vJD" = ( /obj/machinery/firealarm{ dir = 4; @@ -60454,6 +63078,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/research) +"vJW" = ( +/obj/structure/reagent_dispensers/cooking_oil, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "vKc" = ( /obj/structure/table/reinforced, /obj/item/food/grown/carrot{ @@ -60557,21 +63186,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) -"vLM" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore) "vMm" = ( /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -31 @@ -60656,6 +63270,18 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) +"vNU" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "vOe" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -60674,6 +63300,11 @@ }, /turf/open/floor/iron/grid/steel, /area/ai_monitored/storage/eva) +"vPA" = ( +/obj/structure/cable/yellow, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "vPD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -60723,16 +63354,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/tcommsat/computer) -"vPT" = ( -/obj/item/radio/intercom{ - pixel_x = -27 - }, -/obj/structure/curtain, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "vQe" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -60762,15 +63383,6 @@ }, /turf/open/floor/iron, /area/security/courtroom) -"vRb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain) "vRe" = ( /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; @@ -60799,6 +63411,49 @@ /obj/item/analyzer, /turf/open/floor/iron/dark, /area/bridge) +"vSl" = ( +/obj/structure/table/reinforced, +/obj/effect/loot_jobscale/medical/medkits{ + pixel_x = -7 + }, +/obj/effect/loot_jobscale/medical/medkits{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/effect/loot_jobscale/medical/medkits{ + pixel_x = 7; + pixel_y = 8 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/window/northright{ + dir = 2; + name = "First-Aid Supplies"; + req_access_txt = "5" + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/medical/storage) +"vSt" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) +"vSz" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "vSB" = ( /obj/machinery/door/poddoor/preopen{ id = "testlab"; @@ -60821,19 +63476,13 @@ broken = 1 }, /area/vacant_room/office) -"vTh" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +"vSY" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/sorting/mail/flip{ - sortType = 24 - }, -/turf/open/floor/iron, -/area/science/mixing) +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "vTj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -60848,14 +63497,6 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"vTt" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - req_access_txt = "28" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/crew_quarters/kitchen) "vTy" = ( /obj/machinery/light_switch{ pixel_x = 28 @@ -60870,46 +63511,22 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/central) -"vTD" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/table, -/obj/machinery/chem_dispenser/drinks/beer{ - dir = 8 - }, -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"vTI" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/secondary/entry) -"vUe" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) "vUf" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/open/floor/iron, /area/quartermaster/miningdock) +"vUv" = ( +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13, engine") + }, +/obj/machinery/light_switch{ + pixel_x = -28 + }, +/obj/structure/chair/stool/directional/south, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/aft) "vUw" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 5; @@ -60937,6 +63554,17 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) +"vUL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/plating, +/area/maintenance/aft) "vUU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/atmospheric_technician, @@ -61002,6 +63630,10 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/brig) +"vWT" = ( +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) "vXe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -61012,6 +63644,35 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/quartermaster/exploration_prep) +"vXN" = ( +/obj/structure/table/wood, +/obj/machinery/microwave{ + desc = "Cooks and boils stuff, somehow."; + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/storage/box/donkpockets, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/wood, +/area/medical/break_room) +"vXO" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft) "vYA" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 5 @@ -61050,6 +63711,24 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"vYR" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "vYS" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -61070,14 +63749,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"vZk" = ( -/obj/machinery/power/apc/auto_name/directional/west{ - pixel_x = -24 - }, -/obj/structure/cable/yellow, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/science/mixing/chamber) "vZp" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 1 @@ -61146,21 +63817,15 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"vZX" = ( -/obj/item/radio/intercom{ - pixel_y = -29 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 +"waa" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "way" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -61174,6 +63839,29 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"waz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) +"waJ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "waL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -61188,16 +63876,6 @@ }, /turf/open/floor/plating, /area/bridge/meeting_room) -"waS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, -/turf/open/floor/iron/dark, -/area/medical/morgue) "waT" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "commandwindow2" @@ -61239,6 +63917,38 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"wbO" = ( +/obj/effect/turf_decal/box, +/obj/machinery/plumbing/bottle_dispenser{ + dir = 4 + }, +/obj/machinery/door/window/westleft{ + name = "plumbing factory duct access"; + red_alert_access = 1; + req_access_txt = "5; 33"; + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/storage) +"wbQ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "wcd" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 @@ -61260,19 +63970,18 @@ }, /turf/open/floor/iron, /area/storage/tools) -"wcm" = ( -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/item/radio/intercom{ - pixel_x = -32 - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/prison, -/area/security/prison) "wcx" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/crew_quarters/dorms) +"wcD" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/structure/chair/stool/directional/north, +/turf/open/floor/iron/white, +/area/science/robotics/lab) "wcH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump{ @@ -61290,6 +63999,20 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark, /area/security/prison) +"wds" = ( +/obj/effect/landmark/xeno_spawn, +/obj/item/bikehorn/rubberducky, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "wdw" = ( /obj/machinery/door/airlock/public/glass{ name = "Library" @@ -61317,24 +64040,38 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/engine, /area/science/mixing/chamber) -"wee" = ( -/obj/machinery/airalarm/directional/west{ - pixel_x = -23 +"wel" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/turf/open/floor/iron, -/area/hallway/secondary/service) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "wen" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 }, /turf/open/floor/iron/white, /area/science/xenobiology) +"weE" = ( +/obj/machinery/clonepod/prefilled, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) +"weH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "wfq" = ( /obj/structure/sign/warning/electricshock{ pixel_y = 32 @@ -61376,12 +64113,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) -"wfS" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "wfU" = ( /obj/machinery/atmospherics/components/trinary/mixer{ dir = 8 @@ -61476,11 +64207,22 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"wgP" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "wgR" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/security/brig) +"wgY" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/crew_quarters/fitness) "whi" = ( /obj/machinery/computer/secure_data{ dir = 1 @@ -61551,14 +64293,18 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"wiL" = ( -/obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" +"wis" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks, +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/surgery) +/obj/machinery/requests_console/directional/north, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) +"wiu" = ( +/turf/open/floor/iron/checker, +/area/maintenance/starboard/fore) "wjf" = ( /obj/machinery/door/window/southleft{ name = "Court Cell"; @@ -61577,21 +64323,6 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) -"wji" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "wka" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -61604,16 +64335,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"wkg" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" +"wki" = ( +/obj/effect/turf_decal/siding/wood{ + layer = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/genetics) +/obj/structure/reagent_dispensers/water_cooler, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/wood, +/area/medical/exam_room) "wkj" = ( /obj/machinery/computer/security/labor{ dir = 4 @@ -61626,18 +64355,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"wkl" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "wks" = ( /obj/structure/table, /obj/item/stack/sheet/plasteel{ @@ -61658,6 +64375,21 @@ }, /turf/open/floor/iron/dark, /area/storage/tech) +"wkE" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/catwalk_floor, +/area/hallway/secondary/service) "wkN" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/shutters/preopen{ @@ -61678,13 +64410,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/xenobiology) -"wlo" = ( -/obj/effect/spawner/randomvend/cola, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "wlD" = ( /obj/structure/table, /obj/machinery/light, @@ -61701,6 +64426,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"wlI" = ( +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/iron/dark, +/area/medical/morgue) +"wlO" = ( +/obj/structure/window/reinforced, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "wlS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -61716,12 +64453,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/carpet, /area/quartermaster/exploration_prep) -"wma" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "wmF" = ( /obj/machinery/computer/rdservercontrol{ dir = 1 @@ -61751,6 +64482,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/space, /area/maintenance/starboard/aft) +"wng" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "wno" = ( /obj/structure/railing/corner{ dir = 1 @@ -61795,22 +64532,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/grimy, /area/vacant_room/office) -"wnJ" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +"wnL" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) +/obj/machinery/camera/directional/south, +/turf/open/floor/iron/white/corner, +/area/hallway/secondary/entry) "wnQ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, /turf/open/space, /area/solar/port/aft) -"wnT" = ( -/obj/structure/chair/stool, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) "woq" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -61867,32 +64600,6 @@ }, /turf/open/floor/iron, /area/tcommsat/computer) -"woP" = ( -/obj/structure/table/glass, -/obj/item/pen, -/obj/item/clothing/neck/stethoscope, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/mob/living/simple_animal/pet/cat/Runtime, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/item/book/manual/wiki/sopmedical, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) -"woY" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "wpc" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -61902,19 +64609,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness) -"wpf" = ( -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) "wph" = ( /obj/docking_port/stationary{ dheight = 4; @@ -61954,6 +64648,15 @@ "wpw" = ( /turf/open/floor/wood, /area/lawoffice) +"wqz" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 1 + }, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/maintenance/aft) "wqD" = ( /obj/machinery/power/apc/auto_name/directional/east{ pixel_x = 24 @@ -62018,21 +64721,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"wrE" = ( -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Air to Mix" - }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/engine/atmos) "wrN" = ( /obj/structure/railing{ dir = 1 @@ -62047,15 +64735,27 @@ }, /turf/open/floor/prison, /area/security/prison) +"wrV" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "wsh" = ( /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/hallway/primary/starboard) -"wti" = ( -/obj/effect/turf_decal/stripes/line, -/obj/item/kirbyplants/random, -/turf/open/floor/iron, -/area/hallway/secondary/entry) +"wsA" = ( +/obj/structure/table_frame, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "wts" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty{ @@ -62086,21 +64786,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"wtJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "wtK" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -62119,6 +64804,19 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"wtW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/chair/office/light{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "wtY" = ( /obj/item/wrench, /obj/item/weldingtool, @@ -62142,11 +64840,6 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) -"wuU" = ( -/obj/structure/table, -/obj/item/paper/fluff/holodeck/disclaimer, -/turf/open/floor/iron, -/area/crew_quarters/fitness) "wuV" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -62169,19 +64862,31 @@ }, /turf/open/floor/iron, /area/tcommsat/computer) -"wuY" = ( -/obj/structure/window/reinforced/spawner{ - dir = 1 +"wvA" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/end{ + dir = 8 }, -/obj/machinery/telecomms/server/presets/exploration, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/circuit/telecomms/server, -/area/quartermaster/exploration_dock) +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "wvD" = ( /obj/machinery/nuclearbomb/selfdestruct, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/nuke_storage) +"wvI" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/landmark/start/depsec/medical, +/obj/machinery/camera/autoname/directional/south, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "wvN" = ( /obj/item/radio/intercom{ pixel_y = -28 @@ -62194,12 +64899,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) -"wvP" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/port) "wvY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -62208,6 +64907,23 @@ dir = 10 }, /area/engine/atmos) +"wwh" = ( +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 8 + }, +/obj/structure/chair/stool/directional/east, +/turf/open/floor/iron, +/area/engine/atmos) +"wwq" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/book/manual/wiki/barman_recipes, +/obj/item/reagent_containers/glass/rag, +/obj/structure/noticeboard{ + pixel_y = 29 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "wwv" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/machinery/airalarm/directional/west, @@ -62237,6 +64953,20 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"wxs" = ( +/obj/structure/chair/office/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/white/opposingcorners, +/obj/effect/turf_decal/tile/white{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "wxA" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -62245,16 +64975,42 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"wxR" = ( -/obj/effect/turf_decal/tile/dark_blue/half/contrasted, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 8 +"wxG" = ( +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/door/airlock/medical{ + name = "Operating Theatre"; + req_access_txt = "45" }, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron/dark, -/area/crew_quarters/heads/captain) +/area/medical/surgery) +"wxN" = ( +/obj/structure/table/reinforced, +/obj/structure/desk_bell{ + pixel_x = 8 + }, +/obj/machinery/door/window/eastright{ + name = "Hydroponics Desk"; + req_access_txt = "35" + }, +/obj/item/folder/white{ + pixel_x = -4; + pixel_y = 2 + }, +/turf/closed/wall, +/area/crew_quarters/kitchen) +"wyb" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "wyf" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -62270,6 +65026,13 @@ }, /turf/open/floor/prison, /area/security/prison) +"wyp" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 1 + }, +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/plating, +/area/maintenance/aft) "wzg" = ( /obj/machinery/power/apc/auto_name/directional/north{ pixel_y = 24 @@ -62287,6 +65050,20 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"wzL" = ( +/obj/machinery/door/window/eastright{ + name = "Theatre Stage"; + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "wzT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -62321,12 +65098,6 @@ }, /turf/open/floor/wood, /area/lawoffice) -"wAi" = ( -/obj/structure/sign/plaques/deempisi{ - pixel_y = -28 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "wAG" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -62339,38 +65110,6 @@ }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) -"wAH" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/cryo) -"wAI" = ( -/obj/effect/turf_decal/siding/thinplating_new/corner, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) -"wAM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "wBd" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -62395,21 +65134,18 @@ }, /turf/open/floor/iron/dark, /area/storage/tech) -"wBB" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "1-2" +"wBg" = ( +/obj/item/bedsheet/medical, +/obj/structure/bed{ + dir = 8 }, -/obj/structure/cable/yellow, -/turf/open/floor/plating, -/area/crew_quarters/heads/cmo) -"wCj" = ( -/obj/structure/table, -/obj/machinery/dish_drive{ - pixel_y = 5 +/obj/machinery/newscaster{ + pixel_y = 32 }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/obj/effect/turf_decal/tile/blue, +/obj/machinery/iv_drip, +/turf/open/floor/iron/dark, +/area/medical/surgery) "wCo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -62417,6 +65153,11 @@ }, /turf/open/floor/plating, /area/hallway/primary/central) +"wCr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/white, +/area/medical/virology) "wCw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -62450,6 +65191,15 @@ }, /turf/open/floor/iron/dark, /area/security/prison) +"wCU" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south{ + pixel_y = -22 + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "wCW" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -62466,6 +65216,21 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"wDt" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/port) "wDR" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -62475,16 +65240,9 @@ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/fitness) -"wEf" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "wEC" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -62520,6 +65278,24 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/virology) +"wER" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/fore) "wEU" = ( /obj/machinery/camera/autoname/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -62559,6 +65335,25 @@ }, /turf/open/floor/iron, /area/security/courtroom) +"wFy" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/chair/office/light, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white, +/area/medical/genetics) "wGl" = ( /obj/structure/bed, /obj/item/bedsheet/dorms, @@ -62577,15 +65372,15 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/dorms) -"wGy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +"wGR" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +/obj/machinery/fax/med, +/obj/structure/table/glass, +/turf/open/floor/iron/dark, +/area/medical/storage) "wHs" = ( /turf/closed/wall/r_wall, /area/security/courtroom) @@ -62596,15 +65391,30 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"wHW" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 +"wHT" = ( +/obj/effect/turf_decal/box/corners{ + dir = 8; + pixel_x = 15; + pixel_y = 16 }, -/obj/effect/turf_decal/tile/yellow{ +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/chemistry) +/obj/effect/turf_decal/tile/white, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "wIz" = ( /obj/structure/railing/corner{ dir = 8 @@ -62657,6 +65467,20 @@ }, /turf/open/floor/iron/dark, /area/security/warden) +"wJC" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hydroponics) "wJI" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -62719,14 +65543,6 @@ }, /turf/open/floor/iron, /area/storage/primary) -"wKI" = ( -/obj/structure/chair, -/obj/effect/landmark/start/medical_doctor, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "wKN" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -62759,6 +65575,10 @@ }, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) +"wLc" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/crew_quarters/bar) "wLg" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ @@ -62820,15 +65640,6 @@ }, /turf/open/floor/iron/techmaint, /area/ai_monitored/storage/eva) -"wLT" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/storage) "wMl" = ( /obj/structure/sign/warning/securearea{ pixel_x = -32 @@ -62866,6 +65677,19 @@ }, /turf/open/floor/iron/dark, /area/tcommsat/computer) +"wMx" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "wMA" = ( /obj/structure/table, /obj/item/stack/package_wrap, @@ -62898,6 +65722,13 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"wNc" = ( +/obj/structure/chair/fancy/comfy{ + color = "#596479"; + dir = 1 + }, +/turf/open/floor/wood, +/area/medical/break_room) "wNg" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -62919,6 +65750,16 @@ /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/ai_monitored/turret_protected/aisat_interior) +"wNJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "wOB" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible, @@ -62940,18 +65781,6 @@ }, /turf/open/floor/iron/techmaint, /area/storage/tech) -"wPc" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "wPp" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/corner{ @@ -62992,6 +65821,24 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"wQa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/fore) "wQj" = ( /turf/closed/wall/r_wall, /area/security/detectives_office) @@ -63002,6 +65849,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/brig) +"wQB" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "wQF" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -63051,28 +65906,11 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"wRy" = ( -/mob/living/carbon/monkey/punpun, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "wRS" = ( /obj/machinery/computer/security, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) -"wRU" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen"; - name = "kitchen shutters" - }, -/obj/machinery/door/firedoor, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "wRV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -63136,6 +65974,22 @@ }, /turf/open/floor/iron/techmaint, /area/security/brig) +"wTv" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/plating, +/area/maintenance/aft) "wTO" = ( /obj/effect/spawner/randomvend/cola, /turf/open/floor/iron, @@ -63201,14 +66055,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/aft) -"wUB" = ( -/obj/machinery/telecomms/processor/preset_exploration, -/obj/machinery/airalarm/server{ - dir = 8; - pixel_x = -28 - }, -/turf/open/floor/circuit/telecomms/server, -/area/quartermaster/exploration_dock) "wUH" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -63247,6 +66093,15 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/central) +"wVP" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 1 + }, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "wWl" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -63260,27 +66115,39 @@ /obj/item/book/manual/wiki/security_space_law, /turf/open/floor/iron/dark, /area/security/main) +"wWC" = ( +/obj/machinery/holopad, +/obj/effect/landmark/start/geneticist, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron/white, +/area/medical/genetics/cloning) +"wWE" = ( +/obj/effect/turf_decal/tile/dark_green{ + dir = 1 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/iron, +/area/hydroponics) "wWX" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, /turf/open/floor/iron, /area/construction/mining/aux_base) -"wXK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +"wWY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"wXL" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/iron, -/area/crew_quarters/dorms) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "wXP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -63334,6 +66201,16 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/quartermaster/storage) +"wYC" = ( +/obj/effect/turf_decal/tile/dark_red/anticorner/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_red/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/dark, +/area/bridge) "wYO" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -63371,17 +66248,24 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, /turf/open/space, /area/space/nearstation) -"wZY" = ( -/obj/machinery/door/window/westleft{ - name = "plumbing factory duct access"; - red_alert_access = 1; - req_access_txt = "5; 33" +"wZO" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "CloningDoor"; + name = "Genetics Lab"; + req_access_txt = "9" }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, /turf/open/floor/iron/white, -/area/medical/chemistry) +/area/medical/genetics) "xaf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -63406,6 +66290,11 @@ }, /turf/open/floor/iron/tech, /area/maintenance/fore/secondary) +"xaR" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/digital_clock/directional/south, +/turf/open/floor/iron/white, +/area/medical/apothecary) "xaY" = ( /obj/structure/table, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -63444,17 +66333,6 @@ }, /turf/open/floor/iron, /area/security/checkpoint/science) -"xbF" = ( -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 27 - }, -/obj/machinery/computer/secure_data{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron, -/area/security/checkpoint/supply) "xbP" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -63509,6 +66387,11 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) +"xdb" = ( +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/structure/rack, +/turf/open/floor/iron, +/area/maintenance/starboard/fore) "xdc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63524,6 +66407,30 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"xdh" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"xdY" = ( +/obj/item/clothing/head/costume/festive{ + pixel_y = -3; + pixel_x = -5 + }, +/obj/effect/decal/cleanable/generic, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "xel" = ( /obj/structure/filingcabinet{ pixel_x = -8 @@ -63537,12 +66444,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"xen" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "xew" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -63573,24 +66474,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) -"xeT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "xeZ" = ( /obj/structure/rack, /obj/item/clothing/mask/gas{ @@ -63615,6 +66498,21 @@ }, /turf/open/floor/iron, /area/science/explab) +"xfs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, +/area/medical/break_room) "xft" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -63638,6 +66536,19 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/security/courtroom) +"xfX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "xfZ" = ( /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /obj/structure/window/reinforced{ @@ -63650,30 +66561,37 @@ }, /turf/open/floor/iron/grid/steel, /area/storage/tech) -"xgn" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +"xgj" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=2"; + freq = 1400; + location = "Bar" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/structure/plasticflaps/opaque, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/crew_quarters/kitchen/coldroom) +"xgC" = ( +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/medical/morgue) +"xgE" = ( +/obj/effect/turf_decal/siding/wood{ dir = 1 }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) -"xgH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/disposalpipe/segment{ + dir = 5 }, +/obj/structure/cable/yellow, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "1-4" }, -/turf/open/floor/iron/white, -/area/medical/chemistry) +/obj/machinery/power/apc/auto_name/directional/south, +/obj/item/kirbyplants/random, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "xhm" = ( /obj/effect/turf_decal/delivery, /obj/structure/curtain, @@ -63697,27 +66615,29 @@ }, /turf/open/floor/iron/white, /area/science/explab) -"xhP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +"xhD" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance"; + req_access_txt = "5" }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"xis" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/turf/open/floor/plating, +/area/medical/surgery) +"xhK" = ( +/obj/machinery/camera/autoname/directional/south, +/obj/machinery/computer/card/minor/cmo{ dir = 1 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) +"xhR" = ( +/obj/effect/decal/cleanable/greenglow, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "xiZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -63729,6 +66649,13 @@ dir = 9 }, /area/science/research) +"xjr" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/crew_quarters/theatre) "xjt" = ( /obj/structure/window/reinforced{ dir = 4 @@ -63758,6 +66685,31 @@ /obj/item/wrench, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) +"xkd" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/item/cigbutt{ + pixel_x = 9; + pixel_y = -3 + }, +/turf/open/floor/iron/checker, +/area/hallway/secondary/service) +"xko" = ( +/obj/structure/table, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 8 + }, +/obj/item/reagent_containers/food/condiment/enzyme{ + pixel_x = 13; + pixel_y = 17 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "xkq" = ( /obj/machinery/computer/card{ dir = 1 @@ -63771,22 +66723,43 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) -"xku" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 +"xkA" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/security/main) +"xkC" = ( +/obj/effect/turf_decal/box/corners{ + pixel_x = -16; + pixel_y = 16 }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, /obj/structure/cable/yellow{ - icon_state = "0-2" + icon_state = "2-8" }, -/turf/open/floor/iron, -/area/hallway/primary/fore) -"xkA" = ( -/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) +"xkD" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, -/area/security/main) +/area/medical/morgue) "xkG" = ( /obj/effect/turf_decal/siding/thinplating_new, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -63882,6 +66855,27 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/science/nanite) +"xmA" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) +"xmP" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/item/radio/intercom{ + dir = 1; + pixel_x = -31; + pixel_y = -3 + }, +/turf/open/floor/iron/checker, +/area/hallway/secondary/service) "xne" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -63997,18 +66991,25 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"xon" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = -7; - pixel_y = 4 +"xoc" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 8 }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 4; - pixel_y = 5 +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) +/obj/structure/chair/fancy/plastic{ + dir = 4 + }, +/obj/item/cigbutt{ + pixel_x = 9; + pixel_y = -3 + }, +/obj/item/cigbutt{ + pixel_x = 10 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "xop" = ( /obj/machinery/power/tracker, /obj/structure/cable{ @@ -64065,27 +67066,12 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/security/prison) -"xpf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/science/explab) -"xpk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 +"xpq" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 1 }, -/turf/open/floor/iron/white, -/area/medical/apothecary) +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) "xpu" = ( /obj/machinery/door/airlock/research{ name = "Mech Bay"; @@ -64107,10 +67093,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) -"xpH" = ( -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "xqa" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -64162,17 +67144,6 @@ }, /turf/open/floor/iron, /area/security/checkpoint/auxiliary) -"xqP" = ( -/obj/structure/table/reinforced, -/obj/item/wrench/medical, -/obj/machinery/computer/med_data/laptop, -/obj/machinery/camera/autoname/directional/east, -/obj/machinery/light_switch{ - pixel_x = 1; - pixel_y = -26 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "xrw" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment{ @@ -64195,6 +67166,37 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"xrM" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/white/opposingcorners, +/obj/effect/turf_decal/tile/white{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/table/glass, +/obj/item/book/manual/wiki/sopmedical{ + pixel_x = 10 + }, +/obj/item/reagent_containers/spray/cleaner, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) +"xrZ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar/atrium) "xsl" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 @@ -64217,17 +67219,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/locker) -"xsv" = ( -/obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/recharger{ - pixel_y = 2 - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) "xsB" = ( /obj/machinery/vending/wardrobe/cargo_wardrobe, /obj/machinery/camera/directional/north, @@ -64309,6 +67300,16 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/engine/gravity_generator) +"xug" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "xup" = ( /obj/machinery/status_display/supply, /turf/closed/wall, @@ -64413,18 +67414,10 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/lawoffice) -"xwr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +"xwv" = ( +/obj/machinery/gibber, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "xwA" = ( /obj/structure/sign/painting/library{ pixel_x = -32 @@ -64464,22 +67457,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) -"xxL" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) -"xxP" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Diner" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/crew_quarters/bar) "xxT" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -64505,20 +67482,6 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron/dark, /area/engine/atmos) -"xyn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "xyy" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -64529,6 +67492,32 @@ }, /turf/open/floor/carpet/grimy, /area/security/brig) +"xyD" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) +"xyQ" = ( +/obj/effect/turf_decal/tile/white/opposingcorners, +/obj/effect/turf_decal/tile/white{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) +"xyU" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "xyW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -64538,16 +67527,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"xzi" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_x = -30; - pixel_y = 1 - }, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain) "xzq" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 9 @@ -64571,6 +67550,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) +"xAd" = ( +/obj/item/radio/intercom{ + pixel_y = 25 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/chem_master/condimaster{ + name = "CondiMaster Neo" + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "xAx" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -64618,32 +67609,34 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"xBl" = ( -/obj/structure/table, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 +"xBA" = ( +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/effect/loot_jobscale/medical/first_aid_kit, -/turf/open/floor/iron/white, -/area/medical/storage) -"xBv" = ( -/obj/structure/chair{ - dir = 8 +/obj/item/book/manual/wiki/sopcommand, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/cmo) +"xBE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/turf/open/floor/iron, -/area/crew_quarters/fitness) +/turf/open/floor/iron/dark, +/area/medical/morgue) "xBK" = ( /obj/structure/bed/roller, /obj/structure/disposalpipe/segment, @@ -64681,13 +67674,21 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"xCy" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +"xBV" = ( /obj/structure/cable/yellow{ - icon_state = "2-8" + icon_state = "2-4" }, -/turf/open/floor/iron/white, -/area/medical/sleeper) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "xCD" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/extinguisher, @@ -64731,12 +67732,20 @@ }, /turf/open/floor/prison, /area/security/prison) -"xEo" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +"xEh" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/hydroponics) +"xEl" = ( +/obj/structure/lattice, +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13", "minisat") }, -/turf/open/floor/wood, -/area/crew_quarters/bar) +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","minisat") + }, +/turf/open/space, +/area/space/nearstation) "xEr" = ( /obj/machinery/door/airlock/maintenance{ name = "Firefighting Equipment"; @@ -64744,6 +67753,11 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"xEO" = ( +/obj/machinery/door/firedoor, +/obj/machinery/camera/directional/south, +/turf/open/floor/iron/checker, +/area/crew_quarters/bar/atrium) "xEX" = ( /obj/machinery/door/airlock/external{ req_access_txt = "13" @@ -64798,35 +67812,6 @@ dir = 1 }, /area/hallway/secondary/exit) -"xGw" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer"; - req_access_txt = "40" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "xGD" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 8 @@ -64851,11 +67836,6 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/grass, /area/hallway/secondary/command) -"xGO" = ( -/obj/structure/reagent_dispensers/watertank/high, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron, -/area/hydroponics) "xGT" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 8; @@ -64863,6 +67843,16 @@ }, /turf/closed/wall/r_wall, /area/medical/virology) +"xHj" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/hallway/primary/aft) "xHw" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -64872,14 +67862,6 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) -"xHx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/iron/dark, -/area/medical/morgue) "xHI" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -64913,6 +67895,30 @@ /obj/machinery/holopad, /turf/open/floor/carpet, /area/library) +"xHP" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"xHU" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 + }, +/obj/machinery/light_switch{ + pixel_x = -28 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/hallway/primary/central) "xIi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -64983,18 +67989,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/quartermaster/office) -"xJU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "xKf" = ( /obj/machinery/light, /turf/open/floor/engine, @@ -65012,16 +68006,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"xLe" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/structure/rack, -/obj/item/multitool, -/obj/item/analyzer, -/obj/item/geiger_counter, -/turf/open/floor/iron/white, -/area/science/explab) "xLi" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -65065,18 +68049,6 @@ }, /turf/open/floor/carpet, /area/quartermaster/exploration_prep) -"xMd" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "xMl" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -65111,6 +68083,9 @@ }, /turf/open/floor/iron/white, /area/science/lab) +"xNl" = ( +/turf/open/floor/iron/white, +/area/medical/patients_rooms) "xNz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -65158,6 +68133,10 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"xOb" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/fore) "xOj" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -65249,17 +68228,6 @@ }, /turf/open/floor/iron/techmaint, /area/storage/tech) -"xQo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "xQD" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, @@ -65268,6 +68236,16 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/mixing/chamber) +"xQG" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/holopad{ + pixel_x = 16 + }, +/turf/open/floor/iron/white, +/area/medical/genetics) "xQO" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -65283,39 +68261,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"xRh" = ( -/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 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/storage) -"xRj" = ( -/obj/machinery/shower{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/noslip/white, -/area/medical/cryo) "xRo" = ( /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 @@ -65331,16 +68276,6 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) -"xRt" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "xRJ" = ( /obj/item/stack/sheet/glass, /obj/structure/table/glass, @@ -65385,15 +68320,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"xSh" = ( -/obj/machinery/airalarm/directional/west{ - pixel_x = -22 - }, -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13, engine") - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "xSj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -65426,6 +68352,31 @@ }, /turf/open/floor/prison/dark, /area/security/prison) +"xSv" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar/atrium) +"xSw" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/white, +/area/medical/virology) "xSE" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -65450,51 +68401,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"xTc" = ( -/obj/structure/table/glass, -/obj/item/assembly/igniter{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/assembly/igniter{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/assembly/igniter{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/assembly/igniter{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/assembly/timer{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/assembly/timer{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/assembly/timer{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/assembly/timer{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "xTj" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -65520,23 +68426,6 @@ /obj/item/clothing/mask/gas/sechailer, /turf/open/floor/iron/dark, /area/security/main) -"xTr" = ( -/obj/structure/table, -/obj/machinery/vending/wallmed{ - pixel_x = 28 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/item/glove_box, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_y = 8 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "xTE" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -65578,6 +68467,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/hallway/secondary/command) +"xVh" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_green/half/contrasted, +/turf/open/floor/iron, +/area/hydroponics) "xVq" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ @@ -65610,16 +68506,6 @@ /obj/machinery/smartfridge, /turf/closed/wall/r_wall, /area/medical/virology) -"xVM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/surgery) "xVS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -65637,30 +68523,18 @@ }, /turf/open/floor/iron/freezer, /area/security/prison) -"xWg" = ( -/obj/machinery/light{ - dir = 8 - }, +"xWy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/structure/disposaloutlet, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/white, -/area/medical/virology) -"xWV" = ( -/obj/structure/sink{ - pixel_y = 30 - }, -/obj/effect/turf_decal/tile/blue{ dir = 1 }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"xWB" = ( +/obj/effect/turf_decal/tile/blue, +/obj/structure/sign/departments/minsky/research/genetics{ + pixel_x = 32 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "xWX" = ( @@ -65679,13 +68553,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"xXh" = ( -/obj/structure/lattice, -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13","minisat") - }, -/turf/open/space, -/area/space/nearstation) "xXr" = ( /obj/item/cigbutt, /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ @@ -65735,6 +68602,25 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/bridge) +"xYc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance{ + name = "Theatre Maintenance"; + req_access_txt = "46" + }, +/turf/open/floor/plating, +/area/crew_quarters/theatre/backstage) "xYk" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 @@ -65745,6 +68631,25 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) +"xYm" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white, +/area/medical/virology) "xYt" = ( /obj/machinery/light, /obj/structure/cable/yellow{ @@ -65802,6 +68707,18 @@ }, /turf/open/floor/plating, /area/engine/engineering) +"xZK" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "xZT" = ( /obj/structure/table, /obj/effect/turf_decal/tile/black/fourcorners, @@ -65813,9 +68730,12 @@ }, /turf/open/floor/iron/grid/steel, /area/teleporter) -"xZW" = ( -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain) +"yag" = ( +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "yal" = ( /obj/machinery/light/small{ dir = 8 @@ -65872,11 +68792,20 @@ }, /turf/open/floor/iron, /area/science/storage) -"ycc" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +"ybK" = ( +/obj/item/radio/intercom{ + dir = 4; + pixel_x = 27 + }, +/obj/machinery/computer/secure_data{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/iron, -/area/hydroponics) +/area/security/checkpoint/supply) "ycx" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -65932,25 +68861,12 @@ }, /turf/open/floor/carpet/orange, /area/crew_quarters/dorms) -"ycX" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 16 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +"ydn" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/iron/dark, +/area/maintenance/aft) "ydq" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -65990,6 +68906,12 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) +"yeA" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/iron, +/area/engine/engineering) "yeY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -66016,17 +68938,26 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) -"yfx" = ( -/turf/open/floor/prison, -/area/security/prison) -"yfC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +"yfu" = ( +/obj/structure/curtain, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_y = 23 + }, +/obj/machinery/camera/autoname/directional/north, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, /turf/open/floor/iron/white, -/area/medical/medbay/central) +/area/medical/surgery) +"yfw" = ( +/turf/open/floor/iron/dark, +/area/medical/surgery) +"yfx" = ( +/turf/open/floor/prison, +/area/security/prison) "yfF" = ( /obj/machinery/vending/boozeomat/all_access{ req_access_txt = "4" @@ -66107,6 +69038,16 @@ }, /turf/open/floor/iron/freezer, /area/security/prison) +"yhl" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "yhC" = ( /obj/machinery/light{ dir = 1 @@ -66149,6 +69090,22 @@ }, /turf/open/floor/prison, /area/security/prison) +"yhN" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "yhZ" = ( /obj/machinery/door/airlock/public/glass{ name = "Primary Tool Storage" @@ -66157,6 +69114,16 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/storage/primary) +"yiJ" = ( +/obj/effect/turf_decal/tile/white{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/grid, +/area/medical/patients_rooms) "yiW" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -66178,6 +69145,13 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"yjp" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/medical/storage) "yjs" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -66193,6 +69167,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/telecomms, /area/quartermaster/exploration_dock) +"yjI" = ( +/obj/machinery/door/airlock/medical{ + name = "Operating Backroom"; + req_access_txt = "45" + }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/medical/surgery) "yjY" = ( /obj/machinery/light/small, /turf/open/floor/engine/air, @@ -66214,6 +69197,9 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) +"ykR" = ( +/turf/closed/wall, +/area/crew_quarters/heads/captain/private) "ykW" = ( /obj/machinery/holopad, /obj/effect/turf_decal/trimline/dark_blue/filled/corner{ @@ -66235,6 +69221,35 @@ broken = 1 }, /area/vacant_room/office) +"ylR" = ( +/obj/item/clothing/gloves/color/rainbow, +/obj/item/clothing/head/soft/rainbow, +/obj/item/clothing/shoes/sneakers/rainbow, +/obj/item/clothing/under/color/rainbow, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port) +"ylV" = ( +/obj/machinery/chem_master, +/obj/structure/sign/departments/minsky/medical/chemistry/chemical1{ + pixel_y = 32 + }, +/turf/open/floor/iron/white, +/area/medical/virology) +"ymg" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/white, +/area/medical/medbay/central) (1,1,1) = {" aaa @@ -76632,7 +79647,7 @@ aaa aaa aaa rQX -bIk +fgR ayl iMy aRY @@ -76876,10 +79891,10 @@ apN apN apN apJ -rov +fAO rnF ayl -wti +hYu rQX aaa aaa @@ -76903,7 +79918,7 @@ rQX awZ lnp ayl -wti +hYu rQX aaa aaa @@ -78177,7 +81192,7 @@ aaa asE aPt jdt -mUT +wnL arB arB arB @@ -78185,7 +81200,7 @@ tAH rQX rQX arB -vTI +dfI tlO azB rQX @@ -82261,7 +85276,7 @@ xvU xvU xvU lMZ -amy +eQQ gqX alR aoj @@ -84594,7 +87609,7 @@ aBQ aDn gWs aDo -aHD +lcT aIZ aBQ aLE @@ -85611,8 +88626,8 @@ atR alU alU alU -atW -atW +ivR +ivR alU xHI alU @@ -85884,7 +88899,7 @@ aBR aBR aLJ aLE -ubL +fpk aPA aQW aQW @@ -86425,8 +89440,8 @@ bjr bjr bub bxu -eiB -qyT +oxe +ssR sJS bxu aaa @@ -88206,12 +91221,12 @@ aPK snB cCF elS -fkv -prx -wvP -iVk -bdW -kzn +tRF +tqH +mKP +qor +ylR +txx aZE bgz biT @@ -88463,12 +91478,12 @@ aPK aWB cCj aSg -aYf -faE +mAc +wDt aSg aPz -pVb -bgB +eWv +eMl bhX bgv ouK @@ -89456,7 +92471,7 @@ yfx yfx prM llv -wcm +iOl xEg wwv vfy @@ -89486,7 +92501,7 @@ aNm aOl aSs aRT -qRv +rdI aWF tav xIQ @@ -89708,7 +92723,7 @@ tNE tBx yhH ksU -ktB +iEW ksU rds dFp @@ -89732,7 +92747,7 @@ gXs bfv bfv vVK -jDk +nTH bfv bfv aaa @@ -89964,9 +92979,9 @@ tNE tNE mdH yfx -owj +dvH fZv -obR +qzt eAJ acd acd @@ -90221,9 +93236,9 @@ tNE tNE pCb yfx -tST -gda obR +gda +qzt ugl sVh muJ @@ -90231,7 +93246,7 @@ bhi hQH lVr acd -uDt +lbf sIR lvf hlq @@ -90281,7 +93296,7 @@ bty qJM bwd bzA -xbF +ybK hiZ bwe eRh @@ -90478,9 +93493,9 @@ tNE tNE fuY yfx -tST -wSz obR +wSz +qzt ugl vKc muJ @@ -90781,7 +93796,7 @@ gMk gMk bbV qnI -rRQ +mnd qnI efv qnI @@ -91020,7 +94035,7 @@ ojA uzn dDy bfv -uyQ +nsI bfv gzT uYC @@ -91074,7 +94089,7 @@ bVI bWD bXA bYB -oKV +tKV uwI hnr ccg @@ -91227,7 +94242,7 @@ afA afA afA kCN -oJg +ccO fMY kPq afA @@ -91751,7 +94766,7 @@ rGb vpP gXs tnE -oxC +bTi gAH shL xeC @@ -92013,7 +95028,7 @@ guI tBK jkW tnE -oLb +fPd tfO oKv oKv @@ -92294,9 +95309,9 @@ kOu mpK jTP ajo -rPX +eYx mkJ -beF +wQa ayE aaa aaa @@ -92808,8 +95823,8 @@ amY cKj jbB ajo -aqR -mbn +eYx +wER bIy aqR aqR @@ -93024,7 +96039,7 @@ aaa aaf gXs aAg -rVD +gHy nEg rDR pef @@ -93085,7 +96100,7 @@ dgB aaa aPR vFT -iau +wYC gdO lel bjz @@ -93329,7 +96344,7 @@ tlM nbl mgh fuF -bBf +hSX vPu tlM ayL @@ -93350,7 +96365,7 @@ acO kZO hxw rvO -knn +pTf jKn xLi lOA @@ -94335,8 +97350,8 @@ tXy nIx hfq agn -feR -vLM +anw +pww paf ajo jrc @@ -94438,7 +97453,7 @@ cDv cDD cqU cMD -ioP +hyV cEz cEz cMD @@ -94891,7 +97906,7 @@ ifm vGV quo wgy -nht +oRz mRL tsb qfD @@ -94915,7 +97930,7 @@ bSA xkQ uqP vVj -tsf +cKB bSA bIe wLg @@ -94948,15 +97963,15 @@ uEw gop hOR nGx -jYV +kCc cqF -uEG +gEz crI cEw cEw cEw cFw -cFN +hWf csH csR cMm @@ -95172,7 +98187,7 @@ veo veo fEh swy -iQs +vXO eUt exS exS @@ -95213,7 +98228,7 @@ cMH cAm cMH cMN -tBN +qDH cSI cSI cMm @@ -95425,11 +98440,11 @@ cac nWV vsg bHP -bCp -bYI +bHP +bHP bHP hup -eYe +gJx sfI bQg ebi @@ -95445,7 +98460,7 @@ bQg hXu pYc dZz -hqI +cZC pYc vSa phv @@ -95470,7 +98485,7 @@ cEx cEx cEx cAP -cFP +jTm csI cAt cMm @@ -95657,12 +98672,12 @@ tpL jMP lCw nxV -aZV -aZV -aZV -aZV -aZV -aZV +cZF +cZF +cZF +cZF +cZF +cZF jGm nqw mqh @@ -95680,13 +98695,13 @@ hbS tuq hKs rZC -cBD -cBD -cBD -cBD -cBD -cBD -mvY +aJw +xHj +ayR +pnK +jsc +pTx +rJd bLK bLK bLK @@ -95718,8 +98733,8 @@ cfz cgR ccw mhm -cLh -cqi +lSx +hqm cMD cAP crv @@ -95850,7 +98865,7 @@ aiX pEU aiX rfQ -uBZ +mcS xIi miy osc @@ -95914,13 +98929,13 @@ jaQ lBW jfd ugE -aZV -xon -cpf -xzi -bpk -aZV -aZV +cZF +vCD +bAY +fdP +mgK +cZF +cZF oqq nNQ vPa @@ -95937,13 +98952,13 @@ hbS klN hKs bBu -cBD -bDL -bDL -bDL -cJS -cBD -jxk +bzs +bzs +bzs +bzs +bzs +bzs +pdl bLK tHw cwl @@ -96171,13 +99186,13 @@ qOi vpS hce lZR -aZV -czU -xZW -lAb -xZW -dBA -aZV +cZF +lcZ +awd +kUB +awd +lkz +cZF hDd aZV aZV @@ -96194,13 +99209,13 @@ vWd klN hKs aXh -hdg -aXN -heN -snw -hKV -cBD -jxk +bzs +bAw +bAw +bAw +iRT +bzs +pdl bLK xyb bNP @@ -96428,13 +99443,13 @@ iKk sYA xNZ oZi -aZV -aZV -pYH -vRb -rWT -gwy -aZV +cZF +cZF +aZN +gsw +inY +sdu +cZF pqV aZV aaa @@ -96451,13 +99466,13 @@ vWd klN hKs jfm -cBD -tTS -bFi -waS -qxV -hSk -sfj +bzs +bAw +bAw +bAw +bAw +bzs +oyg bLK bLM cwm @@ -96466,7 +99481,7 @@ xSj rrR rrR fIA -rbZ +kqx sll bRA rOJ @@ -96654,8 +99669,8 @@ dPv hmR ooM aph -xku -vYD +kSJ +vNE ooI arf arf @@ -96686,12 +99701,12 @@ azc cli gTL jvp -aZV -bmx -etn -bmx -bmx -bmx +cZF +ykR +gwA +ykR +ykR +ykR rsY bmx waT @@ -96708,13 +99723,13 @@ hbS klN hKs aJq -cBD -bDJ -cAL -lJv -sXR -cBD -jxk +uoj +bAw +bAw +bAw +bAw +uoj +pdl bLK bLL cwp @@ -96902,7 +99917,7 @@ aiX fhY fDt ulD -dUl +kYS aiX wQj wQj @@ -96911,8 +99926,8 @@ wQj wQj wQj wQj -anA -vNE +nZc +vYD aoz oup kfk @@ -96945,9 +99960,9 @@ aus ffr aZV ckE -pAb +lBC xel -xsv +ptU hqD fPH jsF @@ -96965,13 +99980,13 @@ bqH xTN hKs aJq -cBD -dkv -bFi -vNj -dRs -cBD -jxk +bzs +bAw +bAw +bAw +bAw +bzs +pdl bLK bLN bNQ @@ -97173,14 +100188,14 @@ iRe qSy arf twX -rWw +kYh rOm rOm -nuF +aOs rOm -qkk -nuF -fhu +bkY +aOs +sLO rOm uiS jbM @@ -97202,7 +100217,7 @@ vFr aen aZV bdi -pAb +lBC bbw bNM hob @@ -97222,13 +100237,13 @@ bqH aLh sMZ qVS -cBD -cAL -cAL -cAL -jWJ -cBD -jxk +bzs +bAw +bAw +bAw +bAw +bzs +pdl bLK hBJ fQu @@ -97426,11 +100441,11 @@ xoZ jka iDc twu -pEv -neT -ugn -iVg -hny +fMD +bfp +pnk +kvS +syz pLM pLM pLM @@ -97459,9 +100474,9 @@ eCd aPR aZV bch -xgn -vyA -noE +uZe +iBK +yhl iDt cyU bbw @@ -97479,13 +100494,13 @@ bqH klN hKs aJq -cBD -cBD -cBD -cBD -tCh -cBD -jxk +bzs +bzs +bzs +bzs +bzs +bzs +pdl bLK bMK bMK @@ -97686,12 +100701,12 @@ anA ixa jaD hDg -jMo -wXL +aZU +klE oax -kcC +nPq vGi -wAI +abJ tyX gpU cHz @@ -97718,7 +100733,7 @@ aZV bmx cak bmx -bbw +uWg bbw mQw huf @@ -97736,13 +100751,13 @@ bqH klN hKs uHQ -cBD -bAV -rCg -cBD -qUA -cBD -jxk +bzs +mzV +qwC +tkK +wyp +bzs +pdl bLK bML oSO @@ -97943,7 +100958,7 @@ fhF oKH duA ahn -dvf +kGk arf arf arf @@ -97975,10 +100990,10 @@ aZV keZ hyg bmx -wxR +pOb vCa -vCa -obT +gFv +kzC bbw rQI rtT @@ -97993,13 +101008,13 @@ bqH klN hKs aJq -cBD -diM -ntB -tZA -xHx -cBD -jxk +bzs +taw +txK +jPq +wVP +bzs +pdl bLK bMN bNV @@ -98028,7 +101043,7 @@ ccw ccw nDb rnL -cWC +yeA wmW cgR hCM @@ -98200,7 +101215,7 @@ vRe vRe vRe ahn -hRS +jmI arf cge hqH @@ -98215,7 +101230,7 @@ nNi kwx cJA dIg -gkL +uxg obl aAh uEE @@ -98235,7 +101250,7 @@ bmx dqH cMw aVW -tJV +doS lTj aZV aZV @@ -98250,13 +101265,13 @@ tpk nss hKs byU -cBD -bDO -sYt -cBD -tEr -cBD -jxk +bzs +tyn +puo +ivh +wqz +bzs +pdl bLK nCA eBT @@ -98277,7 +101292,7 @@ vJD ycR usI tdQ -nKn +ldN ntX oYm aGx @@ -98457,7 +101472,7 @@ gXs gXs gXs ahn -eMU +ikk arf aaF xRN @@ -98492,8 +101507,8 @@ bmx qkq pMr pCH -rDG -aRo +pyv +etH pqN snr mGI @@ -98507,13 +101522,13 @@ sRe nss hKs aJq -cBD -cBD -cBD -cBD -dRs -cBD -jxk +bzs +akO +fJb +clD +ydn +tsL +pdl bLK bMP jHJ @@ -98714,7 +101729,7 @@ qwc qwc qwc ahn -eMU +ikk arf pIv vkZ @@ -98730,7 +101745,7 @@ oFB vqV jij vlM -nKQ +lYV aAh aMm jDW @@ -98764,13 +101779,13 @@ bqH tjO gnO aJq -cBD -ctN -npd -cBD -oNQ -cBD -fVk +bzs +uxO +fwd +ldH +wqz +bzs +sQZ kGH vtz mYH @@ -98966,12 +101981,12 @@ anF anF anF anF -anF +dfB vZO -wnT +ikq lCD vLE -iRs +kGB arf arf arf @@ -98986,8 +102001,8 @@ gUf aAh aAh dIg -gHK -oDz +fmN +wCU aAh aJq aJq @@ -98999,8 +102014,8 @@ tjO tjO aJq aOE -rBC -dKA +fiA +xHU aOE qJK iNa @@ -99021,13 +102036,13 @@ tjO tjO hKs aJq -cBD -prm -ntB -kwW -xwr -cBD -kff +bzs +jLe +sCP +kIB +wVP +bzs +fDn bLK bJF bMQ @@ -99218,17 +102233,17 @@ spM aoJ aoJ aoJ -nQd -rHy -rHy -cLs -lnK -rHy -lnK -rHy -rHy -rHy -lqR +eFJ +spg +spg +fJx +qrt +waz +qrt +spg +spg +aOr +juH arf xLZ hff @@ -99239,12 +102254,12 @@ upT ooz mwi aAh -fBg +xug ahC aAh -dIg -rYB -dIg +aqw +aAh +kKW aAh kQk aNC @@ -99256,8 +102271,8 @@ aJq aJq aJq aJq -qVS aJq +qVS bco aJq beo @@ -99278,13 +102293,13 @@ jgJ jgJ fRI aJq -cBD -bDO -sYt -cBD -bHW -cBD -qap +bzs +siZ +lKU +pQy +eJG +bzs +oyg bLK bMU tVj @@ -99306,7 +102321,7 @@ bOd wMp bTO cfQ -tYh +owx mfn mFR qPz @@ -99475,7 +102490,7 @@ ahn ahn ahn cXc -oOE +njw ahn ahn ahn @@ -99484,7 +102499,7 @@ ahn ahn ahn gQS -nNY +bcP skl arf vFU @@ -99495,13 +102510,13 @@ dwh npc ioN ihm -ueF +lAJ nuK ahC aAh -ioR +msJ aAh -sZf +dws aAh aJq aJq @@ -99511,10 +102526,10 @@ aRt aJq aJq aJq -nJp +cJr aJq -qVS aJq +qVS bcp aJq beq @@ -99524,24 +102539,24 @@ aJq aJq aJq aJq -aJq +khB aJq qVS aJq taa aJq -aJq +oGj qgK -gBy +aRt cjx gUu cBD cBD cBD cBD -cuX cBD -qap +cBD +oyg bLK bMT kEj @@ -99732,7 +102747,7 @@ anF dwH ahn eMP -gQG +tku ahn anF anF @@ -99741,7 +102756,7 @@ anF tEB arj arj -teF +mTz arj arf dcP @@ -99750,55 +102765,55 @@ arf ugU mNm ewc -wpf -tzK +lum +dRW pur -kPZ +wds ahC -aAh -tID -aAh -nDS -aAh +oLg +oLg +oLg +oLg +oLg aCr +rWM +rWM aCr -aCr -aJC -aJC -aQg -aJC -xxP -aJC -aQg -aJC -aJC -nIK -nIK -nIK -cZK -cZK -cZK -cZK -cZK -cZK -cZK -cZK -cZK -cZK -cZK -bof -bof -bof -bof -bof -bof -bof -ctQ -bCB -qnv -cvb -bof -jxk +hUm +hUm +fTE +xSv +xSv +jwT +hUm +hUm +uFK +uFK +uFK +btZ +btZ +btZ +btZ +bQj +btZ +btZ +bIr +bIr +bIr +bIr +cBD +cBD +cBD +cBD +cBD +cBD +cBD +obY +eyD +pBk +ura +cBD +pdl bLK bMS bOd @@ -99989,7 +103004,7 @@ anF anF eTS anF -gQG +tku xEr anF anF @@ -99998,7 +103013,7 @@ anF anF arj jdn -dzZ +kTN aHR arf bQE @@ -100007,55 +103022,55 @@ arf oup dUh ure -pWi +qsq oup -aAh -eJW -ahC -aAh -aCr -aCr -aCr -aCr -pEr -adq -aQb -tEq -dLu -fRF -xSh -fRF -ldf -fRF -jnT -aJC +oLg +oLg +oLg +oLg +tbq +aql +pyC +oLg +tna +aMr +ndY +uSC +cik +qPv +qto +prs +prs +tNl +gzx +hUm aYV aYV aYV -cZK -eWJ -uYs -bgF -etZ -tZy -dTW -vPT -bio -bqR -cZK -mQy -rog -pFj -bAl -sTO -oJs -bzK -vGn -qMz -dPi -obi -bof -qap +btZ +tSU +pzK +tam +aRu +iPB +btZ +lmv +gmx +rsU +aAW +cBD +wlI +fzt +dOL +ajG +bDL +cBD +cBD +xgC +nIQ +nrO +cBD +oyg bLK bMV upc @@ -100070,7 +103085,7 @@ bUO bVZ bVZ bZI -caH +wwh oNw pYU xGE @@ -100246,7 +103261,7 @@ anF anF ahn vUB -gQG +tku ahn anF anF @@ -100255,64 +103270,64 @@ anF anF arj eHI -bWs +qUe nRl -bXG +ugv nXm eCU ram bXG foO bXG -fTj -ucv -aAh -aAh -aAh -aAh -qZc -mee -aCr -aCr -aMp -aMr -aOH -icF -fRF -oli -fRF -fRF -icF -fRF -bUD -aJC +uKd +svA +oLg +lpS +ewj +uah +owM +mWL +iUl +oLg +qaC +eFx +urK +jLW +rSQ +pRR +fyT +fyT +fyT +cij +cij +fqC aYV aYV aYV -cZK -bgZ -bmG -bmG -bjK -bmG -gIb -eQn -cQz -bqO -cZK -jIS -cOp -hQB -alh -mNs -xhP -cIx -xyn -nvQ -nDv -oUG -mnh -rzm +btZ +eGM +fPb +kuS +mwu +jxh +btZ +tsi +sWO +iHK +jND +cBD +xkD +xBE +gwz +eef +jZx +bQn +cBD +cBD +tXd +cBD +cBD +oyg bLK bLK fRd @@ -100503,7 +103518,7 @@ aiA ahn ahn anF -uIO +geE ahn ahn ahn @@ -100512,7 +103527,7 @@ ahn ahn arj hWP -hKj +eyI tzz wDR sjb @@ -100521,55 +103536,55 @@ tjm twA iJR arQ -rcl -vZX -arj -rIV -sxa -aFl -qFe -vwT -aCr -aKJ +erv +myI +oLg +tSP +bzb +dsd +plw +mWL +ndg +dTZ aMr -ndY -aOH -fRF -sSZ -opT -jKY -fJJ -cad -jCo -nAK -aJC +qBj +uYV +wlO +pbA +fyT +fyT +gRD +fyT +kzk +hOV +dZa aYV aYV aYV -cZK -psy -bip -bmG -iXm -bkL -fFu -bqT -cZK -cZK -cZK -euJ -iYL -fsH -fsH -lhK -oGY -bzK -ucP -fhv -itx -ngt -bof -xdc +btZ +gNN +sIU +gPt +jhf +wvI +btZ +eNz +hLO +lJF +loD +cBD +obj +ndT +rXI +kHr +lzK +kHr +jYP +dSt +cFW +sbE +omV +exA ivX bLK hFx @@ -100760,8 +103775,8 @@ gXs gXs ahn gEO -gtR -tiP +ikP +loR anF jdh fBN @@ -100770,62 +103785,62 @@ wif arj hWP lMP -pxI -nGo -dOz +kSk +hWy rLR rLR rLR rLR rLR qrR +kSk nOH -arj -sPu -sBP -iRZ -jQe -sAt -cZt -fKs -fKs -crw -aOH -fRF -fRF -adn -pEE -fRF -icF -fRF -eRA -aJC +oLg +mCl +tQY +sHz +lcs +rmU +sCA +oLg +yag +qBj +sHa +wzL +xrZ +wWY +wWY +wgP +fyT +lyC +gsG +hUm aYV aYV -ber -cZK -bhb -sqB -bmG -bmG -bmG -seN -bqS -nYd -fRf -cZK -xWV -fPQ -rYU -bhh -bhh -oGY -bof -ssN -sFY -vay -ovr -bof +bFO +btZ +voa +spa +jLH +nDi +eNw +btZ +ojH +pmc +sHA +tyR +cBD +obY +snx +cAL +cAL +cAL +uFq +cBD +ehC +vNj +gZv +cBD xdc ccv bLK @@ -100899,7 +103914,7 @@ aaa aaa aaa aaf -lYs +xEl aaf aaa aaa @@ -101018,7 +104033,7 @@ aaa ahn tkF riU -vvL +evY anF ahn ahJ @@ -101027,7 +104042,6 @@ xaN arj rPV qTu -rxC hLJ qgO auv @@ -101036,74 +104050,75 @@ qOk qOk qOk azn -tsI -arj -aCh -kNI -pio -nPC -nPC -aCr -mLt -aMr -vil -aOH -fRF -ptV -kbR -kfH -aVq -fRF -fRF -fRF -xxP -aYV +kSk +nGa +oLg +liU +dAi +qSG +rFl +gHJ +jYG +oLg +sGW +qBj +xjr +wlO +gsK +tFo +fyT +vHr +fyT +ioy +tgq +hUm aYV -aYV -cZK -pMt -xCy -cGN -rQZ -lok -unu -rFg -rFg -gia -hfj -qjl -iZs -qYb -cfZ -dXe -wlo -gWM -gWM -gWM -gWM -uvx -gWM +nTk +ber +btZ +btZ +btZ +ecV +pGd +oeY +btZ +fIL +nyQ +pzb +fIL +cBD +cBD +hCV +cBD +ktd +cBD +cBD +cBD +cBD +hQe +cBD +cBD xdc uDi bLK eHG -wrE +rIZ opQ qmj bSM bTV bUT fUA -fYS -sYl +rhu +gum bYT bZK fYS tnN iqh xYv -ceB -kUw +pNZ +aVx aJf bLZ cix @@ -101284,61 +104299,61 @@ llD arj arj dUa -pxI -pxI +kSk qgO aur qOk qOk aXF qOk -azm +tXO +kSk mjx -arj -aCr -iYQ -aCr -aCr -aCr -aCr -vDf -aMr -aMr -aOH -fRF -nRm -icF -khg -fRF -oli -fRF -fRF -aQg -aYV -nTk +oLg +oLg +oLg +xYc +oLg +oLg +oLg +oLg +tMn +dBZ +cKr +wlO +hHJ +bYZ +fyT +vHr +fyT +cKs +uVQ +hUm +wsh +mNB bes -cZK -aNl -blh -ueA -blh -blh -oiT -blh -blh -ede -ota -mKA -qOI -cfk -gWM -gWM -gWM +uwZ +pWh +rhm +vmZ +jPP +unZ +qXI +inT +tXo +csE +tXo +rsW +ube +cQZ +cGn +kIz +nFA gWM -usC -aku -lTO -xVM +wBg +rdm +ioB +urV gWM xdc bMK @@ -101542,60 +104557,60 @@ enz mgQ rTf teR -pxI qgO sNT qOk qOk qOk qOk -tuJ -dxY -nai -img -lYy -maL -ewK -anf -aCr -aKN -aKN -aNH -aOJ -fRF -sRO -heZ -jCo -nRo -cGR -uYr -fRF -xxP -aYV -mNB +snf +kSk +fPc +alP +aAM +aFm +rHS +asw +asw +asw +vvj +nVi +hNP +gwU +wlO +oou +loo +fyT +qIg +wng +wng +lxF +gKU +psk +uea cOt -cZK -cZK -bdq -eiC -bsx -bsx -cZK -bsx -bqP -bsx -cZK -bvh -lnJ -bxN -gWM -ovd -oDx -jrP -ePv -qUg -bol -ezK +uwZ +kFl +reU +heT +qgs +gcw +gEo +vhB +vBQ +opv +eUP +kfp +eUP +uue +pTd +vYR +adm +yjI +yfw +sMn +yfw +uok gWM xdc bzs @@ -101799,62 +104814,62 @@ iYo auB ejB jui -iXW qgO auv qOk qOk qOk qOk -uGZ -oQw -arj -alP -alP -alP -prA -lOh +vBa +kQe +ren +diq +img +rwZ +yhN +aoP +aqA aJC -vyQ -fRF -fRF -fRF -fRF -nRm -icF -fRF -fRF -adn -fRF -ohF -bby +aJC +aJC +aJC +uny +aJC +wLc +aJC +ddl +fkY +trK +fyT +hnc +tyw aYV mNB rpN iQT -loN -sNZ -aeK -sNZ -sNZ -uPa -fGQ -kSZ -xxL +vBZ +vmZ +tAl +vmZ +cKh uwZ -jIS -lHY -mXl +iQT +dHY +tAn +gcS +nly +xyQ +jXT +oIT +wHT +pLs gWM -hHX -ovd -jrP -nUH -hgh -vCl -uJP -iQy -pDQ +ozw +cCu +kRC +kIg +gWM +tIL bzs aaf bLK @@ -102055,7 +105070,6 @@ arj arj arj arj -arj wpc gGV ipt @@ -102063,53 +105077,54 @@ ipt ipt ipt ipt -eDu +lAD +kSk dIq -arj -gXs -aaa alP -dbX -qcV -dPS -ksO -jxC -jxC -jxC -kbR -wGy -fRF -fRF -fRF -fRF -fRF -xpH +bQm +anf +mGN aJC -aYV -mNB +aJC +aJC +xmA +hyt +aJC +wis +qCR +fRF +phL +mgv +auX +vSt +vSt +gMl +aHw +wyb +hQE rpN -iQT -wKI +rYC kSZ -nSK -kSZ -sNZ -ipM -oIm -jwX -pLt -pAs -qsl -nZJ -ubU -nDU -hTk -niV -jrP -hLW -uMI -qUg -oOt +pcD +oxh +gPN +lsV +hFE +adI +kwB +uwZ +gjH +tOI +awn +tOI +yiJ +oJG +hss +gWM +gWM +yfu +aFO +gWM gWM xdc bzs @@ -102311,7 +105326,6 @@ aaa aaa aoV aaf -aaa arj qMH wqS @@ -102320,53 +105334,54 @@ gPp wqS yff yff -yff -lqD -arj -gXs -aaf +tSV +lVX +nAF alP -jVC anf +wiu +mGN aJC -gFg -jMr -dmt -jMr -aOK -dRw -dRw -dRw -dRw -dRw -fRF -hAq +hkB +mhw +jqv +hsW aJC -wsh -mNB -rpN +cOn +fRF +pEE +pLg +nez +fkY +fyT +cKs +hmQ +hUm +aYV +dlB +nhK +iKc +jQJ +vJp +byO +qjW +dxW +bKZ +wxs +nXU iQT -rYa -kSZ -oxh -xen -sNZ -szW -tXQ -bpV -xqP -uwZ -iRL -lHY -mXl +vAp +xyQ +nwu +xyQ +toE +hhc +czI gWM -fUy -ovd -jrP -nUH -tRo -tNy -dyB +kIY +eBM +gSK +iAe gWM xdc bzs @@ -102568,7 +105583,6 @@ aaa aaa aaa aaf -aaa arj auB auB @@ -102579,51 +105593,52 @@ auB iNS auB auB -arj -arj -aaa alP -jVC -aJC -aJC -aJC -aJC -aJC -aJC -aJC -aKD -gEU -kbO -mvz -wEf -ogj -usO +alP +anf +mkW +xTj +ppf +dWo +qyP +vjJ +xgE aJC +hBS +fRF +spz +qsr +nez +fkY +fyT +syZ +vwl +hUm aYV -iGe -mkY -lUQ -epq -pYY -hjw +cuf +rpN +rYC +pcD kSZ -sNZ -boi -btZ -btZ -btZ -btZ -fle -nQV -vTC +rXD +vIR +vSY +dTM +bJp +lbz +uwZ +jpg +roW +tpt +yiJ +tpt +bmp +knU gWM -ovd -ovd -jrP -ePv +cDi +joU qUg -eGr -hPg +mAf gWM xdc bzs @@ -102825,7 +105840,6 @@ aaa aaa aaa aaf -aaa auB aro aro @@ -102836,53 +105850,54 @@ aro aro aro aro -aro -auB -aaf -alP -jVC -aJC -kKN -aKQ -dOO -aNu -aJC -lKm -fRF -fRF -dWa -fRF -lLK -mNS -wAi +alO +sae +anf +eKZ +fZM aJC +vqN +jVH +nup +aHJ +idb +jEK +fLh +jDj +unQ +nez +fkY +fyT +gBj +kIP +gzd aYV cuf rpN -lAI -pcD -kSZ -aXz -kSZ -sNZ -bzV -fod -fiy -kHF -bQj -jIS -cGa -wXK -gWM -gWM -gWM -gWM -xTr -gRe -hJs -gSK -gWM -xdc +iQT +ipn +vmZ +qjW +vmZ +osN +uwZ +iQT +vCM +uwZ +aXI +taf +xyQ +kZy +xrM +xkC +pyn +wxG +nZs +kmr +jCy +bCm +xhD +vUL bzs aaf bLK @@ -103082,7 +106097,6 @@ aaf aaf aaf aaf -aaa auB aro aro @@ -103093,51 +106107,52 @@ aro aro aro aro -aro -auB -aaa alP -xTj -qiJ -vUe -imn -kYi -ixC -aOO -kAz -fRF -wRy -fRF -fRF -tAG -fRF -hwu +rmj +pDz +kPQ +gOt aJC +aJC +kmG +jUv +iss +kjj +kiZ +rvC +ogQ +pLg +nez +fkY +fyT +gMi +sKo +pHK aYV cuf cOt uwZ -iCP -kSZ +pxR +pcD kSZ +pcD kSZ -sNZ -boj -lxp -vbQ -mtZ -hTg -fzD -iuO -bhh -cga -fWO -cry -gWM +dSa +xNl +rbX +hpQ +rbX +qDY +rbX +xNl +waa +hOI +iVo gWM -gWM -gWM -wiL +kxR +hgh +jeh +iPF gWM xdc bzs @@ -103339,7 +106354,6 @@ aaa aaa aaa aaf -aaa auB aro aro @@ -103350,52 +106364,53 @@ aro aro aro aro -aro -auB -aaf alP -hZH +usc +bQm +uvw +noM +hCa aJC -aJm -xEo -mjr -bRM -aJC -vTD -jRJ -fRF -pZz -fRF -ojc -fRF -fRF +pet +jUv +deN aJC +wwq +rvC +vqa +pLg +ruT +sVx +tgj +tgj +djY +hUm aYV -cuf +xPB nEu uwZ -olY +kve qjW +vmZ qjW -qjW -hEc -bzW -kMV -dbF -dlN -bRv -bYe -oWZ -nlp -yfC -dla -hSh -bIr -dTH -gxL -xRj -klA -bof +tEW +dSa +inT +tXo +inT +tXo +inT +eqr +iDQ +crb +utM +npm +gWM +gWM +gYB +aAI +aAI +gWM xdc bzs bzs @@ -103596,7 +106611,6 @@ aaa aaa aaa aaf -aaa auB aro aro @@ -103607,55 +106621,56 @@ aro aro aro aro -aro -auB -aaa -alP -hZH -aJC -aJC -jZl -lme +alO +eBo +kcQ +ofK +iUM +aoP aJC +dES +rGK +tAr aJC -aJI -aJI -vTt -aJI -aVA -aJI -gSi -aJI -aJI +fhA +ruo +rLF +fBq +cWS +azw +jFI +vpD +hUm +hUm bcs -xPB aYV +uYQ bok bok -bix -bjX -iUQ +uWw +htR +btX bok -btZ -pVe -lOF -dgq -btZ -eJE -ucP -nKE -ucP -lHY -mGt -bCO -bGU -tMg -cuI -ptW -bof -jGB -bkQ -lmG +bok +bRO +bKN +bGt +bKN +bRO +bRO +bRO +spA +gmP +spA +gWM +ceP +nWY +qqh +pno +gWM +vId +ruM +bgL lmG lmG lmG @@ -103676,8 +106691,8 @@ wUw lmG wUw wUw -hcD -bAw +wTv +njb oYy cfj sjq @@ -103853,7 +106868,6 @@ aaa aaa aaa aaf -aaa auB aro aro @@ -103864,58 +106878,59 @@ aro aro aro aro -aro -auB -aaf -alP -hZH -aIg -aJH -aKR -aMB +alO +awG +jxG +dZF +dZF +dZF aJC -aOP -aJI -aRA -aVz -aVz -aVz -aVz -aYJ -aJI -pJk +aJC +aJC +aJC +aJC +aJC +dTf +hdj +aJC +ukb +uQL +uQL +xEO +hUm +ryN aYV aYV aYV bok -bhj -hcs -lxa -mXU -bmN +tHI +umv +cfC +pti +eMk bok -xJf -xJf -xJf -xJf -xJf -xJf -xJf -bzi -qNd -eEd -hgw -gut -vzx -uWn -jiz +vdG +iGU +srF +mRO +ugH +epn bRO -vck +kGX +uUq +fkU +gEH +foG +vkx +jWo +ioB +gWM +cXE +cXE hvq -bRO -bRO -bRO -bRO +cXE +cXE +cXE bNd bNd bNd @@ -103933,9 +106948,9 @@ bNd bNd bNd bNd -eKr -jlW -dvS +gcZ +lOa +bxa cfj rAw kUk @@ -104110,7 +107125,6 @@ aaa aaa aaa aaf -aaf auB aro aro @@ -104121,71 +107135,72 @@ aro aro aro aro -aro -auB -aaa -alP -hZH -aJC -dZF -dZF -dZF +alO +osx +rXh dZF +vJW +doP +kvq dZF +txT +jil +vuA +lmm +psd +djp +efq +qBE +tAZ +tAZ +iEM aJI -aRC -aVz -aVz -aVz -aVz -aVz -plq -bbz +eTm aYV aYV aYV -bok -bhl -biy -bjY -fzJ -bkO -bok -btV -btk -vxH -bSD -caQ -ilz -xJf -ucP -kDP -gUG -eAF -rlg -mSs -cuJ -cvf -bRO -nws -ghp -xBl -kbe -unz -uCp +cOv +jqO +vJC +jhL +fiR +iNK +uJl +dmb +npq +dmb +bEP +nGG +doi +bKN +jIS +lMx +mvI +hhG +hhG +hhG +hhG +hhG +hhG +cXE +cQc +sxo +nlS +dGz +vXN bNd wxA -tjb -ivp -cAY +tYZ +xSw +mYQ fBK chl bZO -ifu -kWa -noD +gxC +bdT +vzw uFk -lqG +jnn hjj lAN lgX @@ -104367,7 +107382,6 @@ aaa aaa aaf aaf -aaf auB aro aro @@ -104378,58 +107392,59 @@ aro aro aro aro -aro -auB -aaa alP -gAn -dHi +omL +rXh dZF -ozf -jia -fwN -eGg -aJI -aRy -fQm -aTM -aVB +abI +jJX +vPA +dZF +vpf aVz +gJj +sJK +cCq +psd +eML +gzG +fRe aVz -kVI -bbz +pOB +aJI +aJI aYV aYV aYV bok -bdc -jhL -bll -mSX -bxc -bok -jLS -jLS -jLS -prR -jLS -jLS -cfY -ucP -lnJ -lmH -ifq -bBm -pdV -bGT -bIo -bRO -pQf -wLT -dmK -bII -fPk -qSU +krR +qCQ +hzF +lKT +uEC +cOv +dxB +pZJ +lGD +jnC +eoC +ezE +qmD +gmN +xZK +gyW +hhG +lxI +sQq +wki +pEg +rOO +cXE +iTK +dfC +aXf +hgj +htB bNd bMa cAZ @@ -104439,9 +107454,9 @@ bSQ tsY gZG eaM -ceI -cjA -ccE +oGT +wCr +ncJ hqh hqh uHd @@ -104497,7 +107512,7 @@ aaa aaa aaa aaf -xXh +cMg aaf aaa aaa @@ -104624,7 +107639,6 @@ aaa aaf aaf aaa -aaa auB aro aro @@ -104635,60 +107649,61 @@ aro aro aro aro -aro -auB -aaa alP -aGB -nGr -pKd -sgi -sQx -qEw -uve -lCW -hcL -bEr -aVE +diA +hZH +dZF +ncP +guF +vel +dZF +vgA +aVz aVD -aXm +nGC +kpy +psd +eML +gzG +nGC aVz -kVI -bbz -aYV +efR +qmy +eTp +qSd aYV aYV bok -xTc -ePJ -oke +cQf +anS +rEo lhV -ioz +ecZ hAF -tin -xgH -mLG -wkl -pOt -pOt -luu -xQo -uOw -oGY -bCO -wAH -cug -bGV -pky -bRO -ixo -hlE -dVI -nPP -szC -lGi +tUw +dHD +rCb +vko +hJD +vvT +bKN +bhh +oAZ +bhh +hhG +iiu +vtG +hVW +kBS +jnN +cXE +xfs +pmh +reZ +nYV +wNc bNd -ojT +ylV ogb xnm sqF @@ -104698,7 +107713,7 @@ nMH qAH hfY pnD -qSx +vem egX tCS ikK @@ -104881,7 +107896,6 @@ aaf aaf aaa aaa -aaa auB aro aro @@ -104892,60 +107906,61 @@ aro aro aro aro -aro -auB -aaa -alP -aGL -mmx -dZF -dmQ -iqN -rSk -jxJ -aJI -gJc -thS -aTN -wCj -aVz -cAg -wRU -bbz -aYV -aYV +alO +oLR +oPh +nNF +cQS +dgD +hKb +bRy +tQv +ruJ +bAK +nSq +fyX +ixK +dNA +gzG +kll +jNp +tho +hqT +cUX +lzr cBm +aYV +cOv +eMk +wtW +cfC +umv +xaR bok -bhm -tVy -bll -jhL -bkP -bmV -jLS -cVy -jLS -gtP -jLS -jLS -cfY -ucP -lHY -oGY -bCO -wAH -jVS -bGU -gVE +vSl +peP +vba +wGR +yjp +lvS bRO -bCR -bLV -xRh -bNh -bPp -bQF +xyU +cpm +lWM +hhG +rWC +tGD +hfh +kmK +tKy +cXE +vgk +tLy +gyZ +pNP +wNc bNd -fYc +aXC pST dqA ftG @@ -104955,7 +107970,7 @@ bNd bNd bNd bNd -qpZ +fDE tsY tsY tsY @@ -105138,69 +108153,69 @@ aaf aaa aaa aaa -aaa arj auB auB -arj iNS auB auB iNS arj arj -arj -arj -aaa alP -aGL -mmx -ngG -jXE -eJC -hmL -umi -aJI -ffL -qbQ -aTO -cCq +alP +arA +vSz +xgj +eWt +nue +ssw +dZF +rUV aVz +pkl aVz -qTP -bbz -aYV +muT +bfX +dOI +gzG +qgf +aVz +weH +hqT +cUX +lzr aYV aYV bok -eUm -vjh -xpk -fgo -tHf -bBc -jLS -cVy -jLS -bWe -bvn -chp -xJf -rDE -nQV -oZm -bIr -bCO -bCO -bCO -bIr -bRO +cow +xyD +oES +rzX +vdp +bok bKN -bHT +gat bKN +jsf +wbO +kFv bRO -bRO -bRO +bdu +lHY +tFP +hhG +oyc +rIm +oyc +hhG +hhG +cXE +lQd +cXE +cXE +cXE +cXE bNd bWX eOi @@ -105212,9 +108227,9 @@ oon eDD bmK bNd -joA -xWg -gBO +sip +eZu +dEh ovY aiR aiR @@ -105395,38 +108410,38 @@ aaa aaa aaa aaa -aaa -aaa -aaa +gXs aaa arj -tTL +kSk +dKn xlK -wuU +kSk jBO arj -anf +jGU alP -aaf -aaa -alO -aGP -mmx -dZF +vud +fZM dZF +xAd +fOt +aEY dZF -lTB -uGr -aJI -aRF -eIg -aVF -aVF -aVF -aYM -aJI -lmy -aYV +gRb +aVz +xko +xwv +gJj +bfX +eML +gzG +qgf +aVz +tff +rOP +eTp +dYi aYV aYV bok @@ -105436,34 +108451,34 @@ ulM bok bok bok -bri -mEp -bri -wZY -ixX -kMc +but +hGn +but +gta +pac +rmM xJf -bzl -lHY -oGY -xis -oGY -oGY -oGY -iDg -gWY -oGY -btf -oGY -oZm -oGY -oGY -xRt -wPc -ojl -omo -xJU -hTF +jcY +hEZ +oSc +ymg +gyW +pdL +gyW +tIw +gyW +rZp +wbQ +fIh +vTC +xyU +gyW +mKM +ovq +odz +oZJ +xfX +wNJ bDo bYX sld @@ -105652,75 +108667,75 @@ aaa aaa aaa aaa -aaa -aaa -aaa +gXs aaa arj -fsV -xBv +wgY +pta +hRk iwa vTy -arj -jGU -alP -aaf -aaa -alP -aGP -mmx -aJL -aKX +cVb +cVb +cVb +cVb +eSl dZF dZF +lzP +aEY dZF +sZa +psd +eSw +vqg +rzF +oUR +abx +rCV +pPl +tFf +tFf +gfU aJI -fEN -wfS -aVz -aVH -aXn -aYN -aJI -pJk aYV aYV aYV xJf nRz -but +oRW vMT but -oRW +kbW mVY -but -hGn -but +jLS +cVy +jLS jLS jLS but xJf -lhC -fhT -tIi -grZ -mNs -mNs +ptm +pvA +wMx +gAS +qJk +eLy +asn +jJU mNs -mNs -mNs -pBA -oAt -hQB +aAT +ksS +qjl lds -nlp -hQB +wel hQB +qjl cBB -fFJ +xHP tKd -bZS -szF +fup +rzw bNd tsY tsY @@ -105728,7 +108743,7 @@ tsY bNd liI dcN -lvq +jZp dNW aiR aiR @@ -105909,35 +108924,35 @@ aaa aaa aaa aaa -aaa -aaf +gXs aaf -alO +arj arj arj xtm arj arj cVb +jlh +xmP cVb -cVb -cVb -cVb -cVb -aGQ -xMd -aIp -aKW -aMG -aIp -aIp +vrZ +oOk +dZF +dZF +dZF +dZF aJI aJI -aSP -aUh aJI aJI +aLu +aSP +aJI aJI +eTp +wxN +rgU aJI aJI mkg @@ -105950,34 +108965,34 @@ myP vim qKT jLS -qQi -tfI -dSJ jLS -gbR -but +gdZ +jLS +bvu +jLS +rAs xJf -qSV -ucP -nKE -ucP -ucP -ucP -ucP -bFL -ucP -wji -ucP -ucP -rDE -nKE -ucP -ucP -wAM -ucP -cBS -ucP -umf +sJP +gyW +cpC +xWB +nOq +bXv +xyU +swO +xyU +glX +xyU +fUs +oGM +waJ +wQB +gyW +ifr +gyW +jrM +kFE +ebA oVg hiA erE @@ -106167,39 +109182,39 @@ aaa aaa aaa aag -alO +alP fpV -alO -krd -nEm -qCJ -etI -kEB +alP +awE +bSD +aqA +aAM cVb -kEC -lYu -wee -cfn -rSC -mos -rDo -aIp -aKH -aMI +uYF +orW +cVb +cVb +hjP +plh +qzz +uDZ +fUm +pxC +gBT +rLZ aIp -gvI -aOX -aOX -aSR -qlf -aVJ -aOX -aYP -bal -bam -aYV +gcJ +eAk +kqk +nXt +lBV +eAk +eAk +eUF +hcQ aYV aYV +ihb xJf xtf jLS @@ -106209,31 +109224,31 @@ yew jLS jLS cVy -jLS -jLS -jLS -hmY +rTc +rBd +bvu +pdH bye bMc -csq -bMc bMc bMc +fJP bMc +wZO bMc bon -bMc -tDM -bMc -bMc +qPL +hyl +qPL +sqz +bOt +bOt +bOt +dfc +axL +fsA +bOt bOt -bWj -mEc -wBB -xGw -pGI -bWj -bWj vHh bNd oon @@ -106241,14 +109256,14 @@ dXK bmK bNd ttb -ktp +xYm qZE bYY kMX xBK lbh -cko -ffw +fsl +eke cko bFu cko @@ -106427,33 +109442,33 @@ aag oXN mCd ulG -dFY -anf -anf -awE -mmx +xWy +qCJ +xWy +pAd cVb -vCb -vxf -tIW -grR +sEv +jjA +lMV cVb +xdh anf -fHE -jVI -kMQ -twb +wsA aIp -aOQ -mtS -cjq -ptj -cBQ -cBQ -cBQ -aYO -aRJ -kRy +fwV +xEh +ktH +gDA +aCf +jPb +ffd +tur +dEq +rYh +xVh +keh +buE +ckl aYV aYV beE @@ -106465,32 +109480,32 @@ brc blg jLS ied -epP -jLS -jLS +cVy +sqR +pac jLS -hwc +hOd bye -icf -csr -aFa -bCY -bEh -bCY -nal +edA +adg +evS +tVm +cUp +lnB +ehe bon -cMp -wtJ -bKH -cwf +iid +rsd +vWT +hHA +bOt +iTi +vJt +xBA +jip +iEs +fyp bOt -nFD -wnJ -kqm -tVl -hVa -gdp -bWj lwA bNd bNd @@ -106680,37 +109695,37 @@ aaf aaf aaf aaf -aag -apC -apC -apC -apC -apC -apC alP -bhY -cVb -cVb -cVb -cVb -cVb -cVb -aGC -grA +alP +alP +alP +alP +alP +alP +vsA +moB +ijd +wkE +rbT +vAf +qRO +pJi +uyr aIp -rYT -hbd +nPX +wvA +qvO +eSF +aIp +nRV +nGJ +dnm +hOj +hOj +nGJ +dnm +mkR aIp -aOX -aDU -wma -aJN -aRJ -aVK -aRJ -aRJ -aRJ -kRy aYV aYV aYV @@ -106722,40 +109737,40 @@ brc cTO jLS ied -epP -jLS +tci jLS jLS +ofM but bye -bqV -bMd -bMd -dsg -bEk -bFG -njT +mqa +tlH +rcL +uFr +xQG +wFy +hsL bMc -cvq -kVZ -mQp -cwg +vCs +idA +hgk +qMt +bOt +gfB +oER +cfa +dQb +xpq +xhK bOt -rcH -kEq -ncc -xeT -hVa -dOZ -bWj lwA bNd bZT ggx bZT cnc -dfV -tqv +chN +dLc oTf wXU gTu @@ -106933,7 +109948,6 @@ aaf aaa aaa aaa -aaa qmd aof aof @@ -106943,31 +109957,32 @@ anf anf anf acX -apC -awF -mmx alP -arA -anf -aCz -asw -asw -aGT -hIk -aIp -ycc -mvX +awF +mde +cVb +qXc +xkd +xoc +cVb +anC +hWq +voG aIp -nvn -aDU -wma -aSS -aUj -aRJ -aRJ -lWX -cBg -bam +bZG +bZG +boO +wJC +ihI +eYH +taQ +sfk +fGZ +hOj +taQ +sfk +buE +bBr aYV aYV aYV @@ -106983,28 +109998,28 @@ oJk jLS jLS jLS -but +kNg bye -eJN -gsW -qng -kJp -nrJ -nIJ -lZj -wkg -osO -ueQ -bMd -slG +pjF +dWr +ayX +hxp +qyD +ktv +cst +bMc +htt +wWC +sNL +iQJ +bOt +qiD +iEs +kNz +wrV +jCz +raS bOt -vIj -wnJ -woP -tdh -oTM -nSG -bWj lwA bNd isE @@ -107012,7 +110027,7 @@ lqk jLx pps mZL -fsG +lBv tsY ceL hqh @@ -107188,47 +110203,47 @@ aaa aaa aaf aaa -aaa qmd qmd qmd uvs -aoN +iqj bnk aof -owQ anf anf anf -apC +anf +alP aoQ -woY -gTO -gTO -gTO -jBl -uro -pof -lag -dFY +nzX +cVb +kRe +qyo +iQZ +cVb +inq +nYO +rYO aIp -fGf -rdv +isM +dwm +vxO +jxI aIp -oau -qEQ -wma -aST -aUk -aRJ -aRJ -lWX -bam -aYV -aYV +kdx +nVY +kAh +hOj +hOj +jOE +maS +oHH +aIP aYV aYV aYV +aBC xJf vUD bpL @@ -107240,28 +110255,28 @@ bre jLS jLS jLS -itF +ehY bye -eye -pyN -bBQ -bFH -bEl -bFH -bHb -bMc -ioc -bMd -bMd -qmf +edA +nvm +dMw +sES +qbJ +tCY +cfm +bon +bGb +juI +weE +tgY +bOt +fDL +ndM +qJw +jXy +fUQ +jVz bOt -pnv -hZm -nCW -pWy -tln -dPm -bWj lwA bNd bSU @@ -107445,7 +110460,6 @@ adU adU adU alg -acx cOJ jqR qpT @@ -107453,72 +110467,73 @@ gnc qbL cCi khA -lvM +vNU wka anf anf -apC +alP awG fUO -alP -alP -alP -alP -alP -alO -aGV -aIp +cVb +cVb +cVb +cVb +cVb +bpE +anf +cMx aIp -sne -sxt +piR +tiU +ilm +owA +aCf +fhl +gyt +qhk +qhk +fvl +tDx +jOt +buE aNQ -aOX -aDU -wma -aRJ -aRJ -aRJ -aRJ -aYR -dbc -aYV tqW oVr bez nCl xJf -rhc -jTM +bvu +bvu bvu gzL tzn rha -wHW -bQh bvu +bQh bvu -uMw +jAP +kbW bye -tPt -csV -ctA -ctL -ctV -cum -mUm bon -cvw -cvM -cvW -cwk +bon +ctE +bon +eNI +bon +bon +bon +sqz +sqz +sqz +sqz +bOt +bOt +bOt +bOt +bOt +bOt +bOt bOt -bWj -bWj -bWj -bWj -bWj -bWj -bWj lwA bNd iLi @@ -107541,7 +110556,7 @@ vwb xnx cNW cOe -lpZ +lQu nrt cNW aaa @@ -107702,7 +110717,6 @@ aaa aaa aaf aaa -aaa qmd aof aof @@ -107714,68 +110728,69 @@ anf fUO anf anf -apC -awH -fUO alP -aAr +awH +ajY anf +apE +fyV alP -aaa -aaf -aGX +awG +gYi +anf +mGN +aIp +aIp +aIp +bWP +aIp +aIp +pRp +fNP +ntV +mNg +pqa +deD +aAj +wWE aIp -aJO -aRJ -peX -ggQ -cVw -dWS -qsy -tMY -geG -geG -geG -aYO -ggq -aYV aYV mNB -cFD +sYn xJf xJf xJf xJf xJf -svb +jgX xJf xJf xJf xJf xJf xJf +qOp xJf -bye -bon -kmU -ctE -bon -bon -bon -bon -bon -bon -bon -bon -bon -bOt +vmv +kRh +vmv +bzs +vJz +clf +cBd +bzs cwu cki +bzs +oTT +hRc +jSZ +jiW cAR -bAw +qoi cBd clf -bWj +bzs iis bNd bNd @@ -107961,7 +110976,6 @@ aaf aaa aaa aaa -aaa aof aof aof @@ -107971,32 +110985,33 @@ anf fUO anf anf -apC +alP aoP fUO azr -anf -pKz alP alP -jow -qcI +alP +alP +xdb +aFm +ifS +fPX +alP +bxq +agr +cDU aIp -aLd -oee -aMN -aNQ -aOZ -aOX -aOX -aOX -vvH -aVM -aOX -xGO -bam -aYV -aYV +aIp +aIp +aIp +aIp +aIp +aIp +aIp +aIp +aIp +gLL imz xvr ndk @@ -108013,11 +111028,11 @@ yfq mUc ejZ teG -hQn -cJD -dNV -kBF -yji +aTP +frD +oRM +kfS +pLr yji yji yji @@ -108222,38 +111237,38 @@ aaf aaf aaf aaf -apC alP alP pqs alP alP -apC -alP -fUO -alP -alP alP alP +aQK +aeB +apE +aAr +xdY +fvG aFm fSS -aGF -aIp -aIp -aIp -aIp -aIp -aIp -aIp -aIp -aIp -aIp -aIp -aIp -aIp -aIp -aIp -oLG +pgo +gYi +sEG +aic +gKm +aij +alP +aAr +anf +xOb +aPr +alP +uBL +trH +sIw +unS +aYV kDj mJF bfT @@ -108269,7 +111284,7 @@ bfV bfV usl uUU -sJI +iNn cpt hvx aWw @@ -108479,37 +111494,37 @@ aaf aaa aaa aaa -apC -anf -anf +alP +awJ fUO alP -mdr -apC +rnU +aQn +alP auD fUO alP -aAs -anf -alP -rUC -iMY -rfG -lMk -hiT -hiT -hiT -hiT -hiT -hiT -qxO -hiT +mkW +hWq +mkW +xBV +gTO +qRO hiT +oyx +jai +fEY +jXY +gZU +vvx +qiH +vvx +vvx lNM -dxg -iXc -pWd -ulZ +gBV +jpv +jpv +eND cJb jWS ohL @@ -108537,7 +111552,7 @@ bEm bDb bJH bKW -fud +unM tAB bMi bPx @@ -108736,21 +111751,21 @@ aaf aaa aaa aaa -apC -goW -alP +alO +anf fUO alP -apE -apC +jks +gTf +alP aoP fUO apE +pKz anf +gYi +xdh anf -alP -rUC -fUO aFu aFu aFu @@ -108763,10 +111778,10 @@ aFu aFu aFu aFu -fyv -aYV -aYV -tod +grT +gIl +gIl +dyt qwp win bfU @@ -108785,7 +111800,7 @@ eek eao byf bzu -kzi +mKv bzu bDb bEm @@ -108993,21 +112008,21 @@ aaf aaf aaf aaf -apC +alP arA -anf rlq +vJw ycE -auE -alP +ffM alP -fUO alP +kta alP alP alP -rUC -fUO +qcS +vAk +nRK aFu kyJ xwA @@ -109020,10 +112035,10 @@ aRN aIt aUB aFu -aYV -aYV -bar -bar +piw +hvs +hvs +oKB aYV tdc bfU @@ -109051,7 +112066,7 @@ cBz bEm bJI kmO -bMh +tMd goK lAC bPz @@ -109254,17 +112269,17 @@ alP alP alP alP -tXR -reA -mpm -uxB -iFs -vJw -ogD -sih -hDG -ycX -fUC +kUi +kqv +uHk +pGW +jrk +iJZ +kKx +dDk +vEj +gbs +qkh hDc eRQ hos @@ -109511,16 +112526,16 @@ abz alP aqA anf -anf -anf -avE -anf -anf -awD -aAt -bWJ -aCC -hWb +qal +rxA +bJK +qva +fCG +dBz +eJV +laP +hnR +vzS aFu aFu xNJ @@ -109564,7 +112579,7 @@ hqw iyq frE cyQ -axy +gxP wen vkc bMi @@ -109760,277 +112775,277 @@ aaf aaf aaa aaa -aaa +aaa +alO +anf +anf +anf +cPl +anf +anf +alP +alP +alP +alP +pUQ +alP +alP +alP +alP +hWb +aFu +aHc +cKg +aLg +mls +qQb +aIt +aYW +aYW +aYW +aYW +aYW +aYW +hCC +aYW +eQP +aFu +aYV +tdc +kJQ +bfV +jyd +blA +blA +blA +box +box +cHU +jvO +cIf +box +uIp +rRU +byf +jkS +bAD +wmF +bDb +bEm +bEm +bEm +bIx +bJM +ghL +vrh +vkc +bOx +bPD +usv +bMi +bMi +bRZ +bVj +bMi +bMi +bRZ +ori +bMi +bMi +bRZ +cTY +cTZ +chu +tGp +aaf +cOT +uKv +cAa +cOT +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 +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 +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +"} +(171,1,1) = {" +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 +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 +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 +aaf +aaf +aaa +aaa alO anf anf anf -cPl -anf -anf -alP -anf -alP -alP -anf alP -alP -alP -alP -hWb -aFu -aHc -cKg -aLg -mls -qQb -aIt -aYW -aYW -aYW -aYW -aYW -aYW -hCC -aYW -eQP -aFu -aYV -tdc -kJQ -bfV -jyd -blA -blA -blA -box -box -cHU -jvO -cIf -box -uIp -rRU -byf -okQ -bAD -wmF -bDb -bEm -bEm -bEm -bIx -bJM -ghL -vrh -vkc -bOx -bPD -usv -bMi -bMi -bRZ -bVj -bMi -bMi -bRZ -ori -bMi -bMi -bRZ -cTY -cTZ -chu -tGp -aaf -cOT -uKv -cAa -cOT -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 -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 -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(171,1,1) = {" -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 -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 -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 -aaf -aaf -aaa -aaa -alO -anf -anf +atw anf alP atw anf -alP anf -alP -awJ anf -alP +apE aAv aAs alP @@ -110283,13 +113298,13 @@ alP arA anf alP -atw -alP -anf +kVS +hYO +oeG anf apE anf -aAs +anf alP hWb aFu @@ -110535,7 +113550,7 @@ aaf aaa alO anf -apD +rAe alP alP atB @@ -110804,11 +113819,11 @@ anf aeg apE aBF -aBF +xhR hWb -anf +aBF aFw -oKc +gWQ aJJ bgG aMW @@ -111063,9 +114078,9 @@ apE anf anf fyh -sOG -qhu -rek +uUP +sBT +qlI kUm mBa nXq @@ -111109,7 +114124,7 @@ bIA bJN vfP bPD -bOz +hLp bPG bJN bEm @@ -111342,7 +114357,7 @@ aXq aYV eZA rLd -sVT +wcD biL blC bou @@ -111574,8 +114589,8 @@ anf anf anf apE -anf -anf +rTO +cXa fUO aFw kqP @@ -111831,8 +114846,8 @@ anf anf anf apE -arx -arx +tSm +cXa fUO aFw nHV @@ -112665,7 +115680,7 @@ vIL kTY xOj vSB -xpf +iUg cQm abw hNK @@ -112918,11 +115933,11 @@ bJT tIA tIA mLo -xLe +dhf tIE fQv tIA -goV +kph sei sei hNK @@ -113398,7 +116413,7 @@ aXq sYn eZA qWu -ulU +fUv bhV bnp bnp @@ -113912,7 +116927,7 @@ aXq sYn rYy bgc -cJn +dpA wKb wKb wKb @@ -114961,11 +117976,11 @@ bFW rYJ rYJ bKa -vZk +xQE bMz cQR bOH -lto +xQE bFU rxf uht @@ -115476,8 +118491,8 @@ glg mAN dCN diK -iLN -onp +acM +mkS hrb xQE bFU @@ -115738,9 +118753,9 @@ dGF dGF dGF dMZ -bGk +nWo bFU -ptw +oks bGz bEC cOe @@ -116015,7 +119030,7 @@ vYY nDl cjD urW -jbP +vUv cmw cjD cjD @@ -116243,7 +119258,7 @@ kch wzg wtK nad -vTh +kJk fRr afE xSY @@ -116500,8 +119515,8 @@ kch btp aCJ bky -bHs -gZz +qif +eLz gqy cNW bMC @@ -116758,7 +119773,7 @@ btp aCJ bEs bEs -vmz +kdQ bEs bEs bEs @@ -116982,17 +119997,17 @@ aaa aaa aaa aNa -imi +bfw aMZ -fUY +qyd aNa aaf aaf aaf aNa -imi +bfw aMZ -fUY +qyd aNa aaa aaa @@ -117014,8 +120029,8 @@ kch uGH cUP bEs -rTK -gEk +uzT +slr bKf bLk bEs @@ -117261,7 +120276,7 @@ eIi qZW cJR hJR -jvu +jxw kub hJR jUs @@ -118030,8 +121045,8 @@ aaa aaa xkR sDn -wuY -wUB +aoS +sGv gQd xcE ict @@ -128327,7 +131342,7 @@ bIY bKh bKh bKh -bND +skB bGe bGe aaf @@ -129096,7 +132111,7 @@ aaf bGf bGf bKi -bLq +fdy bME bNG bNG From 05bca0e8c0f3ac5432ca6c1337461e5c5fdb1579 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Thu, 5 Sep 2024 15:12:42 -0500 Subject: [PATCH 24/58] Automatic changelog generation for PR #11219 [ci skip] --- html/changelogs/AutoChangeLog-pr-11219.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11219.yml diff --git a/html/changelogs/AutoChangeLog-pr-11219.yml b/html/changelogs/AutoChangeLog-pr-11219.yml new file mode 100644 index 0000000000000..974b4eaf6b7d7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11219.yml @@ -0,0 +1,10 @@ +author: Varo, Bombyy, PigeonVerde +delete-after: true +changes: + - tweak: 'BoxStation: Reworked the service area and maintenance' + - tweak: 'BoxStation: Reworked the medbay area and maintenance' + - rscadd: 'BoxStation: a room for the psychiatrist in medbay' + - tweak: 'BoxStation: fixed chaplain backroom having a weird shape' + - rscadd: 'BoxStation: Added a new area, apc and air alarm for the captain room' + - bugfix: 'BoxStation: Fixes floating cameras and doble pipes and cables errors' + - bugfix: 'BoxStation: Fixes stools directions and types' From 2e5c97fae1c9d1fca3b6dcf423a3b847141d26b7 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Thu, 5 Sep 2024 21:03:42 +0000 Subject: [PATCH 25/58] Automatic changelog compile [ci skip] --- html/changelog.html | 12 ++++++++++++ html/changelogs/.all_changelog.yml | 9 +++++++++ html/changelogs/AutoChangeLog-pr-11219.yml | 10 ---------- 3 files changed, 21 insertions(+), 10 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11219.yml diff --git a/html/changelog.html b/html/changelog.html index df8915136035c..b7304d89b0854 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,18 @@ -->
          +

          05 September 2024

          +

          Varo, Bombyy, PigeonVerde updated:

          +
            +
          • BoxStation: Reworked the service area and maintenance
            • +
          • BoxStation: Reworked the medbay area and maintenance
            • +
          • BoxStation: a room for the psychiatrist in medbay
            • +
          • BoxStation: fixed chaplain backroom having a weird shape
            • +
          • BoxStation: Added a new area, apc and air alarm for the captain room
            • +
          • BoxStation: Fixes floating cameras and doble pipes and cables errors
            • +
          • BoxStation: Fixes stools directions and types
            • +
          +

          04 September 2024

          Programs-The-Station, Rukofamicom updated:

            diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index f39d39a198333..eb0b26aac2afb 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44103,3 +44103,12 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Programs-The-Station, Rukofamicom: - rscadd: You can now Latejoin directly as an on-station posibrain. - rscadd: Due to Job-code, Positronic Brain is now a job. +2024-09-05: + Varo, Bombyy, PigeonVerde: + - tweak: 'BoxStation: Reworked the service area and maintenance' + - tweak: 'BoxStation: Reworked the medbay area and maintenance' + - rscadd: 'BoxStation: a room for the psychiatrist in medbay' + - tweak: 'BoxStation: fixed chaplain backroom having a weird shape' + - rscadd: 'BoxStation: Added a new area, apc and air alarm for the captain room' + - bugfix: 'BoxStation: Fixes floating cameras and doble pipes and cables errors' + - bugfix: 'BoxStation: Fixes stools directions and types' diff --git a/html/changelogs/AutoChangeLog-pr-11219.yml b/html/changelogs/AutoChangeLog-pr-11219.yml deleted file mode 100644 index 974b4eaf6b7d7..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11219.yml +++ /dev/null @@ -1,10 +0,0 @@ -author: Varo, Bombyy, PigeonVerde -delete-after: true -changes: - - tweak: 'BoxStation: Reworked the service area and maintenance' - - tweak: 'BoxStation: Reworked the medbay area and maintenance' - - rscadd: 'BoxStation: a room for the psychiatrist in medbay' - - tweak: 'BoxStation: fixed chaplain backroom having a weird shape' - - rscadd: 'BoxStation: Added a new area, apc and air alarm for the captain room' - - bugfix: 'BoxStation: Fixes floating cameras and doble pipes and cables errors' - - bugfix: 'BoxStation: Fixes stools directions and types' From 23658ba915bba1e9f6331b32b59b115ebba6e423 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Fri, 6 Sep 2024 00:12:41 +0000 Subject: [PATCH 26/58] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index b7304d89b0854..3caa7c74430cf 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -928,12 +928,6 @@

            DarnTheMarn updated:

          • Brig surgical duffelbags and defibrillators now spawn in the brig physician locker instead of on the ground
          • Extra gauze to brig infirmary and kelotane/charcoal bottles to the brig physician locker
          - -

          05 July 2024

          -

          XeonMations updated:

          -
            -
          • Added the ability for admins to remove a language from a mob's blocked language's list innately.
            • -
          GoonStation 13 Development Team From 6a66500ffc3d9edee854f6257850aef4bbf4fba7 Mon Sep 17 00:00:00 2001 From: Byemoh Date: Sat, 7 Sep 2024 15:18:42 -0500 Subject: [PATCH 27/58] Update topic.dm (#11439) --- code/modules/admin/topic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 466a2cebe11f0..5a6122d574020 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1652,7 +1652,7 @@ if(response.body == "[]") dat += "
          0 bans detected for [ckey]
          " else - bans = json_decode(response["body"]) + bans = json_decode(response.body) dat += "
          [bans.len] ban\s detected for [ckey]
          " for(var/list/ban in bans) dat += "Server: [sanitize(ban["sourceName"])]
          " From b1a465f8841db5d08ccb1a2ffa8eaafd621a287e Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 7 Sep 2024 15:28:27 -0500 Subject: [PATCH 28/58] Automatic changelog generation for PR #11439 [ci skip] --- html/changelogs/AutoChangeLog-pr-11439.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11439.yml diff --git a/html/changelogs/AutoChangeLog-pr-11439.yml b/html/changelogs/AutoChangeLog-pr-11439.yml new file mode 100644 index 0000000000000..394a4ed6c3383 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11439.yml @@ -0,0 +1,4 @@ +author: ToasterBiome +delete-after: true +changes: + - bugfix: Centcom Ban DB is now accessible again through PP From 37ec29896afeff2f48093fd113c1c0753b1d5dbe Mon Sep 17 00:00:00 2001 From: BeeBot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 7 Sep 2024 15:23:40 -0500 Subject: [PATCH 29/58] Update TGS DMAPI (#11429) --- code/__DEFINES/tgs.dm | 2 +- code/modules/tgs/v5/__interop_version.dm | 2 +- code/modules/tgs/v5/_defines.dm | 1 + code/modules/tgs/v5/topic.dm | 4 +++- code/modules/tgs/v5/undefs.dm | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index 4766b3dfe661e..42f2d5fc31fee 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,7 +1,7 @@ // tgstation-server DMAPI // The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in IETF RFC 2119. -#define TGS_DMAPI_VERSION "7.2.1" +#define TGS_DMAPI_VERSION "7.3.0" // All functions and datums outside this document are subject to change with any version and should not be relied on. diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm index f4806f7adb97c..29ea239ad84db 100644 --- a/code/modules/tgs/v5/__interop_version.dm +++ b/code/modules/tgs/v5/__interop_version.dm @@ -1 +1 @@ -"5.9.0" +"5.10.0" diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm index 92c7a8388a711..a47bfd78000bc 100644 --- a/code/modules/tgs/v5/_defines.dm +++ b/code/modules/tgs/v5/_defines.dm @@ -95,6 +95,7 @@ #define DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION "newServerVersion" #define DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE "broadcastMessage" +#define DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT "clientCount" #define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE "commandResponse" #define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE "commandResponseMessage" #define DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES "chatResponses" diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm index e1f2cb6385789..59e5e63e5cd42 100644 --- a/code/modules/tgs/v5/topic.dm +++ b/code/modules/tgs/v5/topic.dm @@ -149,7 +149,9 @@ if(DMAPI5_TOPIC_COMMAND_HEALTHCHECK) if(event_handler && event_handler.receive_health_checks) event_handler.HandleEvent(TGS_EVENT_HEALTH_CHECK) - return TopicResponse() + var/list/health_check_response = TopicResponse() + health_check_response[DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT] = TGS_CLIENT_COUNT + return health_check_response; if(DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH) detached = FALSE diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm index 237207fdfd056..acd19dfa6411c 100644 --- a/code/modules/tgs/v5/undefs.dm +++ b/code/modules/tgs/v5/undefs.dm @@ -18,7 +18,6 @@ #undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER #undef DMAPI5_PARAMETER_CUSTOM_COMMANDS -#undef DMAPI5_PARAMETER_TOPIC_PORT #undef DMAPI5_CHUNK #undef DMAPI5_CHUNK_PAYLOAD @@ -95,6 +94,7 @@ #undef DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION #undef DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE +#undef DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT #undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE #undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE #undef DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES From e4b1b184a26f62cbfae7cfaca83dab3faff66076 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sat, 7 Sep 2024 21:04:04 +0000 Subject: [PATCH 30/58] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-11439.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11439.yml diff --git a/html/changelog.html b/html/changelog.html index 3caa7c74430cf..f2f5557a7d877 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
          +

          07 September 2024

          +

          ToasterBiome updated:

          +
            +
          • Centcom Ban DB is now accessible again through PP
            • +
          +

          05 September 2024

          Varo, Bombyy, PigeonVerde updated:

            diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index eb0b26aac2afb..49f5bae8e7af1 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -44112,3 +44112,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: 'BoxStation: Added a new area, apc and air alarm for the captain room' - bugfix: 'BoxStation: Fixes floating cameras and doble pipes and cables errors' - bugfix: 'BoxStation: Fixes stools directions and types' +2024-09-07: + ToasterBiome: + - bugfix: Centcom Ban DB is now accessible again through PP diff --git a/html/changelogs/AutoChangeLog-pr-11439.yml b/html/changelogs/AutoChangeLog-pr-11439.yml deleted file mode 100644 index 394a4ed6c3383..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-11439.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: ToasterBiome -delete-after: true -changes: - - bugfix: Centcom Ban DB is now accessible again through PP From 32cdd7a0a0db13a521c49605206a86a4475f9784 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Sun, 8 Sep 2024 00:13:55 +0000 Subject: [PATCH 31/58] Automatic changelog compile [ci skip] --- html/changelog.html | 9 --------- 1 file changed, 9 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index f2f5557a7d877..b0a85f11d53dc 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -925,15 +925,6 @@

            tonty updated:

            • starting an emote with " 's " or "," won't leave a space anymore. roleplay has been saved
            - -

            07 July 2024

            -

            DarnTheMarn updated:

            -
              -
            • Reduced the med kit count in the brig, total of two first aid kits
              • -
            • Removed duplicate medical equipment in the brig, and specialty medkit spawns from the brig physician locker
              • -
            • Brig surgical duffelbags and defibrillators now spawn in the brig physician locker instead of on the ground
              • -
            • Extra gauze to brig infirmary and kelotane/charcoal bottles to the brig physician locker
              • -
          GoonStation 13 Development Team From 7640e0c5bc0e621fa4fbe42770db74b91178eee0 Mon Sep 17 00:00:00 2001 From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Sun, 8 Sep 2024 08:57:01 +0100 Subject: [PATCH 32/58] The Testening: Ports improved unit tests from TG, New mapping tests, Refactors of existing tests to improve code quality (#11364) * Fixes redefined defines * Adds trait validity * Adds ticked file enforcement Co-Authored-By: san7890 Co-Authored-By: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> * Fixes references to TGstation isntead of Beestation * Create max_required_byond_client.txt Co-Authored-By: Kyle Spier-Swenson Co-Authored-By: Mothblocks <35135081+Mothblocks@users.noreply.github.com> * Fixes qdel in optimisation * I don't think we need mariaDB anymore * Update run_server.sh * Updates check_grep to include the new * Adds mapping tests * Adds some mapping testers * Disables create and destroy * Update run_server.sh Co-Authored-By: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Co-Authored-By: Jordan Dominion Co-Authored-By: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-Authored-By: Tastyfish <1185434+Tastyfish@users.noreply.github.com> * Fixes compilation * Fixes compilation issues * Corrects the DME target * Removes auxmos temporarilly * Revert "Removes auxmos temporarilly" This reverts commit 4c42c82126a4ac5156cd0042b91ee6f33553755c. * Disables restore_atmos * Re-enables atmos reset * Fixes crashing issues * Fixes issue with disposal unit test check * Another correction in disposal tests * Fixes infinite loop check * Correctly return when we encounter an error * Fixes failures not being properly * Fixes disposal loop bug * Account for the complete shitcode of disposals * Update check_disposals.dm * Fixes * Debug info * Update check_disposals.dm * Fixes the stupidity of sort codes * Corrects a mistake * Makes run ID properly unique * Update check_disposals.dm * Update check_disposals.dm * Fixes some areas interacting wtih APC checks * Random rooms will delete any directional things not placed on walls, fixes inconsistent indentation * Adds a somewhat hacky check to fix random maint room spawning * Update check_disposals.dm * Fixes ending in a null location * Fixes disposals detecting loops when there are none * Adds more information to the failure * Fixes an issue with the disposals check * Update check_disposals.dm * Update check_disposals.dm * /area/medical/apothecary is valid for the output of chemistry * Fixes the issue with virology and finally resolves issues with the disposals checker * Adds a check for multiple objects on the same turf * Fixes the multiple object check * Update check_multiple_objects.dm * Update check_multiple_objects.dm * Update check_multiple_objects.dm * Fixes list messages * Assume that things with different pixel offsets are intended to be different * Corrects some issues with the map tests * How about we just disable random maints on unit testing * Update check_wallthing_attachment.dm * warnings fix * Allows disposals to end in delivery office * Squashed commit of the following: commit 18bbae7148b35987dd90e49105d1273784c053e8 Author: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Fri Aug 30 19:49:01 2024 +0100 Allows disposals to end in delivery office commit 565af663a73daabddf3d6fc6a4e2371c4c696a35 Author: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Fri Aug 30 19:09:53 2024 +0100 Merges 2 files together commit 195fa7cc9887ab2ea672aebfa008725f8a415732 Author: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Fri Aug 30 18:58:57 2024 +0100 Adds in mapping helpers for disposals commit 611dd96c91eeaeb6815bbae1d347e5db2b2934a2 Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Fri Aug 30 00:12:46 2024 +0000 Automatic changelog compile [ci skip] commit 522552aab205cd9e2878cd29d28e023d5bc8e762 Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Thu Aug 29 18:03:54 2024 +0000 Automatic changelog compile [ci skip] commit 1f5a444a9e512216882fdb71e518ca5262e6f16e Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Thu Aug 29 12:28:03 2024 -0500 Automatic changelog generation for PR #11366 [ci skip] commit c05a8ee2d98373918a7bb43fb1f834e91eed5df4 Author: Rukofamicom Date: Thu Aug 29 12:18:22 2024 -0500 Gibtonite flashes again (#11366) commit af85a212a6cfe674ea0e5f52269a2d59f7c0fa85 Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Thu Aug 29 17:03:19 2024 +0000 Automatic changelog compile [ci skip] commit 000ed5cf7649a074a3431397177fc496aa62e058 Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Thu Aug 29 11:23:27 2024 -0500 Automatic changelog generation for PR #10983 [ci skip] commit fd1e700cc41fb608dc3ec722a534c3dced7d1dab Author: Dejaku51 <40302913+Dejaku51@users.noreply.github.com> Date: Thu Aug 29 18:13:47 2024 +0200 Server framework v2 (#10983) * i don't remember what is happening * much better * just debug stuff * the ideas are coming * that shouldn't be here * it works now! * RnD servers integrated * sparks! * no more "if true return true" * reverse logic * adds ! to comments in stat.dm * clean up after yourself on Destroy() * splits early return * clean up after yourself tcomm monitoring * you too all tcomms machines * adds type holder instead of GetComponents * fix indentation * cmon indentation * HOW?! * oopsie woopsie * removes TODO and adds a comment * packet types and null on destroy * update comment * fixed radstation tcomms area + switches hub with blackbox * rebalances tcomms heat generation * fix echo tcomms cooling * that should stop funny exploit discovered by aramix * cooldown define * remove useless signal * opened machine is under maintenance * return null instead of 0 points * return false * I HATE TESTS commit 79ee7538ea52c517309af9fea10990b47aecd0c4 Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Thu Aug 29 00:12:28 2024 +0000 Automatic changelog compile [ci skip] commit f4028a7a2025234d4b5d9751544ce8ec240d6051 Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Wed Aug 28 16:03:51 2024 +0000 Automatic changelog compile [ci skip] commit ded9e053ef45ff46398ef5bee5e3b9ccbf46116a Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Wed Aug 28 10:18:28 2024 -0500 Automatic changelog generation for PR #11373 [ci skip] commit c95ed70fd70701b573b4da90314df2d6c2c1ffd6 Author: ClownMoff <148357670+ClownMoff@users.noreply.github.com> Date: Wed Aug 28 15:59:25 2024 +0100 Update cigarette.dm (#11373) commit a251e91529fba7328066c1f07572f1393a93bc39 Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Wed Aug 28 10:08:53 2024 -0500 Automatic changelog generation for PR #11387 [ci skip] commit 61b21cc07df7ed6b0baac6d0458f81c93bd3cbba Author: XeonMations <62395746+XeonMations@users.noreply.github.com> Date: Wed Aug 28 17:58:39 2024 +0300 Fixes simplemobs being able to interact with machinery (#11387) * another PR, another banger * comment moment commit 1cf494144d21689452b455484893fb275f364fb3 Author: Markus Larsson <82539179+MarkusLarsson421@users.noreply.github.com> Date: Tue Aug 27 13:17:12 2024 +0200 Delta Science Doors Fix (#11303) * Silly goose didn't use the "txt" var. * Update DeltaStation2.dmm * Update DeltaStation2.dmm * Update DeltaStation2.dmm commit ceee177c04241c34ddced7884f977e485d30b5a4 Author: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> Date: Tue Aug 27 11:35:01 2024 +0100 Boxstation mapping fixes #11364 (#11368) * Fixes 89,129 * Update BoxStation.dmm * Update BoxStation.dmm * Camera fixes * Adds in an unsorted loop to the boxstation package loop * Fixes direction of the sorting pipe * Fixes boxstation disposal issues * Fixes cameras * Fixes multiple objects stacked on top of each other * Fixes some lights placed on windows * Fixes all boxstation light issues * Update BoxStation.dmm * Fixes some lights placed on windows * Fixes all boxstation light issues commit 8d8f3f8eae4fd759ca8f55c0bb05560b87ba5476 Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Tue Aug 27 00:12:25 2024 +0000 Automatic changelog compile [ci skip] commit ff2162b9e0cfce9b154d7bbb171ebf7ee3f554a7 Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Mon Aug 26 18:11:15 2024 -0500 Automatic changelog generation for PR #11385 [ci skip] commit d1c6236fb6a10f503bec1e94d4763a988276558d Author: XeonMations <62395746+XeonMations@users.noreply.github.com> Date: Tue Aug 27 02:01:44 2024 +0300 Fuck ups of the year. (#11385) * Properly disables random maint rooms if unit tests are not defined * Removes wallthing attachment, we will tackle this in the future * Update beestation.dme * Update _unit_tests.dm * Update check_grep.sh * Ports define sanity Co-Authored-By: san7890 Co-Authored-By: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Co-Authored-By: Zephyr <12817816+zephyrtfa@users.noreply.github.com> * [TEST]: Fixes room spawner clearing outside of its bounds * Fixes APC checks * Allow CI building to have 515 for OD compilation * Removes some unused files * Fixes metastation's invalid bag * Fixes Nanotrasen misspellings * Pipes are now hashed by their pipe layer * Compilation fix * Not all areas require power * Resets changelog * Screenshot tests only if they actually exist * Update run_server.sh * Attempt to fix OD lints * Fixes some space indentation issues * Creation test ignore turf_decal * Test including create and destroy tests * This will be far too much work to fix right now * Fixes beestation.dme file ordering * Fixes some missing undefs * Allow _DEFINES to be declared anywhere, allow components to declare their own defines for modularisation purposes * Fixes define sanity linter * Fixes 03- src as trait source * Adds in the LOWER_TEXT define * Fixes the remaining tab/space indentation issues, and allows 2 spaces followed by a star * Fixes the comment things * Ports maplint Co-Authored-By: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Co-Authored-By: Tastyfish <1185434+Tastyfish@users.noreply.github.com> Co-Authored-By: san7890 Co-Authored-By: Zephyr <12817816+zephyrtfa@users.noreply.github.com> Co-Authored-By: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-Authored-By: Andrew <3625094+MTandi@users.noreply.github.com> Co-Authored-By: tattle <66640614+dragomagol@users.noreply.github.com> Co-Authored-By: Jolly <70232195+jolly-66@users.noreply.github.com> Co-Authored-By: die_amond <58376695+dieamond13@users.noreply.github.com> Co-Authored-By: Tim * Removes this test as we currently do docking ports manually * Updates the defines for the component module * we need to scan subdirectories of unit tests now * Fixes mixed indentation issues * Fixes inconsistent human * Ensures proper lowertext usage * Corrects NanoTrasen to Nanotrasen * Fixes recieved spelling mistakes * Fixes update path files, allows tg_ before the name * Fixes to_chat issues * Corrects IMER_OVERRIDE used without TIMER_UNIQUE * Fixes trailing newlines * Fixes improper Initialize() arguments * Allow for recursive directory travel * Fixes some common spelling mistakes * Fixes shuttles with objects outside of their shuttle boundaries * Fixes ticked file enforcement * Corrects a ticked file that shouldn't have been * Organises the trait defines * Fixes consistent human compilation and test compilation * Fixes 2 final grep issues * Update unit_tests.json * Update declarations.dm * Adds the traits file to global vars * Update armour_checks.dm * Fordbid the inclusion of anything in the unit tests subdirectories * Should fix OD's unhapiness * I guess that didn't allow the base directory... * Corrects OD lint issues * Corrects ticked_file_enforcement to always work no matter the circumstances * Adds the ability to disable certain maplints * Replace / with \\ inside dme files * Very confusied right now * Skip the warning when we are building CI * Removes the layer var from being used in maps * Adds begin and end include to _unit_tests.dm * Fixes a few mapping lint issues * Fixes missing unit tests * Update _component.dm * Compilation fix * Fixes ticked file enforcement * Update ticked_file_enforcement.py * Update _unit_tests.dm * Fixes the ordering * Update _unit_tests.dm * Update _unit_tests.dm * We don't have nearly as many traits as TG does * We don't need check changelogs * Updates the build script and adds icon generation tools Co-Authored-By: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-Authored-By: oranges * Supports 514-515 dual compilation with JukeBuild * Update _unit_tests.dm * Fixes the missing trait declarations * Update _traits.dm * Update _traits.dm * Update _traits.dm * Update _traits.dm * Switches back to using the spacestation13 repo * Door Names * mapping changes * We don't use smart cables * Update undergroundoutpost45.dmm * Changes the formatting of the error to make it easier to search over * Echostation merge conflict markers * Obsolete var removal * Update undergroundoutpost45.dmm * Departments.dmm issues * Update CentCom.dmm * Do not edit areas * Box, Fland, Meta * Makes fridges opaque * DeltaStation * CorgStation * RadStation, KiloStation * Various maps * Removes banned /area var-edits from Echo, Kilo and Rad * Fixes fridges inside walls on EchoStation * Adds a mapping helper for the air mix * Fixes update paths * Uncorrupts map files * UpdatePaths * Banned Var Edits * EchoStation banned var-edits * Echostation piping layer * Echostation piping disaster fixes * KiloStation Lints * End of the nightmare lints * Lints 2 * Adds the missing type * Kilo, Meta, Rad, Fixes Pipe Check * Update check_multiple_objects.dm * Radstation * Metastation lighting issues * RadStation disposals * KiloStation * Route all disposals through security on RadStation * Radstation mapfix v145 * Update RadStation.dmm * Yea, we're a sorting network * Always allow leading to an input node, because it just makes everyone's lives easier * BoxStation fuck ups * Fuck off * Update check_disposals.dm * Echo mapping fixes -disposals * Update network.dm * Update network.dm * Update networks.dm * Fixes RadStation disposals * Corgstation final fixes * CorgStation finishing touches * Update KiloStation.dmm * For some reason it was reaching a node * Accept disposals going to janitor closet for kilo * Flaky test shit * Adds the show screenshot test results file * FlandStation Part 1 * Fland disposal fixes * Update FlandStation.dmm * Fixes * Update MetaStation.dmm * MetaStation disposals * Fixes metastation area mapping * Update MetaStation.dmm * Fixes incomplete disposal track on MetaStation * Cleans up some disposals shitcode that mixed movement with direction grabbing * Fixes multiz debug APCs * Fixes an issue area on echo where it had no area * Echostation disposals fixes * Fixes dorms bypassing disposals filtering * Echo disposals final touches * Update EchoStation.dmm * Allow this * Update EchoStation.dmm * Update EchoStation.dmm * Update EchoStation.dmm * Send a message when you start a unit test run * Log it to world actually * Update unit_test.dm * Should fix an issue with unit tests never running * Adds screenshot tests Co-Authored-By: Mothblocks <35135081+Mothblocks@users.noreply.github.com> * Fixes a few issues * Ports #86500 Co-Authored-By: oranges * Fixes mapping helpers not being deleted * Removes the random boxstation door * Apply suggestions from code review Co-authored-by: Crossedfall * Fixes a tab indentation, fixes a file with the wrong indentation * Bee: Disables the autowiki target * Blanket removes heat capacity from usage in all maps * Removes from random z levels * Make sure we have parents too * Fixes a race condition in shuttle loading * Update shuttle.dm * Removes some unnecessary greps There are 3 greps that maplint is not currently expressive enough to handle * Update pixel_varedits.yml * I guess this works --------- Co-authored-by: san7890 Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-authored-by: Kyle Spier-Swenson Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Co-authored-by: Jordan Dominion Co-authored-by: Tastyfish <1185434+Tastyfish@users.noreply.github.com> Co-authored-by: Zephyr <12817816+zephyrtfa@users.noreply.github.com> Co-authored-by: Andrew <3625094+MTandi@users.noreply.github.com> Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com> Co-authored-by: Jolly <70232195+jolly-66@users.noreply.github.com> Co-authored-by: die_amond <58376695+dieamond13@users.noreply.github.com> Co-authored-by: Tim Co-authored-by: oranges Co-authored-by: BriggsIDP Co-authored-by: Crossedfall --- .github/alternate_byond_versions.txt | 8 + .github/max_required_byond_client.txt | 8 + .github/workflows/ci_suite.yml | 290 + .github/workflows/continuous_integration.yml | 139 - .github/workflows/rerun_flaky_tests.yml | 31 + .github/workflows/run_integration_tests.yml | 81 + .../show_screenshot_test_results.yml | 43 + .gitignore | 3 + _maps/Prefab/Departments.dmm | 407 +- .../10x10/rdm_organ_harvesting.dmm | 4 +- .../10x10/sk_rdm062_roosterdome.dmm | 3 - .../10x10/sk_rdm159_kilosnakepit.dmm | 4 +- _maps/RandomRooms/10x5/rdm_vault_storages.dmm | 4 +- .../RandomRooms/10x5/sk_rdm125_courtroom.dmm | 2 +- .../rdm_insane_atmospherics_technician.dmm | 1 - .../5x3/sk_rdm068_pubbyclutter7.dmm | 3 +- _maps/RandomRooms/5x4/rdm_bathroom.dmm | 1 - .../RandomRooms/5x4/rdm_captain_quarters.dmm | 5 +- .../RandomRooms/5x4/sk_rdm049_metakitchen.dmm | 4 +- .../5x4/sk_rdm121_honkaccident.dmm | 7 - .../5x4/sk_rdm166_printing_press.dmm | 3 - .../fland/sk_rdm_fln_03_vendingminimarket.dmm | 4 +- .../fland/sk_rdm_fln_04_conveniencestore.dmm | 10 +- .../LavaRuins/lavaland_biodome_beach.dmm | 3 +- .../lavaland_surface_animal_hospital.dmm | 6 +- .../LavaRuins/lavaland_surface_golem_ship.dmm | 1 - .../LavaRuins/lavaland_surface_seed_vault.dmm | 90 +- .../lavaland_surface_syndicate_base1.dmm | 8 +- _maps/RandomRuins/SpaceRuins/Fast_Food.dmm | 2 +- _maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 2 +- _maps/RandomRuins/SpaceRuins/bigderelict1.dmm | 2 +- _maps/RandomRuins/SpaceRuins/bus.dmm | 3 +- .../SpaceRuins/cloning_facility.dmm | 6 +- .../RandomRuins/SpaceRuins/gasthelizards.dmm | 3 +- .../SpaceRuins/hilbertshoteltestingsite.dmm | 2 +- .../SpaceRuins/listeningstation.dmm | 299 +- .../SpaceRuins/mrow_thats_right.dmm | 14 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 4 +- _maps/RandomRuins/SpaceRuins/onehalf.dmm | 34 +- _maps/RandomRuins/SpaceRuins/power_puzzle.dmm | 38 +- _maps/RandomRuins/SpaceRuins/sos1.dmm | 4 +- _maps/RandomRuins/SpaceRuins/sos6.dmm | 2 +- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 9 +- .../SpaceRuins/whiteshipruin_box.dmm | 2 +- _maps/RandomZLevels/SnowCabin.dmm | 23 +- _maps/RandomZLevels/TheBeach.dmm | 8 +- _maps/RandomZLevels/moonoutpost19.dmm | 1692 +- _maps/RandomZLevels/research.dmm | 16 +- _maps/RandomZLevels/snowdin.dmm | 133 +- _maps/RandomZLevels/undergroundoutpost45.dmm | 4297 +-- _maps/RuinGeneration/13x13_ai-lab.dmm | 4 +- _maps/RuinGeneration/13x13_hilberttest.dmm | 2 +- _maps/RuinGeneration/13x13_listening_base.dmm | 3 +- _maps/RuinGeneration/17x9_pubbybridgehall.dmm | 4 +- _maps/RuinGeneration/9x13_kitchen.dmm | 4 +- _maps/RuinGeneration/9x9_chemlab.dmm | 6 +- _maps/arenas/cargobelt.dmm | 9 +- _maps/arenas/solars.dmm | 29 +- _maps/holodeck/basketball.dmm | 7 +- _maps/holodeck/kobayashi.dmm | 8 +- _maps/holodeck/lounge.dmm | 16 +- _maps/holodeck/meeting.dmm | 7 +- _maps/holodeck/small/kobayashi.dmm | 12 +- _maps/holodeck/small/lounge.dmm | 13 +- _maps/holodeck/small/meeting.dmm | 3 +- _maps/map_files/BoxStation/BoxStation.dmm | 794 +- _maps/map_files/CorgStation/CorgStation.dmm | 582 +- .../map_files/Deltastation/DeltaStation2.dmm | 1001 +- _maps/map_files/EchoStation/EchoStation.dmm | 24665 ++++++++-------- _maps/map_files/EchoStation/job_changes.dm | 7 + _maps/map_files/FlandStation/FlandStation.dmm | 1998 +- _maps/map_files/KiloStation/KiloStation.dmm | 1470 +- _maps/map_files/MetaStation/MetaStation.dmm | 2208 +- _maps/map_files/Mining/Lavaland.dmm | 10 +- _maps/map_files/RadStation/RadStation.dmm | 3084 +- _maps/map_files/debug/multiz.dmm | 282 +- _maps/map_files/debug/runtimestation.dmm | 103 +- _maps/map_files/generic/CentCom.dmm | 119 +- _maps/shuttles/arrival/arrival_delta.dmm | 12 +- _maps/shuttles/arrival/arrival_pubby.dmm | 2 +- _maps/shuttles/cargo/cargo_birdboat.dmm | 4 +- _maps/shuttles/cargo/cargo_box.dmm | 4 +- _maps/shuttles/cargo/cargo_corg.dmm | 8 +- _maps/shuttles/cargo/cargo_delta.dmm | 4 +- _maps/shuttles/cargo/cargo_fland.dmm | 4 - _maps/shuttles/cargo/cargo_kilo.dmm | 2 - _maps/shuttles/cargo/cargo_rad.dmm | 2 - .../shuttles/emergency/emergency_birdboat.dmm | 4 +- _maps/shuttles/emergency/emergency_delta.dmm | 8 +- _maps/shuttles/emergency/emergency_fland.dmm | 2 - _maps/shuttles/emergency/emergency_meta.dmm | 1 - _maps/shuttles/emergency/emergency_meteor.dmm | 3 +- _maps/shuttles/emergency/emergency_pubby.dmm | 18 +- .../emergency/emergency_russiafightpit.dmm | 2 +- .../shuttles/emergency/emergency_shelter.dmm | 2 +- .../shuttles/emergency/emergency_theatre.dmm | 116 +- _maps/shuttles/emergency/emergency_tiny.dmm | 4 +- .../shuttles/exploration/exploration_corg.dmm | 4 +- .../exploration/exploration_fland.dmm | 12 +- _maps/shuttles/ferry/ferry_lighthouse.dmm | 10 +- _maps/shuttles/hunter/hunter_bounty.dmm | 26 +- _maps/shuttles/hunter/hunter_russian.dmm | 33 +- _maps/shuttles/hunter/hunter_space_cop.dmm | 26 +- .../infiltrator/infiltrator_advanced.dmm | 2 +- .../infiltrator/infiltrator_basic.dmm | 4 +- _maps/shuttles/labour/labour_box.dmm | 6 +- _maps/shuttles/labour/labour_corg.dmm | 3 +- _maps/shuttles/labour/labour_delta.dmm | 6 +- _maps/shuttles/labour/labour_fland.dmm | 8 +- _maps/shuttles/labour/labour_kilo.dmm | 6 +- _maps/shuttles/mining/mining_box.dmm | 3 +- _maps/shuttles/mining/mining_delta.dmm | 3 +- _maps/shuttles/mining/mining_fland.dmm | 66 +- _maps/shuttles/mining/mining_large.dmm | 3 +- _maps/shuttles/mining/mining_rad.dmm | 33 +- _maps/shuttles/pirate/pirate_default.dmm | 32 +- _maps/shuttles/tram/tram_corg.dmm | 21 +- _maps/shuttles/whiteship/whiteship_cere.dmm | 5 +- _maps/shuttles/whiteship/whiteship_fland.dmm | 4 +- _maps/shuttles/whiteship/whiteship_meta.dmm | 18 +- _maps/shuttles/whiteship/whiteship_pubby.dmm | 6 +- _maps/templates/capsule_checkpoint.dmm | 8 +- _maps/templates/shelter_2.dmm | 5 +- _maps/templates/shelter_4.dmm | 25 +- _maps/templates/shelter_6.dmm | 32 +- beestation.dme | 21 +- bin/temp-fast-test.cmd | 4 - code/__DEFINES/MC.dm | 20 +- code/__DEFINES/{_readme.dm => README.md} | 0 code/__DEFINES/SDQL.dm | 29 + code/__DEFINES/_globals.dm | 8 +- code/__DEFINES/_helpers.dm | 3 + code/__DEFINES/actions.dm | 8 + code/__DEFINES/admin.dm | 7 + code/__DEFINES/ai.dm | 9 + code/__DEFINES/antagonists.dm | 22 + code/__DEFINES/configuration.dm | 7 + .../dcs/signals/signals_atom/signals_atom.dm | 2 +- .../signals/signals_datum/signals_datum.dm | 6 +- .../dcs/signals/signals_mob/signals_mob.dm | 2 +- .../signals_obj/signals_item/signals_item.dm | 10 +- code/__DEFINES/directional.dm | 8 +- code/__DEFINES/dynamic.dm | 2 + code/__DEFINES/economy.dm | 8 +- code/__DEFINES/fields.dm | 4 + code/__DEFINES/flags.dm | 4 +- code/__DEFINES/html_assistant.dm | 28 +- code/__DEFINES/hud.dm | 2 + code/__DEFINES/inventory.dm | 5 + code/__DEFINES/machines.dm | 69 + code/__DEFINES/maps.dm | 42 +- code/__DEFINES/pipe_construction.dm | 8 +- code/__DEFINES/preferences.dm | 32 + code/__DEFINES/qdel.dm | 45 +- code/__DEFINES/say.dm | 8 +- code/__DEFINES/shuttles.dm | 6 + code/__DEFINES/species.dm | 8 +- code/__DEFINES/status_effects.dm | 1 + code/__DEFINES/subsystems.dm | 10 +- code/__DEFINES/text.dm | 4 + code/__DEFINES/traits/_traits.dm | 119 + .../{traits.dm => traits/declarations.dm} | 292 +- code/__DEFINES/traits/macros.dm | 4 + code/__DEFINES/traits/sources.dm | 135 + code/__DEFINES/turfs.dm | 16 +- code/__DEFINES/weather.dm | 5 + code/__DEFINES/zmimic.dm | 2 +- code/__HELPERS/_lists.dm | 22 +- code/__HELPERS/areas.dm | 6 +- code/__HELPERS/atoms.dm | 19 - code/__HELPERS/combat.dm | 2 + code/__HELPERS/datums.dm | 2 +- code/__HELPERS/icon_smoothing.dm | 2 +- code/__HELPERS/icons.dm | 118 +- code/__HELPERS/matrices.dm | 6 +- code/__HELPERS/names.dm | 14 +- .../position_point_vector.dm | 0 code/__HELPERS/qdel.dm | 8 - code/__HELPERS/sanitize_values.dm | 2 +- code/__HELPERS/string_assoc_lists.dm | 16 +- code/__HELPERS/test_helpers.dm | 35 + code/__HELPERS/text.dm | 2 +- code/__HELPERS/time.dm | 2 +- code/__HELPERS/type2type.dm | 2 +- code/__HELPERS/unused.dm | 39 - code/__byond_version_compat.dm | 2 +- code/_compile_options.dm | 4 +- code/_globalvars/lists/flavor_misc.dm | 2 +- code/_globalvars/logging.dm | 5 + code/_globalvars/soul_glimmer.dm | 8 +- .../{traits.dm => traits/_traits.dm} | 114 +- code/_js/menus.dm | 66 +- code/_onclick/click.dm | 3 + code/_onclick/hud/action_button.dm | 4 +- code/_onclick/hud/alert.dm | 17 +- code/_onclick/hud/credits.dm | 9 + code/_onclick/hud/fullscreen.dm | 9 +- code/_onclick/hud/holoparasite.dm | 4 +- code/_onclick/hud/hud.dm | 3 +- code/_onclick/hud/parallax.dm | 4 + code/_onclick/hud/radial.dm | 3 + .../hud/rendering/plane_master_controller.dm | 2 + code/_onclick/hud/screen_objects.dm | 8 + code/_onclick/item_attack.dm | 4 +- .../controllers/configuration/config_entry.dm | 11 +- .../configuration/configuration.dm | 10 +- .../configuration/entries/resources.dm | 2 +- code/controllers/failsafe.dm | 10 +- code/controllers/master.dm | 14 +- code/controllers/subsystem/area_contents.dm | 2 + code/controllers/subsystem/atoms.dm | 7 + code/controllers/subsystem/blackbox.dm | 4 +- code/controllers/subsystem/dbcore.dm | 2 +- code/controllers/subsystem/explosion.dm | 4 + code/controllers/subsystem/garbage.dm | 293 +- code/controllers/subsystem/init_profiler.dm | 2 + code/controllers/subsystem/mapping.dm | 5 +- code/controllers/subsystem/overlays.dm | 2 + code/controllers/subsystem/persistence.dm | 2 + .../subsystem/processing/networks.dm | 9 +- code/controllers/subsystem/profiler.dm | 3 + code/controllers/subsystem/shuttle.dm | 11 +- code/controllers/subsystem/spatial_gridmap.dm | 4 + code/controllers/subsystem/throwing.dm | 3 + code/controllers/subsystem/ticker.dm | 20 +- code/controllers/subsystem/topic.dm | 6 +- code/controllers/subsystem/traumas.dm | 16 +- code/controllers/subsystem/weather.dm | 19 +- code/controllers/subsystem/zclear.dm | 3 + code/controllers/subsystem/zcopy.dm | 5 - code/datums/action.dm | 9 - .../ai/hunting_behavior/hunting_behaviors.dm | 2 +- code/datums/ai/tamed/tamed_behaviour.dm | 2 + code/datums/ai/tamed/tamed_controller.dm | 7 + code/datums/ai_laws.dm | 9 - code/datums/alarm.dm | 2 +- code/datums/brain_damage/hypnosis.dm | 2 +- code/datums/brain_damage/imaginary_friend.dm | 2 + code/datums/brain_damage/mild.dm | 2 +- code/datums/brain_damage/mrat.dm | 2 + code/datums/brain_damage/severe.dm | 2 +- code/datums/brain_damage/special.dm | 8 +- code/datums/brain_damage/split_personality.dm | 2 + code/datums/chatmessage.dm | 7 + code/datums/components/COMPONENT_TEMPLATE.md | 2 +- code/datums/components/README.md | 2 +- code/datums/components/_component.dm | 17 +- code/datums/components/alert_research.dm | 0 code/datums/components/aquarium.dm | 4 +- code/datums/components/archaeology.dm | 101 - code/datums/components/buffer.dm | 6 +- code/datums/components/construction.dm | 12 +- code/datums/components/crafting/recipes.dm | 26 +- code/datums/components/crafting/tailoring.dm | 4 +- code/datums/components/cult_ritual_item.dm | 4 +- .../components/customizable_reagent_holder.dm | 4 +- code/datums/components/deadchat_control.dm | 2 +- code/datums/components/deployable.dm | 2 +- code/datums/components/forensics.dm | 2 +- code/datums/components/haircolor_clothes.dm | 22 +- code/datums/components/lockon_aiming.dm | 3 + code/datums/components/material_container.dm | 2 +- code/datums/components/nanites.dm | 4 +- code/datums/components/remote_materials.dm | 6 +- code/datums/components/shuttle_cling.dm | 4 +- code/datums/components/sound_player.dm | 2 +- code/datums/components/squeak.dm | 2 +- .../components/storage/concrete/pockets.dm | 6 +- code/datums/components/storage/storage.dm | 4 - code/datums/components/twohanded.dm | 3 - code/datums/components/udder.dm | 2 + code/datums/components/uplink.dm | 10 +- code/datums/datum.dm | 17 + code/datums/diseases/advance/advance.dm | 2 +- .../diseases/advance/symptoms/alcohol.dm | 2 +- .../diseases/advance/symptoms/beesymptom.dm | 6 +- .../diseases/advance/symptoms/blobspores.dm | 8 +- .../diseases/advance/symptoms/braindamage.dm | 4 +- .../diseases/advance/symptoms/choking.dm | 2 +- .../diseases/advance/symptoms/clockwork.dm | 12 +- .../diseases/advance/symptoms/cockroach.dm | 2 +- .../diseases/advance/symptoms/confusion.dm | 4 +- .../datums/diseases/advance/symptoms/cough.dm | 8 +- .../diseases/advance/symptoms/deafness.dm | 2 +- .../datums/diseases/advance/symptoms/fever.dm | 2 +- code/datums/diseases/advance/symptoms/fire.dm | 10 +- .../diseases/advance/symptoms/flesh_eating.dm | 6 +- .../diseases/advance/symptoms/genetics.dm | 4 +- .../diseases/advance/symptoms/hallucigen.dm | 2 +- .../diseases/advance/symptoms/headache.dm | 4 +- code/datums/diseases/advance/symptoms/heal.dm | 12 +- .../diseases/advance/symptoms/heartattack.dm | 2 +- .../diseases/advance/symptoms/itching.dm | 2 +- .../datums/diseases/advance/symptoms/kitty.dm | 4 +- .../diseases/advance/symptoms/lubefeet.dm | 4 +- .../diseases/advance/symptoms/macrophage.dm | 10 +- .../diseases/advance/symptoms/nanites.dm | 4 +- .../diseases/advance/symptoms/narcolepsy.dm | 2 +- .../diseases/advance/symptoms/necropolis.dm | 8 +- .../diseases/advance/symptoms/organs.dm | 6 +- .../diseases/advance/symptoms/pierrot.dm | 8 +- .../diseases/advance/symptoms/shivering.dm | 2 +- code/datums/diseases/advance/symptoms/skin.dm | 6 +- .../diseases/advance/symptoms/sneeze.dm | 2 +- .../datums/diseases/advance/symptoms/viral.dm | 14 +- .../diseases/advance/symptoms/vision.dm | 4 +- .../diseases/advance/symptoms/voice_change.dm | 4 +- .../datums/diseases/advance/symptoms/vomit.dm | 4 +- .../diseases/advance/symptoms/wizarditis.dm | 2 +- code/datums/elements/art.dm | 2 +- code/datums/elements/rust.dm | 4 +- code/datums/emotes.dm | 3 - code/datums/greyscale/_greyscale_config.dm | 12 +- code/datums/greyscale/json_reader.dm | 2 +- code/datums/helper_datums/teleport.dm | 2 + code/datums/holocall.dm | 11 - code/datums/map_config.dm | 13 + code/datums/mapgen/JungleGenerator.dm | 2 + code/datums/martial/cqc.dm | 6 + code/datums/martial/karate.dm | 5 + code/datums/martial/plasma_fist.dm | 4 + code/datums/martial/sleeping_carp.dm | 6 + code/datums/martial/tribal_claw.dm | 5 + code/datums/mutations/antenna.dm | 2 +- code/datums/mutations/sight.dm | 2 +- code/datums/progressbar.dm | 7 + code/datums/recipe.dm | 2 +- code/datums/station_traits/positive_traits.dm | 3 + code/datums/status_effects/debuffs.dm | 2 - code/datums/traits/_quirk.dm | 1 + code/datums/traits/negative_quirk.dm | 10 +- code/datums/wires/_wires.dm | 2 +- code/datums/wires/airalarm.dm | 4 +- code/datums/world_topic.dm | 8 +- code/game/area/Space_Station_13_areas.dm | 9 +- code/game/area/area_color_correction.dm | 3 +- code/game/area/areas/holodeck.dm | 2 +- code/game/atoms.dm | 2 + code/game/communications.dm | 118 +- code/game/data_huds.dm | 6 +- code/game/gamemodes/dynamic/dynamic.dm | 2 - .../gamemodes/dynamic/dynamic_rulesets.dm | 3 - .../dynamic/dynamic_rulesets_midround.dm | 3 - code/game/gamemodes/gangs/dominator.dm | 241 - code/game/gamemodes/gangs/gang_tags.dm | 2 + code/game/gamemodes/gangs/implant_gang.dm | 4 + code/game/gamemodes/meteor/meteors.dm | 10 +- code/game/gamemodes/nuclear/nuclear.dm | 2 + code/game/gamemodes/sandbox/h_sandbox.dm | 4 +- code/game/machinery/_machinery.dm | 122 +- code/game/machinery/airlock_control.dm | 2 + code/game/machinery/airlock_cycle_control.dm | 15 + code/game/machinery/aug_manipulator.dm | 4 +- code/game/machinery/buttons.dm | 2 + code/game/machinery/camera/camera.dm | 8 +- code/game/machinery/camera/camera_assembly.dm | 4 +- code/game/machinery/cloning.dm | 4 +- code/game/machinery/computer/Operating.dm | 4 +- code/game/machinery/computer/arena.dm | 2 + code/game/machinery/computer/camera.dm | 2 +- .../machinery/computer/camera_advanced.dm | 2 +- code/game/machinery/computer/card.dm | 2 +- code/game/machinery/computer/cloning.dm | 6 +- code/game/machinery/computer/crew.dm | 2 + code/game/machinery/computer/dna_console.dm | 2 +- .../machinery/computer/launchpad_control.dm | 2 +- code/game/machinery/computer/medical.dm | 4 +- code/game/machinery/computer/security.dm | 2 + code/game/machinery/cryopod.dm | 2 +- code/game/machinery/dance_machine.dm | 2 +- code/game/machinery/dna_scanner.dm | 2 +- code/game/machinery/doors/airlock.dm | 4 +- code/game/machinery/doors/firedoor.dm | 51 +- code/game/machinery/doors/windowdoor.dm | 10 +- code/game/machinery/doppler_array.dm | 10 +- code/game/machinery/ecto_sniffer.dm | 2 +- .../embedded_controller/airlock_controller.dm | 6 + .../fabricators/modular_fabricator.dm | 2 + code/game/machinery/firealarm.dm | 6 +- code/game/machinery/flasher.dm | 2 + code/game/machinery/launch_pad.dm | 16 +- code/game/machinery/limbgrower.dm | 4 + .../newscaster/newscaster_machine.dm | 2 + code/game/machinery/pipe/construction.dm | 2 + .../machinery/porta_turret/portable_turret.dm | 16 +- .../porta_turret/portable_turret_construct.dm | 10 + .../porta_turret/portable_turret_cover.dm | 2 +- code/game/machinery/quantum_pad.dm | 8 +- code/game/machinery/scan_gate.dm | 2 +- code/game/machinery/shieldgen.dm | 6 + code/game/machinery/shuttle/shuttle_engine.dm | 3 + code/game/machinery/slotmachine.dm | 11 +- code/game/machinery/stasis.dm | 4 +- code/game/machinery/status_display.dm | 9 +- code/game/machinery/teambuilder.dm | 2 +- .../telecomms/computers/logbrowser.dm | 4 +- .../machinery/telecomms/computers/message.dm | 2 + .../machinery/telecomms/telecomunications.dm | 2 +- code/game/machinery/teleporter.dm | 4 +- code/game/machinery/transformer.dm | 2 +- code/game/machinery/washing_machine.dm | 8 +- code/game/objects/effects/alien_acid.dm | 2 + .../objects/effects/anomalies/_anomalies.dm | 2 + .../objects/effects/anomalies/anomaly_flux.dm | 2 + .../effects/anomalies/anomaly_gravity.dm | 4 + code/game/objects/effects/contraband.dm | 2 + code/game/objects/effects/decals/cleanable.dm | 2 + .../effects/decals/cleanable/humans.dm | 6 + .../objects/effects/decals/cleanable/misc.dm | 2 + .../effects/decals/cleanable/robots.dm | 2 +- code/game/objects/effects/decals/crayon.dm | 2 + code/game/objects/effects/decals/decal.dm | 2 + .../effects/effect_system/effects_water.dm | 8 +- code/game/objects/effects/forcefields.dm | 4 + code/game/objects/effects/icons.dm | 4 + code/game/objects/effects/info.dm | 2 + code/game/objects/effects/landmarks.dm | 2 + code/game/objects/effects/lighting.dm | 4 + code/game/objects/effects/mainttraps.dm | 2 +- code/game/objects/effects/portals.dm | 4 + code/game/objects/effects/proximity.dm | 2 + .../objects/effects/spawners/gibspawner.dm | 2 + .../objects/effects/spawners/mailspawner.dm | 18 +- .../objects/effects/spawners/roomspawner.dm | 89 +- code/game/objects/effects/step_triggers.dm | 2 +- .../effects/temporary_visuals/clockwork.dm | 4 + .../objects/effects/temporary_visuals/cult.dm | 2 + .../temporary_visuals/miscellaneous.dm | 32 + .../projectiles/projectile_effects.dm | 2 + .../temporary_visuals/temporary_visual.dm | 4 +- code/game/objects/effects/wanted_poster.dm | 6 + code/game/objects/effects/water_ripple.dm | 18 - code/game/objects/items.dm | 4 +- code/game/objects/items/RPD.dm | 4 +- code/game/objects/items/airlock_painter.dm | 4 + code/game/objects/items/bedsheets.dm | 6 +- code/game/objects/items/blueprints.dm | 5 + code/game/objects/items/cards_ids.dm | 2 +- code/game/objects/items/carp_lasso.dm | 2 +- code/game/objects/items/chrono_eraser.dm | 2 + code/game/objects/items/cigs_lighters.dm | 2 + .../circuitboards/machine_circuitboards.dm | 2 + .../game/objects/items/colorizers/clothing.dm | 18 +- .../objects/items/colorizers/colorizer.dm | 88 +- code/game/objects/items/colorizers/mobs.dm | 10 +- code/game/objects/items/cosmetics.dm | 10 +- code/game/objects/items/crab17.dm | 4 + code/game/objects/items/crayons.dm | 10 +- code/game/objects/items/credit_holochip.dm | 2 + code/game/objects/items/cursed_necklace.dm | 46 +- code/game/objects/items/debug_items.dm | 2 +- code/game/objects/items/devices/flashlight.dm | 4 + .../items/devices/forcefieldprojector.dm | 2 + code/game/objects/items/devices/multitool.dm | 4 + .../items/devices/radio/encryptionkey.dm | 2 +- .../objects/items/devices/radio/headset.dm | 4 +- .../objects/items/devices/radio/intercom.dm | 4 + .../game/objects/items/devices/radio/radio.dm | 4 +- code/game/objects/items/devices/scanners.dm | 2 + .../game/objects/items/devices/sound_synth.dm | 2 +- code/game/objects/items/dice.dm | 4 +- code/game/objects/items/documents.dm | 2 + code/game/objects/items/food/bread.dm | 2 +- code/game/objects/items/food/donkpockets.dm | 2 +- code/game/objects/items/food/donuts.dm | 2 +- code/game/objects/items/food/misc.dm | 2 +- code/game/objects/items/food/salad.dm | 2 +- code/game/objects/items/food/spaghetti.dm | 2 +- .../objects/items/grenades/clusterbuster.dm | 4 + .../objects/items/grenades/discogrenade.dm | 2 + .../objects/items/implants/implant_track.dm | 2 +- .../objects/items/implants/implantuplink.dm | 4 + code/game/objects/items/mail.dm | 22 +- code/game/objects/items/melee/misc.dm | 2 +- code/game/objects/items/miscellaneous.dm | 8 +- code/game/objects/items/mjolnir.dm | 4 + code/game/objects/items/plushes.dm | 4 +- code/game/objects/items/pneumaticCannon.dm | 7 +- code/game/objects/items/robot/robot_items.dm | 2 + code/game/objects/items/spear.dm | 2 + code/game/objects/items/stacks/cash.dm | 2 + code/game/objects/items/stacks/medical.dm | 6 +- code/game/objects/items/stacks/ores/ore.dm | 2 + code/game/objects/items/stacks/rods/rods.dm | 6 +- .../items/stacks/sheets/mineral/metals.dm | 4 + .../items/stacks/sheets/organic/leather.dm | 2 + .../objects/items/stacks/sheets/sheets.dm | 2 + code/game/objects/items/stacks/stack.dm | 2 + code/game/objects/items/stacks/tiles/light.dm | 2 + .../objects/items/stacks/tiles/tile_types.dm | 2 + code/game/objects/items/storage/boxes.dm | 4 +- code/game/objects/items/storage/secure.dm | 9 + code/game/objects/items/teleportation.dm | 3 + code/game/objects/items/toys.dm | 34 +- code/game/objects/objs.dm | 18 +- code/game/objects/structures/ai_core.dm | 2 +- code/game/objects/structures/artstuff.dm | 6 +- .../objects/structures/beds_chairs/bed.dm | 2 +- code/game/objects/structures/bot_elevator.dm | 2 + .../crates_lockers/closets/infinite.dm | 2 +- .../structures/crates_lockers/crates/large.dm | 4 +- .../crates_lockers/crates/secure.dm | 2 + code/game/objects/structures/displaycase.dm | 4 +- code/game/objects/structures/door_assembly.dm | 12 +- code/game/objects/structures/extinguisher.dm | 2 + code/game/objects/structures/fireplace.dm | 4 + .../objects/structures/ghost_role_spawners.dm | 6 + code/game/objects/structures/grille.dm | 8 +- .../objects/structures/gym/exercise_status.dm | 5 + code/game/objects/structures/ladders.dm | 4 +- code/game/objects/structures/mirror.dm | 2 + .../objects/structures/petrified_statue.dm | 2 + code/game/objects/structures/showcase.dm | 3 + code/game/objects/structures/shower.dm | 4 + code/game/objects/structures/signs/_signs.dm | 6 +- code/game/objects/structures/stairs.dm | 4 + code/game/objects/structures/statues.dm | 6 +- code/game/objects/structures/tables_racks.dm | 4 +- .../structures/transit_tubes/station.dm | 2 + .../structures/transit_tubes/transit_tube.dm | 2 + code/game/objects/structures/watercloset.dm | 10 +- .../objects/structures/windoor_assembly.dm | 2 + code/game/objects/structures/window.dm | 2 + code/game/say.dm | 4 +- code/game/sound.dm | 4 +- code/game/turfs/baseturf_skipover.dm | 4 + code/game/turfs/closed/_closed.dm | 2 + code/game/turfs/open/_open.dm | 2 + code/game/turfs/open/floor/fancy_floor.dm | 16 +- .../game/turfs/open/floor/plating/asteroid.dm | 8 +- .../turfs/open/floor/plating/misc_plating.dm | 4 +- code/game/turfs/open/openspace.dm | 2 + code/game/turfs/turf.dm | 3 + code/game/turfs/turf_texture.dm | 2 + code/game/world.dm | 7 +- code/modules/NTNet/network.dm | 5 +- code/modules/admin/battle_royale.dm | 2 + code/modules/admin/chat_commands.dm | 2 + code/modules/admin/create_poll.dm | 143 - code/modules/admin/greyscale_modify_menu.dm | 4 +- code/modules/admin/ipintel.dm | 2 +- code/modules/admin/poll_management.dm | 2 +- code/modules/admin/sql_ban_system.dm | 7 +- code/modules/admin/sql_message_system.dm | 2 +- code/modules/admin/verbs/SDQL2/SDQL_2.dm | 35 +- .../admin/verbs/SDQL2/SDQL_2_parser.dm | 4 +- .../admin/verbs/SDQL2/SDQL_2_wrappers.dm | 4 +- code/modules/admin/verbs/_help.dm | 8 +- code/modules/admin/verbs/adminpm.dm | 4 +- code/modules/admin/verbs/beakerpanel.dm | 130 +- code/modules/admin/verbs/mapping.dm | 10 +- .../admin/verbs/modify_antag_tokens.dm | 3 + code/modules/admin/verbs/spawnobjasmob.dm | 8 +- .../debug_variable_appearance.dm | 2 + .../admin/view_variables/debug_variables.dm | 7 +- .../antagonists/_common/antag_spawner.dm | 2 +- code/modules/antagonists/abductor/abductor.dm | 2 - .../abductor/equipment/abduction_gear.dm | 38 +- .../abductor/machinery/dispenser.dm | 1 + code/modules/antagonists/blob/blob_mobs.dm | 2 + .../antagonists/blob/blobstrains/multiplex.dm | 2 +- code/modules/antagonists/blob/overmind.dm | 2 + code/modules/antagonists/blob/powers.dm | 4 +- .../antagonists/blob/structures/_blob.dm | 2 + .../antagonists/blob/structures/core.dm | 2 + .../antagonists/blob/structures/factory.dm | 2 + .../antagonists/changeling/changeling.dm | 4 - .../changeling/powers/mutations.dm | 4 + .../clock_cult/clockwork_massive.dm | 2 + .../antagonists/clock_cult/clockwork_turfs.dm | 8 + .../clock_cult/items/replica_fabricator.dm | 2 + .../antagonists/clock_cult/mobs/cogscarab.dm | 2 - .../clock_cult/ratvarian_language.dm | 39 +- .../scriptures/abstraction_crystal.dm | 2 + .../scriptures/interdiction_lens.dm | 2 + .../clock_cult/scriptures/ocular_warden.dm | 2 + .../scriptures/sigil_transmission.dm | 2 - .../clock_cult/scriptures/stargazer.dm | 2 + .../clock_cult/structure/clockwork_sigil.dm | 3 + code/modules/antagonists/cult/blood_magic.dm | 10 +- code/modules/antagonists/cult/cult.dm | 2 + code/modules/antagonists/cult/cult_items.dm | 2 +- code/modules/antagonists/cult/runes.dm | 26 +- code/modules/antagonists/devil/devil.dm | 19 +- .../antagonists/disease/disease_abilities.dm | 444 - .../sacrifice_knowledge.dm | 3 + .../sacrifice_knowledge/sacrifice_map.dm | 4 +- .../antagonists/heretic/magic/mansus_grasp.dm | 2 + .../heretic/structures/carving_knife.dm | 2 + .../holoparasite/holoparasite_team.dm | 2 +- code/modules/antagonists/morph/morph.dm | 2 + .../nukeop/equipment/nuclearbomb.dm | 3 + code/modules/antagonists/revenant/revenant.dm | 22 +- .../revenant/revenant_spawn_event.dm | 2 + .../antagonists/revolution/revolution.dm | 7 + .../antagonists/slaughter/slaughter.dm | 4 +- .../traitor/IAA/internal_affairs.dm | 2 + .../antagonists/traitor/datum_traitor.dm | 5 +- .../antagonists/wizard/equipment/artefact.dm | 8 +- .../antagonists/wizard/equipment/spellbook.dm | 20 +- code/modules/aquarium/aquarium_behaviour.dm | 2 + code/modules/assembly/assembly.dm | 7 - code/modules/assembly/flash.dm | 4 +- code/modules/assembly/mousetrap.dm | 6 +- code/modules/assembly/voice.dm | 6 +- .../batched/batched_spritesheet.dm | 2 + .../spritesheet/batched/universal_icon.dm | 10 +- .../atmospherics/environmental/LINDA_fire.dm | 2 + .../environmental/LINDA_system.dm | 6 +- .../atmospherics/gasmixtures/reactions.dm | 2 + .../atmospherics/machinery/airalarm.dm | 2 + .../atmospherics/machinery/atmosmachinery.dm | 4 + .../components/binary_devices/circulator.dm | 2 - .../machinery/components/components_base.dm | 2 +- .../machinery/components/mapping.dm | 87 + .../components/trinary_devices/filter.dm | 22 +- .../components/trinary_devices/mixer.dm | 18 +- .../unary_devices/outlet_injector.dm | 26 + .../components/unary_devices/tank.dm | 2 + .../components/unary_devices/thermomachine.dm | 23 + .../components/unary_devices/vent_pump.dm | 21 + .../atmospherics/machinery/other/meter.dm | 2 + .../machinery/portable/canister.dm | 6 +- .../atmospherics/machinery/portable/pump.dm | 6 + code/modules/awaymissions/corpse.dm | 2 + .../awaymissions/mission_code/TheFactory.dm | 24 +- .../awaymissions/mission_code/snowdin.dm | 24 +- .../awaymissions/mission_code/wildwest.dm | 2 +- code/modules/awaymissions/zlevel.dm | 4 +- .../bluespace_anchor/bluespace_anchor.dm | 2 + .../bluespace_anchor_deployer.dm | 2 + code/modules/cargo/bounty_console.dm | 2 + code/modules/cargo/centcom_podlauncher.dm | 6 + code/modules/cargo/exports.dm | 20 +- code/modules/cargo/gondolapod.dm | 2 + code/modules/cargo/supplypod.dm | 10 + code/modules/client/client_colour.dm | 3 +- code/modules/client/client_procs.dm | 13 +- .../client/loadout/loadout_colorizers.dm | 40 +- .../character/species_features/ethereal.dm | 2 +- .../client/preferences/middleware/antags.dm | 2 +- .../client/preferences/preference_entry.dm | 33 - .../preference_character_preview.dm | 2 + code/modules/client/verbs/suicide.dm | 2 +- code/modules/clothing/chameleon.dm | 2 + code/modules/clothing/clothing.dm | 10 +- code/modules/clothing/head/frenchberet.dm | 2 +- code/modules/clothing/head/jobs.dm | 2 +- code/modules/clothing/masks/cluwne.dm | 112 +- .../modules/clothing/spacesuits/chronosuit.dm | 2 + .../clothing/spacesuits/miscellaneous.dm | 26 +- code/modules/clothing/spacesuits/plasmamen.dm | 2 +- code/modules/clothing/under/accessories.dm | 4 +- code/modules/economy/account.dm | 2 + code/modules/emoji/emoji_parse.dm | 6 +- code/modules/error_handler/error_handler.dm | 2 + code/modules/events/brand_intelligence.dm | 12 +- code/modules/events/floorcluwne.dm | 22 - code/modules/events/immovable_rod.dm | 2 +- code/modules/events/pirates.dm | 4 +- code/modules/events/wizard/embeddies.dm | 46 - code/modules/events/wizard/rpgtitles.dm | 2 +- code/modules/events/wormholes.dm | 2 + .../exploration_crew/exploration_laser_gun.dm | 6 +- code/modules/fields/fields.dm | 5 - code/modules/fields/timestop.dm | 2 + code/modules/fields/turf_objects.dm | 2 + code/modules/flufftext/Hallucination.dm | 18 +- .../modules/food_and_drinks/food/condiment.dm | 33 +- .../kitchen_machinery/deep_fryer.dm | 17 - .../kitchen_machinery/griddle.dm | 2 +- .../kitchen_machinery/monkeyrecycler.dm | 2 +- .../kitchen_machinery/smartfridge.dm | 9 +- .../recipes/tablecraft/recipes_pie.dm | 44 +- code/modules/holiday/halloween.dm | 263 - code/modules/holodeck/computer.dm | 5 +- code/modules/holodeck/turfs.dm | 2 +- code/modules/holoparasite/_holoparasite.dm | 10 +- .../holoparasite/abilities/lesser/radio.dm | 4 +- .../holoparasite/abilities/lesser/snares.dm | 10 +- .../abilities/lesser/telepathy.dm | 4 +- .../holoparasite/abilities/lesser/teleport.dm | 8 +- .../holoparasite/abilities/major/assassin.dm | 4 +- .../holoparasite/abilities/major/explosive.dm | 4 +- .../holoparasite/abilities/major/scout.dm | 4 +- .../holoparasite/holoparasite_builder.dm | 12 +- .../holoparasite/holoparasite_helpers.dm | 4 +- code/modules/holoparasite/themes/_theme.dm | 2 +- code/modules/hydroponics/beekeeping/beebox.dm | 6 + code/modules/hydroponics/grown.dm | 4 + code/modules/hydroponics/grown/flowers.dm | 4 + .../modules/hydroponics/grown/grass_carpet.dm | 2 + code/modules/hydroponics/grown/misc.dm | 2 + code/modules/hydroponics/grown/mushrooms.dm | 2 + code/modules/hydroponics/grown/nettle.dm | 4 + code/modules/hydroponics/growninedible.dm | 2 + code/modules/hydroponics/seeds.dm | 2 + code/modules/instruments/songs/play_legacy.dm | 2 +- .../instruments/songs/play_synthesized.dm | 2 +- code/modules/interview/interview.dm | 7 - code/modules/jobs/job_types/_job.dm | 2 +- code/modules/jobs/job_types/chaplain.dm | 2 +- code/modules/jobs/job_types/chief_engineer.dm | 6 +- .../jobs/job_types/head_of_personnel.dm | 10 +- .../jobs/job_types/head_of_security.dm | 4 +- .../jobs/job_types/research_director.dm | 8 +- code/modules/jobs/jobs.dm | 2 +- code/modules/keybindings/focus.dm | 3 +- code/modules/language/calcic.dm | 4 +- code/modules/language/language.dm | 4 +- code/modules/language/metalanguage.dm | 2 +- code/modules/language/shadowtongue.dm | 12 +- code/modules/language/sylvan.dm | 8 +- code/modules/language/voltaic.dm | 6 +- code/modules/library/lib_codex_gigas.dm | 6 + code/modules/library/lib_machines.dm | 2 + code/modules/library/soapstone.dm | 6 +- code/modules/lighting/emissive_blocker.dm | 2 + code/modules/lighting/lighting_source.dm | 3 + code/modules/mapping/mapping_helpers.dm | 22 +- code/modules/mapping/merge_conflicts.dm | 2 + code/modules/mapping/reader.dm | 6 + code/modules/mining/coins.dm | 4 +- .../mining/equipment/marker_beacons.dm | 6 +- code/modules/mining/equipment/resonator.dm | 2 + code/modules/mining/equipment/survival_pod.dm | 1 + code/modules/mining/gibtonite.dm | 4 + .../mining/lavaland/necropolis_chests.dm | 12 +- code/modules/mining/machine_processing.dm | 4 +- code/modules/mining/machine_silo.dm | 2 +- code/modules/mining/machine_stacking.dm | 4 +- code/modules/mining/minebot.dm | 6 +- .../modules/mob/dead/new_player/new_player.dm | 2 + code/modules/mob/emote.dm | 2 +- .../mob/living/basic/vermin/cockroach.dm | 2 +- code/modules/mob/living/blood.dm | 2 + code/modules/mob/living/brain/brain_item.dm | 4 +- code/modules/mob/living/carbon/carbon.dm | 4 +- code/modules/mob/living/carbon/human/dummy.dm | 69 +- code/modules/mob/living/carbon/human/emote.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 + .../mob/living/carbon/human/species.dm | 6 +- .../carbon/human/species_types/dullahan.dm | 2 + .../carbon/human/species_types/golems.dm | 4 +- .../human/species_types/lizardpeople.dm | 2 +- .../carbon/human/species_types/mothmen.dm | 2 +- .../human/species_types/shadowpeople.dm | 4 +- .../mob/living/carbon/human/update_icons.dm | 8 +- .../mob/living/carbon/human/verbs/give.dm | 4 +- code/modules/mob/living/carbon/life.dm | 2 + .../mob/living/carbon/monkey/monkey.dm | 2 + code/modules/mob/living/inhand_holder.dm | 4 + code/modules/mob/living/living.dm | 2 +- code/modules/mob/living/living_defines.dm | 2 +- code/modules/mob/living/silicon/ai/ai.dm | 6 + .../living/silicon/ai/freelook/cameranet.dm | 2 - .../mob/living/silicon/ai/freelook/chunk.dm | 1 - .../mob/living/silicon/ai/freelook/read_me.dm | 64 +- code/modules/mob/living/silicon/ai/say.dm | 6 +- .../modules/mob/living/silicon/robot/robot.dm | 2 +- .../mob/living/simple_animal/bot/atmosbot.dm | 17 + .../mob/living/simple_animal/bot/ed209bot.dm | 2 + .../mob/living/simple_animal/bot/floorbot.dm | 4 +- .../mob/living/simple_animal/bot/honkbot.dm | 12 +- .../mob/living/simple_animal/bot/medbot.dm | 6 + .../mob/living/simple_animal/bot/secbot.dm | 20 +- .../friendly/drone/drones_as_items.dm | 2 + .../friendly/drone/interaction.dm | 14 +- .../simple_animal/friendly/farm_animals.dm | 2 +- .../living/simple_animal/heretic_monsters.dm | 4 + .../mob/living/simple_animal/hostile/bees.dm | 13 +- .../simple_animal/hostile/floor_cluwne.dm | 8 + .../mob/living/simple_animal/hostile/goose.dm | 12 +- .../simple_animal/hostile/gorilla/gorilla.dm | 60 + .../hostile/gorilla/visuals_icons.dm | 55 - .../simple_animal/hostile/jungle/seedling.dm | 2 +- .../simple_animal/hostile/macrophage.dm | 2 +- .../simple_animal/hostile/mecha_pilot.dm | 22 +- .../hostile/megafauna/blood_drunk_miner.dm | 2 + .../hostile/megafauna/bubblegum.dm | 6 +- .../hostile/megafauna/colossus.dm | 15 +- .../simple_animal/hostile/megafauna/drake.dm | 15 +- .../hostile/megafauna/hierophant.dm | 10 + .../mob/living/simple_animal/hostile/mimic.dm | 4 +- .../living/simple_animal/hostile/mimite.dm | 4 +- .../hostile/mining_mobs/elites/elite.dm | 6 + .../mining_mobs/elites/goliath_broodmother.dm | 7 + .../hostile/mining_mobs/elites/herald.dm | 5 + .../hostile/mining_mobs/elites/legionnaire.dm | 5 + .../hostile/mining_mobs/elites/pandora.dm | 5 + .../hostile/mining_mobs/goldgrub.dm | 2 +- .../hostile/mining_mobs/goliath.dm | 6 +- .../living/simple_animal/hostile/redgrub.dm | 2 +- .../living/simple_animal/hostile/statue.dm | 2 + .../living/simple_animal/hostile/stickman.dm | 2 + .../simple_animal/hostile/venus_human_trap.dm | 2 +- .../simple_animal/hostile/wumborian_fugu.dm | 2 +- .../mob/living/simple_animal/parrot.dm | 18 +- .../mob/living/simple_animal/simple_animal.dm | 2 +- .../mob/living/simple_animal/slime/life.dm | 2 +- .../mob/living/simple_animal/slime/powers.dm | 3 + .../mob/living/simple_animal/slime/say.dm | 2 +- .../mob/living/simple_animal/slime/slime.dm | 6 + code/modules/mob/living/taste.dm | 4 +- code/modules/mob/mob.dm | 2 + code/modules/mob/mob_defines.dm | 2 + code/modules/mob/mob_helpers.dm | 10 +- code/modules/mob/mob_movement.dm | 6 +- code/modules/mob/mob_stat.dm | 4 +- code/modules/mob/say.dm | 6 +- .../computers/item/processor.dm | 3 + .../computers/item/tablet.dm | 4 +- .../computers/item/tablet_presets.dm | 2 +- .../file_system/programs/cargobounty.dm | 4 + .../file_system/programs/file_browser.dm | 2 +- .../file_system/programs/portrait_printer.dm | 2 + .../file_system/programs/radar.dm | 2 + .../file_system/programs/secureye.dm | 4 +- .../hardware/battery_module.dm | 2 + code/modules/multiz/movement/atom/climbing.dm | 17 - .../multiz/movement/mob/living_zmove.dm | 2 + code/modules/multiz/zmimic/mimic_movable.dm | 29 +- code/modules/ninja/suit/gloves.dm | 2 +- code/modules/paperwork/contract.dm | 2 + code/modules/paperwork/handlabeler.dm | 2 +- code/modules/paperwork/origami.dm | 2 + code/modules/paperwork/photocopier.dm | 4 +- .../byond_particles/emitter/smoke.dm | 30 +- .../byond_particles/particle/fire.dm | 50 +- .../byond_particles/particle/smoke.dm | 42 +- .../byond_particles/particle/spark.dm | 24 +- .../particles/byond_particles/particool.dm | 2 + code/modules/photography/camera/camera.dm | 2 + code/modules/photography/photos/frame.dm | 2 + code/modules/photography/photos/photo.dm | 2 + code/modules/plumbing/ducts.dm | 4 + .../plumbing/plumbers/_plumb_machinery.dm | 8 + code/modules/plumbing/plumbers/acclimator.dm | 2 + .../plumbing/plumbers/bottle_dispenser.dm | 4 +- code/modules/plumbing/plumbers/destroyer.dm | 2 + code/modules/plumbing/plumbers/filter.dm | 2 + .../plumbing/plumbers/grinder_chemical.dm | 2 + .../plumbing/plumbers/reaction_chamber.dm | 2 + code/modules/plumbing/plumbers/splitters.dm | 2 + code/modules/plumbing/plumbers/synthesizer.dm | 2 + code/modules/point/point.dm | 2 + code/modules/pool/pool.dm | 2 +- code/modules/power/apc/apc_main.dm | 2 +- code/modules/power/cable.dm | 10 +- code/modules/power/cell.dm | 2 + code/modules/power/generator.dm | 2 + code/modules/power/gravitygenerator.dm | 20 + .../modules/power/lighting/light_construct.dm | 2 + code/modules/power/singularity/collector.dm | 2 +- code/modules/power/singularity/emitter.dm | 2 +- .../power/singularity/field_generator.dm | 20 +- .../particle_accelerator.dm | 30 +- .../particle_accelerator/particle_control.dm | 5 - code/modules/power/singularity/singularity.dm | 14 +- code/modules/power/solar.dm | 5 +- code/modules/power/supermatter/supermatter.dm | 2 + code/modules/power/tesla/energy_ball.dm | 5 + code/modules/power/tracker.dm | 2 + code/modules/power/turbine.dm | 2 +- .../procedural_mapping/mapGenerator.dm | 16 - .../procedural_mapping/mapGeneratorReadme.dm | 10 +- .../projectiles/ammunition/energy/portal.dm | 2 + code/modules/projectiles/autofire.dm | 2 + .../projectiles/guns/energy/dueling.dm | 9 + .../projectiles/guns/misc/beam_rifle.dm | 7 + .../projectiles/guns/misc/blastcannon.dm | 2 + code/modules/projectiles/projectile.dm | 3 + .../projectile/special/wormhole.dm | 2 + .../reagents/__DEFINES/reagent_defines.dm | 8 + code/modules/reagents/chemistry/holder.dm | 6 +- .../chemistry/machinery/chem_synthesizer.dm | 2 +- .../reagents/chemistry/machinery/pandemic.dm | 3 + .../chemistry/machinery/reagentgrinder.dm | 2 + code/modules/reagents/chemistry/reagents.dm | 5 - .../chemistry/reagents/alcohol_reagents.dm | 6 +- .../chemistry/reagents/metabolites.dm | 56 +- .../chemistry/reagents/other_reagents.dm | 4 +- code/modules/reagents/reagent_containers.dm | 2 + .../reagent_containers/chem_heirloom.dm | 4 + code/modules/recycling/conveyor.dm | 14 +- code/modules/recycling/disposal/bin.dm | 6 + .../recycling/disposal/construction.dm | 2 + code/modules/recycling/disposal/holder.dm | 4 +- code/modules/recycling/disposal/multiz.dm | 49 +- code/modules/recycling/disposal/outlet.dm | 2 + code/modules/recycling/disposal/pipe.dm | 7 + code/modules/recycling/sortingmachinery.dm | 4 +- code/modules/religion/_religion_sects.dm | 2 +- code/modules/religion/sects/shadow_sect.dm | 8 +- .../research/nanites/nanite_programs.dm | 4 +- .../nanites/nanite_programs/sensor.dm | 10 +- .../modules/research/techweb/_techweb_node.dm | 2 +- code/modules/research/techweb/all_nodes.dm | 2 +- .../xenobiology/crossbreeding/__corecross.dm | 6 +- .../xenobiology/crossbreeding/_clothing.dm | 2 + .../xenobiology/crossbreeding/_structures.dm | 6 +- .../xenobiology/crossbreeding/gentle.dm | 2 + .../xenobiology/crossbreeding/recurring.dm | 3 + .../crossbreeding/selfsustaining.dm | 6 +- .../research/xenobiology/xenobio_camera.dm | 2 +- .../modules/ruins/lavalandruin_code/puzzle.dm | 2 + .../ruins/lavalandruin_code/syndicate_base.dm | 8 +- .../ruins/objects_and_mobs/ash_walker_den.dm | 2 + .../ruins/spaceruin_code/hilbertshotel.dm | 28 +- code/modules/security/crimes.dm | 8 +- code/modules/security/genpop.dm | 8 +- .../bluespace_shuttle_pod/pod_computer.dm | 2 + code/modules/shuttle/custom_shuttle.dm | 5 - code/modules/shuttle/emergency.dm | 2 +- code/modules/shuttle/on_move.dm | 11 - code/modules/shuttle/ripple.dm | 2 + code/modules/shuttle/shuttle.dm | 11 +- .../shuttle_creation/shuttle_creator.dm | 2 - code/modules/shuttle/special.dm | 4 + .../loot/alien_artifact.dm | 2 + .../loot/artifact_defenses.dm | 2 + .../objective_computer.dm | 2 + .../ruin_generator/ruin_generator.dm | 3 - .../shuttle_components/shuttle_console.dm | 2 + .../shuttle_components/shuttle_docking.dm | 4 + code/modules/spells/{ => __DEFINES}/spell.dm | 1 - code/modules/spells/spell_types/forcewall.dm | 2 + code/modules/spells/spell_types/godhand.dm | 6 +- .../spells/spell_types/lesserlichdom.dm | 2 + code/modules/spells/spell_types/lichdom.dm | 2 + code/modules/spells/spell_types/pointed.dm | 4 +- code/modules/spells/spell_types/shapeshift.dm | 2 + code/modules/spells/spell_types/soultap.dm | 2 + .../spells/spell_types/touch_attacks.dm | 4 +- code/modules/station_goals/bsa.dm | 8 +- code/modules/station_goals/dna_vault.dm | 8 + code/modules/surgery/coronary_bypass.dm | 2 +- code/modules/surgery/lobectomy.dm | 2 +- .../surgery/organs/augments_internal.dm | 2 +- code/modules/surgery/organs/eyes.dm | 4 + code/modules/surgery/organs/liver.dm | 3 + code/modules/surgery/organs/lungs.dm | 7 + code/modules/surgery/organs/organ_internal.dm | 2 +- code/modules/surgery/organs/vocal_cords.dm | 2 +- code/modules/tgui_input/color.dm | 2 +- code/modules/tooltip/tooltip.dm | 2 +- .../unit_tests/__DEFINES/test_defines.dm | 81 + code/modules/unit_tests/_unit_tests.dm | 123 +- code/modules/unit_tests/armour_checks.dm | 4 +- code/modules/unit_tests/bloody_footprints.dm | 2 +- code/modules/unit_tests/create_and_destroy.dm | 156 +- code/modules/unit_tests/heretic_rituals.dm | 2 +- .../unit_tests/mapping/check_active_turfs.dm | 6 + .../unit_tests/mapping/check_area_apc.dm | 12 + .../mapping/check_camera_attachment.dm | 8 + .../unit_tests/mapping/check_disposals.dm | 104 + .../mapping/check_light_attachment.dm | 10 + .../mapping/check_multiple_objects.dm | 36 + code/modules/unit_tests/mapping/map_test.dm | 69 + code/modules/unit_tests/merge_type.dm | 10 +- code/modules/unit_tests/metabolizing.dm | 2 +- code/modules/unit_tests/preferences.dm | 5 +- code/modules/unit_tests/rcd.dm | 2 +- code/modules/unit_tests/spawn_humans.dm | 2 +- code/modules/unit_tests/unit_test.dm | 170 +- code/modules/uplink/uplink_devices.dm | 12 + code/modules/uplink/uplink_items.dm | 4 +- code/modules/vehicles/cars/clowncar.dm | 4 +- code/modules/vehicles/mecha/_mecha.dm | 2 +- code/modules/vehicles/mecha/combat/durand.dm | 2 + code/modules/vehicles/mecha/combat/honker.dm | 22 +- .../mecha/equipment/tools/mining_tools.dm | 2 +- .../mecha/equipment/weapons/weapons.dm | 2 +- code/modules/vehicles/mecha/mecha_wreckage.dm | 4 +- code/modules/vending/_vending.dm | 8 +- code/modules/vending/autodrobe.dm | 12 +- code/modules/vending/boozeomat.dm | 8 +- code/modules/vending/coffee.dm | 4 +- code/modules/vending/cola.dm | 4 +- code/modules/vending/drinnerware.dm | 2 +- code/modules/vending/engineering.dm | 6 +- code/modules/vending/games.dm | 8 +- code/modules/vending/liberation.dm | 6 +- code/modules/vending/liberation_toy.dm | 12 +- code/modules/vending/magivend.dm | 14 +- code/modules/vending/medical.dm | 6 +- code/modules/vending/medical_wall.dm | 2 +- code/modules/vending/megaseed.dm | 16 +- code/modules/vending/mining.dm | 4 +- code/modules/vending/nutrimax.dm | 2 +- code/modules/vending/plasmaresearch.dm | 4 +- code/modules/vending/sustenance.dm | 6 +- code/modules/vending/youtool.dm | 22 +- .../wiremod/components/abstract/module.dm | 2 +- code/modules/wiremod/components/action/mmi.dm | 4 +- .../components/bci/thought_listener.dm | 2 +- code/modules/wiremod/components/math/trig.dm | 4 +- .../wiremod/components/string/textcase.dm | 2 +- .../wiremod/components/utility/router.dm | 2 + code/modules/wiremod/core/component.dm | 4 +- .../wiremod/shell/brain_computer_interface.dm | 12 +- code/modules/wiremod/shell/scanner_gate.dm | 2 +- .../traits/xenoartifact_majors.dm | 2 +- .../traits/xenoartifact_minors.dm | 14 +- code/modules/xenoarchaeology/xenoartifact.dm | 8 +- .../xenoarchaeology/xenoartifact_console.dm | 2 +- .../xenoarchaeology/xenoartifact_labeler.dm | 2 +- dependencies.sh | 6 + interface/stylesheet.dm | 38 +- strings/junkmail.txt | 2 +- tools/HubMigrator/HubMigrator.dm | 20 +- tools/Redirector/textprocs.dm | 10 +- ...diag_f2w.txt => 11055_camera_diag_f2w.txt} | 0 ...litems_f2w.txt => 11055_wallitems_f2w.txt} | 0 .../Scripts/11364_multiz_trunks.txt | 2 + .../Scripts/11364_trinary_helpers.txt | 6 + tools/UpdatePaths/__main__.py | 4 +- tools/build/README.md | 24 +- tools/build/build.js | 439 +- tools/build/lib/byond.js | 163 +- tools/ci/annotate_dm.sh | 4 + tools/ci/annotate_od.sh | 4 + tools/ci/check_grep.sh | 353 +- tools/ci/ci_dependencies.sh | 6 + tools/ci/install_byond.sh | 5 +- tools/ci/install_ripgrep.sh | 6 + tools/ci/run_server.sh | 18 +- tools/ci/show_screenshot_test_results.js | 236 + tools/define_sanity/check.py | 106 + tools/dm_annotator/__main__.py | 51 + tools/expand_filedir_paths.py | 6 +- tools/icon_cutter/README.md | 23 + tools/icon_cutter/cache/.gitignore | 1 + tools/icon_cutter/check.py | 133 + tools/maplint/README.md | 132 + tools/maplint/lints/apc_pixel_shifts.yml | 8 + tools/maplint/lints/area_varedits.yml | 3 + tools/maplint/lints/atmos_var_edits.yml | 4 + tools/maplint/lints/banned_obj_vars.yml | 4 + tools/maplint/lints/base_turf.yml | 2 + tools/maplint/lints/cable_varedits.yml | 9 + tools/maplint/lints/colorless_decals.yml | 6 + .../lints/conveyor_cardinal_inversion.yml | 5 + .../lints/door_name_capitalization.yml | 5 + tools/maplint/lints/grille_stacking.yml | 6 + tools/maplint/lints/heat_capacity.yml | 4 + tools/maplint/lints/identical_barricades.yml | 4 + tools/maplint/lints/identical_pipes.yml | 4 + tools/maplint/lints/merge_conflict_marker.yml | 5 + tools/maplint/lints/multiple_airlocks.yml | 3 + tools/maplint/lints/multiple_area.yml | 3 + tools/maplint/lints/multiple_cables.yml | 5 + tools/maplint/lints/multiple_chairs.yml | 3 + tools/maplint/lints/multiple_closets.yml | 3 + tools/maplint/lints/multiple_firelocks.yml | 3 + tools/maplint/lints/multiple_girders.yml | 3 + tools/maplint/lints/multiple_grilles.yml | 3 + tools/maplint/lints/multiple_lattice.yml | 3 + tools/maplint/lints/multiple_machinery.yml | 4 + tools/maplint/lints/multiple_stairs.yml | 3 + tools/maplint/lints/multiple_tables.yml | 3 + tools/maplint/lints/multiple_turf.yml | 3 + tools/maplint/lints/multiple_windows.yml | 4 + tools/maplint/lints/pixel_varedits.yml | 11 + tools/maplint/lints/posters_directionals.yml | 6 + tools/maplint/lints/smartfridges_in_walls.yml | 4 + tools/maplint/lints/stairs_with_genturf.yml | 4 + tools/maplint/lints/stray_item.yml | 3 + tools/maplint/lints/telescreen_varedits.yml | 9 + tools/maplint/lints/wall_stacking.yml | 5 + tools/maplint/lints/windoor_var_edits.yml | 7 + tools/maplint/lints/window_pane_varedits.yml | 6 + tools/maplint/source/__main__.py | 123 + tools/maplint/source/common.py | 36 + tools/maplint/source/dmm.py | 184 + tools/maplint/source/error.py | 28 + tools/maplint/source/lint.py | 281 + tools/od_annotator/__main__.py | 50 + tools/pull_request_hooks/rerunFlakyTests.js | 298 + .../rerunFlakyTests.test.js | 45 + tools/requirements.txt | 3 + tools/screenshot-test-comparison/index.js | 103 + .../package-lock.json | 51 + tools/screenshot-test-comparison/package.json | 12 + .../schemas/beestation_dme.json | 10 + .../schemas/unit_tests.json | 8 + .../ticked_file_enforcement.py | 154 + tools/trait_validity/check.py | 88 + 1088 files changed, 27828 insertions(+), 29898 deletions(-) create mode 100644 .github/alternate_byond_versions.txt create mode 100644 .github/max_required_byond_client.txt create mode 100644 .github/workflows/ci_suite.yml delete mode 100644 .github/workflows/continuous_integration.yml create mode 100644 .github/workflows/rerun_flaky_tests.yml create mode 100644 .github/workflows/run_integration_tests.yml create mode 100644 .github/workflows/show_screenshot_test_results.yml delete mode 100644 bin/temp-fast-test.cmd rename code/__DEFINES/{_readme.dm => README.md} (100%) create mode 100644 code/__DEFINES/SDQL.dm create mode 100644 code/__DEFINES/actions.dm create mode 100644 code/__DEFINES/fields.dm create mode 100644 code/__DEFINES/traits/_traits.dm rename code/__DEFINES/{traits.dm => traits/declarations.dm} (61%) create mode 100644 code/__DEFINES/traits/macros.dm create mode 100644 code/__DEFINES/traits/sources.dm create mode 100644 code/__HELPERS/combat.dm rename code/{datums => __HELPERS}/position_point_vector.dm (100%) create mode 100644 code/__HELPERS/test_helpers.dm delete mode 100644 code/__HELPERS/unused.dm rename code/_globalvars/{traits.dm => traits/_traits.dm} (61%) delete mode 100644 code/datums/components/alert_research.dm delete mode 100644 code/datums/components/archaeology.dm delete mode 100644 code/game/gamemodes/gangs/dominator.dm delete mode 100644 code/game/objects/effects/water_ripple.dm delete mode 100644 code/modules/admin/create_poll.dm delete mode 100644 code/modules/antagonists/disease/disease_abilities.dm create mode 100644 code/modules/atmospherics/machinery/components/mapping.dm delete mode 100644 code/modules/events/floorcluwne.dm delete mode 100644 code/modules/events/wizard/embeddies.dm delete mode 100644 code/modules/holiday/halloween.dm delete mode 100644 code/modules/mob/living/simple_animal/hostile/gorilla/visuals_icons.dm delete mode 100644 code/modules/multiz/movement/atom/climbing.dm create mode 100644 code/modules/reagents/__DEFINES/reagent_defines.dm rename code/modules/spells/{ => __DEFINES}/spell.dm (99%) create mode 100644 code/modules/unit_tests/__DEFINES/test_defines.dm create mode 100644 code/modules/unit_tests/mapping/check_active_turfs.dm create mode 100644 code/modules/unit_tests/mapping/check_area_apc.dm create mode 100644 code/modules/unit_tests/mapping/check_camera_attachment.dm create mode 100644 code/modules/unit_tests/mapping/check_disposals.dm create mode 100644 code/modules/unit_tests/mapping/check_light_attachment.dm create mode 100644 code/modules/unit_tests/mapping/check_multiple_objects.dm create mode 100644 code/modules/unit_tests/mapping/map_test.dm rename tools/UpdatePaths/Scripts/{camera_diag_f2w.txt => 11055_camera_diag_f2w.txt} (100%) rename tools/UpdatePaths/Scripts/{wallitems_f2w.txt => 11055_wallitems_f2w.txt} (100%) create mode 100644 tools/UpdatePaths/Scripts/11364_multiz_trunks.txt create mode 100644 tools/UpdatePaths/Scripts/11364_trinary_helpers.txt create mode 100644 tools/ci/annotate_dm.sh create mode 100644 tools/ci/annotate_od.sh create mode 100644 tools/ci/ci_dependencies.sh create mode 100644 tools/ci/install_ripgrep.sh create mode 100644 tools/ci/show_screenshot_test_results.js create mode 100644 tools/define_sanity/check.py create mode 100644 tools/dm_annotator/__main__.py create mode 100644 tools/icon_cutter/README.md create mode 100644 tools/icon_cutter/cache/.gitignore create mode 100644 tools/icon_cutter/check.py create mode 100644 tools/maplint/README.md create mode 100644 tools/maplint/lints/apc_pixel_shifts.yml create mode 100644 tools/maplint/lints/area_varedits.yml create mode 100644 tools/maplint/lints/atmos_var_edits.yml create mode 100644 tools/maplint/lints/banned_obj_vars.yml create mode 100644 tools/maplint/lints/base_turf.yml create mode 100644 tools/maplint/lints/cable_varedits.yml create mode 100644 tools/maplint/lints/colorless_decals.yml create mode 100644 tools/maplint/lints/conveyor_cardinal_inversion.yml create mode 100644 tools/maplint/lints/door_name_capitalization.yml create mode 100644 tools/maplint/lints/grille_stacking.yml create mode 100644 tools/maplint/lints/heat_capacity.yml create mode 100644 tools/maplint/lints/identical_barricades.yml create mode 100644 tools/maplint/lints/identical_pipes.yml create mode 100644 tools/maplint/lints/merge_conflict_marker.yml create mode 100644 tools/maplint/lints/multiple_airlocks.yml create mode 100644 tools/maplint/lints/multiple_area.yml create mode 100644 tools/maplint/lints/multiple_cables.yml create mode 100644 tools/maplint/lints/multiple_chairs.yml create mode 100644 tools/maplint/lints/multiple_closets.yml create mode 100644 tools/maplint/lints/multiple_firelocks.yml create mode 100644 tools/maplint/lints/multiple_girders.yml create mode 100644 tools/maplint/lints/multiple_grilles.yml create mode 100644 tools/maplint/lints/multiple_lattice.yml create mode 100644 tools/maplint/lints/multiple_machinery.yml create mode 100644 tools/maplint/lints/multiple_stairs.yml create mode 100644 tools/maplint/lints/multiple_tables.yml create mode 100644 tools/maplint/lints/multiple_turf.yml create mode 100644 tools/maplint/lints/multiple_windows.yml create mode 100644 tools/maplint/lints/pixel_varedits.yml create mode 100644 tools/maplint/lints/posters_directionals.yml create mode 100644 tools/maplint/lints/smartfridges_in_walls.yml create mode 100644 tools/maplint/lints/stairs_with_genturf.yml create mode 100644 tools/maplint/lints/stray_item.yml create mode 100644 tools/maplint/lints/telescreen_varedits.yml create mode 100644 tools/maplint/lints/wall_stacking.yml create mode 100644 tools/maplint/lints/windoor_var_edits.yml create mode 100644 tools/maplint/lints/window_pane_varedits.yml create mode 100644 tools/maplint/source/__main__.py create mode 100644 tools/maplint/source/common.py create mode 100644 tools/maplint/source/dmm.py create mode 100644 tools/maplint/source/error.py create mode 100644 tools/maplint/source/lint.py create mode 100644 tools/od_annotator/__main__.py create mode 100644 tools/pull_request_hooks/rerunFlakyTests.js create mode 100644 tools/pull_request_hooks/rerunFlakyTests.test.js create mode 100644 tools/screenshot-test-comparison/index.js create mode 100644 tools/screenshot-test-comparison/package-lock.json create mode 100644 tools/screenshot-test-comparison/package.json create mode 100644 tools/ticked_file_enforcement/schemas/beestation_dme.json create mode 100644 tools/ticked_file_enforcement/schemas/unit_tests.json create mode 100644 tools/ticked_file_enforcement/ticked_file_enforcement.py create mode 100644 tools/trait_validity/check.py diff --git a/.github/alternate_byond_versions.txt b/.github/alternate_byond_versions.txt new file mode 100644 index 0000000000000..4d001ab811899 --- /dev/null +++ b/.github/alternate_byond_versions.txt @@ -0,0 +1,8 @@ +# This file contains extra tests to run for specific BYOND versions. +# This is useful for making sure we maintain compatibility with both older and newer versions, +# while still having our main tests run on a guaranteed pinned version. + +# Format is version: map +# Example: +# 500.1337: runtimestation +# 515.1627: runtimestation diff --git a/.github/max_required_byond_client.txt b/.github/max_required_byond_client.txt new file mode 100644 index 0000000000000..86c9b22d1b04c --- /dev/null +++ b/.github/max_required_byond_client.txt @@ -0,0 +1,8 @@ +# Highest byond client version allowed to be required by the byond world. Set to 9999 to disable the check flat out. +# If the compiled world requires clients use a version higher than this, ci will fail. +# for instance: if this is set to 514, and a pr uses a 515 client feature, an alert will trigger +# If you have to update this number for your pr, you should make it VERY CLEAR in the pr body that you did so. +# (Requiring clients update to connect to the game server is not something we like to spring on them with no notice, +# especially for beta builds where the pager/updater won't let them update without additional configuration.) + +514 diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml new file mode 100644 index 0000000000000..99e1770b3ecd4 --- /dev/null +++ b/.github/workflows/ci_suite.yml @@ -0,0 +1,290 @@ +name: CI Suite +on: + push: + branches: + - master + - 'project/**' + - 'gh-readonly-queue/master/**' + - 'gh-readonly-queue/project/**' + pull_request: + branches: + - master + - 'project/**' + merge_group: + branches: + - master + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + run_linters: + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) + name: Run Linters + runs-on: ubuntu-22.04 + timeout-minutes: 5 + + steps: + - uses: actions/checkout@v4 + - name: Restore SpacemanDMM cache + uses: actions/cache@v4 + with: + path: ~/SpacemanDMM + key: ${{ runner.os }}-spacemandmm-${{ hashFiles('dependencies.sh') }} + restore-keys: | + ${{ runner.os }}-spacemandmm- + - name: Restore Yarn cache + uses: actions/cache@v4 + with: + path: tgui/.yarn/cache + key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-yarn- + - name: Restore Node cache + uses: actions/cache@v4 + with: + path: ~/.nvm + key: ${{ runner.os }}-node-${{ hashFiles('dependencies.sh') }} + restore-keys: | + ${{ runner.os }}-node- + - name: Restore Bootstrap cache + uses: actions/cache@v4 + with: + path: tools/bootstrap/.cache + key: ${{ runner.os }}-bootstrap-${{ hashFiles('tools/requirements.txt') }} + restore-keys: | + ${{ runner.os }}-bootstrap- + - name: Restore Rust cache + uses: actions/cache@v4 + with: + path: ~/.cargo + key: ${{ runner.os }}-rust-${{ hashFiles('tools/ci/ci_dependencies.sh')}} + restore-keys: | + ${{ runner.os }}-rust- + - name: Restore Cutter cache + uses: actions/cache@v4 + with: + path: tools/icon_cutter/cache + key: ${{ runner.os }}-cutter-${{ hashFiles('dependencies.sh') }} + - name: Python setup + uses: actions/setup-python@v4 + with: + python-version: "3.11" + - name: Install OpenDream + uses: robinraju/release-downloader@v1.9 + with: + repository: "OpenDreamProject/OpenDream" + tag: "latest" + fileName: "DMCompiler_linux-x64.tar.gz" + extract: true + - name: Install Tools + run: | + pip3 install setuptools + bash tools/ci/install_node.sh + bash tools/ci/install_spaceman_dmm.sh dreamchecker + bash tools/ci/install_ripgrep.sh + tools/bootstrap/python -c '' + - name: Setup linters + id: linter-setup + run: ':' + - name: Run Grep Checks + if: steps.linter-setup.conclusion == 'success' && !cancelled() + run: bash tools/ci/check_grep.sh + - name: Ticked File Enforcement + if: steps.linter-setup.conclusion == 'success' && !cancelled() + run: | + tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/beestation_dme.json + tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/unit_tests.json + - name: Check Define Sanity + if: steps.linter-setup.conclusion == 'success' && !cancelled() + run: tools/bootstrap/python -m define_sanity.check + - name: Check Trait Validity + if: steps.linter-setup.conclusion == 'success' && !cancelled() + run: tools/bootstrap/python -m trait_validity.check + - name: Run DreamChecker + if: steps.linter-setup.conclusion == 'success' && !cancelled() + shell: bash + run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh + - name: Run OpenDream + if: steps.linter-setup.conclusion == 'success' && !cancelled() + run: ./DMCompiler_linux-x64/DMCompiler beestation.dme --suppress-unimplemented --define=CIBUILDING | bash tools/ci/annotate_od.sh + - name: Run Map Checks + if: steps.linter-setup.conclusion == 'success' && !cancelled() + run: | + tools/bootstrap/python -m mapmerge2.dmm_test + tools/bootstrap/python -m tools.maplint.source + - name: Check Cutter + if: steps.linter-setup.conclusion == 'success' && !cancelled() + run: tools/bootstrap/python -m tools.icon_cutter.check + - name: Run DMI Tests + if: steps.linter-setup.conclusion == 'success' && !cancelled() + run: tools/bootstrap/python -m dmi.test + - name: Check File Directories + if: steps.linter-setup.conclusion == 'success' && !cancelled() + run: bash tools/ci/check_filedirs.sh beestation.dme + - name: Check Miscellaneous Files + if: steps.linter-setup.conclusion == 'success' && !cancelled() + run: bash tools/ci/check_misc.sh + - name: Run TGUI Checks + if: steps.linter-setup.conclusion == 'success' && !cancelled() + run: tools/build/build --ci lint tgui-test + + compile_all_maps: + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) + name: Compile Maps + needs: [collect_data] + runs-on: ubuntu-22.04 + timeout-minutes: 5 + + steps: + - uses: actions/checkout@v4 + - name: Restore BYOND cache + uses: actions/cache@v4 + with: + path: ~/BYOND + key: ${{ runner.os }}-byond-${{ hashFiles('dependencies.sh') }} + - name: Compile All Maps + run: | + bash tools/ci/install_byond.sh + source $HOME/BYOND/byond/bin/byondsetup + tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS + - name: Check client Compatibility + uses: tgstation/byond-client-compatibility-check@v3 + with: + dmb-location: beestation.dmb + max-required-client-version: ${{needs.collect_data.outputs.max_required_byond_client}} + + collect_data: + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) + name: Collect data for other tasks + runs-on: ubuntu-22.04 + timeout-minutes: 5 + outputs: + maps: ${{ steps.map_finder.outputs.maps }} + alternate_tests: ${{ steps.alternate_test_finder.outputs.alternate_tests }} + max_required_byond_client: ${{ steps.max_required_byond_client.outputs.max_required_byond_client }} + + steps: + - uses: actions/checkout@v4 + - name: Find Maps + id: map_finder + run: | + echo "$(ls -mw0 _maps/*.json)" > maps_output.txt + sed -i -e s+_maps/+\"+g -e s+.json+\"+g maps_output.txt + echo "Maps: $(cat maps_output.txt)" + echo "maps={\"paths\":[$(cat maps_output.txt)]}" >> $GITHUB_OUTPUT + - name: Find Alternate Tests + id: alternate_test_finder + run: | + ALTERNATE_TESTS_JSON=$(jq -nRc '[inputs | capture("^(?[0-9]+)\\.(?[0-9]+): (?.+)$")]' .github/alternate_byond_versions.txt) + echo "alternate_tests=$ALTERNATE_TESTS_JSON" >> $GITHUB_OUTPUT + - name: Collect byond client version configuration + id: max_required_byond_client + #the regex here does not filter out non-numbers because error messages about no input are less helpful then error messages about bad input (which includes the bad input) + run: | + echo "max_required_byond_client=$(grep -Ev '^[[:blank:]]{0,}#{1,}|^[[:blank:]]{0,}$' .github/max_required_byond_client.txt | tail -n1)" >> $GITHUB_OUTPUT + + run_all_tests: + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) + name: Integration Tests + needs: [collect_data] + + strategy: + fail-fast: false + matrix: + map: ${{ fromJSON(needs.collect_data.outputs.maps).paths }} + + uses: ./.github/workflows/run_integration_tests.yml + with: + map: ${{ matrix.map }} + max_required_byond_client: ${{needs.collect_data.outputs.max_required_byond_client}} + + run_alternate_tests: + if: ( !contains(github.event.head_commit.message, '[ci skip]') && needs.collect_data.outputs.alternate_tests != '[]' ) + name: Alternate Tests + needs: [collect_data] + strategy: + fail-fast: false + matrix: + setup: ${{ fromJSON(needs.collect_data.outputs.alternate_tests) }} + + uses: ./.github/workflows/run_integration_tests.yml + with: + map: ${{ matrix.setup.map }} + major: ${{ matrix.setup.major }} + minor: ${{ matrix.setup.minor }} + max_required_byond_client: ${{needs.collect_data.outputs.max_required_byond_client}} + + check_alternate_tests: + if: ( !contains(github.event.head_commit.message, '[ci skip]') && needs.collect_data.outputs.alternate_tests != '[]' ) + name: Check Alternate Tests + needs: [run_alternate_tests, collect_data] + runs-on: ubuntu-22.04 + timeout-minutes: 5 + steps: + - run: echo Alternate tests passed. + + compare_screenshots: + if: ( !contains(github.event.head_commit.message, '[ci skip]') && (always() && (!failure() && !cancelled())) ) + needs: [run_all_tests, run_alternate_tests] + name: Compare Screenshot Tests + timeout-minutes: 15 + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + - name: Setup directory + run: mkdir -p artifacts + # If we ever add more artifacts, this is going to break, but it'll be obvious. + - name: Download screenshot tests + uses: actions/download-artifact@v4 + with: + path: artifacts + - name: ls -R + run: ls -R artifacts + - name: Setup screenshot comparison + run: npm i + working-directory: tools/screenshot-test-comparison + - name: Run screenshot comparison + run: node tools/screenshot-test-comparison/index.js artifacts code/modules/unit_tests/screenshots artifacts/screenshot_comparisons + # workflow_run does not give you the PR it ran on, + # even through the thing literally named "matching pull requests". + # However, in GraphQL, you can check if the check suite was ran + # by a specific PR, so trusting the (user controlled) action here is okay, + # as long as we check it later in show_screenshot_test_results + - name: Save PR ID + if: failure() && github.event.pull_request + run: | + echo ${{ github.event.pull_request.number }} > artifacts/screenshot_comparisons/pull_request_number.txt + - name: Upload bad screenshots + if: failure() + uses: actions/upload-artifact@v4 + with: + name: bad-screenshots + path: artifacts/screenshot_comparisons + + test_windows: + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) + name: Windows Build + needs: [collect_data] + runs-on: windows-latest + timeout-minutes: 5 + + steps: + - uses: actions/checkout@v4 + - name: Restore Yarn cache + uses: actions/cache@v4 + with: + path: tgui/.yarn/cache + key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-yarn- + - name: Compile + run: pwsh tools/ci/build.ps1 + env: + DM_EXE: "C:\\byond\\bin\\dm.exe" + - name: Check client Compatibility + uses: tgstation/byond-client-compatibility-check@v3 + with: + dmb-location: beestation.dmb + max-required-client-version: ${{needs.collect_data.outputs.max_required_byond_client}} diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml deleted file mode 100644 index d52ea0e45f3d5..0000000000000 --- a/.github/workflows/continuous_integration.yml +++ /dev/null @@ -1,139 +0,0 @@ -name: Run tests - -on: - workflow_dispatch: -# push: -# paths-ignore: -# - "html/changelogs/**" -# - "html/changelog.html" - pull_request: - branches: - - master - merge_group: - branches: - - master - -jobs: - run_linters: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - name: Python setup - uses: actions/setup-python@v4 - with: - python-version: "3.11" - cache: 'pip' - - uses: actions/setup-node@v3 - with: - node-version: 18 - cache: yarn - cache-dependency-path: tgui/yarn.lock - - name: Cache SpacemanDMM - id: cache-spacemandmm - uses: actions/cache@v3 - with: - path: ~/dreamchecker - key: ${{ runner.os }}-spacemandmm-cache-${{ hashFiles('dependencies.sh') }} - - name: Install SpacemanDMM - if: steps.cache-spacemandmm.outputs.cache-hit != 'true' - run: bash tools/ci/install_spaceman_dmm.sh dreamchecker - - name: Install Tools - run: | - pip install setuptools - pip install -r tools/requirements.txt - - name: Run Linters - run: | - bash tools/ci/check_filedirs.sh beestation.dme - bash tools/ci/check_changelogs.sh - find . -name "*.php" -print0 | xargs -0 -n1 php -l - find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python ./tools/json_verifier.py - bash tools/ci/check_grep.sh - tools/build/build --ci lint tgui-test - tools/bootstrap/python -m dmi.test - tools/bootstrap/python -m mapmerge2.dmm_test - ~/dreamchecker - compile_all_maps: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - name: Setup cache - id: cache-byond - uses: actions/cache@v3 - with: - path: ~/BYOND - key: ${{ runner.os }}-byond-cache-${{ hashFiles('Dockerfile') }} - - name: Install BYOND - if: steps.cache-byond.outputs.cache-hit != 'true' - run: bash tools/ci/install_byond.sh - - name: Compile All Maps - run: | - source $HOME/BYOND/byond/bin/byondsetup - python3 tools/ci/template_dm_generator.py - tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS - run_all_tests: - runs-on: ubuntu-20.04 - services: - mariadb: - image: mariadb:latest - env: - MYSQL_ROOT_PASSWORD: root - ports: - - 3306 - options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=3 - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 18 - cache: yarn - cache-dependency-path: tgui/yarn.lock - - name: Cache BYOND - id: cache-byond - uses: actions/cache@v3 - with: - path: ~/BYOND - key: ${{ runner.os }}-byond-cache-${{ hashFiles('Dockerfile') }} - - name: Install BYOND - if: steps.cache-byond.outputs.cache-hit != 'true' - run: bash tools/ci/install_byond.sh - - name: Setup database - run: | - sudo systemctl start mysql - mysql -u root -proot -e 'CREATE DATABASE bee_ci;' - mysql -u root -proot bee_ci < SQL/beestation_schema.sql - - name: Install rust-g - run: | - sudo dpkg --add-architecture i386 - sudo apt update || true - sudo apt install libssl1.1:i386 - bash tools/ci/install_rust_g.sh - - name: Install auxmos - run: | - bash tools/ci/install_auxmos.sh - - name: Compile Tests - run: | - source $HOME/BYOND/byond/bin/byondsetup - tools/build/build --ci dm -DCIBUILDING -DANSICOLORS - - name: Run Tests - run: | - source $HOME/BYOND/byond/bin/byondsetup - bash tools/ci/run_server.sh - test_windows: - runs-on: windows-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 18 - cache: yarn - cache-dependency-path: tgui/yarn.lock - - name: Cache BYOND - id: cache-byond - uses: actions/cache@v3 - with: - path: C:/byond - key: ${{ runner.os }}-byond-cache-${{ hashFiles('dependencies.sh') }} - - name: Compile - run: pwsh tools/ci/build.ps1 - env: - DM_EXE: "C:\\byond\\bin\\dm.exe" diff --git a/.github/workflows/rerun_flaky_tests.yml b/.github/workflows/rerun_flaky_tests.yml new file mode 100644 index 0000000000000..7f498de144308 --- /dev/null +++ b/.github/workflows/rerun_flaky_tests.yml @@ -0,0 +1,31 @@ +name: Rerun/Report Flaky Tests +on: + workflow_run: + workflows: [CI Suite] + types: + - completed +jobs: + rerun_flaky_tests: + runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.run_attempt == 1 }} + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Rerun flaky tests + uses: actions/github-script@v6 + with: + script: | + const { rerunFlakyTests } = await import('${{ github.workspace }}/tools/pull_request_hooks/rerunFlakyTests.js') + await rerunFlakyTests({ github, context }) + report_flaky_tests: + runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.run_attempt == 2 }} + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Report flaky tests + uses: actions/github-script@v6 + with: + script: | + const { reportFlakyTests } = await import('${{ github.workspace }}/tools/pull_request_hooks/rerunFlakyTests.js') + await reportFlakyTests({ github, context }) diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml new file mode 100644 index 0000000000000..43eeda344d694 --- /dev/null +++ b/.github/workflows/run_integration_tests.yml @@ -0,0 +1,81 @@ +# This is a reusable workflow to run integration tests on a single map. +# This is run for every single map in ci_suite.yml. You might want to edit that instead. +name: Run Integration Tests +on: + workflow_call: + inputs: + map: + required: true + type: string + major: + required: false + type: string + minor: + required: false + type: string + max_required_byond_client: + required: true + type: string + +jobs: + run_integration_tests: + runs-on: ubuntu-latest + timeout-minutes: 15 + services: + mysql: + image: mysql:latest + env: + MYSQL_ROOT_PASSWORD: root + ports: + - 3306 + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + steps: + - uses: actions/checkout@v4 + - name: Restore BYOND cache + uses: actions/cache@v4 + with: + path: ~/BYOND + key: ${{ runner.os }}-byond-${{ hashFiles('dependencies.sh') }} + - name: Setup database + run: | + sudo systemctl start mysql + mysql -u root -proot -e 'CREATE DATABASE bee_ci;' + mysql -u root -proot bee_ci < SQL/beestation_schema.sql + - name: Install rust-g + run: | + bash tools/ci/install_rust_g.sh +# Bee: Dreamlua is not used +# - name: Install dreamluau +# run: | +# bash tools/ci/install_dreamluau.sh + - name: Install auxmos + run: | + bash tools/ci/install_auxmos.sh + - name: Configure version + run: | + echo "BYOND_MAJOR=${{ inputs.major }}" >> $GITHUB_ENV + echo "BYOND_MINOR=${{ inputs.minor }}" >> $GITHUB_ENV + if: ${{ inputs.major }} + - name: Compile Tests + id: compile_tests + run: | + bash tools/ci/install_byond.sh + source $HOME/BYOND/byond/bin/byondsetup + tools/build/build --ci dm -DCIBUILDING -DANSICOLORS -Werror -ITG0001 -I"loop_checks" + - name: Run Tests + run: | + source $HOME/BYOND/byond/bin/byondsetup + bash tools/ci/run_server.sh ${{ inputs.map }} + - name: Upload screenshot tests + if: always() + uses: actions/upload-artifact@v4 + with: + name: test_artifacts_${{ inputs.map }}_${{ inputs.major }}_${{ inputs.minor }} + path: data/screenshots_new/ + retention-days: 1 + - name: Check client Compatibility + if: always() && steps.compile_tests.outcome == 'success' + uses: tgstation/byond-client-compatibility-check@v3 + with: + dmb-location: beestation.dmb + max-required-client-version: ${{inputs.max_required_byond_client}} diff --git a/.github/workflows/show_screenshot_test_results.yml b/.github/workflows/show_screenshot_test_results.yml new file mode 100644 index 0000000000000..c61d09fa89057 --- /dev/null +++ b/.github/workflows/show_screenshot_test_results.yml @@ -0,0 +1,43 @@ +# This is a separate workflow so that it can access secrets, which are necessary +# because we need to be able to upload the images and post a comment. +# In the event this workflow fails, the screenshot test results are still +# available as an artifact of the screenshot test comparison workflow itself. +# This simply provides necessary quality of life. +name: Show Screenshot Test Results +on: + workflow_run: + workflows: [CI Suite] + types: + - completed +jobs: + show_screenshot_test_results: + if: ( !contains(github.event.head_commit.message, '[ci skip]') && github.event.workflow_run.run_attempt == 1 ) + name: Show Screenshot Test Results + runs-on: ubuntu-22.04 + steps: + - name: "Check for ARTIFACTS_FILE_HOUSE_KEY" + id: secrets_set + env: + ENABLER_SECRET: ${{ secrets.ARTIFACTS_FILE_HOUSE_KEY }} + run: | + unset SECRET_EXISTS + if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi + echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT + - name: Checkout + if: steps.secrets_set.outputs.SECRETS_ENABLED + uses: actions/checkout@v4 + - name: Prepare module + if: steps.secrets_set.outputs.SECRETS_ENABLED + run: | + # This is needed because node-fetch needs import and doesn't work with require :/ + echo "{\"type\": \"module\"}" > package.json + npm install node-fetch + - name: Show screenshot test results + if: steps.secrets_set.outputs.SECRETS_ENABLED + uses: actions/github-script@v6 + env: + FILE_HOUSE_KEY: ${{ secrets.ARTIFACTS_FILE_HOUSE_KEY }} + with: + script: | + const { showScreenshotTestResults } = await import('${{ github.workspace }}/tools/ci/show_screenshot_test_results.js') + await showScreenshotTestResults({ github, context, exec }) diff --git a/.gitignore b/.gitignore index 904089f0cdf53..de6b5f24ac797 100644 --- a/.gitignore +++ b/.gitignore @@ -190,3 +190,6 @@ Temporary Items # byond-tracy prof.dll libprof.so + +# Define sanity output +define_sanity_output.txt diff --git a/_maps/Prefab/Departments.dmm b/_maps/Prefab/Departments.dmm index 701c9bcc3b5ff..6c1a0ee6bcd7d 100644 --- a/_maps/Prefab/Departments.dmm +++ b/_maps/Prefab/Departments.dmm @@ -74,6 +74,10 @@ }, /turf/open/floor/iron/grid/steel, /area/space) +"bD" = ( +/obj/machinery/gibber, +/turf/open/floor/iron/freezer, +/area/space) "bE" = ( /obj/item/book/manual/wiki/sopservice, /turf/open/floor/wood, @@ -104,11 +108,7 @@ /turf/open/floor/iron, /area/space) "co" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Xenobiology Junction"; - sortType = 28 - }, +/obj/structure/disposalpipe/sorting/mail/destination/xenobiology, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "ct" = ( @@ -161,15 +161,11 @@ /turf/open/floor/iron/grid/steel, /area/space) "dc" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "dorms"; - sortType = 26 - }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ alpha = 200; color = "#267878" }, +/obj/structure/disposalpipe/sorting/mail/destination/dormitories, /turf/open/floor/iron, /area/crew_quarters/dorms) "dv" = ( @@ -206,11 +202,7 @@ /turf/open/floor/iron/white, /area/science/robotics) "et" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Kitchen"; - sortType = 20 - }, +/obj/structure/disposalpipe/sorting/mail/destination/kitchen, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen) "ew" = ( @@ -223,12 +215,8 @@ /turf/open/floor/iron/white, /area/science/robotics) "eA" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Medbay"; - sortType = 9 - }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/medbay, /turf/open/floor/iron/white, /area/medical/sleeper) "eB" = ( @@ -267,9 +255,7 @@ /obj/effect/landmark/start/warden, /obj/effect/landmark/start/security_officer, /turf/open/floor/iron, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "fK" = ( /obj/machinery/holopad, /turf/open/floor/iron, @@ -285,16 +271,20 @@ }, /turf/open/floor/iron/grid/steel, /area/space) +"fU" = ( +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ + alpha = 200; + color = "#267878" + }, +/obj/structure/closet/wardrobe/white, +/turf/open/floor/iron/dark, +/area/space) "fZ" = ( /obj/machinery/vending/wardrobe/atmos_wardrobe, /turf/open/floor/iron/tech, /area/engine/atmos) "ga" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Chap"; - sortType = 17 - }, +/obj/structure/disposalpipe/sorting/mail/destination/chapel, /turf/open/floor/carpet/purple, /area/chapel/office) "gf" = ( @@ -324,6 +314,14 @@ /obj/item/toy/plush/moth/bluespace, /turf/open/floor/iron, /area/space) +"hs" = ( +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/structure/table/reinforced, +/turf/open/floor/iron/freezer, +/area/space) "hz" = ( /obj/machinery/conveyor_switch/oneway{ id = "packageSort2" @@ -383,9 +381,7 @@ }, /obj/machinery/vending/wardrobe/sec_wardrobe, /turf/open/floor/iron, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "iC" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -424,21 +420,14 @@ /turf/open/floor/iron/dark, /area/space) "jS" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Medbay"; - sortType = 10 - }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/structure/disposalpipe/sorting/mail/destination/cmo_office, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "jV" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "HOS" - }, +/obj/structure/disposalpipe/sorting/mail/destination/hos_office, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "kj" = ( @@ -493,16 +482,13 @@ }, /mob/living/simple_animal/kalo{ desc = "The Perma brig's cute grass snake."; - icon = 'icons/mob/animal.dmi'; icon_dead = "snake_dead"; icon_living = "snake"; icon_state = "snake"; name = "Hugel" }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "mo" = ( /obj/item/toy/plush/moth/lovers, /turf/open/floor/iron/tech/grid, @@ -522,11 +508,7 @@ /turf/open/floor/iron, /area/space) "mT" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Hydro"; - sortType = 21 - }, +/obj/structure/disposalpipe/sorting/mail/destination/hydroponics, /turf/open/floor/grass/no_border, /area/hydroponics) "mY" = ( @@ -562,9 +544,7 @@ color = "#DE3A3A" }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "nq" = ( /turf/open/floor/carpet/orange, /area/quartermaster/qm) @@ -588,11 +568,7 @@ /turf/open/floor/iron/white, /area/medical/sleeper) "nG" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "HOP"; - sortType = 15 - }, +/obj/structure/disposalpipe/sorting/mail/destination/hop_office, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "nL" = ( @@ -633,11 +609,8 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "oG" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - sortType = 12 - }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/research, /turf/open/floor/iron/white, /area/science/research) "oO" = ( @@ -696,12 +669,8 @@ /turf/open/floor/iron/dark, /area/medical/genetics) "qf" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Medbay Junction"; - sortType = 11 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/chemistry, /turf/open/floor/iron/white, /area/medical/apothecary) "qh" = ( @@ -713,18 +682,13 @@ "qx" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /obj/machinery/door/airlock/virology/glass{ - id_tag = null; name = "Virology Ward"; req_access_txt = "39" }, /turf/open/floor/iron/grid/steel, /area/medical/virology) "qy" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "disposals"; - sortTypes = list(0,1) - }, +/obj/structure/disposalpipe/sorting/mail/destination/disposals, /turf/open/floor/plating, /area/maintenance/disposal) "qz" = ( @@ -754,18 +718,13 @@ /turf/open/floor/iron/dark, /area/space) "rc" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Security" - }, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; color = "#DE3A3A" }, +/obj/structure/disposalpipe/sorting/mail/destination/security, /turf/open/floor/iron, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "rq" = ( /obj/machinery/genpop_interface, /turf/open/floor/iron, @@ -818,12 +777,13 @@ /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "tn" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - sortType = 2 +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ + alpha = 200; + color = "#267878" }, -/turf/open/floor/iron/sepia, -/area/quartermaster/storage) +/obj/structure/closet/wardrobe/green, +/turf/open/floor/iron/dark, +/area/space) "tw" = ( /obj/effect/turf_decal/edges/borderfloor{ dir = 10 @@ -841,16 +801,9 @@ alpha = 200; color = "#267878" }, -/obj/structure/closet/wardrobe/yellow, -/obj/structure/closet/wardrobe/white, -/obj/structure/closet/wardrobe/red, -/obj/structure/closet/wardrobe/pink, /obj/structure/closet/wardrobe/orange, -/obj/structure/closet/wardrobe/grey, -/obj/structure/closet/wardrobe/green, -/obj/structure/closet/wardrobe/black, -/turf/open/floor/iron, -/area/crew_quarters/dorms) +/turf/open/floor/iron/dark, +/area/space) "tK" = ( /obj/machinery/door/window/eastleft{ dir = 8; @@ -874,7 +827,7 @@ "uo" = ( /obj/machinery/door/poddoor{ id = "AIwindows"; - name = "AI View Blast door" + name = "AI View Blast Door" }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) @@ -889,7 +842,11 @@ /turf/open/floor/grass/no_border, /area/hydroponics) "uN" = ( -/obj/item/toy/plush/moth/error, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ + alpha = 200; + color = "#267878" + }, +/obj/effect/landmark/start/assistant, /turf/open/floor/iron/dark, /area/space) "va" = ( @@ -903,13 +860,17 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) "vp" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Atmos"; - sortType = 6 - }, +/obj/structure/disposalpipe/sorting/mail/destination/atmospherics, /turf/open/floor/iron/tech, /area/engine/atmos) +"vu" = ( +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ + alpha = 200; + color = "#267878" + }, +/obj/structure/closet/wardrobe/red, +/turf/open/floor/iron/dark, +/area/space) "vW" = ( /obj/item/toy/plush/moth/gothic, /turf/open/floor/iron/tech, @@ -985,9 +946,7 @@ anchored = 1 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "xM" = ( /obj/item/book/manual/hydroponics_pod_people, /turf/open/floor/grass/no_border, @@ -997,11 +956,7 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) "yb" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "CE"; - sortType = 5 - }, +/obj/structure/disposalpipe/sorting/mail/destination/ce_office, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) "yf" = ( @@ -1032,6 +987,10 @@ /obj/machinery/fax/eng, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) +"zb" = ( +/obj/machinery/processor, +/turf/open/floor/iron/freezer, +/area/space) "zv" = ( /obj/effect/landmark/start/quartermaster, /turf/open/floor/carpet/orange, @@ -1074,6 +1033,14 @@ /obj/machinery/vending/wardrobe/det_wardrobe, /turf/open/floor/wood, /area/security/detectives_office) +"AE" = ( +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ + alpha = 200; + color = "#267878" + }, +/obj/structure/closet/wardrobe/yellow, +/turf/open/floor/iron/dark, +/area/space) "AF" = ( /obj/item/toy/plush/moth/bluespace, /turf/open/floor/iron/dark, @@ -1091,9 +1058,6 @@ /turf/open/floor/plating, /area/maintenance/disposal) "Bo" = ( -/obj/structure/closet, -/obj/structure/closet/firecloset/full, -/obj/structure/closet/emcloset, /obj/structure/rack, /turf/open/floor/plating, /area/space) @@ -1254,12 +1218,12 @@ }, /turf/open/floor/iron, /area/janitor) +"Fr" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom, +/turf/open/floor/iron/freezer, +/area/space) "Ft" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Barman"; - sortType = 19 - }, +/obj/structure/disposalpipe/sorting/mail/destination/bar, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "Fx" = ( @@ -1271,18 +1235,11 @@ /turf/open/floor/iron/tech/grid, /area/space) "Gs" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - sortType = 25 - }, +/obj/structure/disposalpipe/sorting/mail/destination/testing_range, /turf/open/floor/engine, /area/science/mixing) "Gy" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Curator"; - sortType = 16 - }, +/obj/structure/disposalpipe/sorting/mail/destination/library, /turf/open/floor/carpet/royalblack, /area/library) "GN" = ( @@ -1314,14 +1271,9 @@ req_one_access_txt = "63;38" }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "HZ" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - sortType = 3 - }, +/obj/structure/disposalpipe/sorting/mail/destination/qm_office, /turf/open/floor/carpet/orange, /area/quartermaster/qm) "Ih" = ( @@ -1351,12 +1303,20 @@ }, /turf/open/floor/iron, /area/space) +"Ji" = ( +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ + alpha = 200; + color = "#267878" + }, +/obj/structure/closet/wardrobe/grey, +/turf/open/floor/iron/dark, +/area/space) "Jk" = ( /obj/structure/sign/warning/pods, /turf/open/floor/iron/dark, /area/space) "Jo" = ( -/obj/item/toy/plush/moth/royal, +/obj/structure/closet, /turf/open/floor/iron, /area/space) "JM" = ( @@ -1368,9 +1328,7 @@ /turf/open/floor/iron/white, /area/science/research) "JN" = ( -/mob/living/simple_animal/hostile/retaliate/goat{ - name = "Pete" - }, +/obj/machinery/griddle, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen) "JV" = ( @@ -1381,6 +1339,10 @@ /obj/structure/closet/l3closet/virology, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) +"JZ" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/iron, +/area/space) "Kb" = ( /obj/item/book/codex_gigas, /turf/open/floor/carpet/royalblack, @@ -1394,10 +1356,7 @@ /turf/open/floor/plating, /area/space) "Kh" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - sortType = 13 - }, +/obj/structure/disposalpipe/sorting/mail/destination/rd_office, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "Km" = ( @@ -1458,9 +1417,7 @@ /turf/open/floor/carpet/purple, /area/chapel/office) "LC" = ( -/obj/structure/closet/secure_closet/freezer/meat, -/obj/structure/closet/secure_closet/freezer/kitchen, -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/sink/kitchen, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen) "LH" = ( @@ -1518,11 +1475,9 @@ /turf/open/floor/plating, /area/maintenance/disposal) "Mw" = ( -/obj/structure/disposalpipe/sorting/mail{ - name = "Captain" - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain) +/obj/structure/disposalpipe/sorting/mail/destination/toxins, +/turf/open/floor/engine, +/area/science/mixing) "MC" = ( /obj/machinery/mass_driver{ dir = 8; @@ -1534,6 +1489,10 @@ /obj/item/book/manual/wiki/sopsupply, /turf/open/floor/carpet/orange, /area/quartermaster/qm) +"MS" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/iron, +/area/space) "Nb" = ( /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /obj/machinery/vending/wardrobe/chem_wardrobe, @@ -1580,6 +1539,10 @@ "Os" = ( /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) +"Ov" = ( +/obj/structure/kitchenspike, +/turf/open/floor/iron/freezer, +/area/space) "Oz" = ( /turf/open/floor/grass/no_border, /area/hydroponics) @@ -1594,12 +1557,8 @@ /turf/open/floor/iron, /area/space) "OT" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Genie"; - sortType = 23 - }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/genetics, /turf/open/floor/iron/dark, /area/medical/genetics) "OX" = ( @@ -1635,10 +1594,7 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "PI" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - sortType = 30 - }, +/obj/structure/disposalpipe/sorting/mail/destination/detective_office, /turf/open/floor/wood, /area/security/detectives_office) "PL" = ( @@ -1660,12 +1616,8 @@ /turf/open/floor/iron, /area/janitor) "PR" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Virology Junction"; - sortType = 27 - }, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/virology, /turf/open/floor/iron/grid/steel, /area/medical/virology) "PX" = ( @@ -1741,8 +1693,13 @@ /turf/open/floor/iron/sepia, /area/quartermaster/storage) "Rq" = ( +/obj/machinery/deepfryer, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen) +"RA" = ( +/obj/structure/closet/secure_closet/freezer/kitchen, +/turf/open/floor/iron/freezer, +/area/space) "RB" = ( /obj/machinery/door/airlock/research{ name = "Exploration Preparation Room"; @@ -1799,11 +1756,7 @@ /turf/open/floor/iron/dark, /area/space) "Tj" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Theatre"; - sortType = 18 - }, +/obj/structure/disposalpipe/sorting/mail/destination/threatre, /turf/open/floor/carpet/red, /area/crew_quarters/theatre/backstage) "Tm" = ( @@ -1832,14 +1785,6 @@ "Tq" = ( /mob/living/simple_animal/hostile/retaliate/frog{ attacked_sound = 'sound/effects/huuu.ogg'; - density = 0; - desc = "It seems a little sad."; - head_icon = 'icons/mob/pets_held.dmi'; - held_state = ""; - icon = 'icons/mob/animal.dmi'; - icon_dead = "frog_dead"; - icon_living = "frog"; - icon_state = "frog"; name = "Larry"; pixel_y = 12; stepped_sound = null @@ -1855,10 +1800,7 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "TE" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - sortType = 14 - }, +/obj/structure/disposalpipe/sorting/mail/destination/robotics, /turf/open/floor/iron/white, /area/science/robotics) "TL" = ( @@ -1884,6 +1826,10 @@ /obj/item/toy/plush/moth/deadhead, /turf/open/floor/iron/grid/steel, /area/space) +"Uo" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/turf/open/floor/iron/freezer, +/area/space) "Up" = ( /mob/living/simple_animal/hostile/carp/lia, /mob/living/simple_animal/bot/secbot{ @@ -1938,22 +1884,15 @@ /turf/open/floor/iron, /area/engine/engineering) "Vm" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - sortType = 29 - }, +/obj/structure/disposalpipe/sorting/mail/destination/law_office, /turf/open/floor/carpet/green, /area/lawoffice) "Vy" = ( /turf/open/floor/carpet/red, /area/crew_quarters/theatre/backstage) "VA" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Janie"; - sortType = 22 - }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/structure/disposalpipe/sorting/mail/destination/janitor_closet, /turf/open/floor/iron, /area/janitor) "VB" = ( @@ -1971,6 +1910,18 @@ }, /turf/open/floor/iron, /area/space) +"VH" = ( +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ + alpha = 200; + color = "#267878" + }, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ + alpha = 200; + color = "#267878" + }, +/obj/structure/closet/wardrobe/black, +/turf/open/floor/iron/dark, +/area/space) "VY" = ( /obj/machinery/conveyor{ dir = 4; @@ -1986,8 +1937,10 @@ /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "Wu" = ( -/obj/item/toy/plush/moth/firewatch, -/turf/open/floor/iron/dark, +/mob/living/simple_animal/hostile/retaliate/goat{ + name = "Pete" + }, +/turf/open/floor/iron/freezer, /area/space) "Wx" = ( /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -2001,9 +1954,7 @@ /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "WU" = ( -/obj/structure/disposalpipe/sorting/wrap{ - dir = 2 - }, +/obj/structure/disposalpipe/sorting/mail/destination/cargo_bay, /turf/open/floor/iron/sepia, /area/quartermaster/sorting) "Xh" = ( @@ -2069,14 +2020,10 @@ }, /area/space) "YT" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Engi"; - sortType = 4 - }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 }, +/obj/structure/disposalpipe/sorting/mail/destination/engineering, /turf/open/floor/iron, /area/engine/engineering) "YV" = ( @@ -2091,6 +2038,10 @@ /obj/effect/landmark/start/head_of_personnel, /turf/open/floor/wood, /area/crew_quarters/heads/hop) +"Zh" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/open/floor/iron/freezer, +/area/space) "Zj" = ( /obj/structure/reagent_dispensers/fueltank, /obj/structure/reagent_dispensers/watertank, @@ -2104,15 +2055,21 @@ /area/medical/apothecary) "ZA" = ( /obj/item/book/manual/wiki/cooking_to_serve_man, +/obj/machinery/microwave{ + desc = "Cooks and boils stuff, somehow."; + pixel_x = -3; + pixel_y = 5 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen) "ZB" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - sortType = 13 +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ + alpha = 200; + color = "#267878" }, +/obj/structure/closet/wardrobe/pink, /turf/open/floor/iron/dark, -/area/quartermaster/exploration_prep) +/area/space) "ZM" = ( /obj/machinery/rnd/production/techfab/department/security, /turf/open/floor/carpet/red, @@ -2125,7 +2082,7 @@ /area/space) (1,1,1) = {" -Mw +OZ AU ea Kh @@ -2200,7 +2157,7 @@ xI YT nr Tn -tn +dZ UQ qz "} @@ -2249,7 +2206,7 @@ Gy kG KM Gs -lt +Mw rN eA Qe @@ -2428,7 +2385,7 @@ Qk mT Oz Sa -ZB +ti JV ti Qk @@ -2497,12 +2454,12 @@ XF Qk Qk Qk -XF -XF -XF -Qk +zb +Fr +Zh Qk Qk +MS "} (20,1,1) = {" ZA @@ -2517,12 +2474,12 @@ XF Qk ST Qk -XF +bD Wu -XF +RA Qk -Jo Qk +JZ "} (21,1,1) = {" eJ @@ -2537,20 +2494,20 @@ XF Qk Qk Qk -XF -XF -XF -Qk +Ov +hs +Uo Qk Qk +Jo "} (22,1,1) = {" dc SQ +SQ +VH tB -XF -XF -XF +ZB Qk Qk Qk @@ -2568,9 +2525,9 @@ qP KD kZ SQ -XF +tn uN -XF +vu Qk Kq Qk @@ -2588,9 +2545,9 @@ yt Pd Tr NH -XF -XF -XF +Ji +AE +fU Qk Qk Qk diff --git a/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm b/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm index 26b1ed7e5b78d..732ec6abcaf21 100644 --- a/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm +++ b/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm @@ -347,9 +347,7 @@ /turf/open/floor/carpet/royalblack, /area/template_noop) "UO" = ( -/obj/item/kirbyplants/random{ - layer = 3.3 - }, +/obj/item/kirbyplants/random, /turf/open/floor/carpet/royalblack, /area/template_noop) "Vo" = ( diff --git a/_maps/RandomRooms/10x10/sk_rdm062_roosterdome.dmm b/_maps/RandomRooms/10x10/sk_rdm062_roosterdome.dmm index d497f09e0895f..5fcbacfdb7d8e 100644 --- a/_maps/RandomRooms/10x10/sk_rdm062_roosterdome.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm062_roosterdome.dmm @@ -90,9 +90,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 4 - }, /turf/open/floor/engine, /area/template_noop) "at" = ( diff --git a/_maps/RandomRooms/10x10/sk_rdm159_kilosnakepit.dmm b/_maps/RandomRooms/10x10/sk_rdm159_kilosnakepit.dmm index c094947a1e688..9d95192d3ce3b 100644 --- a/_maps/RandomRooms/10x10/sk_rdm159_kilosnakepit.dmm +++ b/_maps/RandomRooms/10x10/sk_rdm159_kilosnakepit.dmm @@ -6,7 +6,7 @@ /obj/effect/turf_decal/stripes/line, /obj/structure/barricade/wooden/crude, /obj/machinery/door/window/northleft{ - name = "cage door" + name = "Cage Door" }, /turf/open/floor/iron/dark, /area/template_noop) @@ -115,7 +115,7 @@ }, /obj/structure/barricade/wooden/crude, /obj/machinery/door/window/southleft{ - name = "cage door" + name = "Cage Door" }, /turf/open/floor/iron/dark, /area/template_noop) diff --git a/_maps/RandomRooms/10x5/rdm_vault_storages.dmm b/_maps/RandomRooms/10x5/rdm_vault_storages.dmm index c633505786a59..9837ff43ff45f 100644 --- a/_maps/RandomRooms/10x5/rdm_vault_storages.dmm +++ b/_maps/RandomRooms/10x5/rdm_vault_storages.dmm @@ -11,7 +11,7 @@ "e" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/vault{ - name = "abandoned vault door"; + name = "Abandoned Vault"; desc = "It opens and closes. What's behind this forgotten door?" }, /turf/open/floor/plating, @@ -55,7 +55,7 @@ /area/template_noop) "x" = ( /obj/machinery/door/airlock/vault{ - name = "abandoned vault door"; + name = "Abandoned Vault"; desc = "It opens and closes. What's behind this forgotten door?" }, /obj/effect/mapping_helpers/airlock/locked, diff --git a/_maps/RandomRooms/10x5/sk_rdm125_courtroom.dmm b/_maps/RandomRooms/10x5/sk_rdm125_courtroom.dmm index d8a9f316bbbbc..3d3e5af3d59e3 100644 --- a/_maps/RandomRooms/10x5/sk_rdm125_courtroom.dmm +++ b/_maps/RandomRooms/10x5/sk_rdm125_courtroom.dmm @@ -51,7 +51,7 @@ /area/template_noop) "p" = ( /obj/machinery/door/window/southleft{ - name = "old cell door" + name = "Old Cell" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, diff --git a/_maps/RandomRooms/3x5/rdm_insane_atmospherics_technician.dmm b/_maps/RandomRooms/3x5/rdm_insane_atmospherics_technician.dmm index a042bb613b800..c86f9a4424e02 100644 --- a/_maps/RandomRooms/3x5/rdm_insane_atmospherics_technician.dmm +++ b/_maps/RandomRooms/3x5/rdm_insane_atmospherics_technician.dmm @@ -7,7 +7,6 @@ /obj/structure/lattice/catwalk/over, /obj/machinery/shower{ dir = 8; - layer = 4; name = "emergency shower"; pixel_y = 6 }, diff --git a/_maps/RandomRooms/5x3/sk_rdm068_pubbyclutter7.dmm b/_maps/RandomRooms/5x3/sk_rdm068_pubbyclutter7.dmm index c34770b9a2f13..6594862b19ed3 100644 --- a/_maps/RandomRooms/5x3/sk_rdm068_pubbyclutter7.dmm +++ b/_maps/RandomRooms/5x3/sk_rdm068_pubbyclutter7.dmm @@ -15,8 +15,7 @@ "d" = ( /obj/structure/table, /obj/item/stack/rods{ - amount = 5; - layer = 3.3 + amount = 5 }, /obj/effect/spawner/lootdrop/maintenance, /obj/item/assembly/prox_sensor{ diff --git a/_maps/RandomRooms/5x4/rdm_bathroom.dmm b/_maps/RandomRooms/5x4/rdm_bathroom.dmm index 79f230c82d1c4..4b6fd23d99f4a 100644 --- a/_maps/RandomRooms/5x4/rdm_bathroom.dmm +++ b/_maps/RandomRooms/5x4/rdm_bathroom.dmm @@ -66,7 +66,6 @@ dir = 1 }, /obj/structure/sink{ - layer = 4; pixel_y = 25 }, /obj/structure/mirror{ diff --git a/_maps/RandomRooms/5x4/rdm_captain_quarters.dmm b/_maps/RandomRooms/5x4/rdm_captain_quarters.dmm index 444b43325ea11..ba450eea4c819 100644 --- a/_maps/RandomRooms/5x4/rdm_captain_quarters.dmm +++ b/_maps/RandomRooms/5x4/rdm_captain_quarters.dmm @@ -36,7 +36,6 @@ pixel_y = 6 }, /obj/structure/sink{ - layer = 4; pixel_y = 25 }, /obj/structure/mirror{ @@ -157,9 +156,7 @@ name = "Bathroom" }, /obj/effect/decal/cleanable/dirt, -/obj/structure/barricade/wooden/crude{ - layer = 4 - }, +/obj/structure/barricade/wooden/crude, /turf/open/floor/iron/white, /area/template_noop) diff --git a/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm b/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm index c15c797e303ca..6e53fd6d8973c 100644 --- a/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm +++ b/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm @@ -1,9 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme{ - layer = 5 - }, +/obj/item/reagent_containers/food/condiment/enzyme, /obj/item/reagent_containers/food/condiment/flour, /turf/open/floor/plating, /area/template_noop) diff --git a/_maps/RandomRooms/5x4/sk_rdm121_honkaccident.dmm b/_maps/RandomRooms/5x4/sk_rdm121_honkaccident.dmm index d31e45f5fe668..68074c28688f2 100644 --- a/_maps/RandomRooms/5x4/sk_rdm121_honkaccident.dmm +++ b/_maps/RandomRooms/5x4/sk_rdm121_honkaccident.dmm @@ -1,14 +1,12 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "b" = ( /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/template_noop) "c" = ( /obj/item/grown/bananapeel, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/template_noop) @@ -16,14 +14,12 @@ /obj/structure/mecha_wreckage/honker, /obj/effect/trap/nexus/darkness, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/template_noop) "e" = ( /obj/effect/decal/cleanable/ash, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/template_noop) @@ -33,7 +29,6 @@ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/template_noop) @@ -53,7 +48,6 @@ "l" = ( /obj/effect/spawner/lootdrop/clowntrap, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/template_noop) @@ -84,7 +78,6 @@ "O" = ( /obj/effect/spawner/lootdrop/trap, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/template_noop) diff --git a/_maps/RandomRooms/5x4/sk_rdm166_printing_press.dmm b/_maps/RandomRooms/5x4/sk_rdm166_printing_press.dmm index 6a16c572aeae4..3ebec1638940e 100644 --- a/_maps/RandomRooms/5x4/sk_rdm166_printing_press.dmm +++ b/_maps/RandomRooms/5x4/sk_rdm166_printing_press.dmm @@ -42,9 +42,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/light/small{ - dir = 4 - }, /obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_03_vendingminimarket.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_03_vendingminimarket.dmm index 614cada582b64..6d1744490a961 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_03_vendingminimarket.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_03_vendingminimarket.dmm @@ -139,7 +139,7 @@ /area/template_noop) "u" = ( /obj/machinery/door/airlock/maintenance{ - name = "Vending machine Store Backroom" + name = "Vending Machine Store Backroom" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -192,7 +192,7 @@ /area/template_noop) "J" = ( /obj/machinery/door/airlock/maintenance{ - name = "Vending machine Store Maintenance"; + name = "Vending Machine Store Maintenance"; req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_04_conveniencestore.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_04_conveniencestore.dmm index dbc352a096967..b88717604c439 100644 --- a/_maps/RandomRooms/fland/sk_rdm_fln_04_conveniencestore.dmm +++ b/_maps/RandomRooms/fland/sk_rdm_fln_04_conveniencestore.dmm @@ -101,7 +101,7 @@ /area/template_noop) "B" = ( /obj/machinery/door/airlock/maintenance{ - name = "Convenience store Backroom" + name = "Convenience Store Backroom" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -118,7 +118,7 @@ "F" = ( /obj/machinery/button/door{ id = "ConvenienceShutter"; - name = "Convenience store Shutters"; + name = "Convenience Store Shutters"; normaldoorcontrol = 1; pixel_x = -8; pixel_y = -26; @@ -145,7 +145,7 @@ /area/template_noop) "J" = ( /obj/machinery/door/airlock/maintenance{ - name = "Convenience store Maintenance"; + name = "Convenience Store Maintenance"; req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -174,7 +174,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "ConvenienceShutter"; - name = "Convenience store Shutters" + name = "Convenience Store Shutters" }, /turf/open/floor/plating, /area/template_noop) @@ -187,7 +187,7 @@ "W" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "ConvenienceShutter"; - name = "Convenience store Shutters" + name = "Convenience Store Shutters" }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 1b3a75680d870..e282e294b0e7e 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -306,8 +306,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/chair/stool, /turf/open/floor/wood, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index a1972c4101151..baba995eb3e92 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -393,7 +393,7 @@ /area/ruin/powered/animal_hospital) "fx" = ( /obj/structure/chair/fancy/comfy{ - color = "#354562" ; + color = "#354562"; dir = 8 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -560,7 +560,7 @@ /area/ruin/powered/animal_hospital) "qX" = ( /obj/structure/chair/fancy/comfy{ - color = "#354562" ; + color = "#354562"; dir = 8 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, @@ -641,7 +641,7 @@ /area/ruin/powered/animal_hospital) "vf" = ( /obj/structure/chair/fancy/comfy{ - color = "#354562" ; + color = "#354562"; dir = 8 }, /obj/effect/turf_decal/tile/blue/half/contrasted, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm index 0b12632f89133..8dee467d9b536 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm @@ -95,7 +95,6 @@ "aq" = ( /obj/structure/table/reinforced, /obj/item/bedsheet/rd/royal_cape{ - layer = 3; pixel_x = 5; pixel_y = 9 }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index b6728158e3300..d9bd0c6bfeed7 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -65,8 +65,7 @@ dir = 4 }, /obj/structure/window/reinforced/survival_pod{ - dir = 8; - icon_state = "pwindow" + dir = 8 }, /obj/machinery/door/poddoor{ id = "lifebring" @@ -88,8 +87,7 @@ /area/ruin/powered/seedvault) "dX" = ( /obj/machinery/light/broken{ - dir = 1; - icon_state = "tube-broken" + dir = 1 }, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/sink{ @@ -175,8 +173,7 @@ dir = 1 }, /obj/structure/chair/office{ - dir = 4; - icon_state = "officechair_dark" + dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -193,9 +190,7 @@ /turf/open/floor/grass, /area/ruin/powered/seedvault) "ja" = ( -/obj/structure/chair/office{ - icon_state = "officechair_dark" - }, +/obj/structure/chair/office, /obj/structure/sign/warning/vacuum{ pixel_x = 33 }, @@ -361,8 +356,7 @@ /area/ruin/powered/seedvault) "os" = ( /obj/structure/chair/office{ - dir = 1; - icon_state = "officechair_dark" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/grass, @@ -426,8 +420,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/old, /obj/machinery/light/small/broken{ - dir = 8; - icon_state = "bulb-broken" + dir = 8 }, /turf/open/floor/pod, /area/ruin/powered/seedvault) @@ -464,7 +457,7 @@ /area/ruin/powered/seedvault) "sN" = ( /obj/machinery/smartfridge, -/turf/closed/wall/mineral/titanium/survival/nodiagonal, +/turf/open/floor/pod, /area/ruin/powered/seedvault) "sU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -499,23 +492,20 @@ /obj/item/pickaxe, /obj/structure/rack, /obj/machinery/light/small/broken{ - dir = 1; - icon_state = "bulb-broken" + dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ruin/powered/seedvault) "wa" = ( /obj/machinery/computer/shuttle_flight{ - dir = 4; - icon_state = "computer-0" + dir = 4 }, /turf/open/floor/pod/light, /area/ruin/powered/seedvault) "wP" = ( /obj/structure/chair/office{ - dir = 8; - icon_state = "officechair_dark" + dir = 8 }, /obj/structure/sink{ dir = 1; @@ -525,8 +515,7 @@ /area/ruin/powered/seedvault) "wW" = ( /obj/machinery/light/broken{ - dir = 1; - icon_state = "tube-broken" + dir = 1 }, /obj/effect/turf_decal/loading_area{ dir = 1 @@ -534,9 +523,7 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "xB" = ( -/obj/machinery/light/broken{ - icon_state = "tube-broken" - }, +/obj/machinery/light/broken, /obj/structure/closet/crate/hydroponics, /obj/item/melee/flyswatter, /obj/item/honey_frame, @@ -576,8 +563,7 @@ /area/ruin/powered/seedvault) "yG" = ( /obj/structure/chair/office{ - dir = 8; - icon_state = "officechair_dark" + dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -769,8 +755,7 @@ /area/lavaland/surface/outdoors) "Gm" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb" + dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -807,8 +792,7 @@ /area/lavaland/surface/outdoors) "Ih" = ( /obj/machinery/light/broken{ - dir = 8; - icon_state = "tube-broken" + dir = 8 }, /obj/structure/table, /obj/item/gun/energy/floragun, @@ -854,8 +838,7 @@ /area/ruin/powered/seedvault) "Jg" = ( /obj/machinery/light/broken{ - dir = 8; - icon_state = "tube-broken" + dir = 8 }, /obj/machinery/chem_master/condimaster, /obj/structure/sign/poster/ripped{ @@ -869,9 +852,7 @@ /turf/open/floor/grass, /area/ruin/powered/seedvault) "JD" = ( -/obj/machinery/light/broken{ - icon_state = "tube-broken" - }, +/obj/machinery/light/broken, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, @@ -941,9 +922,7 @@ /turf/open/floor/pod, /area/ruin/powered/seedvault) "Lb" = ( -/obj/machinery/light/broken{ - icon_state = "tube-broken" - }, +/obj/machinery/light/broken, /obj/machinery/chem_dispenser/mutagensaltpeter, /turf/open/floor/pod, /area/ruin/powered/seedvault) @@ -1069,14 +1048,6 @@ /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/retaliate/frog{ attacked_sound = 'sound/effects/huuu.ogg'; - density = 0; - desc = "It seems a little sad."; - head_icon = 'icons/mob/pets_held.dmi'; - held_state = ""; - icon = 'icons/mob/animal.dmi'; - icon_dead = "frog_dead"; - icon_living = "frog"; - icon_state = "frog"; name = "Phyllis "; pixel_y = 12; stepped_sound = null @@ -1091,8 +1062,7 @@ /area/ruin/powered/seedvault) "NL" = ( /obj/structure/shuttle/engine/huge{ - dir = 4; - icon_state = "huge_engine" + dir = 4 }, /turf/template_noop/open, /area/lavaland/surface/outdoors) @@ -1118,8 +1088,7 @@ /area/ruin/powered/seedvault) "Po" = ( /obj/machinery/computer/monitor/secret{ - dir = 4; - icon_state = "computer-0" + dir = 4 }, /turf/open/floor/pod/light, /area/ruin/powered/seedvault) @@ -1135,8 +1104,7 @@ /area/ruin/powered/seedvault) "Pv" = ( /obj/structure/chair/office{ - dir = 8; - icon_state = "officechair_dark" + dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -1150,9 +1118,7 @@ /turf/open/floor/grass, /area/ruin/powered/seedvault) "PU" = ( -/obj/machinery/light/small{ - icon_state = "bulb" - }, +/obj/machinery/light/small, /obj/structure/table, /obj/item/circuitboard/machine/plantgenes{ pixel_x = -6; @@ -1270,8 +1236,7 @@ /area/ruin/powered/seedvault) "SC" = ( /obj/machinery/light/broken{ - dir = 1; - icon_state = "tube-broken" + dir = 1 }, /obj/effect/decal/cleanable/dirt, /obj/structure/extinguisher_cabinet{ @@ -1334,8 +1299,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small/broken{ - dir = 8; - icon_state = "bulb-broken" + dir = 8 }, /turf/open/floor/plating, /area/ruin/powered/seedvault) @@ -1384,8 +1348,7 @@ pixel_y = 14 }, /obj/machinery/light/broken{ - dir = 4; - icon_state = "tube-broken" + dir = 4 }, /turf/open/floor/pod, /area/ruin/powered/seedvault) @@ -1435,8 +1398,7 @@ /area/ruin/powered/seedvault) "Zi" = ( /obj/machinery/light/broken{ - dir = 1; - icon_state = "tube-broken" + dir = 1 }, /obj/structure/closet/crate/hydroponics, /obj/item/melee/flyswatter, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index d3315b5a07bee..ccd5c580b5f42 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -2045,9 +2045,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "iU" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, @@ -2091,9 +2089,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/ruin/unpowered/syndicate_lava_base/dormitories) "ja" = ( /obj/effect/turf_decal/stripes/red/corner{ diff --git a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm index 06d8b25323d77..1ab5c49591a29 100644 --- a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm +++ b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm @@ -215,7 +215,7 @@ /area/ruin/space/has_grav/powered/macspace) "aU" = ( /obj/machinery/smartfridge/food, -/turf/closed/wall, +/turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/powered/macspace) "aV" = ( /obj/item/bedsheet/patriot, diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index e7833d088dc3e..03e7de95c4eab 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -2260,7 +2260,7 @@ /area/ruin/space/derelict/medical/chapel) "hG" = ( /obj/machinery/door/morgue{ - name = "coffin storage"; + name = "coffin Storage"; req_access_txt = "22" }, /turf/open/floor/iron/dark, diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index 6c2ec699fa637..ab18c9e534dfc 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -863,7 +863,7 @@ /obj/machinery/door/airlock/public/glass, /obj/machinery/door/poddoor{ id = "bigderelictcheckpoint"; - name = "checkpoint security doors" + name = "checkpoint Security Doors" }, /obj/structure/cable/yellow{ icon_state = "4-8" diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm index 087e462d7f643..5bae30eefbee6 100644 --- a/_maps/RandomRuins/SpaceRuins/bus.dmm +++ b/_maps/RandomRuins/SpaceRuins/bus.dmm @@ -184,8 +184,7 @@ /area/ruin/unpowered/no_grav) "aM" = ( /obj/structure/fluff/bus/passable{ - icon_state = "bottomdoor"; - layer = 3 + icon_state = "bottomdoor" }, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) diff --git a/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm b/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm index 4c41e9595d348..028e4dfb1933c 100644 --- a/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm +++ b/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm @@ -6,8 +6,7 @@ /turf/closed/wall/r_wall, /area/ruin/space/has_grav/powered/ancient_shuttle) "ac" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/iron, /area/ruin/space/has_grav/powered/ancient_shuttle) "ad" = ( @@ -18,8 +17,7 @@ /turf/closed/wall/r_wall, /area/ruin/space/has_grav/powered/ancient_shuttle) "af" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/powered/ancient_shuttle) "an" = ( diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm index 75fe34848238d..d665d7f8dc707 100644 --- a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm +++ b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm @@ -340,8 +340,7 @@ /area/ruin/space/has_grav/gasthelizard) "X" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 diff --git a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm index 0f4d4739b4100..fd689a7b13664 100644 --- a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm +++ b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm @@ -145,7 +145,7 @@ /area/ruin/space/has_grav/hilbertresearchfacility) "z" = ( /obj/machinery/door/airlock/vault{ - name = "secured door"; + name = "secured Door"; req_access = 207 }, /obj/effect/mapping_helpers/airlock/locked, diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 8fd470381dd21..a8432f71eae07 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -9,9 +9,7 @@ /turf/closed/wall, /area/ruin/space/has_grav/listeningstation) "ad" = ( -/obj/machinery/computer/message_monitor{ - dir = 2 - }, +/obj/machinery/computer/message_monitor, /obj/machinery/airalarm/syndicate{ pixel_y = 24; dir = 1 @@ -24,7 +22,6 @@ "ae" = ( /obj/structure/table/reinforced, /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, @@ -62,9 +59,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "ak" = ( -/obj/machinery/telecomms/relay/preset/ruskie{ - use_power = 0 - }, +/obj/machinery/telecomms/relay/preset/ruskie, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) @@ -196,8 +191,7 @@ /area/ruin/space/has_grav/listeningstation) "aC" = ( /obj/structure/rack{ - dir = 8; - layer = 2.9 + dir = 8 }, /obj/item/mining_scanner, /obj/item/pickaxe, @@ -212,29 +206,16 @@ oxygentanks = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/listeningstation) "aF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/closed/wall/r_wall, /area/ruin/space/has_grav/listeningstation) "aG" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 8; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ + dir = 8 }, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/listeningstation) @@ -273,53 +254,32 @@ /area/ruin/space/has_grav/listeningstation) "aP" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "aQ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "aR" = ( /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/machinery/door/airlock{ name = "Personal Quarters" }, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "aS" = ( /obj/effect/decal/cleanable/dirt, -/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/turf_decal/tile/red{ dir = 4 }, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "aY" = ( @@ -338,11 +298,8 @@ /area/ruin/space/has_grav/listeningstation) "ba" = ( /obj/structure/chair/stool, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) @@ -356,13 +313,8 @@ pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "bc" = ( @@ -373,36 +325,29 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "bd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "be" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -29 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "bf" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, /turf/open/floor/iron/white/corner, /area/ruin/space/has_grav/listeningstation) "bg" = ( -/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/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron/white/side, /area/ruin/space/has_grav/listeningstation) "bh" = ( @@ -422,12 +367,8 @@ /obj/effect/turf_decal/caution/red{ dir = 8 }, -/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/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "bl" = ( @@ -445,7 +386,7 @@ /area/ruin/space/has_grav/listeningstation) "bm" = ( /obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "bn" = ( @@ -455,15 +396,11 @@ "bo" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, -/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/medical/glass{ name = "Medbay" }, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/ruin/space/has_grav/listeningstation) "bp" = ( @@ -473,12 +410,8 @@ /obj/machinery/door/airlock{ name = "Cabin" }, -/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/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "bq" = ( @@ -500,13 +433,13 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/power/apc/syndicate{ dir = 4; name = "Syndicate Listening Post APC"; pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "bs" = ( @@ -517,23 +450,14 @@ }, /obj/item/reagent_containers/blood/OMinus, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /turf/open/floor/iron/white/side{ dir = 9 }, /area/ruin/space/has_grav/listeningstation) "bt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, /turf/open/floor/iron/white/side{ dir = 5 @@ -562,8 +486,8 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "bz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "bA" = ( @@ -587,7 +511,7 @@ pixel_y = -24 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /turf/open/floor/iron/white/side{ @@ -606,9 +530,9 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "bF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/meter, /obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "bH" = ( @@ -654,41 +578,25 @@ req_access_txt = "150"; specialfunctions = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "fA" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "fS" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "hl" = ( @@ -727,13 +635,9 @@ /turf/open/floor/carpet/grimy, /area/ruin/space/has_grav/listeningstation) "ik" = ( -/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/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "iF" = ( @@ -778,13 +682,10 @@ /area/ruin/space/has_grav/listeningstation) "qI" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "vL" = ( @@ -792,19 +693,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) -"vT" = ( -/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/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/listeningstation) "yt" = ( /obj/structure/chair/office{ dir = 8 @@ -812,27 +700,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) -"AP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/listeningstation) "BF" = ( /obj/effect/mob_spawn/human/lavaland_syndicate/comms/space{ assignedrole = "Space Syndicate"; dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, /turf/open/floor/carpet/grimy, /area/ruin/space/has_grav/listeningstation) @@ -841,8 +715,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "Dl" = ( @@ -863,46 +737,30 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/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/effect/baseturf_helper/asteroid/airless, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "Kq" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/carpet/grimy, /area/ruin/space/has_grav/listeningstation) "Lc" = ( /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 = "E.V.A. Equipment"; req_access_txt = "150" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "QK" = ( @@ -916,21 +774,13 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, -/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/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "TB" = ( @@ -960,32 +810,21 @@ "VE" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, -/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 = "Telecommunications"; req_access_txt = "150" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "WI" = ( -/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/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/effect/mapping_helpers/simple_pipes/supply/hidden, +/obj/effect/mapping_helpers/simple_pipes/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "XP" = ( @@ -1000,8 +839,8 @@ /area/ruin/space/has_grav/listeningstation) "YJ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) @@ -1936,10 +1775,10 @@ ab ac ae YJ -AP +ik ik VE -vT +WI bc ac bq diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm index a42211653c6d0..b9cace72a2efc 100644 --- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm +++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm @@ -196,7 +196,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "meow"; - name = "kitty protection door" + name = "kitty Protection Door" }, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/cat_man) @@ -204,10 +204,10 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/preopen{ id = "meow"; - name = "kitty protection door" + name = "kitty Protection Door" }, /obj/machinery/door/window{ - name = "kitty door"; + name = "kitty Door"; req_access_txt = "200" }, /turf/open/floor/plating, @@ -278,10 +278,10 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/preopen{ id = "meow"; - name = "kitty protection door" + name = "kitty Protection Door" }, /obj/machinery/door/window/westleft{ - name = "kitty door"; + name = "kitty Door"; req_access_txt = "200" }, /turf/open/floor/plating, @@ -439,10 +439,10 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/preopen{ id = "meow"; - name = "kitty protection door" + name = "kitty Protection Door" }, /obj/machinery/door/window/northleft{ - name = "kitty door"; + name = "kitty Door"; req_access_txt = "200" }, /turf/open/floor/plating, diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 673788888b36f..2cbc3bbbe923c 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -2541,9 +2541,7 @@ "hU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme{ - layer = 5 - }, +/obj/item/reagent_containers/food/condiment/enzyme, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm index 2b12ac4acde53..a61b507f17af5 100644 --- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm @@ -96,7 +96,7 @@ "as" = ( /obj/machinery/door/poddoor{ id = "onehalf_drone1ext"; - name = "mining drone bay blast door" + name = "mining Drone Bay Blast Door" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -106,7 +106,7 @@ "at" = ( /obj/machinery/door/poddoor{ id = "onehalf_drone2ext"; - name = "mining drone bay blast door" + name = "mining Drone Bay Blast Door" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -116,7 +116,7 @@ "au" = ( /obj/machinery/door/poddoor/preopen{ id = "onehalf_drone3ext"; - name = "mining drone bay blast door" + name = "mining Drone Bay Blast Door" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -126,7 +126,7 @@ "av" = ( /obj/machinery/door/poddoor{ id = "onehalf_drone4ext"; - name = "mining drone bay blast door" + name = "mining Drone Bay Blast Door" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -236,7 +236,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor{ id = "onehalf_drone1int"; - name = "mining drone bay blast door" + name = "mining Drone Bay Blast Door" }, /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf/drone_bay) @@ -244,7 +244,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor{ id = "onehalf_drone2int"; - name = "mining drone bay blast door" + name = "mining Drone Bay Blast Door" }, /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf/drone_bay) @@ -252,7 +252,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor{ id = "onehalf_drone3int"; - name = "mining drone bay blast door" + name = "mining Drone Bay Blast Door" }, /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf/drone_bay) @@ -260,7 +260,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor{ id = "onehalf_drone4int"; - name = "mining drone bay blast door" + name = "mining Drone Bay Blast Door" }, /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf/drone_bay) @@ -733,7 +733,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridge_onehalf"; - name = "bridge blast door" + name = "bridge Blast Door" }, /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf/bridge) @@ -822,7 +822,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge_onehalf"; - name = "bridge blast door" + name = "bridge Blast Door" }, /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf/bridge) @@ -875,7 +875,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge_onehalf"; - name = "bridge blast door" + name = "bridge Blast Door" }, /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf/bridge) @@ -930,7 +930,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge_onehalf"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -965,7 +965,7 @@ "cG" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge_onehalf"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/machinery/door/airlock/command/glass{ name = "Bridge" @@ -1055,7 +1055,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge_onehalf"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -1125,7 +1125,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge_onehalf"; - name = "bridge blast door" + name = "bridge Blast Door" }, /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf/bridge) @@ -1139,7 +1139,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge_onehalf"; - name = "bridge blast door" + name = "bridge Blast Door" }, /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf/bridge) @@ -1153,7 +1153,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge_onehalf"; - name = "bridge blast door" + name = "bridge Blast Door" }, /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf/bridge) diff --git a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm index 2a835a0a44837..433a0e5099c83 100644 --- a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm +++ b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm @@ -18,7 +18,6 @@ /area/ruin/space/has_grav/storage/materials3) "af" = ( /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 4 }, /turf/open/floor/iron, @@ -26,7 +25,6 @@ "ag" = ( /obj/item/storage/pill_bottle, /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 4 }, /turf/open/floor/iron, @@ -48,14 +46,12 @@ /area/ruin/space/has_grav/storage/materials3) "ak" = ( /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 1 }, /turf/open/floor/iron, /area/ruin/space/has_grav/storage/materials2) "al" = ( /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -73,7 +69,6 @@ /area/ruin/space/has_grav/storage/materials2) "ao" = ( /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -113,7 +108,6 @@ "av" = ( /obj/structure/falsewall/reinforced, /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 1 }, /turf/open/floor/iron, @@ -147,7 +141,6 @@ /area/ruin/space/has_grav/storage/materials2) "aA" = ( /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 4 }, /turf/open/floor/iron, @@ -155,7 +148,6 @@ "aB" = ( /obj/machinery/door/airlock/highsecurity, /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 4 }, /obj/effect/mapping_helpers/airlock/locked, @@ -278,7 +270,6 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 1 }, /turf/open/floor/iron, @@ -384,7 +375,6 @@ /area/ruin/space/has_grav/storage/central) "bt" = ( /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 10 }, /turf/open/floor/iron, @@ -394,7 +384,6 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 9 }, /obj/effect/decal/cleanable/dirt/dust, @@ -406,7 +395,6 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 6 }, /obj/structure/cable{ @@ -446,7 +434,6 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/storage/central2) "bD" = ( -/obj/structure/table/wood/fancy/red, /obj/structure/table/wood/fancy/cyan, /obj/item/storage/lockbox/dueling{ req_access = null @@ -513,7 +500,6 @@ icon_state = "1-8" }, /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 1 }, /turf/open/floor/iron, @@ -523,7 +509,6 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 8 }, /turf/open/floor/iron, @@ -533,7 +518,6 @@ icon_state = "1-8" }, /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 8 }, /turf/open/floor/iron, @@ -547,7 +531,6 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 1 }, /obj/effect/mapping_helpers/airlock/locked, @@ -555,7 +538,6 @@ /area/ruin/space/has_grav/storage/power1) "bQ" = ( /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 8 }, /turf/open/floor/iron, @@ -573,7 +555,6 @@ /area/ruin/space/has_grav/storage/central2) "bT" = ( /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, @@ -588,13 +569,6 @@ }, /turf/open/floor/iron, /area/ruin/space/has_grav/storage/power3) -"bV" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/item/melee, -/turf/open/floor/iron, -/area/ruin/space/has_grav/storage/central2) "bW" = ( /obj/machinery/door/airlock/hatch, /turf/open/floor/iron, @@ -631,7 +605,6 @@ "cc" = ( /obj/machinery/door/airlock/highsecurity, /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/locked, @@ -646,10 +619,6 @@ /obj/item/crowbar/red, /turf/open/floor/iron, /area/ruin/space/has_grav/storage/central) -"cf" = ( -/obj/item/melee, -/turf/open/floor/iron, -/area/ruin/space/has_grav/storage/central2) "cg" = ( /obj/structure/closet/crate/internals, /turf/open/floor/iron, @@ -673,7 +642,6 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/storage/central2) "cl" = ( -/obj/structure/table/wood/fancy/blue, /obj/structure/table/wood/fancy/purple, /obj/item/assembly/signaler/anomaly, /turf/open/floor/iron, @@ -688,7 +656,6 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood/footprints{ - icon_state = "blood1"; dir = 1 }, /obj/structure/cable{ @@ -751,7 +718,6 @@ /area/ruin/space/has_grav/storage/materials2) "cy" = ( /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 8 }, /obj/effect/decal/cleanable/vomit, @@ -1559,7 +1525,7 @@ bk bB bC bC -cf +bC cj bk aO @@ -1653,7 +1619,7 @@ bg Wu bo bR -bV +bR bR bR bR diff --git a/_maps/RandomRuins/SpaceRuins/sos1.dmm b/_maps/RandomRuins/SpaceRuins/sos1.dmm index e679d1ba02663..2c017abc57b29 100644 --- a/_maps/RandomRuins/SpaceRuins/sos1.dmm +++ b/_maps/RandomRuins/SpaceRuins/sos1.dmm @@ -35,8 +35,8 @@ }, /obj/item/storage/pill_bottle/floorpill/full, /obj/effect/mob_spawn/human/corpse/assistant, - /obj/item/storage/secure/briefcase/syndie, - /obj/item/storage/pod{ +/obj/item/storage/secure/briefcase/syndie, +/obj/item/storage/pod{ pixel_y = -30 }, /turf/open/floor/mineral/titanium/blue, diff --git a/_maps/RandomRuins/SpaceRuins/sos6.dmm b/_maps/RandomRuins/SpaceRuins/sos6.dmm index d838286b146ac..c8dd9f8414a1a 100644 --- a/_maps/RandomRuins/SpaceRuins/sos6.dmm +++ b/_maps/RandomRuins/SpaceRuins/sos6.dmm @@ -65,7 +65,7 @@ /area/ruin/unpowered) "m" = ( /obj/machinery/door/airlock/vault{ - name = "secured door"; + name = "secured Door"; req_access = 207 }, /obj/structure/fans/tiny, diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 077361f2eee3a..467208977640a 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -3794,8 +3794,7 @@ "yD" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/carpet/grimy, /area/ruin/space/has_grav/hotel/dock) @@ -3917,8 +3916,7 @@ "CQ" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/light/small{ dir = 8 @@ -4030,8 +4028,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/item/gps{ gpstag = "Twin-Nexus Hotel Retreat"; diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm index 66acc088d523a..2af94d934981d 100644 --- a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm +++ b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm @@ -12,7 +12,7 @@ "bg" = ( /obj/machinery/door/poddoor{ id = "oldship_ruin_gun"; - name = "pod bay door" + name = "pod Bay Door" }, /turf/open/floor/plating, /area/ruin/space/has_grav/whiteship/box) diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index 9dd754b815fb1..505fc7a5b8cc1 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -375,7 +375,7 @@ /area/awaymission/cabin) "bg" = ( /obj/machinery/door/window/westleft{ - name = "manager's desk" + name = "Manager's Desk" }, /turf/open/floor/carpet, /area/awaymission/cabin) @@ -1381,7 +1381,7 @@ "eq" = ( /obj/machinery/door/poddoor/shutters{ id = "garage_cabin"; - name = "garage door" + name = "Garage Door" }, /obj/structure/fans/tiny, /turf/open/floor/plating/snowed/temperatre, @@ -1715,7 +1715,6 @@ desc = "It is a ghostly cat."; icon = 'icons/mob/mob.dmi'; icon_state = "catghost"; - layer = 3; max_integrity = 66666; name = "Cat" }, @@ -1861,11 +1860,7 @@ }, /area/awaymission/cabin/caves/mountain) "fZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile{ - desc = "Enjoy the view."; - name = "window" - }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/awaymission/cabin/caves/mountain) "gb" = ( @@ -2183,13 +2178,12 @@ /obj/structure/sign/warning/fire{ pixel_y = 32 }, -/obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/awaymission/cabin) "hg" = ( /obj/machinery/door/airlock/maintenance{ - name = "janitor closet" + name = "Janitor Closet" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -2299,7 +2293,7 @@ /area/awaymission/cabin) "hy" = ( /obj/machinery/door/airlock/maintenance{ - name = "heater storage" + name = "Heater Storage" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -2458,14 +2452,12 @@ /obj/item/claymore/weak/ceremonial{ desc = "Brought to you by the guys in charge of making replica katana toys!"; force = 1; - layer = 3.01; name = "replica claymore"; pixel_x = 5; pixel_y = 8; throwforce = 2 }, /obj/item/shield/riot/roman/fake{ - layer = 3.01; pixel_x = -7 }, /turf/open/floor/plating/asteroid/snow, @@ -3346,9 +3338,7 @@ pixel_x = -1; pixel_y = 13 }, -/obj/item/staff{ - layer = 3.01 - }, +/obj/item/staff, /turf/open/floor/plating/asteroid/snow, /area/awaymission/cabin/caves) "kB" = ( @@ -3363,7 +3353,6 @@ /obj/item/gun/magic/wand{ desc = "It's just a fancy staff so that holy clerics and priests look cool. What? You didn't think someone would leave a REAL magic artifact with a snowman out in the cold, did you?"; icon_state = "revivewand"; - layer = 3.01; name = "holy staff"; pixel_y = -2 }, diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm index 656bad3a4db4b..c02738946b515 100644 --- a/_maps/RandomZLevels/TheBeach.dmm +++ b/_maps/RandomZLevels/TheBeach.dmm @@ -466,14 +466,14 @@ "bs" = ( /obj/machinery/door/airlock/sandstone{ id_tag = "changlinhut2"; - name = "changing room" + name = "Changing Room 2" }, /turf/open/floor/wood, /area/awaymission/beach) "bt" = ( /obj/machinery/door/airlock/sandstone{ id_tag = "changlinhut1"; - name = "changing room" + name = "Changing Room 1" }, /turf/open/floor/wood, /area/awaymission/beach) @@ -702,7 +702,7 @@ "bX" = ( /obj/machinery/door/airlock/sandstone{ id_tag = "toilet1"; - name = "restroom stall" + name = "Restroom 1" }, /obj/effect/turf_decal/sand, /turf/open/floor/iron/white, @@ -710,7 +710,7 @@ "bY" = ( /obj/machinery/door/airlock/sandstone{ id_tag = "toilet2"; - name = "restroom stall" + name = "Restroom 2" }, /obj/effect/turf_decal/sand, /turf/open/floor/iron/white, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index eab720a4ac0e7..2cef09ba236cf 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -12,7 +12,6 @@ /obj/structure/alien/weeds, /obj/structure/alien/resin/wall, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -20,14 +19,12 @@ /obj/structure/alien/weeds, /obj/structure/alien/egg/burst, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "ai" = ( /obj/structure/alien/weeds, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -35,7 +32,6 @@ /obj/structure/alien/weeds, /obj/structure/bed/nest, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -43,14 +39,12 @@ /obj/structure/alien/weeds, /mob/living/simple_animal/hostile/alien, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "am" = ( /obj/structure/alien/weeds/node, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -61,7 +55,6 @@ /obj/item/clothing/mask/facehugger/impregnated, /obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -70,7 +63,6 @@ /obj/structure/alien/resin/wall, /obj/structure/alien/resin/wall, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -81,7 +73,6 @@ /obj/structure/alien/weeds, /mob/living/simple_animal/hostile/alien/sentinel, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -89,7 +80,6 @@ /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -97,7 +87,6 @@ /obj/structure/alien/weeds/node, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -105,28 +94,21 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "aA" = ( -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "aB" = ( /obj/effect/turf_decal/tile/red{ dir = 4 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "aD" = ( /obj/structure/alien/weeds/node, /obj/structure/alien/resin/wall, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -140,7 +122,6 @@ /obj/item/melee/baton/loaded, /obj/item/clothing/head/helmet, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -149,16 +130,13 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "aJ" = ( /obj/structure/alien/weeds, /obj/structure/alien/egg/burst, /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -167,7 +145,6 @@ /obj/structure/alien/egg/burst, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -177,7 +154,6 @@ plants_off = 1 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -185,25 +161,19 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "aP" = ( /obj/machinery/gateway/centeraway{ calibrated = 0 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "aR" = ( /obj/machinery/light{ dir = 4 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "aS" = ( /obj/item/stack/ore/iron{ @@ -211,7 +181,6 @@ pixel_y = -6 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -224,7 +193,6 @@ plants_off = 1 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -235,19 +203,14 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "aZ" = ( /obj/effect/turf_decal/tile/red, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "ba" = ( /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -255,7 +218,6 @@ /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -274,16 +236,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "bh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "bj" = ( /obj/structure/alien/weeds, @@ -294,7 +252,6 @@ /obj/item/clothing/under/syndicate, /obj/item/clothing/glasses/night, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -314,9 +271,7 @@ pixel_x = 2 }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "br" = ( /obj/structure/window/reinforced{ @@ -332,9 +287,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "bs" = ( /obj/machinery/door/window{ @@ -348,9 +301,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "bt" = ( /obj/structure/window/reinforced{ @@ -362,9 +313,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "bu" = ( /obj/structure/window/reinforced{ @@ -376,9 +325,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "bv" = ( /obj/structure/sink{ @@ -388,46 +335,34 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/syndicate) "bw" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/syndicate) "bA" = ( /obj/machinery/light{ dir = 8 }, /obj/structure/chair/stool, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "bB" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "bC" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "bD" = ( -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "bE" = ( /obj/machinery/light{ @@ -439,31 +374,23 @@ req_access_txt = "150" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "bF" = ( /obj/structure/toilet{ dir = 1 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/syndicate) "bO" = ( /obj/machinery/door/airlock/public/glass{ name = "Break Room" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "bP" = ( /obj/effect/spawner/structure/window, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "bQ" = ( /obj/structure/cable{ @@ -474,9 +401,7 @@ name = "Gateway"; req_access_txt = "150" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "bR" = ( /obj/structure/cable{ @@ -492,9 +417,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "bS" = ( /obj/structure/cable{ @@ -507,9 +430,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "bT" = ( /obj/machinery/power/smes{ @@ -520,9 +441,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "bU" = ( /obj/machinery/portable_atmospherics/canister/air, @@ -534,24 +453,19 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "bV" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "bW" = ( /obj/structure/alien/weeds/node, /mob/living/simple_animal/hostile/alien, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -563,7 +477,6 @@ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -577,7 +490,6 @@ }, /obj/structure/alien/weeds, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) @@ -590,7 +502,6 @@ }, /obj/structure/alien/weeds, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -598,7 +509,6 @@ "ca" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -612,7 +522,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched2"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -627,7 +536,6 @@ dir = 4 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -641,7 +549,6 @@ dir = 1 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -654,7 +561,6 @@ dir = 1 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -673,9 +579,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "ck" = ( /obj/machinery/power/terminal{ @@ -687,18 +591,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "cl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "cm" = ( /obj/machinery/light/small{ @@ -710,29 +610,23 @@ /obj/structure/sign/poster/contraband/hacking_guide{ pixel_x = 32 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "cn" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "co" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) "cp" = ( /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) @@ -749,7 +643,6 @@ icon_state = "small" }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) @@ -761,7 +654,6 @@ icon_state = "1-2" }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) @@ -771,7 +663,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -784,25 +675,19 @@ name = "Power Maintenance"; req_access_txt = "150" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "cx" = ( /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "cy" = ( /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "cz" = ( /obj/structure/cable{ @@ -815,9 +700,7 @@ icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "cB" = ( /obj/machinery/space_heater, @@ -825,9 +708,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "cC" = ( /obj/machinery/mineral/processing_unit{ @@ -837,7 +718,6 @@ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -854,7 +734,6 @@ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -866,7 +745,6 @@ /obj/item/shard, /obj/structure/alien/weeds, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) @@ -876,9 +754,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "cN" = ( /obj/structure/cable, @@ -886,9 +762,7 @@ name = "P.A.C.M.A.N.-type portable generator" }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "cO" = ( /obj/structure/cable, @@ -897,30 +771,24 @@ name = "S.U.P.E.R.P.A.C.M.A.N.-type portable generator" }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "cP" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) "cQ" = ( /obj/machinery/conveyor_switch/oneway{ id = "awaysyndie"; - layer = 3.1; name = "mining conveyor" }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -928,7 +796,6 @@ "cR" = ( /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged4"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -946,7 +813,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) @@ -955,9 +821,7 @@ id_tag = "awaydorm5"; name = "Dorm 2" }, -/turf/open/floor/wood{ - heat_capacity = 1e+006 - }, +/turf/open/floor/wood, /area/awaymission/moonoutpost19/syndicate) "cV" = ( /obj/structure/alien/weeds/node, @@ -965,7 +829,6 @@ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -973,7 +836,6 @@ "cW" = ( /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged2"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -982,7 +844,6 @@ "cX" = ( /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged3"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -1000,7 +861,6 @@ }, /turf/open/floor/iron{ dir = 1; - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -1016,21 +876,17 @@ /obj/structure/bed, /obj/item/bedsheet/syndie, /turf/open/floor/wood{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "da" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) "db" = ( -/turf/open/floor/wood{ - heat_capacity = 1e+006 - }, +/turf/open/floor/wood, /area/awaymission/moonoutpost19/syndicate) "dc" = ( /obj/machinery/button/door{ @@ -1042,9 +898,7 @@ }, /obj/structure/dresser, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood{ - heat_capacity = 1e+006 - }, +/turf/open/floor/wood, /area/awaymission/moonoutpost19/syndicate) "dd" = ( /obj/structure/alien/weeds/node, @@ -1052,7 +906,6 @@ plants_off = 1 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -1066,7 +919,6 @@ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -1088,7 +940,6 @@ }, /turf/open/floor/iron{ dir = 1; - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -1102,7 +953,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) @@ -1111,7 +961,6 @@ dir = 4 }, /turf/open/floor/wood{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) @@ -1119,9 +968,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/wood{ - heat_capacity = 1e+006 - }, +/turf/open/floor/wood, /area/awaymission/moonoutpost19/syndicate) "dk" = ( /obj/machinery/airalarm/directional/east{ @@ -1129,16 +976,13 @@ req_access = null; req_access_txt = "150" }, -/turf/open/floor/wood{ - heat_capacity = 1e+006 - }, +/turf/open/floor/wood, /area/awaymission/moonoutpost19/syndicate) "dl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/loading_area, /obj/structure/alien/weeds, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -1149,7 +993,6 @@ dir = 1 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -1159,7 +1002,6 @@ dir = 1 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -1167,7 +1009,6 @@ "do" = ( /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged1"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -1181,7 +1022,6 @@ pixel_y = -32 }, /turf/open/floor/wood{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) @@ -1197,7 +1037,6 @@ }, /obj/item/suppressor, /turf/open/floor/wood{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) @@ -1205,9 +1044,7 @@ /obj/structure/bed, /obj/item/bedsheet/syndie, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood{ - heat_capacity = 1e+006 - }, +/turf/open/floor/wood, /area/awaymission/moonoutpost19/syndicate) "dt" = ( /obj/structure/closet/secure_closet/personal/cabinet{ @@ -1215,9 +1052,7 @@ req_access_txt = "150" }, /obj/item/stack/spacecash/c50, -/turf/open/floor/wood{ - heat_capacity = 1e+006 - }, +/turf/open/floor/wood, /area/awaymission/moonoutpost19/syndicate) "du" = ( /obj/effect/mapping_helpers/airlock/locked, @@ -1230,7 +1065,6 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) @@ -1241,7 +1075,6 @@ pixel_y = -4 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -1256,7 +1089,6 @@ dir = 9 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -1264,7 +1096,6 @@ "dx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) @@ -1278,7 +1109,6 @@ dir = 5 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -1289,7 +1119,6 @@ pixel_y = 9 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -1307,7 +1136,6 @@ dir = 10 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -1319,7 +1147,6 @@ dir = 6 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -1331,7 +1158,6 @@ icon_state = "ltrails_1" }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -1342,7 +1168,6 @@ icon_state = "ltrails_2" }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -1354,7 +1179,6 @@ }, /obj/item/mining_scanner, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -1364,7 +1188,6 @@ }, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -1381,7 +1204,6 @@ dir = 1 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; icon_plating = "asteroidplating"; icon_state = "asteroidplating"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; @@ -1391,14 +1213,12 @@ "dJ" = ( /obj/item/storage/bag/ore, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dK" = ( /obj/item/pickaxe/drill, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -1407,7 +1227,6 @@ dir = 1 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; icon_plating = "asteroidplating"; icon_state = "asteroidplating"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; @@ -1416,7 +1235,6 @@ /area/awaymission/moonoutpost19/syndicate) "dM" = ( /turf/open/floor/plating{ - heat_capacity = 1e+006; icon_plating = "asteroidplating"; icon_state = "asteroidplating"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; @@ -1429,7 +1247,6 @@ pixel_y = -4 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -1443,7 +1260,6 @@ /obj/item/clothing/head/helmet/space/syndicate/orange, /obj/item/clothing/mask/facehugger/impregnated, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -1451,14 +1267,12 @@ /obj/structure/alien/weeds, /obj/structure/alien/resin/wall, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dQ" = ( /obj/structure/alien/weeds/node, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -1469,14 +1283,12 @@ plants_off = 1 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) "dT" = ( /obj/structure/alien/weeds, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -1484,14 +1296,12 @@ /obj/structure/alien/weeds/node, /obj/structure/alien/resin/wall, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "dY" = ( /obj/machinery/light/small, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/research) @@ -1505,18 +1315,15 @@ /obj/machinery/door/poddoor/preopen{ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id = "Awaybiohazard"; - name = "Acid-Proof biohazard containment door" + name = "Acid-Proof Biohazard Containment" }, /obj/machinery/door/poddoor{ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id = "Awaybiohazard"; - layer = 2.9; - name = "Acid-Proof biohazard containment door" + name = "Acid-Proof Biohazard Containment" }, /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "ec" = ( /obj/structure/sign/warning/biohazard, @@ -1528,17 +1335,13 @@ /area/awaymission/moonoutpost19/research) "ee" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "ef" = ( /obj/structure/chair{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "eg" = ( /obj/machinery/atmospherics/components/unary/portables_connector{ @@ -1546,17 +1349,14 @@ }, /obj/machinery/portable_atmospherics/canister, /obj/structure/alien/weeds, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "eh" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4 }, /turf/open/floor/iron/white/side{ - dir = 4; - heat_capacity = 1e+006 + dir = 4 }, /area/awaymission/moonoutpost19/research) "ei" = ( @@ -1577,9 +1377,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "ek" = ( /obj/structure/cable{ @@ -1592,9 +1390,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "el" = ( /obj/structure/alien/weeds, @@ -1651,18 +1447,14 @@ /turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/research) "eu" = ( -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "ev" = ( /obj/machinery/light/small/broken{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "ex" = ( /obj/structure/cable{ @@ -1685,9 +1477,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "ez" = ( /obj/structure/cable{ @@ -1696,13 +1486,11 @@ /obj/machinery/door/poddoor/preopen{ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id = "Awaylab"; - name = "Acid-Proof containment chamber blast door" + name = "Acid-Proof Containment Chamber" }, /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "eA" = ( /obj/structure/sign/warning/electricshock, @@ -1729,15 +1517,11 @@ /turf/closed/wall/rust, /area/awaymission/moonoutpost19/research) "eK" = ( -/turf/open/floor/iron/white/side{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white/side, /area/awaymission/moonoutpost19/research) "eL" = ( /obj/structure/alien/weeds, -/turf/open/floor/iron/white/side{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white/side, /area/awaymission/moonoutpost19/research) "eM" = ( /obj/machinery/light/small/broken{ @@ -1748,8 +1532,7 @@ network = list("mo19","mo19r") }, /turf/open/floor/iron/white/side{ - dir = 6; - heat_capacity = 1e+006 + dir = 6 }, /area/awaymission/moonoutpost19/research) "eN" = ( @@ -1780,18 +1563,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "eP" = ( /obj/structure/closet/l3closet, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "eQ" = ( /obj/structure/alien/weeds, @@ -1805,9 +1584,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "eU" = ( /obj/machinery/space_heater, @@ -1817,9 +1594,7 @@ /obj/structure/sign/poster/official/build{ pixel_y = 32 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "eV" = ( /obj/machinery/power/terminal{ @@ -1833,9 +1608,7 @@ req_access = null; dir = 1 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "eW" = ( /obj/structure/cable{ @@ -1847,26 +1620,20 @@ inputting = 0; output_level = 15000 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "eX" = ( /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "eY" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/item/newspaper, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fa" = ( /obj/structure/cable{ @@ -1877,17 +1644,13 @@ dir = 8; icon_state = "ltrails_1" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fb" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fc" = ( /obj/structure/cable{ @@ -1901,9 +1664,7 @@ dir = 8; icon_state = "ltrails_1" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fd" = ( /obj/structure/cable{ @@ -1917,9 +1678,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "fe" = ( /obj/structure/sign/warning/securearea{ @@ -1930,18 +1689,14 @@ }, /obj/structure/alien/weeds, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "ff" = ( /obj/structure/table, /obj/machinery/reagentgrinder, /obj/structure/alien/weeds, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "fg" = ( /obj/structure/table, @@ -1955,9 +1710,7 @@ dir = 1 }, /obj/structure/alien/weeds, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "fh" = ( /obj/machinery/firealarm{ @@ -1970,9 +1723,7 @@ }, /obj/item/storage/box/syringes, /obj/structure/alien/weeds, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "fi" = ( /obj/structure/closet/crate/freezer, @@ -1980,9 +1731,7 @@ /obj/item/clothing/mask/facehugger/impregnated, /obj/item/xenos_claw, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "fj" = ( /obj/machinery/door/firedoor, @@ -1990,9 +1739,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "fk" = ( /turf/open/floor/iron/white, @@ -2011,9 +1758,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "fn" = ( /obj/structure/cable, @@ -2023,12 +1768,10 @@ /obj/machinery/door/poddoor/preopen{ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id = "Awaylab"; - name = "Acid-Proof containment chamber blast door" + name = "Acid-Proof Containment Chamber" }, /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fp" = ( /obj/structure/alien/weeds, @@ -2040,9 +1783,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fr" = ( /obj/structure/cable{ @@ -2053,25 +1794,19 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fs" = ( /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fu" = ( /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fv" = ( /obj/structure/extinguisher_cabinet{ @@ -2085,9 +1820,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "fw" = ( /obj/structure/cable{ @@ -2098,9 +1831,7 @@ }, /obj/structure/alien/weeds, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "fx" = ( /obj/structure/cable{ @@ -2116,26 +1847,20 @@ req_access_txt = "201"; set_obj_flags = "EMAGGED" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "fy" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "fz" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "fA" = ( /obj/structure/cable{ @@ -2145,9 +1870,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "fB" = ( /obj/structure/cable{ @@ -2181,15 +1904,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "fE" = ( /obj/machinery/door/poddoor/preopen{ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id = "Awaylab"; - name = "Acid-Proof containment chamber blast door" + name = "Acid-Proof Containment Chamber" }, /obj/machinery/atmospherics/pipe/simple/general/visible{ desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; @@ -2259,26 +1980,18 @@ /area/awaymission/moonoutpost19/research) "fL" = ( /obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fM" = ( /obj/item/cigbutt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fN" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fO" = ( -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fP" = ( /obj/structure/cable{ @@ -2287,18 +2000,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fQ" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fR" = ( /obj/structure/cable{ @@ -2308,24 +2017,18 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/oil, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fV" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "fW" = ( /obj/structure/alien/weeds, /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "fX" = ( /obj/structure/sign/warning/biohazard{ @@ -2336,17 +2039,13 @@ }, /obj/structure/alien/weeds, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "fY" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "fZ" = ( /obj/machinery/door/firedoor, @@ -2356,9 +2055,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "ga" = ( /obj/structure/window/reinforced{ @@ -2369,9 +2066,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "gb" = ( /obj/structure/cable{ @@ -2381,14 +2076,12 @@ /obj/machinery/door/poddoor/preopen{ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id = "Awaylab"; - name = "Acid-Proof containment chamber blast door" + name = "Acid-Proof Containment Chamber" }, /obj/item/stack/cable_coil/cut/red{ amount = 1 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "gc" = ( /obj/structure/alien/weeds, @@ -2401,27 +2094,21 @@ /area/awaymission/moonoutpost19/research) "gf" = ( /obj/structure/chair/stool, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "gh" = ( /obj/effect/decal/cleanable/oil, /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "gk" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Post"; req_access_txt = "201" }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "gl" = ( /obj/effect/decal/cleanable/blood/tracks{ @@ -2431,9 +2118,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "gm" = ( /obj/structure/cable{ @@ -2445,9 +2130,7 @@ }, /obj/structure/alien/weeds, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "gn" = ( /obj/structure/table, @@ -2462,26 +2145,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "go" = ( /obj/structure/alien/weeds/node, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "gp" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "gq" = ( /obj/structure/table, @@ -2492,9 +2169,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "gr" = ( /obj/structure/sink{ @@ -2515,9 +2190,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "gt" = ( /obj/structure/cable{ @@ -2531,13 +2204,11 @@ /obj/machinery/door/poddoor/preopen{ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id = "Awaylab"; - name = "Acid-Proof containment chamber blast door" + name = "Acid-Proof Containment Chamber" }, /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "gu" = ( /obj/structure/disposalpipe/segment{ @@ -2564,47 +2235,35 @@ /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /obj/item/radio/off, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "gy" = ( /obj/machinery/light/small, /obj/structure/closet/toolcloset, /obj/item/clothing/gloves/color/yellow, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "gz" = ( /obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "gA" = ( /obj/machinery/computer/monitor/secret{ dir = 1 }, /obj/structure/cable, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "gC" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "gE" = ( /obj/structure/grille/broken, /obj/item/stack/rods, /obj/item/stack/rods, /obj/item/shard, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "gF" = ( /obj/effect/decal/cleanable/blood/tracks{ @@ -2615,9 +2274,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "gG" = ( /obj/structure/cable, @@ -2630,9 +2287,7 @@ start_charge = 100 }, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "gH" = ( /obj/structure/table, @@ -2675,24 +2330,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "gL" = ( /obj/structure/cable, /obj/machinery/door/poddoor/preopen{ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id = "Awaylab"; - name = "Acid-Proof containment chamber blast door" + name = "Acid-Proof Containment Chamber" }, /obj/structure/cable{ icon_state = "0-2" }, /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "gM" = ( /obj/structure/disposalpipe/segment{ @@ -2704,17 +2355,13 @@ /area/awaymission/moonoutpost19/research) "gP" = ( /obj/structure/chair/office, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "gR" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "gS" = ( /obj/machinery/light/broken{ @@ -2726,16 +2373,13 @@ req_access = null }, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "gT" = ( /obj/structure/table/optable, /obj/structure/alien/weeds, /turf/open/floor/iron/white/side{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/moonoutpost19/research) "gU" = ( @@ -2744,8 +2388,7 @@ }, /obj/structure/alien/weeds, /turf/open/floor/iron/white/side{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/moonoutpost19/research) "gV" = ( @@ -2755,8 +2398,7 @@ /obj/item/clothing/suit/apron/surgical, /obj/structure/alien/weeds, /turf/open/floor/iron/white/side{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/moonoutpost19/research) "gW" = ( @@ -2778,9 +2420,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "gZ" = ( /obj/machinery/shieldwallgen{ @@ -2788,9 +2428,7 @@ req_access = null }, /obj/structure/cable, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "ha" = ( /obj/structure/disposaloutlet{ @@ -2831,38 +2469,29 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "he" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "hf" = ( /obj/structure/cable{ icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "hj" = ( -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "hk" = ( /obj/structure/alien/weeds, /obj/structure/alien/egg, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/hive) @@ -2870,9 +2499,7 @@ /obj/machinery/vending/medical{ req_access_txt = "201" }, -/turf/open/floor/iron/white/side{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white/side, /area/awaymission/moonoutpost19/research) "hn" = ( /obj/structure/closet/crate/bin, @@ -2882,16 +2509,13 @@ /obj/machinery/light/small/broken{ dir = 1 }, -/turf/open/floor/iron/white/side{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white/side, /area/awaymission/moonoutpost19/research) "ho" = ( /obj/structure/table, /obj/item/storage/box/gloves, /turf/open/floor/iron/white/corner{ - dir = 8; - heat_capacity = 1e+006 + dir = 8 }, /area/awaymission/moonoutpost19/research) "hq" = ( @@ -2944,27 +2568,20 @@ "hu" = ( /obj/machinery/door/poddoor{ id = "AwayRD"; - layer = 2.9; - name = "privacy shutter" + name = "Privacy Shutter" }, /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "hv" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "hw" = ( /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "hx" = ( /obj/structure/grille/broken, @@ -2973,18 +2590,14 @@ /obj/item/shard{ icon_state = "medium" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "hy" = ( /obj/item/stack/rods, /obj/item/shard{ icon_state = "small" }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "hz" = ( /obj/effect/decal/cleanable/robot_debris, @@ -3002,9 +2615,7 @@ pixel_y = -2 }, /obj/item/bodypart/l_arm/robot, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "hA" = ( /obj/structure/table, @@ -3014,8 +2625,7 @@ pixel_x = 28 }, /turf/open/floor/iron/white/side{ - dir = 8; - heat_capacity = 1e+006 + dir = 8 }, /area/awaymission/moonoutpost19/research) "hB" = ( @@ -3058,24 +2668,18 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "hF" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "hG" = ( /obj/machinery/door/airlock/research/glass{ name = "Research Storage"; req_access_txt = "201" }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "hH" = ( /obj/structure/table, @@ -3087,8 +2691,7 @@ req_access = null }, /turf/open/floor/iron/white/side{ - dir = 8; - heat_capacity = 1e+006 + dir = 8 }, /area/awaymission/moonoutpost19/research) "hI" = ( @@ -3099,9 +2702,7 @@ /area/awaymission/moonoutpost19/arrivals) "hL" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "hM" = ( /obj/structure/chair, @@ -3114,19 +2715,15 @@ /obj/machinery/door/poddoor{ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id = "Awaybiohazard"; - layer = 2.9; - name = "Acid-Proof biohazard containment door" + name = "Acid-Proof Biohazard Containment" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "hO" = ( /obj/structure/table, /turf/open/floor/iron/white/side{ - dir = 8; - heat_capacity = 1e+006 + dir = 8 }, /area/awaymission/moonoutpost19/research) "hP" = ( @@ -3137,25 +2734,19 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "hQ" = ( /obj/machinery/door/airlock{ name = "Unit 2" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "hR" = ( /obj/structure/urinal{ pixel_y = 29 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "hS" = ( /obj/structure/sink{ @@ -3169,31 +2760,24 @@ pixel_x = 28 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "hT" = ( /obj/machinery/shower{ pixel_y = 16 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "hU" = ( /obj/machinery/shower{ pixel_y = 16 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "hV" = ( /obj/machinery/light/small, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) @@ -3256,9 +2840,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "ic" = ( /obj/structure/rack, @@ -3268,18 +2850,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "id" = ( /obj/structure/rack, /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "ie" = ( /obj/machinery/door/airlock/medical{ @@ -3287,24 +2865,20 @@ req_access_txt = "201" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "if" = ( /obj/structure/closet/l3closet, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/side{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/moonoutpost19/research) "ig" = ( /obj/structure/closet/l3closet, /obj/machinery/light/small/broken, /turf/open/floor/iron/white/side{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/moonoutpost19/research) "ih" = ( @@ -3315,15 +2889,13 @@ pixel_y = -30 }, /turf/open/floor/iron/white/side{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/moonoutpost19/research) "ii" = ( /obj/structure/table, /turf/open/floor/iron/white/corner{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/moonoutpost19/research) "ij" = ( @@ -3335,9 +2907,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "ik" = ( /obj/structure/sink{ @@ -3348,37 +2918,27 @@ icon_state = "mirror_broke"; pixel_x = 28 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "il" = ( /obj/item/soap/nanotrasen, /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "im" = ( -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "in" = ( /obj/machinery/shower{ dir = 8 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "io" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "ip" = ( /obj/structure/table/reinforced, @@ -3414,9 +2974,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "is" = ( /obj/effect/decal/cleanable/blood/tracks{ @@ -3424,9 +2982,7 @@ dir = 8; icon_state = "ltrails_1" }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "it" = ( /obj/item/storage/secure/safe{ @@ -3438,9 +2994,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "iu" = ( /obj/structure/sign/warning/securearea{ @@ -3453,18 +3007,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "iv" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "iw" = ( /obj/structure/toilet{ @@ -3473,49 +3023,37 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "ix" = ( /obj/machinery/door/airlock{ name = "Unit 1" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "iy" = ( /obj/machinery/door/airlock{ name = "Unisex Showers" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "iz" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "iA" = ( /obj/machinery/shower{ dir = 8 }, /obj/item/bikehorn/rubberducky, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "iE" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "iF" = ( /obj/structure/sink{ @@ -3524,17 +3062,13 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/research) "iG" = ( /obj/machinery/door/airlock{ name = "Private Restroom" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/research) "iH" = ( /obj/machinery/computer/security/telescreen/entertainment{ @@ -3572,16 +3106,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "iL" = ( /obj/machinery/light/small, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "iM" = ( /obj/structure/table, @@ -3592,9 +3122,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "iN" = ( /obj/structure/sink{ @@ -3606,9 +3134,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "iO" = ( /obj/structure/closet/emcloset, @@ -3616,17 +3142,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "iP" = ( /obj/machinery/shower{ dir = 1 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "iT" = ( /obj/machinery/computer/security/telescreen/entertainment, @@ -3646,7 +3168,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched2" }, /area/awaymission/moonoutpost19/arrivals) @@ -3658,7 +3179,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched1" }, /area/awaymission/moonoutpost19/arrivals) @@ -3678,15 +3198,12 @@ /obj/structure/toilet{ dir = 1 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/research) "ja" = ( /obj/item/stack/rods, /obj/item/shard, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -3696,31 +3213,24 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jc" = ( /obj/structure/table, /obj/item/book/manual/wiki/detective, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jd" = ( /obj/structure/chair/fancy/comfy{ color = "#666666"; dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "je" = ( /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched2" }, /area/awaymission/moonoutpost19/arrivals) @@ -3736,15 +3246,11 @@ /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) "jl" = ( /obj/structure/chair/stool, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "jm" = ( /obj/structure/table/reinforced, @@ -3759,9 +3265,7 @@ id = "awaykitchen"; name = "Serving Hatch" }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "jn" = ( /obj/effect/decal/cleanable/food/flour, @@ -3785,9 +3289,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/oil, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/research) "jq" = ( /obj/item/kirbyplants{ @@ -3796,37 +3298,28 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched1" }, /area/awaymission/moonoutpost19/arrivals) "jr" = ( /obj/structure/chair, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "js" = ( /obj/structure/chair, /obj/effect/decal/cleanable/generic, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jt" = ( /obj/structure/table, /obj/item/newspaper, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "ju" = ( /obj/structure/chair, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jv" = ( /obj/structure/extinguisher_cabinet{ @@ -3834,7 +3327,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched1" }, /area/awaymission/moonoutpost19/arrivals) @@ -3845,21 +3337,18 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched2" }, /area/awaymission/moonoutpost19/arrivals) "jB" = ( /obj/structure/grille, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) "jC" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) @@ -3867,20 +3356,14 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jF" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jG" = ( -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jH" = ( /obj/structure/cable{ @@ -3894,9 +3377,7 @@ req_access = null; start_charge = 100 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jI" = ( /obj/machinery/airalarm/unlocked{ @@ -3904,27 +3385,21 @@ req_access = null; dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jJ" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jK" = ( /obj/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jL" = ( /obj/structure/noticeboard{ @@ -3933,15 +3408,12 @@ /obj/item/paper/fluff/awaymissions/moonoutpost19/food_specials, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched1" }, /area/awaymission/moonoutpost19/arrivals) "jM" = ( /obj/effect/spawner/structure/window, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "jO" = ( /obj/structure/table/reinforced, @@ -3950,9 +3422,7 @@ id = "awaykitchen"; name = "Serving Hatch" }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "jP" = ( /obj/structure/table, @@ -3988,26 +3458,20 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jU" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jV" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jX" = ( /obj/structure/cable{ @@ -4015,9 +3479,7 @@ }, /obj/item/cigbutt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jY" = ( /obj/machinery/light/small{ @@ -4034,9 +3496,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "jZ" = ( /obj/structure/cable{ @@ -4045,9 +3505,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "ka" = ( /obj/structure/cable{ @@ -4057,9 +3515,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "kb" = ( /obj/structure/cable{ @@ -4068,9 +3524,7 @@ /obj/machinery/door/firedoor/closed{ opacity = 0 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "kc" = ( /obj/structure/cable{ @@ -4078,7 +3532,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched2"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -4090,7 +3543,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged1"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -4103,7 +3555,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -4117,7 +3568,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -4128,7 +3578,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched1"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -4140,7 +3589,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged3"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -4155,9 +3603,7 @@ opacity = 0 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "kk" = ( /obj/machinery/light/small, @@ -4165,27 +3611,21 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "kl" = ( /obj/structure/cable{ icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "km" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Diner" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "kn" = ( /obj/structure/table/reinforced, @@ -4197,9 +3637,7 @@ id = "awaykitchen"; name = "Serving Hatch" }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "ko" = ( /obj/effect/decal/cleanable/dirt, @@ -4253,26 +3691,20 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/iron/white/corner{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white/corner, /area/awaymission/moonoutpost19/arrivals) "ku" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/iron/white/corner{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white/corner, /area/awaymission/moonoutpost19/arrivals) "kv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/iron/white/corner{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white/corner, /area/awaymission/moonoutpost19/arrivals) "kw" = ( /obj/machinery/light/small, @@ -4286,9 +3718,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/iron/white/corner{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white/corner, /area/awaymission/moonoutpost19/arrivals) "kx" = ( /obj/structure/sign/poster/official/nanotrasen_logo{ @@ -4297,36 +3727,28 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/iron/white/corner{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white/corner, /area/awaymission/moonoutpost19/arrivals) "ky" = ( /turf/open/floor/iron/white/corner{ - dir = 8; - heat_capacity = 1e+006 + dir = 8 }, /area/awaymission/moonoutpost19/arrivals) "kz" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "kA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/closed{ opacity = 0 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "kB" = ( /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged2"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -4334,7 +3756,6 @@ /area/awaymission/moonoutpost19/arrivals) "kC" = ( /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) @@ -4345,7 +3766,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged4"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -4354,7 +3774,6 @@ "kE" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -4362,7 +3781,6 @@ "kF" = ( /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged5"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -4372,7 +3790,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -4381,16 +3798,12 @@ /obj/machinery/door/firedoor/closed{ opacity = 0 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "kI" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "kJ" = ( /obj/machinery/firealarm{ @@ -4398,17 +3811,14 @@ pixel_y = -24 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "kN" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 }, /turf/open/floor/iron/white/corner{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/moonoutpost19/arrivals) "kO" = ( @@ -4417,9 +3827,7 @@ pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "kP" = ( /obj/item/stack/rods, @@ -4429,7 +3837,6 @@ icon_state = "medium" }, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) @@ -4438,9 +3845,7 @@ opacity = 0 }, /obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "kS" = ( /obj/machinery/door/firedoor/closed{ @@ -4449,9 +3854,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "kT" = ( /obj/machinery/button/door{ @@ -4461,9 +3864,7 @@ pixel_x = -25; specialfunctions = 4 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "kU" = ( /obj/structure/closet/secure_closet/personal/cabinet{ @@ -4471,15 +3872,11 @@ req_access_txt = "201" }, /obj/item/clothing/under/suit/navy, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "kV" = ( /obj/machinery/door/airlock/maintenance, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "lb" = ( /obj/structure/extinguisher_cabinet{ @@ -4505,25 +3902,20 @@ dir = 8 }, /turf/open/floor/iron/white/corner{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/moonoutpost19/arrivals) "lg" = ( /obj/item/cigbutt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "lh" = ( /obj/structure/chair{ dir = 8 }, /obj/effect/turf_decal/stripes/corner, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "li" = ( /obj/item/stack/rods, @@ -4531,7 +3923,6 @@ icon_state = "small" }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -4540,7 +3931,6 @@ dir = 1 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) @@ -4552,7 +3942,6 @@ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -4562,14 +3951,10 @@ id_tag = "awaydorm1"; name = "Dorm 1" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "ln" = ( -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "lo" = ( /obj/machinery/light/small{ @@ -4581,9 +3966,7 @@ pixel_x = 23; req_access = null }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "lt" = ( /obj/machinery/button/door{ @@ -4601,13 +3984,10 @@ name = "Kitchen Cold Room"; req_access_txt = "201" }, -/turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/showroomfloor, /area/awaymission/moonoutpost19/arrivals) "lv" = ( /turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006; initial_temperature = 273.15 }, /area/awaymission/moonoutpost19/arrivals) @@ -4618,7 +3998,6 @@ pixel_y = 28 }, /turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006; initial_temperature = 273.15 }, /area/awaymission/moonoutpost19/arrivals) @@ -4630,7 +4009,6 @@ /obj/item/storage/box/mousetraps, /obj/item/clothing/under/suit/waiter, /turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006; initial_temperature = 273.15 }, /area/awaymission/moonoutpost19/arrivals) @@ -4641,9 +4019,7 @@ req_access_txt = "150" }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "lA" = ( /obj/effect/spawner/structure/window/reinforced, @@ -4666,7 +4042,6 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) @@ -4674,15 +4049,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "lG" = ( /obj/effect/turf_decal/stripes/corner, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "lH" = ( /obj/structure/table, @@ -4690,16 +4061,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "lI" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -4709,7 +4077,6 @@ dir = 4 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -4717,9 +4084,7 @@ "lK" = ( /obj/structure/bed, /obj/item/bedsheet, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "lL" = ( /obj/structure/table/wood, @@ -4727,26 +4092,18 @@ /obj/machinery/newscaster{ pixel_x = 30 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "lM" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "lN" = ( -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "lO" = ( /obj/effect/decal/cleanable/oil, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "lQ" = ( /obj/machinery/door/firedoor, @@ -4778,7 +4135,6 @@ }, /obj/item/gun/ballistic/shotgun/sc_pump, /turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006; initial_temperature = 273.15 }, /area/awaymission/moonoutpost19/arrivals) @@ -4786,7 +4142,6 @@ /obj/structure/table, /obj/item/paper/fluff/awaymissions/moonoutpost19/log/ivan, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/moonoutpost19/research) @@ -4842,7 +4197,6 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) @@ -4850,14 +4204,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "mh" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -4868,9 +4219,7 @@ /obj/structure/window{ dir = 1 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "ml" = ( /obj/structure/table, @@ -4888,7 +4237,6 @@ /obj/item/reagent_containers/food/condiment/sugar, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006; initial_temperature = 273.15 }, /area/awaymission/moonoutpost19/arrivals) @@ -4903,7 +4251,6 @@ /obj/item/food/meat/slab/monkey, /obj/item/food/meat/slab/monkey, /turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006; initial_temperature = 273.15 }, /area/awaymission/moonoutpost19/arrivals) @@ -4918,7 +4265,6 @@ /obj/item/reagent_containers/food/condiment/milk, /obj/item/storage/fancy/egg_box, /turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006; initial_temperature = 273.15 }, /area/awaymission/moonoutpost19/arrivals) @@ -4965,24 +4311,19 @@ name = "\improper HOSTILE ATMOSPHERE AHEAD" }, /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "mw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "mx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -4999,24 +4340,18 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "mz" = ( /obj/structure/chair/wood/normal{ dir = 8 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "mA" = ( /obj/structure/closet/emcloset, /obj/structure/window, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "mB" = ( /obj/effect/spawner/randomarcade, @@ -5093,18 +4428,14 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "mM" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "mN" = ( /obj/machinery/light/small{ @@ -5123,16 +4454,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "mO" = ( /obj/machinery/light/small{ dir = 8 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) @@ -5149,7 +4477,6 @@ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -5162,7 +4489,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched2"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -5178,9 +4504,7 @@ dir = 8; icon_state = "ltrails_1" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "mS" = ( /obj/effect/decal/cleanable/blood/tracks{ @@ -5188,9 +4512,7 @@ dir = 5; icon_state = "ltrails_1" }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "mT" = ( /obj/machinery/light/small{ @@ -5201,15 +4523,11 @@ pixel_x = 23; req_access = null }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "mU" = ( /obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "mV" = ( /obj/structure/table, @@ -5240,7 +4558,6 @@ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -5249,9 +4566,7 @@ /obj/structure/bed, /obj/item/bedsheet, /obj/effect/decal/cleanable/blood, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "nb" = ( /obj/structure/closet/secure_closet/personal/cabinet{ @@ -5259,17 +4574,13 @@ req_access_txt = "201" }, /obj/item/clothing/under/misc/assistantformal, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "nc" = ( /obj/machinery/space_heater, /obj/effect/decal/cleanable/generic, /obj/structure/window, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "nf" = ( /obj/structure/filingcabinet, @@ -5292,7 +4603,6 @@ "ni" = ( /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched2"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -5305,7 +4615,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged2"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -5314,15 +4623,11 @@ "nk" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/candy, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "nl" = ( /obj/item/cigbutt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "nm" = ( /obj/structure/sign/warning/vacuum{ @@ -5330,25 +4635,20 @@ name = "\improper HOSTILE ATMOSPHERE AHEAD"; pixel_y = 32 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "no" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "np" = ( /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) @@ -5363,7 +4663,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged1"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -5372,22 +4671,17 @@ "ns" = ( /obj/structure/grille/broken, /obj/item/stack/rods, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "nt" = ( /obj/structure/grille, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "nu" = ( /obj/machinery/light/small{ dir = 8 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; icon_plating = "asteroidplating"; icon_state = "asteroidplating"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; @@ -5402,7 +4696,6 @@ }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -5411,23 +4704,17 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "201" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "nA" = ( /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "nB" = ( /obj/structure/closet/emcloset, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "nC" = ( /obj/item/stack/rods, @@ -5440,7 +4727,6 @@ icon_state = "ltrails_1" }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -5452,7 +4738,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -5465,7 +4750,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -5481,19 +4765,14 @@ specialfunctions = 4 }, /obj/effect/decal/remains/human{ - desc = "They look like human remains. The skeleton is laid out on its side and there seems to have been no sign of struggle."; - layer = 4.1 - }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 + desc = "They look like human remains. The skeleton is laid out on its side and there seems to have been no sign of struggle." }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "nI" = ( /obj/structure/dresser, /obj/item/paper/fluff/awaymissions/moonoutpost19/goodbye_note, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "nK" = ( /obj/structure/sign/warning/vacuum{ @@ -5501,15 +4780,11 @@ name = "\improper HOSTILE ATMOSPHERE AHEAD"; pixel_x = -32 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "nL" = ( /obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "nM" = ( /obj/structure/chair/fancy/comfy{ @@ -5521,7 +4796,6 @@ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -5532,39 +4806,30 @@ id_tag = "awaydorm3"; name = "Dorm 3" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "nP" = ( /obj/item/pen, /obj/item/storage/pill_bottle{ pixel_y = 6 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "nQ" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "nR" = ( /obj/structure/closet, /obj/item/storage/box/lights/mixed, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "nS" = ( /obj/structure/table, /obj/item/toy/cards/deck, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged1"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -5576,31 +4841,24 @@ req_access_txt = "201" }, /obj/item/clothing/under/suit/burgundy, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "nU" = ( /obj/machinery/newscaster{ pixel_x = 30 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) "nV" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "nW" = ( /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; icon_plating = "asteroidplating"; icon_state = "asteroidplating"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; @@ -5614,7 +4872,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched2"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -5627,7 +4884,6 @@ /obj/effect/decal/cleanable/generic, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -5635,7 +4891,6 @@ "nZ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating{ - heat_capacity = 1e+006; icon_plating = "asteroidplating"; icon_state = "asteroidplating"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; @@ -5647,7 +4902,6 @@ color = "#666666" }, /turf/open/floor/plating{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) @@ -5657,7 +4911,6 @@ dir = 1 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; icon_plating = "asteroidplating"; icon_state = "asteroidplating"; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; @@ -5669,14 +4922,12 @@ icon_state = "small" }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) "oe" = ( /obj/item/trash/candy, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) @@ -5688,9 +4939,7 @@ req_access_txt = "201" }, /obj/item/clothing/suit/toggle/labcoat, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "oU" = ( /obj/structure/window/reinforced, @@ -5703,9 +4952,7 @@ /obj/item/tank/internals/air, /obj/item/clothing/mask/gas, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "pg" = ( /obj/item/radio/off, @@ -5718,16 +4965,12 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "pM" = ( /obj/structure/chair/stool, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "qb" = ( /obj/machinery/airalarm/directional/east{ @@ -5740,7 +4983,6 @@ }, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -5753,27 +4995,21 @@ }, /obj/item/pen, /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "qo" = ( /obj/machinery/light/small, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "qv" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/moonoutpost19/arrivals) "qw" = ( /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/moonoutpost19/arrivals) @@ -5782,9 +5018,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "rd" = ( /obj/structure/filingcabinet, @@ -5792,18 +5026,14 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "rY" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "sb" = ( /obj/machinery/button/door{ @@ -5823,9 +5053,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "so" = ( /obj/machinery/firealarm{ @@ -5838,9 +5066,7 @@ network = list("mo19") }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "sQ" = ( /obj/machinery/power/port_gen/pacman/super{ @@ -5850,7 +5076,6 @@ icon_state = "0-2" }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/moonoutpost19/research) @@ -5859,7 +5084,6 @@ icon_state = "4-8" }, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/moonoutpost19/research) @@ -5868,7 +5092,6 @@ icon_state = "4-8" }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/moonoutpost19/research) @@ -5881,7 +5104,6 @@ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -5890,7 +5112,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -5903,9 +5124,7 @@ /obj/item/trash/cheesie, /obj/item/trash/can, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "vN" = ( /obj/effect/decal/cleanable/blood/tracks{ @@ -5914,7 +5133,6 @@ icon_state = "ltrails_2" }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -5925,30 +5143,23 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "wp" = ( /obj/item/cigbutt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "wP" = ( /obj/machinery/gateway{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "wX" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -5957,34 +5168,27 @@ "xg" = ( /obj/item/cigbutt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "xG" = ( /obj/structure/chair{ dir = 8 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "xH" = ( /obj/structure/chair{ dir = 1 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "xK" = ( /obj/structure/closet/crate, /obj/item/storage/box/lights/mixed, /obj/item/poster/random_contraband, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/moonoutpost19/research) @@ -5993,9 +5197,7 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "yh" = ( /obj/effect/decal/cleanable/xenoblood, @@ -6003,14 +5205,11 @@ desc = "They look like the remains of something... alien. The front of skull appears to have been completely obliterated." }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "yy" = ( /obj/structure/chair/stool, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/moonoutpost19/syndicate) @@ -6023,9 +5222,7 @@ pixel_x = -32 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "yT" = ( /obj/structure/closet/emcloset, @@ -6035,23 +5232,17 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "yU" = ( /obj/structure/chair/stool, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "zl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "zT" = ( /obj/structure/cable{ @@ -6059,7 +5250,6 @@ }, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6067,25 +5257,19 @@ "zZ" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "Al" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "Bn" = ( /obj/structure/table, /obj/item/trash/plate, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "Bs" = ( /obj/structure/cable{ @@ -6093,7 +5277,6 @@ }, /obj/item/stack/rods, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/moonoutpost19/research) @@ -6107,7 +5290,6 @@ icon_state = "ltrails_2" }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -6122,15 +5304,11 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "CJ" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "CL" = ( /obj/structure/table, @@ -6142,9 +5320,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "DN" = ( /obj/structure/closet/crate, @@ -6154,7 +5330,6 @@ /obj/item/shovel, /obj/item/pickaxe, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -6167,7 +5342,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6179,9 +5353,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "Ek" = ( /obj/structure/chair{ @@ -6193,16 +5365,12 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "El" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "Ey" = ( /obj/structure/chair{ @@ -6210,9 +5378,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "EA" = ( /obj/structure/table, @@ -6224,17 +5390,13 @@ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "EH" = ( /obj/structure/chair, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "EU" = ( /obj/structure/sign/departments/science{ @@ -6244,9 +5406,7 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "FJ" = ( /obj/structure/table, @@ -6256,9 +5416,7 @@ /obj/item/trash/plate, /obj/item/cigbutt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "FN" = ( /obj/item/stack/rods, @@ -6271,9 +5429,7 @@ icon_state = "ltrails_1" }, /obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "Go" = ( /obj/effect/decal/cleanable/dirt, @@ -6281,7 +5437,6 @@ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6290,7 +5445,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6307,16 +5461,13 @@ req_access = null }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "Hv" = ( /obj/structure/cable{ icon_state = "2-8" }, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/moonoutpost19/syndicate) @@ -6342,9 +5493,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "HV" = ( /obj/structure/closet/crate/bin, @@ -6359,7 +5508,6 @@ icon_state = "4-8" }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -6370,16 +5518,13 @@ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "Iz" = ( /obj/structure/cable{ icon_state = "1-4" }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/moonoutpost19/research) @@ -6387,7 +5532,6 @@ /obj/structure/grille/broken, /obj/item/stack/rods, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -6398,14 +5542,11 @@ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "Jc" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6415,7 +5556,6 @@ dir = 1 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6425,18 +5565,14 @@ /obj/item/trash/syndi_cakes, /obj/item/trash/sosjerky, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "KQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "KX" = ( /obj/machinery/washing_machine, @@ -6444,22 +5580,17 @@ dir = 1 }, /turf/open/floor/iron/cafeteria{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) "LE" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "LQ" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "LV" = ( /obj/structure/table, @@ -6471,9 +5602,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "Mm" = ( /obj/machinery/door/airlock/medical{ @@ -6483,17 +5612,13 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "MU" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "Nf" = ( /obj/structure/cable, @@ -6508,7 +5633,6 @@ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6517,7 +5641,6 @@ /obj/structure/alien/weeds, /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6528,7 +5651,6 @@ dir = 1 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6539,7 +5661,6 @@ }, /obj/effect/decal/cleanable/oil, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/moonoutpost19/research) @@ -6548,25 +5669,20 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "Pq" = ( /obj/machinery/gateway{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "QH" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6576,7 +5692,6 @@ icon_state = "1-2" }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/moonoutpost19/research) @@ -6585,7 +5700,6 @@ dir = 8 }, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6593,7 +5707,6 @@ "RA" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6604,27 +5717,21 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "RI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "Se" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "Td" = ( /obj/structure/table, @@ -6632,22 +5739,17 @@ pixel_y = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) "TM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "TX" = ( /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 @@ -6657,16 +5759,13 @@ /obj/effect/decal/cleanable/xenoblood, /obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "Um" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/alien/weeds, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6677,13 +5776,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "Ux" = ( /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/moonoutpost19/research) @@ -6691,34 +5787,27 @@ /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) "Wf" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) "WB" = ( /obj/structure/table, /obj/item/trash/raisins, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "WM" = ( /obj/machinery/light/small{ dir = 1 }, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/structure/table, /obj/structure/bedsheetbin, @@ -6728,7 +5817,6 @@ dir = 1 }, /turf/open/floor/iron/cafeteria{ - heat_capacity = 1e+006; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; initial_temperature = 251 }, @@ -6741,9 +5829,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "Yx" = ( /obj/machinery/gateway, @@ -6751,31 +5837,23 @@ icon_state = "0-2" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) "YH" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "ZB" = ( /obj/structure/table, /obj/item/cigbutt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "ZC" = ( /obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/moonoutpost19/research) (1,1,1) = {" diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 640c507250233..b47fee0ad7f33 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -845,7 +845,7 @@ "eb" = ( /obj/machinery/door/poddoor{ id = "cryopodg2"; - name = "cryogenetic genetics blastdoor" + name = "Gryogenetics" }, /turf/open/floor/iron/stairs, /area/awaymission/research/interior/genetics) @@ -1260,7 +1260,7 @@ "hK" = ( /obj/machinery/door/poddoor{ id = "cryopodg1"; - name = "cryogenetic genetics blastdoor" + name = "Gryogenetics" }, /turf/open/floor/iron/stairs{ dir = 1 @@ -1997,8 +1997,7 @@ /area/awaymission/research/interior/dorm) "lN" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/airalarm/directional/east{ pixel_x = 32 @@ -2196,8 +2195,7 @@ /obj/structure/flora/ausbushes/brflowers, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/grass, /area/awaymission/research/interior/escapepods) @@ -2205,8 +2203,7 @@ /obj/structure/flora/ausbushes/fernybush, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/grass, /area/awaymission/research/interior/escapepods) @@ -2214,8 +2211,7 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/grass, /area/awaymission/research/interior/escapepods) diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 77d7da3cb8b78..64ba57911f45e 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -2083,9 +2083,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post) "jo" = ( /turf/open/floor/plating{ @@ -2221,9 +2219,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post) "jU" = ( /obj/effect/decal/cleanable/dirt, @@ -2759,7 +2755,7 @@ "mY" = ( /obj/machinery/button/door{ id = "snowdingarage1"; - name = "garage door toggle"; + name = "Garage Door Toggle"; pixel_x = -24; pixel_y = -7 }, @@ -2893,7 +2889,7 @@ "nB" = ( /obj/machinery/door/poddoor/shutters{ id = "snowdingarage1"; - name = "garage door" + name = "Garage Door" }, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) @@ -4070,7 +4066,6 @@ /obj/machinery/doorButtons/access_button{ idDoor = "snowdin_turbine_interior"; idSelf = "snowdin_turbine_access"; - layer = 3.1; name = "Turbine airlock control"; pixel_x = 8; pixel_y = -24 @@ -6390,7 +6385,7 @@ "zo" = ( /obj/machinery/door/poddoor/shutters{ id = "snowdingarage2"; - name = "garage door" + name = "Garage Door" }, /turf/open/floor/plating, /area/awaymission/snowdin/post/minipost) @@ -6441,7 +6436,7 @@ /obj/machinery/light/small, /obj/machinery/button/door{ id = "snowdingarage2"; - name = "garage door toggle"; + name = "Garage Door Toggle"; pixel_x = -7; pixel_y = -24 }, @@ -8559,7 +8554,7 @@ "Gl" = ( /obj/machinery/door/poddoor/shutters{ id = "snowdingarageunder"; - name = "garage door" + name = "Garage Door" }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -8567,7 +8562,7 @@ "Gm" = ( /obj/machinery/door/poddoor/shutters{ id = "snowdingarageunder2"; - name = "garage door" + name = "Garage Door" }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -8698,13 +8693,13 @@ "GK" = ( /obj/machinery/button/door{ id = "snowdingarageunder2"; - name = "right garage door toggle"; + name = "right Garage Door Toggle"; pixel_x = 7; pixel_y = 24 }, /obj/machinery/button/door{ id = "snowdingarageunder"; - name = "left garage door toggle"; + name = "left Garage Door Toggle"; pixel_x = -7; pixel_y = 24 }, @@ -9091,7 +9086,7 @@ "Ia" = ( /obj/machinery/door/poddoor/shutters{ id = "snowdingarage3"; - name = "garage door" + name = "Garage Door" }, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) @@ -9221,7 +9216,7 @@ "Iw" = ( /obj/machinery/button/door{ id = "snowdingarage3"; - name = "garage door toggle"; + name = "Garage Door Toggle"; pixel_x = 7; pixel_y = 24 }, @@ -9368,9 +9363,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main) "IW" = ( /obj/structure/table, @@ -10076,9 +10069,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) "Li" = ( /obj/structure/table, @@ -10122,9 +10113,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) "Ln" = ( /obj/structure/table, @@ -10412,9 +10401,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) "Mk" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -10654,9 +10641,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) "Nf" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -11013,9 +10998,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) "OJ" = ( /obj/item/shard, @@ -11128,9 +11111,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) "Pc" = ( /obj/structure/table, @@ -11209,9 +11190,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main) "Pq" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -11311,9 +11290,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) "PF" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -11481,9 +11458,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) "Qr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -11518,9 +11493,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) "Qy" = ( /obj/structure/closet/crate, @@ -11774,9 +11747,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main) "Rs" = ( /obj/effect/turf_decal/stripes/line{ @@ -11814,9 +11785,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post) "RA" = ( /obj/effect/spawner/lootdrop/crate_spawner, @@ -11878,9 +11847,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) "RM" = ( /obj/item/knife/kitchen, @@ -11976,9 +11943,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) "Sf" = ( /obj/item/shard, @@ -12474,9 +12439,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post) "Um" = ( /obj/effect/turf_decal/stripes/corner{ @@ -12491,17 +12454,13 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) "Uo" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/minipost) "Uq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -12559,9 +12518,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) "UG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -12728,9 +12685,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) "Vo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -12772,9 +12727,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post) "Vt" = ( /obj/effect/turf_decal/stripes/corner{ @@ -12980,9 +12933,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main) "Wj" = ( /obj/machinery/airalarm/directional/north{ @@ -13311,9 +13262,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post) "XD" = ( /obj/machinery/holopad, @@ -13714,9 +13663,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) "Zj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -13785,9 +13732,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) "Zu" = ( /obj/effect/decal/cleanable/dirt, @@ -13854,9 +13799,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) "ZJ" = ( /obj/structure/table, diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index ffe5cae05a52f..b07ed2c46f8bb 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -9,7 +9,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged2" }, /area/awaymission/undergroundoutpost45/central) @@ -29,7 +28,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged1" }, /area/awaymission/undergroundoutpost45/central) @@ -37,9 +35,7 @@ /turf/closed/wall/r_wall/rust, /area/awaymission/undergroundoutpost45/central) "ao" = ( -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "ap" = ( /obj/machinery/light/small/broken{ @@ -47,7 +43,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched2" }, /area/awaymission/undergroundoutpost45/central) @@ -75,14 +70,12 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged4" }, /area/awaymission/undergroundoutpost45/central) "ar" = ( /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "damaged3" }, /area/awaymission/undergroundoutpost45/central) @@ -91,24 +84,18 @@ id = "UO45_Elevator" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "at" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "au" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "aw" = ( /obj/machinery/camera/directional/east{ @@ -117,15 +104,11 @@ }, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "ax" = ( /obj/effect/landmark/awaystart, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "aC" = ( /turf/closed/wall, @@ -135,9 +118,7 @@ /area/awaymission/undergroundoutpost45/central) "aF" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "aG" = ( /obj/machinery/button/door{ @@ -154,30 +135,22 @@ pixel_x = 6; pixel_y = 24 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "aH" = ( /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = 32 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "aI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "aJ" = ( /obj/machinery/vending/cigarette, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "aK" = ( /obj/structure/closet/emcloset, @@ -185,60 +158,44 @@ /obj/structure/sign/poster/official/safety_internals{ pixel_x = -32 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "aM" = ( /obj/machinery/vending/cola, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "aN" = ( /obj/machinery/light{ dir = 8 }, /obj/machinery/door/firedoor, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "aO" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "aP" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "aQ" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "aR" = ( /obj/machinery/light{ dir = 4 }, /obj/machinery/door/firedoor, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "aS" = ( -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "aU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -247,9 +204,7 @@ req_access_txt = "201" }, /obj/item/clothing/under/misc/pj/blue, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "aZ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -260,9 +215,7 @@ req_access_txt = "201" }, /obj/item/clothing/under/suit/black/skirt, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "bd" = ( /obj/effect/spawner/structure/window/reinforced, @@ -272,27 +225,21 @@ /obj/structure/sink{ pixel_y = 25 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/central) "bj" = ( /obj/structure/sink{ pixel_y = 25 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/central) "bk" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -25 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "bp" = ( /obj/structure/cable{ @@ -301,26 +248,19 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/research) "bq" = ( -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "br" = ( /obj/machinery/door/airlock/maintenance, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "bs" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/central) "bt" = ( /obj/machinery/light/small, @@ -328,55 +268,41 @@ dir = 1; pixel_y = -23 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/central) "bu" = ( -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/central) "bv" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/central) "bx" = ( /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "by" = ( /obj/machinery/door/airlock{ name = "Unit 2" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/central) "bz" = ( /obj/machinery/door/airlock{ name = "Unit 1" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/central) "bA" = ( /obj/machinery/light{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "bB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -385,9 +311,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "bG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -396,17 +320,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "bH" = ( /obj/machinery/light{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "bI" = ( /obj/structure/toilet{ @@ -415,9 +335,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/central) "bJ" = ( /obj/structure/toilet{ @@ -427,38 +345,28 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/central) "bK" = ( /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = -32 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "bL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "bM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "bN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = -32 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "bO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -486,18 +394,14 @@ /area/awaymission/undergroundoutpost45/central) "bS" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "bT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "bU" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -514,7 +418,6 @@ "bW" = ( /obj/structure/glowshroom/single, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 351.9; name = "Cave Floor" @@ -522,7 +425,6 @@ /area/awaymission/undergroundoutpost45/caves) "bX" = ( /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 351.9; name = "Cave Floor" @@ -530,89 +432,67 @@ /area/awaymission/undergroundoutpost45/caves) "bY" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "ca" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cd" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/airlock/maintenance, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "ch" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "ci" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "cj" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "co" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -625,9 +505,7 @@ "cq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -637,28 +515,20 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "ct" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cu" = ( /obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cv" = ( /obj/structure/closet, /obj/item/storage/box/lights/mixed, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cw" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -668,9 +538,7 @@ /obj/machinery/newscaster{ pixel_x = -30 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "cx" = ( /obj/machinery/light/small{ @@ -683,9 +551,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "cA" = ( /obj/machinery/light/small{ @@ -701,9 +567,7 @@ /obj/structure/chair/wood/normal{ dir = 4 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "cB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -711,22 +575,16 @@ /obj/machinery/newscaster{ pixel_x = 30 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "cD" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cE" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -742,15 +600,11 @@ pixel_y = -25; specialfunctions = 4 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "cI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "cJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -758,9 +612,7 @@ }, /obj/structure/bed, /obj/item/bedsheet, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "cK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -768,9 +620,7 @@ }, /obj/structure/bed, /obj/item/bedsheet, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "cL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -783,43 +633,32 @@ pixel_y = -25; specialfunctions = 4 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "cM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5; - - }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 + dir = 5 }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cQ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -829,18 +668,14 @@ /obj/structure/window{ dir = 8 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -850,9 +685,7 @@ /obj/structure/window{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -862,22 +695,16 @@ /area/awaymission/undergroundoutpost45/central) "cW" = ( /obj/structure/grille, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cX" = ( /obj/item/stack/rods, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/grille, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "cZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -885,18 +712,14 @@ id_tag = "awaydorm2"; name = "Dorm 2" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "da" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Central Access" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "db" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -904,9 +727,7 @@ id_tag = "awaydorm1"; name = "Dorm 1" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "dc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -914,9 +735,7 @@ }, /obj/structure/closet, /obj/item/poster/random_contraband, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "de" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -936,58 +755,42 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/stack/rods, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "dh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "dk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "dl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "dm" = ( /obj/machinery/firealarm{ pixel_y = 24 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "dn" = ( /obj/machinery/light{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "do" = ( -/obj/item/kirbyplants{ - layer = 5 - }, +/obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/green, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "dp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -1007,7 +810,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched1" }, /area/awaymission/undergroundoutpost45/central) @@ -1016,40 +818,31 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "dy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "dz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "dA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "dG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -1065,8 +858,7 @@ req_access_txt = "201" }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "dR" = ( @@ -1074,18 +866,14 @@ name = "Security Checkpoint"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "dS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, /obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "dV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -1094,17 +882,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "dW" = ( /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "dY" = ( /obj/machinery/door/firedoor, @@ -1115,40 +899,30 @@ name = "Hydroponics"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "dZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "ea" = ( /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "eb" = ( -/obj/machinery/hydroponics/constructable, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "ec" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "ed" = ( /obj/machinery/door/firedoor, @@ -1159,17 +933,13 @@ name = "Gateway Chamber"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "ee" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "ef" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -1179,9 +949,7 @@ name = "Security Checkpoint Maintenance"; req_access_txt = "201" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "eh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -1189,29 +957,21 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "ej" = ( /obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "el" = ( /obj/effect/spawner/structure/window, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "en" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "eo" = ( /obj/machinery/door/firedoor, @@ -1219,26 +979,20 @@ name = "Hydroponics"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "ep" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "eq" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "es" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -1248,7 +1002,6 @@ /area/awaymission/undergroundoutpost45/central) "eu" = ( /turf/open/floor/plating{ - heat_capacity = 1e+006; icon_plating = "asteroidplating"; icon_state = "asteroidplating"; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; @@ -1261,9 +1014,7 @@ locked = 0; req_access_txt = "201" }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "ex" = ( /obj/structure/table/reinforced, @@ -1280,36 +1031,26 @@ name = "Security Checkpoint"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "eA" = ( /obj/structure/flora/ausbushes/ppflowers, -/turf/open/floor/grass{ - heat_capacity = 1e+006 - }, +/turf/open/floor/grass, /area/awaymission/undergroundoutpost45/central) "eB" = ( /obj/structure/flora/ausbushes/brflowers, -/turf/open/floor/grass{ - heat_capacity = 1e+006 - }, +/turf/open/floor/grass, /area/awaymission/undergroundoutpost45/central) "eD" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "eF" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "eG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -1317,27 +1058,20 @@ dir = 4 }, /obj/machinery/door/airlock/external, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "eH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "eI" = ( /obj/machinery/door/airlock/external, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "eJ" = ( /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -1352,23 +1086,17 @@ name = "Security Checkpoint"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "eO" = ( /obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass{ - heat_capacity = 1e+006 - }, +/turf/open/floor/grass, /area/awaymission/undergroundoutpost45/central) "eP" = ( /obj/effect/turf_decal/tile/green{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "eQ" = ( /obj/structure/table/reinforced, @@ -1378,22 +1106,16 @@ name = "Hydroponics Desk"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "eR" = ( /obj/structure/chair/stool, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "eS" = ( /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/glass/bucket, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "eV" = ( /obj/structure/closet/emcloset, @@ -1401,23 +1123,17 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "eZ" = ( /obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "fb" = ( /obj/effect/turf_decal/tile/green, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "fd" = ( /obj/structure/table/reinforced, @@ -1429,16 +1145,13 @@ name = "Hydroponics Desk"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "fg" = ( /obj/machinery/light/small/broken{ dir = 8 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -1451,7 +1164,6 @@ dir = 8 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -1466,18 +1178,14 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "fr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "ft" = ( /obj/structure/closet/crate/hydroponics, @@ -1485,15 +1193,11 @@ /obj/item/wrench, /obj/item/screwdriver, /obj/item/reagent_containers/glass/bucket, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "fu" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "fw" = ( /obj/structure/disposalpipe/segment{ @@ -1502,9 +1206,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "fx" = ( /obj/structure/cable{ @@ -1517,9 +1219,7 @@ name = "Hydroponics Maintenance"; req_access_txt = "201" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "fy" = ( /obj/structure/cable{ @@ -1528,26 +1228,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "fA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, /obj/structure/chair/wood/normal, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "fB" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "fC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -1560,9 +1254,7 @@ pixel_y = 25; specialfunctions = 4 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "fD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -1572,41 +1264,31 @@ id_tag = "awaydorm3"; name = "Dorm 3" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "fE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "fF" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "fG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "fH" = ( /obj/structure/disposalpipe/segment{ dir = 5 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "fI" = ( /obj/structure/disposalpipe/segment{ @@ -1619,16 +1301,13 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "fJ" = ( /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -1639,7 +1318,7 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "fL" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "fM" = ( /obj/structure/table/reinforced, @@ -1649,9 +1328,7 @@ name = "Hydroponics Desk"; req_access_txt = "201" }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/crew_quarters) "fN" = ( /turf/closed/wall/rust, @@ -1664,9 +1341,7 @@ /obj/machinery/newscaster{ pixel_y = -28 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "fR" = ( /obj/machinery/light/small, @@ -1678,26 +1353,18 @@ dir = 1 }, /obj/structure/dresser, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "fS" = ( /obj/structure/bed, /obj/item/bedsheet, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) "fT" = ( -/obj/item/kirbyplants{ - layer = 5 - }, +/obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "fU" = ( /obj/machinery/firealarm{ @@ -1708,30 +1375,22 @@ c_tag = "Central Hallway"; network = list("uo45") }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "fV" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -28 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "fW" = ( /obj/machinery/vending/snack, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "fX" = ( /obj/machinery/vending/coffee, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "fY" = ( /obj/machinery/disposal/bin, @@ -1743,22 +1402,16 @@ name = "\improper DISPOSAL: LEADS TO EXTERIOR"; pixel_y = -32 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "fZ" = ( -/turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/showroomfloor, /area/awaymission/undergroundoutpost45/crew_quarters) "ga" = ( /obj/structure/sink/kitchen{ pixel_y = 28 }, -/turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/showroomfloor, /area/awaymission/undergroundoutpost45/crew_quarters) "gb" = ( /obj/structure/cable{ @@ -1766,9 +1419,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "gc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -1788,14 +1439,11 @@ /obj/machinery/door/airlock/public/glass{ name = "Central Access" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "gf" = ( /obj/structure/glowshroom/single, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -1808,18 +1456,14 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/showroomfloor, /area/awaymission/undergroundoutpost45/crew_quarters) "gi" = ( /obj/machinery/door/airlock/maintenance{ name = "Kitchen Maintenance"; req_access_txt = "201" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/crew_quarters) "gj" = ( /obj/structure/cable{ @@ -1829,15 +1473,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "gl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "gm" = ( /obj/structure/closet/crate{ @@ -1847,25 +1487,19 @@ /obj/item/storage/box/mousetraps, /obj/item/clothing/under/suit/waiter, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/showroomfloor, /area/awaymission/undergroundoutpost45/crew_quarters) "gn" = ( /obj/item/tank/internals/air, /obj/item/clothing/mask/gas, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "go" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/rods, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "gq" = ( /obj/structure/cable{ @@ -1875,37 +1509,27 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "gr" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/crew_quarters) "gs" = ( -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "gt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "gu" = ( /obj/machinery/door/airlock{ name = "Kitchen Cold Room"; req_access_txt = "201" }, -/turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/showroomfloor, /area/awaymission/undergroundoutpost45/crew_quarters) "gv" = ( /turf/closed/wall/r_wall, @@ -1924,14 +1548,11 @@ /area/awaymission/undergroundoutpost45/research) "gA" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "gB" = ( /obj/machinery/light/small, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -1940,15 +1561,13 @@ "gC" = ( /obj/machinery/vending/dinnerware, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "gD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "gE" = ( @@ -1956,8 +1575,7 @@ pixel_y = 28 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "gF" = ( @@ -1971,16 +1589,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "gG" = ( /obj/structure/table, /obj/machinery/reagentgrinder, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "gH" = ( @@ -1990,20 +1606,14 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "gI" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "gJ" = ( -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "gK" = ( /turf/closed/wall, @@ -2021,21 +1631,16 @@ /obj/item/stack/sheet/iron{ amount = 23 }, -/turf/open/floor/iron/white/side{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white/side, /area/awaymission/undergroundoutpost45/research) "gN" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, -/turf/open/floor/iron/white/side{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white/side, /area/awaymission/undergroundoutpost45/research) "gO" = ( /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "gP" = ( @@ -2045,22 +1650,17 @@ pixel_y = 6 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "gU" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/gateway) "gV" = ( /obj/structure/table, /obj/item/folder/white, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "gW" = ( /obj/structure/table, @@ -2069,15 +1669,11 @@ pixel_y = 9 }, /obj/item/pen, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "gX" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "gY" = ( /obj/machinery/airalarm/all_access{ @@ -2091,22 +1687,16 @@ c_tag = "Research Lab"; network = list("uo45","uo45r") }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "gZ" = ( /obj/machinery/firealarm{ pixel_y = 24 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "ha" = ( -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "hb" = ( /obj/machinery/light/small{ @@ -2123,8 +1713,7 @@ }, /obj/item/reagent_containers/dropper, /turf/open/floor/iron/white/side{ - dir = 8; - heat_capacity = 1e+006 + dir = 8 }, /area/awaymission/undergroundoutpost45/research) "hc" = ( @@ -2135,7 +1724,6 @@ dir = 8 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -2146,7 +1734,6 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -2160,25 +1747,20 @@ dir = 8; pixel_x = -24 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "hg" = ( /obj/machinery/airalarm/all_access{ dir = 4; pixel_x = 23 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "hh" = ( /obj/machinery/light/small{ dir = 8 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -2190,26 +1772,21 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "hq" = ( /obj/structure/table, /obj/item/stack/package_wrap, -/obj/item/reagent_containers/food/condiment/enzyme{ - layer = 5 - }, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "hr" = ( /obj/structure/table, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "hs" = ( @@ -2227,35 +1804,28 @@ pixel_y = 6 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "hu" = ( /obj/machinery/gateway/centeraway{ calibrated = 0 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "hw" = ( /obj/structure/chair{ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "hx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/chair{ dir = 8 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "hz" = ( /obj/effect/decal/cleanable/dirt, @@ -2263,56 +1833,42 @@ dir = 1 }, /obj/item/storage/box/lights/mixed, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/gateway) "hA" = ( /obj/structure/closet/firecloset, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/gateway) "hB" = ( /obj/machinery/rnd/destructive_analyzer, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "hC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "hD" = ( /obj/machinery/rnd/production/protolathe, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "hE" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "hF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "hG" = ( /obj/structure/table/glass, @@ -2324,23 +1880,19 @@ /obj/item/stock_parts/micro_laser, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/side{ - dir = 8; - heat_capacity = 1e+006 + dir = 8 }, /area/awaymission/undergroundoutpost45/research) "hH" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "hQ" = ( /obj/structure/disposalpipe/segment{ dir = 10 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "hR" = ( @@ -2352,16 +1904,14 @@ pixel_x = 3 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "hS" = ( /obj/structure/table, /obj/item/food/mint, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "hT" = ( @@ -2369,31 +1919,25 @@ dir = 4 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "hU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4; - + dir = 4 }, /obj/structure/table, /obj/item/book/manual/chef_recipes, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "hV" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4; - - }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 + dir = 4 }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/crew_quarters) "hW" = ( /obj/structure/cable{ @@ -2403,24 +1947,18 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "hX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "ib" = ( /obj/structure/chair{ dir = 8 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "ic" = ( /obj/machinery/airalarm/all_access{ @@ -2431,53 +1969,37 @@ /obj/structure/chair{ dir = 8 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "id" = ( /obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/gateway) "ie" = ( -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/gateway) "if" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/gateway) "ig" = ( /obj/machinery/computer/rdconsole/core{ dir = 4; req_access = null }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "ih" = ( -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "ii" = ( /obj/machinery/rnd/production/circuit_imprinter, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "ij" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "ik" = ( /obj/structure/table/glass, @@ -2487,8 +2009,7 @@ /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/matter_bin, /turf/open/floor/iron/white/side{ - dir = 8; - heat_capacity = 1e+006 + dir = 8 }, /area/awaymission/undergroundoutpost45/research) "ip" = ( @@ -2498,16 +2019,14 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "iq" = ( /obj/structure/table, /obj/item/kitchen/rollingpin, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "ir" = ( @@ -2516,8 +2035,7 @@ }, /obj/machinery/processor, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "is" = ( @@ -2525,15 +2043,11 @@ dir = 8 }, /obj/structure/window/reinforced, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "it" = ( /obj/structure/window/reinforced, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "iu" = ( /obj/structure/cable{ @@ -2543,16 +2057,12 @@ name = "Gateway Chamber"; req_access_txt = "201" }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "iv" = ( /obj/structure/window/reinforced, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "iw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -2563,17 +2073,13 @@ /obj/structure/sign/warning/nosmoking{ pixel_x = 32 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "ix" = ( /obj/machinery/door/airlock{ name = "Emergency Supplies" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/gateway) "iy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -2596,9 +2102,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "iz" = ( /obj/structure/disposalpipe/segment{ @@ -2610,9 +2114,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "iA" = ( /obj/structure/disposalpipe/segment{ @@ -2624,9 +2126,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "iB" = ( /obj/structure/disposalpipe/segment{ @@ -2638,9 +2138,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "iC" = ( /obj/structure/disposalpipe/segment{ @@ -2649,9 +2147,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "iD" = ( /obj/machinery/disposal/bin, @@ -2659,23 +2155,19 @@ dir = 8 }, /turf/open/floor/iron/white/side{ - dir = 8; - heat_capacity = 1e+006 + dir = 8 }, /area/awaymission/undergroundoutpost45/research) "iE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "iJ" = ( /obj/structure/disposalpipe/segment{ dir = 5 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "iK" = ( @@ -2684,8 +2176,7 @@ dir = 10 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "iL" = ( @@ -2694,9 +2185,7 @@ }, /obj/item/clothing/gloves/color/latex, /obj/structure/closet/emcloset, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "iN" = ( /obj/structure/table, @@ -2705,9 +2194,7 @@ pixel_x = -32 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "iO" = ( /obj/structure/table, @@ -2715,7 +2202,6 @@ /obj/item/radio/off, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched1" }, /area/awaymission/undergroundoutpost45/gateway) @@ -2723,16 +2209,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "iQ" = ( /obj/structure/table, /obj/machinery/recharger, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "iR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -2741,18 +2223,14 @@ /obj/structure/table, /obj/item/paper/pamphlet/gateway, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "iS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/gateway) "iT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -2762,18 +2240,14 @@ /obj/structure/chair{ dir = 8 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "iU" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/chair{ dir = 8 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "iV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -2786,17 +2260,13 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "iX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "iY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -2813,22 +2283,16 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "iZ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "ja" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "jd" = ( /obj/machinery/disposal/bin, @@ -2841,16 +2305,14 @@ pixel_y = -32 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "je" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/junction, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "jf" = ( @@ -2864,8 +2326,7 @@ /obj/item/reagent_containers/food/condiment/sugar, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) "jg" = ( @@ -2878,18 +2339,14 @@ network = list("uo45","uo45r") }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "jh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "ji" = ( /obj/structure/cable{ @@ -2898,49 +2355,37 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "jj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "jk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/chair/stool, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "jl" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/gateway) "jm" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "jn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "jo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -2950,17 +2395,13 @@ name = "Gateway Observation"; req_access_txt = "201" }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "jp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "jq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -2968,9 +2409,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "jr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -2978,16 +2417,12 @@ /obj/item/folder/white, /obj/item/disk/tech_disk, /obj/item/disk/design_disk, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "js" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "jt" = ( /obj/machinery/door/firedoor, @@ -2995,18 +2430,14 @@ /obj/machinery/door/airlock/public/glass{ name = "Central Access" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "ju" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Central Access" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "jB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -3031,33 +2462,25 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "jG" = ( /obj/structure/closet/l3closet/scientist, /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "jI" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "jJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "jK" = ( /obj/machinery/airalarm/all_access{ @@ -3067,14 +2490,11 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "jL" = ( /obj/machinery/light/small, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -3083,9 +2503,7 @@ "jM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/spawner/structure/window, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "jN" = ( /obj/machinery/door/firedoor, @@ -3095,20 +2513,15 @@ name = "Research Lab"; req_access_txt = "201" }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "jO" = ( /obj/effect/spawner/structure/window, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "jP" = ( /obj/machinery/light/small, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -3119,9 +2532,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "jR" = ( /obj/structure/closet/emcloset, @@ -3131,7 +2542,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched1" }, /area/awaymission/undergroundoutpost45/crew_quarters) @@ -3146,9 +2556,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/crew_quarters) "jZ" = ( /obj/structure/cable{ @@ -3160,9 +2568,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "ka" = ( /obj/structure/cable{ @@ -3175,9 +2581,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "kc" = ( /obj/structure/cable{ @@ -3190,9 +2594,7 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "kd" = ( /obj/item/storage/backpack/satchel/tox, @@ -3205,48 +2607,35 @@ req_access_txt = "201" }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "kf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "kg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "kh" = ( -/obj/item/kirbyplants{ - layer = 5 - }, +/obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "ki" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "kk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/purple{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "kl" = ( /obj/machinery/door/firedoor, @@ -3260,9 +2649,7 @@ name = "Gateway EVA"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "km" = ( /obj/item/clothing/under/suit/navy, @@ -3270,9 +2657,7 @@ locked = 0; req_access_txt = "201" }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "kn" = ( /obj/machinery/light{ @@ -3280,33 +2665,25 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "ko" = ( /obj/machinery/airalarm/all_access{ pixel_y = 23; dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "kp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Diner" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "kw" = ( /obj/structure/closet/l3closet, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "kx" = ( /obj/structure/closet/crate, @@ -3316,9 +2693,7 @@ pixel_y = -1 }, /obj/item/multitool, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) "ky" = ( /obj/structure/table, @@ -3332,18 +2707,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "kz" = ( /obj/structure/sign/warning/securearea{ pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "kA" = ( /obj/structure/tank_dispenser/oxygen, @@ -3351,9 +2722,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "kB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -3362,9 +2731,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "kC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -3376,9 +2743,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "kD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -3391,15 +2756,11 @@ /obj/structure/sign/warning/securearea{ pixel_x = -32 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "kE" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "kF" = ( /obj/machinery/door/firedoor, @@ -3410,9 +2771,7 @@ name = "Research Division Access"; req_access_txt = "201" }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "kG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -3422,9 +2781,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "kH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -3433,9 +2790,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "kI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -3445,9 +2800,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "kJ" = ( /obj/machinery/airalarm/all_access{ @@ -3463,9 +2816,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "kK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -3474,9 +2825,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "kL" = ( /obj/machinery/door/firedoor, @@ -3490,23 +2839,17 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "kM" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "kN" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "kO" = ( /obj/structure/disposalpipe/segment, @@ -3514,17 +2857,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "kP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "kQ" = ( /obj/machinery/door/firedoor, @@ -3534,9 +2873,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "kR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -3545,9 +2882,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "kS" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -3556,9 +2891,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "kT" = ( /obj/machinery/airalarm/all_access{ @@ -3574,9 +2907,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "kU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -3586,18 +2917,14 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "kV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "kW" = ( /obj/structure/extinguisher_cabinet{ @@ -3606,20 +2933,16 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "kY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id = "UO45_biohazard"; - name = "biohazard containment door" + name = "biohazard Containment Door" }, /obj/effect/turf_decal/delivery, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "kZ" = ( /obj/structure/sink{ @@ -3632,9 +2955,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/space/nearstation) "la" = ( /obj/machinery/shower{ @@ -3643,9 +2964,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "lb" = ( /obj/structure/sink{ @@ -3654,9 +2973,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "lc" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -3668,40 +2985,30 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "ld" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "le" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "lf" = ( /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "lg" = ( /obj/machinery/light/small, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "ln" = ( /turf/closed/wall/r_wall, @@ -3720,19 +3027,15 @@ pixel_x = -32 }, /obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 + dir = 4 }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "lp" = ( /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "lq" = ( /obj/structure/cable{ @@ -3741,9 +3044,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "lr" = ( /obj/structure/cable{ @@ -3763,9 +3064,7 @@ c_tag = "Gateway Ready Room"; network = list("uo45","uo45r") }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "ls" = ( /obj/structure/cable{ @@ -3774,9 +3073,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "lt" = ( /obj/structure/cable{ @@ -3786,18 +3083,14 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "lv" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "lw" = ( /obj/structure/cable{ @@ -3806,9 +3099,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "lx" = ( /obj/machinery/door/firedoor, @@ -3822,9 +3113,7 @@ name = "Research Division Access"; req_access_txt = "201" }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "ly" = ( /obj/structure/cable{ @@ -3834,9 +3123,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "lz" = ( /obj/structure/cable{ @@ -3844,9 +3131,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "lA" = ( /obj/structure/cable{ @@ -3864,9 +3149,7 @@ network = list("uo45","uo45r") }, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "lB" = ( /obj/structure/cable{ @@ -3879,9 +3162,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "lC" = ( /obj/structure/cable{ @@ -3892,9 +3173,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "lD" = ( /obj/machinery/door/firedoor, @@ -3909,9 +3188,7 @@ req_access_txt = "201" }, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "lE" = ( /obj/structure/cable{ @@ -3922,9 +3199,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "lF" = ( /obj/structure/cable{ @@ -3941,9 +3216,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "lG" = ( /obj/structure/cable{ @@ -3959,9 +3232,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "lH" = ( /obj/structure/cable{ @@ -3971,7 +3242,6 @@ locked = 0; name = "UO45 Research Division APC"; pixel_y = -23; - req_access = null; start_charge = 100 }, /obj/structure/disposalpipe/segment{ @@ -3981,9 +3251,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "lI" = ( /obj/machinery/door/firedoor, @@ -3994,9 +3262,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "lJ" = ( /obj/structure/disposalpipe/segment{ @@ -4005,9 +3271,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "lK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -4015,24 +3279,18 @@ dir = 4 }, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "lL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "lM" = ( /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "lN" = ( /obj/machinery/firealarm{ @@ -4044,33 +3302,25 @@ network = list("uo45","uo45r") }, /obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "lO" = ( /obj/machinery/door/airlock/research{ name = "Research Division Access"; req_access_txt = "201" }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "lQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "lR" = ( /obj/structure/chair{ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "lV" = ( /obj/machinery/door/firedoor, @@ -4078,9 +3328,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Diner" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "lW" = ( /obj/machinery/door/firedoor, @@ -4092,9 +3340,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Diner" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "lX" = ( /obj/structure/closet/crate, @@ -4110,9 +3356,7 @@ maxcharge = 15000 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "lY" = ( /obj/machinery/light/small{ @@ -4122,18 +3366,14 @@ c_tag = "Engineering Secure Storage"; network = list("uo45") }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "lZ" = ( /obj/machinery/suit_storage_unit/engine, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "ma" = ( /obj/structure/table, @@ -4149,35 +3389,26 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "mb" = ( -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) "mc" = ( /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched1" }, /area/awaymission/undergroundoutpost45/gateway) "md" = ( -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "me" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) "mf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -4186,9 +3417,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "mg" = ( /obj/structure/cable{ @@ -4196,9 +3425,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "mh" = ( /obj/structure/disposalpipe/segment, @@ -4208,8 +3435,7 @@ req_access_txt = "201" }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "mi" = ( @@ -4217,38 +3443,30 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/poddoor/shutters/preopen{ id = "UO45_rdprivacy"; - name = "privacy shutters" - }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 + name = "Privacy Shutters" }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "mj" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "UO45_rdprivacy"; - name = "privacy shutters" - }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 + name = "Privacy Shutters" }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "mk" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "ml" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "mm" = ( /obj/structure/closet/firecloset, @@ -4258,18 +3476,14 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "mn" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "mo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -4279,18 +3493,14 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "mp" = ( /obj/structure/chair{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "mq" = ( /obj/structure/table, @@ -4299,18 +3509,14 @@ pixel_x = 30 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "mr" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ pixel_y = 32 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "ms" = ( /obj/machinery/light/small{ @@ -4320,25 +3526,19 @@ pixel_y = 23; dir = 1 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "mt" = ( /obj/structure/bed, /obj/item/bedsheet, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "mu" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ pixel_x = -30 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "mv" = ( /obj/machinery/light/small{ @@ -4351,9 +3551,7 @@ /obj/structure/chair/wood/normal{ dir = 8 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "mx" = ( /obj/machinery/light/small{ @@ -4361,9 +3559,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "my" = ( /obj/structure/cable{ @@ -4371,24 +3567,18 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "mz" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/rods/fifty, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "mA" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "mB" = ( /obj/structure/table, @@ -4399,17 +3589,13 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "mC" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "mD" = ( /obj/structure/extinguisher_cabinet{ @@ -4420,9 +3606,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "mE" = ( /obj/structure/cable, @@ -4430,7 +3614,6 @@ locked = 0; name = "UO45 Gateway APC"; pixel_y = -23; - req_access = null; start_charge = 100 }, /obj/machinery/light/small, @@ -4439,9 +3622,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "mF" = ( /obj/machinery/firealarm{ @@ -4453,34 +3634,27 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "mG" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "mH" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "mI" = ( /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -4500,9 +3674,7 @@ name = "Research Maintenance"; req_access_txt = "201" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "mL" = ( /obj/structure/cable{ @@ -4511,17 +3683,14 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "mM" = ( /obj/structure/disposalpipe/segment{ dir = 6 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "mN" = ( @@ -4530,40 +3699,32 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "mO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "mP" = ( /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "mQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/kirbyplants{ - layer = 5 - }, +/obj/item/kirbyplants, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "mU" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "mV" = ( /obj/machinery/door/firedoor, @@ -4572,9 +3733,7 @@ name = "Dormitories" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "mW" = ( /obj/machinery/door/firedoor, @@ -4582,9 +3741,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Dormitories" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "mX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, @@ -4598,15 +3755,11 @@ /obj/structure/chair/wood/normal{ dir = 1 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "mY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "mZ" = ( /obj/effect/decal/cleanable/dirt, @@ -4614,17 +3767,13 @@ dir = 8; name = "Air to Distro" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "na" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/bed, /obj/item/bedsheet, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "nb" = ( /obj/machinery/button/door{ @@ -4634,25 +3783,19 @@ pixel_y = -25; specialfunctions = 4 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "ng" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "nh" = ( /obj/machinery/door/poddoor{ id = "UO45_Secure Storage"; - name = "secure storage" - }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 + name = "secure Storage" }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "ni" = ( /turf/closed/wall/r_wall/rust, @@ -4664,9 +3807,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "nk" = ( /obj/structure/table, @@ -4677,15 +3818,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "nl" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "nm" = ( @@ -4693,25 +3832,21 @@ dir = 1 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "nn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/chair, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "np" = ( /obj/structure/chair/office{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "nr" = ( /obj/machinery/light/small{ @@ -4720,9 +3855,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "ns" = ( /obj/structure/cable{ @@ -4734,9 +3867,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "nu" = ( /obj/structure/cable{ @@ -4748,9 +3879,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "nv" = ( /obj/structure/cable{ @@ -4763,24 +3892,18 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "ny" = ( /obj/machinery/vending/coffee, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/crew_quarters) "nz" = ( /obj/machinery/vending/cigarette, /obj/structure/sign/poster/contraband/smoke{ pixel_y = 32 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/crew_quarters) "nA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -4792,9 +3915,7 @@ id_tag = "awaydorm5"; name = "Dorm 5" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "nC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -4802,17 +3923,13 @@ id_tag = "awaydorm7"; name = "Dorm 7" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "nE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "nG" = ( /obj/machinery/door/firedoor, @@ -4822,18 +3939,14 @@ /obj/machinery/door/airlock/public/glass{ name = "Dormitories" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "nH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "nI" = ( /obj/structure/cable{ @@ -4843,18 +3956,14 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "nJ" = ( /obj/structure/cable{ icon_state = "2-4" }, /obj/effect/turf_decal/stripes/corner, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "nK" = ( /obj/structure/cable{ @@ -4867,9 +3976,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "nL" = ( /obj/structure/cable{ @@ -4878,9 +3985,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "nM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -4892,9 +3997,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "nO" = ( /obj/machinery/airalarm/all_access{ @@ -4908,8 +4011,7 @@ /obj/item/radio/off, /obj/item/laser_pointer, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "nP" = ( @@ -4926,8 +4028,7 @@ pixel_y = -2 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "nQ" = ( @@ -4939,8 +4040,7 @@ }, /obj/item/pen, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "nR" = ( @@ -4954,8 +4054,7 @@ network = list("uo45r") }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "nS" = ( @@ -4973,15 +4072,12 @@ pixel_x = 4 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "nU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "nW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -5012,9 +4108,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oe" = ( /obj/structure/cable{ @@ -5031,9 +4125,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "of" = ( /obj/structure/cable{ @@ -5046,9 +4138,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "og" = ( /obj/structure/cable{ @@ -5067,9 +4157,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oi" = ( /obj/structure/cable{ @@ -5082,9 +4170,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oj" = ( /obj/structure/cable{ @@ -5100,9 +4186,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "ol" = ( /obj/structure/cable{ @@ -5117,9 +4201,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "om" = ( /obj/structure/cable{ @@ -5133,9 +4215,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "on" = ( /obj/structure/cable{ @@ -5147,9 +4227,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "op" = ( /obj/machinery/door/firedoor, @@ -5165,9 +4243,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Dormitories" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oq" = ( /obj/structure/cable{ @@ -5179,9 +4255,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "or" = ( /obj/structure/cable{ @@ -5195,9 +4269,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "os" = ( /obj/structure/cable{ @@ -5206,9 +4278,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "ot" = ( /obj/structure/cable, @@ -5218,9 +4288,7 @@ inputting = 0; output_level = 7000 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "ou" = ( /obj/structure/cable, @@ -5230,9 +4298,7 @@ inputting = 0; output_level = 7000 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "ov" = ( /obj/structure/cable{ @@ -5241,15 +4307,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "ox" = ( /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "oy" = ( @@ -5265,15 +4328,14 @@ req_access_txt = "201" }, /obj/machinery/button/door{ - desc = "A remote control-switch that controls the privacy shutters."; + desc = "A remote control-switch that controls the Privacy Shutters."; id = "UO45_rdprivacy"; name = "Privacy Shutter Control"; pixel_y = -2; req_access_txt = "201" }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "oz" = ( @@ -5283,15 +4345,13 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "oA" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "oB" = ( @@ -5299,33 +4359,26 @@ dir = 8 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "oD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "oE" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Office"; req_access_txt = "201" }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "oG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oH" = ( /obj/machinery/door/firedoor, @@ -5335,25 +4388,19 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oI" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oJ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -5369,16 +4416,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oM" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -5387,18 +4430,14 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oR" = ( /obj/structure/cable{ @@ -5407,7 +4446,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/research) @@ -5416,9 +4454,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oT" = ( /obj/structure/cable{ @@ -5436,9 +4472,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "oU" = ( /obj/structure/cable{ @@ -5451,9 +4485,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "oV" = ( /obj/machinery/power/terminal{ @@ -5465,9 +4497,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "oW" = ( /obj/machinery/power/terminal{ @@ -5483,9 +4513,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "oX" = ( /obj/machinery/power/terminal{ @@ -5497,9 +4525,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "oY" = ( /obj/structure/cable{ @@ -5511,9 +4537,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "oZ" = ( /obj/machinery/portable_atmospherics/canister/air, @@ -5533,9 +4557,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "pd" = ( /obj/machinery/disposal/bin, @@ -5548,8 +4570,7 @@ pixel_y = -32 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "pe" = ( @@ -5558,8 +4579,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "pf" = ( @@ -5567,8 +4587,7 @@ dir = 1 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "pg" = ( @@ -5577,32 +4596,26 @@ pixel_y = -27 }, /turf/open/floor/iron/cafeteria{ - dir = 5; - heat_capacity = 1e+006 + dir = 5 }, /area/awaymission/undergroundoutpost45/research) "pj" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 6 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "pm" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "pn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -5612,9 +4625,7 @@ id_tag = "awaydorm4"; name = "Dorm 4" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "pp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -5626,24 +4637,18 @@ id_tag = "awaydorm6"; name = "Dorm 6" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "pr" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "ps" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/crew_quarters) "pt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -5652,16 +4657,13 @@ pixel_x = -24 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "pu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -5672,7 +4674,6 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -5684,7 +4685,6 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -5713,9 +4713,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "pA" = ( /obj/structure/cable{ @@ -5727,9 +4725,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "pB" = ( /obj/structure/cable{ @@ -5744,9 +4740,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "pC" = ( /obj/structure/cable{ @@ -5755,9 +4749,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "pD" = ( /obj/structure/cable{ @@ -5766,9 +4758,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "pE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos{ @@ -5794,9 +4784,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "pH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -5807,17 +4795,13 @@ name = "Server Room"; req_access_txt = "201" }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/research) "pJ" = ( /obj/machinery/door/airlock{ name = "Private Restroom" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/research) "pK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -5832,9 +4816,7 @@ name = "Research Storage"; req_access_txt = "201" }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "pQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -5847,17 +4829,13 @@ pixel_x = -25; specialfunctions = 4 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "pR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "pS" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, @@ -5869,9 +4847,7 @@ }, /obj/structure/bed, /obj/item/bedsheet, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "pU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -5884,9 +4860,7 @@ pixel_x = 25; specialfunctions = 4 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "pV" = ( /obj/machinery/light/small{ @@ -5896,22 +4870,16 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "pW" = ( /obj/machinery/door/airlock{ name = "Unit 1" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "pX" = ( -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "pY" = ( /obj/structure/mirror{ @@ -5922,14 +4890,11 @@ pixel_x = 11 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "qa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -5937,9 +4902,7 @@ /area/awaymission/undergroundoutpost45/caves) "qb" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "qc" = ( /obj/structure/cable{ @@ -5950,31 +4913,23 @@ name = "SMES Room"; req_access_txt = "201" }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "qd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/meter{ - layer = 3.3; name = "Mixed Air Tank Out" }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "qe" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/meter{ - layer = 3.3; name = "Mixed Air Tank In" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "qg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -6004,21 +4959,15 @@ name = "SERVER ROOM"; pixel_y = 32 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "qk" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/research) "ql" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/research) "qm" = ( /obj/machinery/light/small, @@ -6029,18 +4978,14 @@ /obj/structure/mirror{ pixel_x = -28 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/research) "qn" = ( /obj/structure/toilet{ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/research) "qo" = ( /obj/structure/table, @@ -6048,9 +4993,7 @@ /obj/item/reagent_containers/spray/cleaner, /obj/item/clothing/glasses/hud/health, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white/corner{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white/corner, /area/awaymission/undergroundoutpost45/research) "qp" = ( /obj/structure/table, @@ -6061,31 +5004,25 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/hand_labeler, /obj/item/clothing/neck/stethoscope, -/turf/open/floor/iron/white/side{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white/side, /area/awaymission/undergroundoutpost45/research) "qq" = ( /obj/machinery/vending/medical{ req_access_txt = "201" }, /turf/open/floor/iron/white/side{ - dir = 6; - heat_capacity = 1e+006 + dir = 6 }, /area/awaymission/undergroundoutpost45/research) "qr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/side{ - dir = 8; - heat_capacity = 1e+006 + dir = 8 }, /area/awaymission/undergroundoutpost45/research) "qs" = ( /obj/structure/chair/wood/normal, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "qt" = ( /obj/machinery/light/small{ @@ -6095,27 +5032,21 @@ dir = 4; pixel_x = 23 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "qu" = ( /obj/machinery/light/small{ dir = 8 }, /obj/structure/dresser, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "qv" = ( /obj/machinery/airalarm/all_access{ dir = 4; pixel_x = 23 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "qw" = ( /obj/machinery/light/small{ @@ -6125,9 +5056,7 @@ dir = 4; pixel_x = -23 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "qx" = ( /obj/structure/sink{ @@ -6135,23 +5064,18 @@ pixel_x = 11 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "qy" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/crew_quarters) "qz" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 4 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -6162,7 +5086,6 @@ dir = 1 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -6173,7 +5096,6 @@ dir = 9 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -6181,15 +5103,11 @@ /area/awaymission/undergroundoutpost45/caves) "qC" = ( /obj/machinery/vending/cola, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "qD" = ( /obj/structure/chair, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) "qG" = ( /obj/structure/cable{ @@ -6198,9 +5116,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 5 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "qH" = ( /obj/structure/cable{ @@ -6210,9 +5126,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "qJ" = ( /obj/machinery/light{ @@ -6237,9 +5151,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "qL" = ( /obj/machinery/atmospherics/components/trinary/mixer/airmix{ @@ -6248,9 +5160,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/iron/cafeteria{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/cafeteria, /area/awaymission/undergroundoutpost45/engineering) "qM" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -6258,16 +5168,12 @@ }, /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/bot, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "qN" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/bot, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "qO" = ( /obj/structure/cable{ @@ -6275,9 +5181,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "qP" = ( /obj/machinery/light/small{ @@ -6309,17 +5213,13 @@ name = "Server Room"; req_access_txt = "201" }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/research) "qS" = ( /obj/machinery/atmospherics/pipe/simple{ dir = 4 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/research) "qT" = ( /obj/machinery/light/small{ @@ -6330,9 +5230,7 @@ }, /obj/structure/chair/office/light, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/research) "qU" = ( /obj/machinery/light/small{ @@ -6343,8 +5241,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/side{ - dir = 4; - heat_capacity = 1e+006 + dir = 4 }, /area/awaymission/undergroundoutpost45/research) "qV" = ( @@ -6353,9 +5250,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "qW" = ( /obj/machinery/light/small{ @@ -6363,8 +5258,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/side{ - dir = 8; - heat_capacity = 1e+006 + dir = 8 }, /area/awaymission/undergroundoutpost45/research) "qY" = ( @@ -6373,17 +5267,13 @@ pixel_y = -28 }, /obj/item/pen, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "qZ" = ( /obj/structure/chair/wood/normal{ dir = 8 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) "ra" = ( /obj/machinery/light/small{ @@ -6392,18 +5282,14 @@ /obj/structure/toilet{ dir = 4 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "rb" = ( /obj/machinery/door/airlock{ name = "Unit 2" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "rc" = ( /obj/structure/mirror{ @@ -6413,24 +5299,18 @@ dir = 4; pixel_x = 11 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "rd" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/crew_quarters) "re" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/extinguisher_cabinet{ pixel_x = -25 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "rf" = ( /obj/structure/cable{ @@ -6442,16 +5322,12 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "rg" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/crew_quarters) "rh" = ( /obj/machinery/light/small{ @@ -6463,7 +5339,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched1" }, /area/awaymission/undergroundoutpost45/engineering) @@ -6471,18 +5346,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "rj" = ( -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "rm" = ( /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -6500,16 +5370,13 @@ dir = 8; name = "UO45 Engineering APC"; pixel_x = -25; - req_access = null; req_access_txt = "201"; start_charge = 100 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "rq" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/visible, @@ -6517,9 +5384,7 @@ id_tag = "UO45_distro_meter"; name = "Distribution Loop" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "rs" = ( /obj/structure/closet/secure_closet/personal/cabinet{ @@ -6527,17 +5392,13 @@ req_access_txt = "201" }, /obj/item/clothing/under/misc/pj, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/mining) "rt" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "ru" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -6547,33 +5408,25 @@ dir = 1; name = "Mix to Exterior" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "rv" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 9 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "rw" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "rx" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/bot, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "rz" = ( /obj/machinery/atmospherics/pipe/simple{ @@ -6591,25 +5444,19 @@ name = "SERVER ROOM"; pixel_y = -32 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "rB" = ( /obj/structure/table, /obj/item/folder/white, /obj/item/pen, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/research) "rC" = ( /obj/machinery/computer/rdservercontrol{ dir = 1 }, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/research) "rE" = ( /obj/structure/disposalpipe/segment{ @@ -6618,25 +5465,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "rF" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4; - + dir = 4 }, /obj/machinery/door/airlock/maintenance{ name = "Research Maintenance"; req_access_txt = "201" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "rG" = ( /obj/structure/disposalpipe/segment{ @@ -6646,42 +5488,34 @@ dir = 9 }, /turf/open/floor/iron/white/side{ - dir = 4; - heat_capacity = 1e+006 + dir = 4 }, /area/awaymission/undergroundoutpost45/research) "rH" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "rI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "rJ" = ( /obj/structure/table, /obj/item/storage/box/gloves, /turf/open/floor/iron/white/side{ - dir = 8; - heat_capacity = 1e+006 + dir = 8 }, /area/awaymission/undergroundoutpost45/research) "rL" = ( /obj/machinery/door/airlock{ name = "Unisex Showers" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "rN" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -6691,9 +5525,7 @@ c_tag = "Engineering Hallway"; network = list("uo45") }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "rO" = ( /obj/structure/cable{ @@ -6709,9 +5541,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "rP" = ( /obj/structure/disposalpipe/segment{ @@ -6724,9 +5554,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "rQ" = ( /obj/structure/cable{ @@ -6741,9 +5569,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "rR" = ( /obj/structure/cable{ @@ -6758,9 +5584,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "rS" = ( /obj/structure/cable{ @@ -6776,9 +5600,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "rT" = ( /obj/structure/cable{ @@ -6797,9 +5619,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "rU" = ( /obj/structure/cable{ @@ -6815,9 +5635,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "rX" = ( /obj/machinery/door/firedoor, @@ -6834,9 +5652,7 @@ name = "Engineering Reception" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "rY" = ( /obj/structure/cable{ @@ -6848,9 +5664,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "rZ" = ( /obj/structure/cable{ @@ -6860,9 +5674,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sa" = ( /obj/structure/cable{ @@ -6874,9 +5686,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sc" = ( /obj/structure/table/reinforced, @@ -6898,17 +5708,13 @@ pixel_y = 9 }, /obj/item/pen, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "se" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sg" = ( /obj/effect/spawner/structure/window/reinforced, @@ -6917,11 +5723,9 @@ }, /obj/machinery/door/poddoor/preopen{ id = "UO45_Engineering"; - name = "engineering security door" - }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 + name = "engineering Security Door" }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "sh" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ @@ -6929,9 +5733,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "si" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -6941,9 +5743,7 @@ locked = 0; req_access_txt = "201" }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/mining) "sj" = ( /obj/structure/cable, @@ -6951,7 +5751,6 @@ locked = 0; name = "UO45 Mining APC"; pixel_y = -23; - req_access = null; start_charge = 100 }, /obj/machinery/light/small, @@ -6968,61 +5767,45 @@ /obj/item/storage/backpack/satchel/eng, /obj/item/clothing/gloves/fingerless, /obj/effect/turf_decal/tile/brown, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "sk" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "Mix to Distro" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sl" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sm" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sn" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "so" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 }, -/obj/machinery/meter{ - layer = 3.3 - }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/obj/machinery/meter, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "sr" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ @@ -7040,17 +5823,13 @@ /area/awaymission/undergroundoutpost45/engineering) "st" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "su" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "sv" = ( /obj/machinery/disposal/bin, @@ -7063,24 +5842,21 @@ pixel_y = -32 }, /turf/open/floor/iron/white/corner{ - dir = 4; - heat_capacity = 1e+006 + dir = 4 }, /area/awaymission/undergroundoutpost45/research) "sw" = ( /obj/structure/closet/l3closet, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/iron/white/side{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/undergroundoutpost45/research) "sx" = ( /obj/structure/closet/l3closet, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/side{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/undergroundoutpost45/research) "sy" = ( @@ -7095,8 +5871,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/side{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/undergroundoutpost45/research) "sz" = ( @@ -7106,8 +5881,7 @@ pixel_y = 6 }, /turf/open/floor/iron/white/corner{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/undergroundoutpost45/research) "sA" = ( @@ -7115,26 +5889,20 @@ dir = 4 }, /obj/item/soap/nanotrasen, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "sB" = ( /obj/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "sC" = ( /obj/machinery/shower{ dir = 8 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "sD" = ( /obj/structure/cable{ @@ -7143,18 +5911,14 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "sE" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "sF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -7163,9 +5927,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "sG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -7177,9 +5939,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "sH" = ( /obj/machinery/light/small, @@ -7193,18 +5953,14 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "sI" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "sL" = ( /obj/machinery/door/firedoor, @@ -7214,17 +5970,13 @@ /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Reception" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sN" = ( /obj/structure/cable{ @@ -7234,9 +5986,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sP" = ( /obj/structure/table/reinforced, @@ -7256,18 +6006,14 @@ req_access_txt = "201" }, /obj/item/folder/red, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sT" = ( /obj/effect/spawner/structure/window/reinforced, @@ -7276,11 +6022,9 @@ }, /obj/machinery/door/poddoor/preopen{ id = "UO45_Engineering"; - name = "engineering security door" - }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 + name = "engineering Security Door" }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "sU" = ( /obj/machinery/atmospherics/components/binary/pump/on{ @@ -7288,9 +6032,7 @@ name = "Waste In" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sV" = ( /obj/structure/cable{ @@ -7299,68 +6041,50 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/visible, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 10 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sY" = ( /obj/machinery/atmospherics/components/binary/pump/on{ name = "Mix to Filter" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "sZ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 6 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "ta" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 9 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "tb" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "td" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, -/obj/machinery/meter{ - layer = 3.3 - }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/obj/machinery/meter, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "te" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos{ @@ -7383,9 +6107,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "th" = ( /obj/structure/cable{ @@ -7397,9 +6119,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "tj" = ( /obj/structure/cable{ @@ -7412,24 +6132,18 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "tk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "tm" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "tn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -7464,26 +6178,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "ts" = ( /obj/machinery/shower{ dir = 4 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "tt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "tu" = ( /obj/structure/cable{ @@ -7495,9 +6203,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "tv" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -7506,39 +6212,33 @@ dir = 4 }, /turf/open/floor/iron/white/corner{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/undergroundoutpost45/engineering) "tw" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/tile/red{ dir = 4 }, /turf/open/floor/iron/white/corner{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/undergroundoutpost45/engineering) "tx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/central) "tA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "tC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -7547,9 +6247,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 6 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "tD" = ( /obj/structure/cable{ @@ -7558,15 +6256,11 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "tE" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "tF" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ @@ -7576,27 +6270,21 @@ id_tag = "UO45_waste_meter"; name = "Waste Loop" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "tG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "tH" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; name = "N2 Outlet Pump" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "tI" = ( /obj/machinery/atmospherics/components/binary/pump/on{ @@ -7604,9 +6292,7 @@ name = "O2 Outlet Pump" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "tJ" = ( /obj/machinery/atmospherics/components/binary/pump/on{ @@ -7617,9 +6303,7 @@ pixel_x = 32 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "tK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -7636,9 +6320,7 @@ req_access_txt = "201" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "tM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -7663,9 +6345,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "tP" = ( /obj/structure/cable{ @@ -7677,9 +6357,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "tR" = ( /obj/structure/cable{ @@ -7690,9 +6368,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "tU" = ( /obj/structure/cable{ @@ -7705,9 +6381,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "tV" = ( /obj/structure/cable{ @@ -7720,9 +6394,7 @@ dir = 1 }, /obj/item/stack/rods, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "tW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -7734,18 +6406,14 @@ /obj/machinery/shower{ dir = 1 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "tY" = ( /obj/machinery/shower{ dir = 1 }, /obj/item/bikehorn/rubberducky, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/crew_quarters) "tZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -7753,9 +6421,7 @@ /obj/effect/turf_decal/tile/brown{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "ua" = ( /obj/structure/cable{ @@ -7765,16 +6431,13 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "ub" = ( /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -7801,14 +6464,11 @@ name = "Engineering Foyer"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "uh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -7818,9 +6478,7 @@ }, /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/bot, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "uj" = ( /obj/structure/cable{ @@ -7830,17 +6488,13 @@ dir = 1; name = "External to Filter" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "uk" = ( /obj/machinery/atmospherics/components/binary/pump/on{ name = "Air to External" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "ul" = ( /obj/machinery/light, @@ -7852,9 +6506,7 @@ pixel_y = -23 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "uo" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -7864,9 +6516,7 @@ pixel_y = -30 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "ur" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -7874,18 +6524,15 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched2" }, /area/awaymission/undergroundoutpost45/engineering) "us" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 + dir = 9 }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "ut" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ @@ -7894,9 +6541,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "uu" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ @@ -7907,9 +6552,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "uv" = ( /turf/closed/mineral/random/labormineral, @@ -7917,9 +6560,7 @@ "uw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/external, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "ux" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -7927,15 +6568,11 @@ /area/awaymission/undergroundoutpost45/research) "uz" = ( /obj/machinery/door/airlock/maintenance, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/crew_quarters) "uB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "uC" = ( /obj/structure/cable{ @@ -7945,9 +6582,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "uD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -7955,9 +6590,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "uE" = ( /turf/closed/wall, @@ -7968,9 +6601,7 @@ req_access_txt = "201" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "uG" = ( /obj/structure/cable{ @@ -7981,9 +6612,7 @@ name = "Engineering"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "uH" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible, @@ -7994,22 +6623,14 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 1 }, -/obj/machinery/meter{ - layer = 3.3 - }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/obj/machinery/meter, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "uJ" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/meter{ - layer = 3.3 - }, +/obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "uK" = ( /obj/machinery/light/small{ @@ -8019,48 +6640,36 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "uL" = ( /obj/machinery/atmospherics/components/binary/valve, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "uM" = ( /obj/machinery/atmospherics/components/binary/valve, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "uP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "uR" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/crew_quarters) "uT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/brown{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "uU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -8073,8 +6682,7 @@ dir = 8 }, /turf/open/floor/iron/dark/corner{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/undergroundoutpost45/engineering) "uV" = ( @@ -8084,9 +6692,7 @@ /obj/structure/chair/office{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "uW" = ( /obj/structure/cable{ @@ -8098,9 +6704,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "uX" = ( /obj/machinery/light{ @@ -8114,9 +6718,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "uZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -8128,15 +6730,13 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id = "UO45_Engineering"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/turf_decal/delivery, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vb" = ( /obj/machinery/door/firedoor, @@ -8145,15 +6745,13 @@ }, /obj/machinery/door/poddoor/preopen{ id = "UO45_Engineering"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, /obj/effect/turf_decal/delivery, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vc" = ( /obj/machinery/door/firedoor, @@ -8162,13 +6760,11 @@ }, /obj/machinery/door/poddoor/preopen{ id = "UO45_Engineering"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/delivery, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vd" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos{ @@ -8205,9 +6801,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "vi" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -8215,9 +6809,7 @@ }, /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "vj" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -8227,15 +6819,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "vk" = ( /obj/machinery/door/airlock/external, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) "vl" = ( /obj/structure/disposaloutlet{ @@ -8245,7 +6833,6 @@ dir = 4 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -8256,26 +6843,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/crew_quarters) "vn" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/item/stack/rods, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/crew_quarters) "vp" = ( /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/crew_quarters) "vq" = ( /obj/structure/cable{ @@ -8287,7 +6868,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -8300,8 +6880,7 @@ dir = 8 }, /turf/open/floor/iron/dark/corner{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/undergroundoutpost45/engineering) "vt" = ( @@ -8312,9 +6891,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vu" = ( /obj/structure/cable{ @@ -8326,9 +6903,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vv" = ( /obj/structure/cable{ @@ -8343,9 +6918,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vw" = ( /obj/structure/cable{ @@ -8354,9 +6927,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vx" = ( /obj/structure/cable{ @@ -8366,9 +6937,7 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vz" = ( /obj/structure/cable{ @@ -8378,25 +6947,19 @@ name = "Engineering"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vA" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vB" = ( /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vC" = ( /obj/machinery/light/small{ @@ -8404,9 +6967,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vD" = ( /obj/machinery/air_sensor{ @@ -8435,7 +6996,6 @@ dir = 1 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -8458,9 +7018,7 @@ name = "Mining Maintenance"; req_access_txt = "201" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/mining) "vN" = ( /obj/machinery/door/firedoor, @@ -8469,9 +7027,7 @@ name = "Mining Foyer"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "vO" = ( /obj/machinery/door/firedoor, @@ -8483,9 +7039,7 @@ name = "Mining Foyer"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "vP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -8497,9 +7051,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/turf/open/floor/iron/checker{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/checker, /area/awaymission/undergroundoutpost45/engineering) "vQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -8510,9 +7062,7 @@ pixel_y = -27 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -8520,17 +7070,13 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vT" = ( /obj/structure/cable{ @@ -8542,9 +7088,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -8559,9 +7103,7 @@ network = list("uo45") }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -8573,7 +7115,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched2" }, /area/awaymission/undergroundoutpost45/engineering) @@ -8590,9 +7131,7 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "vZ" = ( /obj/structure/closet/firecloset, @@ -8600,9 +7139,7 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "wa" = ( /obj/structure/closet/firecloset, @@ -8610,15 +7147,11 @@ dir = 9 }, /obj/effect/turf_decal/bot, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "wb" = ( /obj/structure/table/wood, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/mining) "wc" = ( /obj/machinery/light/small{ @@ -8627,9 +7160,7 @@ /obj/structure/chair/wood/normal{ dir = 8 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/mining) "wd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -8637,9 +7168,7 @@ }, /obj/structure/bed, /obj/item/bedsheet, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/mining) "we" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -8653,7 +7182,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched1" }, /area/awaymission/undergroundoutpost45/mining) @@ -8664,14 +7192,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/kirbyplants{ - layer = 5 - }, +/obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "wh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -8679,9 +7203,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "wi" = ( /obj/structure/cable{ @@ -8690,16 +7212,13 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "wj" = ( /obj/machinery/light/small{ dir = 8 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -8711,9 +7230,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "wl" = ( /obj/effect/spawner/structure/window/reinforced, @@ -8723,9 +7240,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) "wn" = ( /turf/closed/wall/rust, @@ -8734,9 +7249,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/mining) "wq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -8749,9 +7262,7 @@ pixel_y = -25; specialfunctions = 4 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/mining) "wr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -8761,58 +7272,44 @@ id_tag = "awaydorm8"; name = "Mining Dorm 1" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "ws" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "wt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "wu" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "wv" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "ww" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/mining) "wB" = ( /obj/structure/toilet{ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/engineering) "wC" = ( /obj/machinery/airalarm/all_access{ @@ -8820,27 +7317,21 @@ pixel_x = -23 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "wD" = ( /obj/structure/cable{ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "wE" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "wF" = ( /obj/structure/cable{ @@ -8851,17 +7342,13 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "wK" = ( /obj/machinery/door/airlock{ name = "Private Restroom" }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/engineering) "wL" = ( /obj/structure/sink{ @@ -8872,15 +7359,11 @@ /obj/structure/mirror{ pixel_x = 28 }, -/turf/open/floor/iron/freezer{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/freezer, /area/awaymission/undergroundoutpost45/engineering) "wM" = ( /obj/structure/chair/wood/normal, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/mining) "wN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -8893,9 +7376,7 @@ pixel_y = 25; specialfunctions = 4 }, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/mining) "wO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -8905,9 +7386,7 @@ id_tag = "awaydorm9"; name = "Mining Dorm 2" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "wP" = ( /obj/structure/cable{ @@ -8916,9 +7395,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "wQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -8926,25 +7403,19 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "wU" = ( /obj/structure/chair/fancy/comfy{ dir = 1 }, -/turf/open/floor/carpet/grimy{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet/grimy, /area/awaymission/undergroundoutpost45/central) "wV" = ( /obj/machinery/light/small, /obj/structure/bed, /obj/item/bedsheet, -/turf/open/floor/carpet{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/mining) "wX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -8959,9 +7430,7 @@ req_access_txt = "201" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xb" = ( /obj/structure/cable{ @@ -8970,7 +7439,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/research) @@ -8981,9 +7449,7 @@ name = "Processing Area"; req_access_txt = "201" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xh" = ( /obj/machinery/door/firedoor, @@ -8996,9 +7462,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xl" = ( /obj/machinery/conveyor{ @@ -9007,9 +7471,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/mining) "xm" = ( /obj/machinery/mineral/unloading_machine{ @@ -9021,23 +7483,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/mining) "xn" = ( /obj/effect/turf_decal/loading_area{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -9049,9 +7505,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xq" = ( /obj/machinery/conveyor{ @@ -9063,49 +7517,37 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/mining) "xr" = ( /obj/effect/spawner/structure/window, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/mining) "xs" = ( /obj/machinery/conveyor_switch/oneway{ id = "UO45_mining"; name = "mining conveyor" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xu" = ( /obj/machinery/suit_storage_unit/mining, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xv" = ( /obj/structure/table, /obj/item/pickaxe, /obj/item/radio/off, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xw" = ( /obj/machinery/mineral/processing_unit{ @@ -9114,9 +7556,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/mining) "xx" = ( /obj/machinery/mineral/processing_unit_console{ @@ -9136,9 +7576,7 @@ network = list("uo45") }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xz" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -9147,18 +7585,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/mining) "xB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -9166,14 +7600,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xC" = ( -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xD" = ( /obj/machinery/light/small{ @@ -9186,7 +7616,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched2" }, /area/awaymission/undergroundoutpost45/mining) @@ -9200,23 +7629,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/mining) "xF" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xG" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -9226,9 +7649,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -9241,9 +7662,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -9253,9 +7672,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -9264,16 +7681,12 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xL" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xM" = ( /obj/machinery/mineral/stacking_unit_console{ @@ -9285,9 +7698,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xP" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -9301,9 +7712,7 @@ amount = 19 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xQ" = ( /obj/machinery/computer/mech_bay_power_console{ @@ -9312,9 +7721,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xR" = ( /obj/structure/cable{ @@ -9343,24 +7750,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/mining) "xU" = ( /obj/effect/turf_decal/loading_area{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -9374,7 +7775,6 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched1" }, /area/awaymission/undergroundoutpost45/mining) @@ -9386,16 +7786,12 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "xY" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating{ - heat_capacity = 1e+006 - }, +/turf/open/floor/plating, /area/awaymission/undergroundoutpost45/mining) "xZ" = ( /obj/machinery/airalarm/all_access{ @@ -9404,18 +7800,14 @@ }, /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "ya" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "yb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -9423,23 +7815,18 @@ }, /turf/open/floor/iron{ dir = 8; - heat_capacity = 1e+006; icon_state = "floorscorched1" }, /area/awaymission/undergroundoutpost45/mining) "yc" = ( /obj/structure/ore_box, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "yd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "ye" = ( /obj/machinery/light/small{ @@ -9450,9 +7837,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "yf" = ( /obj/machinery/door/airlock/external{ @@ -9467,7 +7852,6 @@ dir = 1 }, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9476,7 +7860,6 @@ "yh" = ( /obj/structure/ore_box, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9485,7 +7868,6 @@ "yi" = ( /obj/structure/closet/crate, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9496,7 +7878,6 @@ /obj/structure/bed/nest, /obj/effect/mob_spawn/human, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9506,7 +7887,6 @@ /obj/structure/alien/weeds, /obj/structure/bed/nest, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9517,7 +7897,6 @@ /obj/structure/glowshroom/single, /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9527,7 +7906,6 @@ /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9536,7 +7914,6 @@ "yn" = ( /obj/structure/alien/weeds, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9546,7 +7923,6 @@ /obj/structure/alien/weeds, /obj/structure/alien/resin/wall, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9556,7 +7932,6 @@ /obj/structure/alien/weeds, /obj/effect/mob_spawn/human, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9565,7 +7940,6 @@ "yq" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9574,7 +7948,6 @@ "yr" = ( /obj/effect/decal/cleanable/blood/gibs/up, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9584,7 +7957,6 @@ /obj/structure/alien/weeds, /obj/structure/glowshroom/single, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9594,7 +7966,6 @@ /obj/structure/alien/resin/wall, /obj/structure/alien/weeds, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9604,7 +7975,6 @@ /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9613,7 +7983,6 @@ "yz" = ( /obj/structure/alien/resin/membrane, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9623,7 +7992,6 @@ /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9632,7 +8000,6 @@ "yB" = ( /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9642,7 +8009,6 @@ /obj/effect/decal/cleanable/blood/splatter, /obj/effect/mob_spawn/human, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9653,7 +8019,6 @@ /obj/effect/decal/cleanable/blood/splatter, /obj/effect/mob_spawn/human, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9666,7 +8031,6 @@ pixel_x = -32 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/research) @@ -9675,7 +8039,6 @@ /obj/effect/decal/cleanable/blood/gibs/down, /obj/effect/mob_spawn/human, /turf/open/floor/plating/asteroid{ - heat_capacity = 1e+006; initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; initial_temperature = 363.9; name = "Cave Floor" @@ -9688,9 +8051,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "za" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -9699,9 +8060,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "ze" = ( /obj/structure/closet/secure_closet{ @@ -9715,9 +8074,7 @@ /obj/item/clothing/mask/bandana, /obj/item/cultivator, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "zi" = ( /turf/open/space, @@ -9731,9 +8088,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "zt" = ( /obj/structure/cable{ @@ -9746,24 +8101,18 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "zB" = ( /obj/structure/table, /obj/item/book/manual/wiki/barman_recipes, /obj/item/reagent_containers/food/drinks/shaker, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "zE" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "zR" = ( /obj/structure/table, @@ -9773,17 +8122,13 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "Aa" = ( /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Aj" = ( /obj/structure/chair{ @@ -9791,9 +8136,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Ap" = ( /obj/structure/table, @@ -9802,26 +8145,20 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "At" = ( /obj/structure/chair/fancy/comfy{ dir = 4 }, /obj/effect/landmark/awaystart, -/turf/open/floor/carpet/grimy{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet/grimy, /area/awaymission/undergroundoutpost45/central) "AA" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "AG" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -9830,23 +8167,17 @@ /obj/structure/table, /obj/item/book/manual/wiki/security_space_law, /obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "AL" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "AO" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/soda_cans/cola, -/turf/open/floor/carpet/grimy{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet/grimy, /area/awaymission/undergroundoutpost45/central) "AR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -9868,9 +8199,7 @@ req_access_txt = "201" }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "AX" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -9881,23 +8210,17 @@ }, /obj/item/radio/off, /obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Be" = ( /obj/structure/table, /obj/item/trash/plate, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Bv" = ( /obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "BA" = ( /obj/structure/disposalpipe/segment, @@ -9905,9 +8228,7 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "BB" = ( /obj/structure/table, @@ -9922,9 +8243,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "BE" = ( /obj/structure/cable{ @@ -9939,27 +8258,21 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "BO" = ( /obj/structure/chair{ dir = 8 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "BP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "BR" = ( /obj/machinery/computer/security{ @@ -9967,16 +8280,13 @@ network = list("uo45") }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Ca" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -9991,7 +8301,6 @@ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/research) @@ -10000,14 +8309,10 @@ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "Ci" = ( -/turf/open/floor/carpet/grimy{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet/grimy, /area/awaymission/undergroundoutpost45/central) "Co" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -10021,17 +8326,14 @@ dir = 1 }, /turf/open/floor/iron/white/corner{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/undergroundoutpost45/engineering) "Cs" = ( /obj/structure/chair, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Cx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -10040,9 +8342,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "CA" = ( /obj/structure/disposalpipe/segment, @@ -10050,9 +8350,7 @@ dir = 9 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "CK" = ( /obj/structure/cable{ @@ -10065,25 +8363,19 @@ dir = 6 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "CS" = ( /obj/structure/cable{ icon_state = "2-8" }, /obj/effect/turf_decal/tile/green/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "De" = ( /obj/structure/chair/stool, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Dw" = ( /obj/structure/cable{ @@ -10096,16 +8388,13 @@ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) "DJ" = ( /obj/machinery/vending/boozeomat, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "DM" = ( /obj/machinery/door/firedoor, @@ -10117,9 +8406,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "DO" = ( /obj/structure/cable{ @@ -10128,9 +8415,7 @@ /obj/structure/disposalpipe/junction, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "DR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -10138,7 +8423,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/research) @@ -10152,9 +8436,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "Eb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -10169,18 +8451,14 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "Ej" = ( /obj/machinery/vending/hydroseeds{ slogan_delay = 700 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "El" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -10189,9 +8467,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Em" = ( /obj/structure/cable{ @@ -10200,15 +8476,11 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Ev" = ( /obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "EB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -10216,16 +8488,13 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) "EK" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "EL" = ( /obj/structure/cable{ @@ -10233,16 +8502,12 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/brown/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "ET" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "EV" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/n2{ @@ -10251,9 +8516,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Fe" = ( /obj/structure/table/reinforced, @@ -10264,15 +8527,12 @@ /obj/item/pen, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Ff" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/grille, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -10285,35 +8545,27 @@ }, /obj/effect/landmark/awaystart, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Fn" = ( /obj/structure/table, /obj/item/kitchen/fork, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Ft" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Fw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Fx" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -10323,9 +8575,7 @@ /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "FH" = ( /obj/structure/closet/secure_closet{ @@ -10339,18 +8589,14 @@ /obj/item/clothing/mask/bandana, /obj/item/hatchet, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "FM" = ( /obj/machinery/gateway{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "FN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -10358,13 +8604,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "FR" = ( /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -10376,17 +8619,13 @@ /obj/item/lighter{ pixel_x = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Ga" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Gd" = ( /obj/structure/cable{ @@ -10402,9 +8641,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Gg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -10414,9 +8651,7 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "Gh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, @@ -10429,18 +8664,14 @@ req_access_txt = "201" }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "Gi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Gj" = ( /obj/structure/table, @@ -10457,9 +8688,7 @@ }, /obj/item/watertank, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "Gt" = ( /obj/structure/disposalpipe/segment{ @@ -10473,9 +8702,7 @@ pixel_y = -23 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Gy" = ( /obj/structure/chair{ @@ -10484,9 +8711,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "GB" = ( /obj/structure/cable{ @@ -10501,9 +8726,7 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "GF" = ( /obj/structure/disposalpipe/segment{ @@ -10516,16 +8739,13 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "GH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -10535,7 +8755,7 @@ network = list("uo45") }, /obj/machinery/button/door{ - desc = "A remote control-switch for the security privacy shutters."; + desc = "A remote control-switch for the security Privacy Shutters."; id = "UO45_EngineeringOffice"; name = "Privacy Shutters"; pixel_x = -24; @@ -10545,9 +8765,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "GS" = ( /obj/item/storage/belt/security, @@ -10561,14 +8779,11 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "GV" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/crew_quarters) @@ -10577,9 +8792,7 @@ /obj/item/stack/package_wrap, /obj/item/reagent_containers/glass/rag, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Hj" = ( /obj/structure/table/reinforced, @@ -10589,9 +8802,7 @@ }, /obj/item/stamp/chief_engineer, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Hl" = ( /obj/item/food/meat/slab/monkey, @@ -10603,18 +8814,14 @@ name = "meat fridge"; req_access_txt = "201" }, -/turf/open/floor/iron/showroomfloor{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/showroomfloor, /area/awaymission/undergroundoutpost45/crew_quarters) "Hq" = ( /obj/machinery/gateway{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "Hr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -10623,26 +8830,21 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Hy" = ( /obj/structure/chair/fancy/comfy{ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/grimy{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet/grimy, /area/awaymission/undergroundoutpost45/central) "HD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/structure/closet/secure_closet/engineering_personal{ req_access = null; @@ -10652,42 +8854,32 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "HH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "HJ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "HO" = ( /obj/structure/bookcase/manuals/engineering, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "HS" = ( /obj/structure/chair/fancy/comfy{ dir = 8 }, -/turf/open/floor/carpet/grimy{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet/grimy, /area/awaymission/undergroundoutpost45/central) "Ic" = ( /obj/machinery/disposal/bin, @@ -10700,9 +8892,7 @@ pixel_y = -32 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Il" = ( /obj/structure/chair{ @@ -10710,9 +8900,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Iu" = ( /obj/structure/cable{ @@ -10726,16 +8914,12 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Iv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Ix" = ( /obj/structure/chair/fancy/comfy{ @@ -10745,9 +8929,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Iy" = ( /obj/machinery/light/small{ @@ -10758,17 +8940,13 @@ pixel_x = -23 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "IF" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Jj" = ( /obj/structure/cable{ @@ -10779,9 +8957,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Jm" = ( /obj/structure/cable{ @@ -10795,7 +8971,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/research) @@ -10808,15 +8983,12 @@ pixel_x = 3 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Js" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -10832,17 +9004,13 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Jw" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "JD" = ( /obj/structure/cable{ @@ -10858,16 +9026,12 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "JH" = ( /obj/machinery/vending/cigarette, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "JY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -10880,20 +9044,14 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Kf" = ( -/obj/item/kirbyplants{ - layer = 5 - }, +/obj/item/kirbyplants, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Kp" = ( /obj/structure/table, @@ -10902,9 +9060,7 @@ pixel_y = 32 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Kr" = ( /obj/machinery/computer/security{ @@ -10914,23 +9070,17 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "Kw" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "KA" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "KE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -10956,9 +9106,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "KJ" = ( /obj/structure/cable{ @@ -10971,7 +9119,6 @@ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/research) @@ -10985,7 +9132,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/research) @@ -10997,9 +9143,7 @@ pixel_x = 32 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "La" = ( /obj/structure/cable{ @@ -11009,9 +9153,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Lg" = ( /obj/structure/cable{ @@ -11026,9 +9168,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Li" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -11041,16 +9181,13 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Lk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -11059,9 +9196,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Ls" = ( /obj/structure/table, @@ -11069,49 +9204,38 @@ /obj/item/paper/guides/jobs/hydroponics, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "Ly" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/drinkingglass, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Lz" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "LA" = ( /obj/structure/chair{ dir = 8 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/crew_quarters) "LF" = ( /obj/structure/table/wood, -/turf/open/floor/carpet/grimy{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet/grimy, /area/awaymission/undergroundoutpost45/central) "LH" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "LJ" = ( /obj/machinery/light/small{ @@ -11122,9 +9246,7 @@ pixel_x = 24 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "LS" = ( /obj/machinery/gateway, @@ -11132,34 +9254,26 @@ icon_state = "0-2" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "LW" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "LY" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "LZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Ma" = ( /obj/structure/disposalpipe/segment{ @@ -11169,26 +9283,20 @@ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Mb" = ( /obj/structure/table/reinforced, /obj/item/folder/yellow, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Mf" = ( /obj/structure/filingcabinet, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "MC" = ( /obj/structure/disposalpipe/segment{ @@ -11201,9 +9309,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "ME" = ( /obj/structure/cable{ @@ -11215,9 +9321,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "MJ" = ( /obj/structure/chair/office/light{ @@ -11225,9 +9329,7 @@ pixel_y = 3 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "MM" = ( /obj/machinery/door/firedoor, @@ -11243,24 +9345,18 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "MQ" = ( /obj/structure/table, /obj/machinery/reagentgrinder, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "MS" = ( /obj/structure/chair/fancy/comfy, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "MT" = ( /obj/machinery/airalarm/all_access{ @@ -11276,9 +9372,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "MU" = ( /obj/structure/disposalpipe/segment{ @@ -11289,16 +9383,12 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Nc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Nd" = ( /obj/structure/cable{ @@ -11307,15 +9397,12 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/research) "Nj" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Nk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -11324,9 +9411,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Nt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -11336,9 +9421,7 @@ pixel_y = -28 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "NG" = ( /obj/structure/cable{ @@ -11354,9 +9437,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "NH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -11371,9 +9452,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "NQ" = ( /obj/machinery/light/small{ @@ -11399,9 +9478,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "NY" = ( /obj/machinery/light/small, @@ -11425,61 +9502,47 @@ req_access_txt = "201" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Ox" = ( /obj/structure/chair, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "OC" = ( /obj/structure/chair/office{ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "OE" = ( /obj/structure/cable{ icon_state = "2-4" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "OX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "OZ" = ( /obj/structure/chair{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Pn" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, /obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Pz" = ( /obj/structure/chair/fancy/comfy, @@ -11487,18 +9550,14 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "PA" = ( /obj/structure/disposalpipe/segment{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "PQ" = ( /obj/structure/cable{ @@ -11507,7 +9566,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -11524,15 +9582,11 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/green/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Qb" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron/white{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) "Qf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -11545,15 +9599,11 @@ maxcharge = 15000 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Ql" = ( -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Qp" = ( /obj/structure/table, @@ -11561,9 +9611,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "Qq" = ( /obj/structure/cable{ @@ -11571,15 +9619,12 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Qz" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/crew_quarters) @@ -11590,9 +9635,7 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "QC" = ( /obj/structure/cable{ @@ -11610,9 +9653,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "QG" = ( /obj/structure/closet/crate, @@ -11620,7 +9661,6 @@ /obj/item/poster/random_contraband, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/research) @@ -11632,9 +9672,7 @@ pixel_y = -32 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "QL" = ( /obj/machinery/door/firedoor, @@ -11647,35 +9685,25 @@ req_access_txt = "201" }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "QU" = ( /obj/structure/table/wood, /obj/item/newspaper, -/turf/open/floor/carpet/grimy{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet/grimy, /area/awaymission/undergroundoutpost45/central) "QV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/green/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "QZ" = ( -/obj/item/kirbyplants{ - layer = 5 - }, +/obj/item/kirbyplants, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Ri" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -11688,8 +9716,7 @@ dir = 1 }, /turf/open/floor/iron/dark/corner{ - dir = 1; - heat_capacity = 1e+006 + dir = 1 }, /area/awaymission/undergroundoutpost45/engineering) "Rl" = ( @@ -11701,7 +9728,6 @@ locked = 0; name = "Hydroponics APC"; pixel_y = -23; - req_access = null; start_charge = 100 }, /obj/structure/cable{ @@ -11710,17 +9736,13 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Rp" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/beer, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Rs" = ( /obj/structure/table/wood, @@ -11728,16 +9750,13 @@ pixel_x = 1; pixel_y = 5 }, -/turf/open/floor/carpet/grimy{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet/grimy, /area/awaymission/undergroundoutpost45/central) "Rt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -11745,24 +9764,19 @@ /obj/structure/table/reinforced, /obj/item/lighter, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Rw" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Ry" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/crew_quarters) @@ -11772,17 +9786,13 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "RW" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "RX" = ( /obj/structure/cable{ @@ -11797,9 +9807,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Sd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -11813,18 +9821,14 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Sg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Sh" = ( /obj/machinery/firealarm{ @@ -11836,18 +9840,14 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Si" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Sm" = ( /obj/structure/disposalpipe/segment{ @@ -11856,9 +9856,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Sq" = ( /obj/machinery/firealarm{ @@ -11866,9 +9864,7 @@ pixel_x = -24 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Ss" = ( /obj/structure/chair/fancy/comfy, @@ -11876,9 +9872,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Sw" = ( /obj/structure/disposalpipe/segment{ @@ -11888,27 +9882,21 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Sz" = ( /obj/machinery/gateway{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "SL" = ( /obj/machinery/computer/station_alert{ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Ta" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -11918,9 +9906,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Tk" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -11935,14 +9921,11 @@ }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Tl" = ( /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/gateway) @@ -11953,7 +9936,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -11963,9 +9945,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "TF" = ( /obj/effect/decal/cleanable/dirt, @@ -11973,33 +9953,25 @@ dir = 5 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "TI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "TJ" = ( /obj/machinery/vending/snack, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "TM" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "TQ" = ( /obj/structure/cable{ @@ -12014,9 +9986,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "TY" = ( /obj/machinery/light{ @@ -12027,18 +9997,14 @@ pixel_x = 23 }, /obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Ud" = ( /obj/machinery/gateway{ dir = 9 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "Uo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -12053,26 +10019,20 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Uw" = ( /obj/machinery/seed_extractor, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "Ux" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Uy" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -12085,16 +10045,13 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) "UB" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -12104,9 +10061,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "UF" = ( /obj/structure/cable{ @@ -12119,7 +10074,6 @@ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/research) @@ -12136,14 +10090,11 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "UO" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/crew_quarters) @@ -12155,7 +10106,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/research) @@ -12163,9 +10113,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Ve" = ( /obj/structure/cable{ @@ -12176,9 +10124,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Vf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -12194,9 +10140,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Vh" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -12206,9 +10150,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Vn" = ( /obj/structure/reagent_dispensers/peppertank{ @@ -12218,16 +10160,12 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "Vo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Vt" = ( /obj/machinery/light/small{ @@ -12244,18 +10182,14 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Vu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Vz" = ( /obj/machinery/disposal/bin, @@ -12266,9 +10200,7 @@ pixel_y = 32 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "VG" = ( /obj/structure/cable{ @@ -12285,9 +10217,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "VJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -12296,9 +10226,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "VK" = ( /obj/machinery/airalarm/all_access{ @@ -12315,9 +10243,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) "VN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -12326,9 +10252,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "VO" = ( /obj/machinery/light/small, @@ -12338,9 +10262,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "VR" = ( /obj/structure/cable{ @@ -12352,7 +10274,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -12363,17 +10284,13 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "We" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Wk" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -12386,33 +10303,25 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Wn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/effect/landmark/awaystart, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Wz" = ( /obj/machinery/gateway{ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "WH" = ( /obj/machinery/biogenerator, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "WK" = ( /obj/structure/chair/fancy/comfy{ @@ -12421,9 +10330,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "WN" = ( /obj/machinery/computer/monitor/secret{ @@ -12432,9 +10339,7 @@ }, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Xm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -12454,23 +10359,17 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Xv" = ( /obj/structure/table/wood, /obj/item/book/manual/ripley_build_and_repair, -/turf/open/floor/carpet/grimy{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet/grimy, /area/awaymission/undergroundoutpost45/central) "Xx" = ( /obj/machinery/vending/cola, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "XN" = ( /obj/structure/disposalpipe/segment, @@ -12480,9 +10379,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Yo" = ( /obj/structure/cable{ @@ -12498,9 +10395,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Yq" = ( /obj/structure/disposalpipe/junction/flip{ @@ -12509,9 +10404,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Yu" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -12526,9 +10419,7 @@ sensors = list("UO45_o2_sensor" = "Tank") }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Yz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -12536,22 +10427,16 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "YA" = ( /obj/effect/landmark/awaystart, -/turf/open/floor/carpet/grimy{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet/grimy, /area/awaymission/undergroundoutpost45/central) "YH" = ( /obj/machinery/vending/hydronutrients, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) "YL" = ( /obj/structure/disposalpipe/segment{ @@ -12562,9 +10447,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "YM" = ( /obj/structure/cable{ @@ -12578,24 +10461,18 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "YO" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "YX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "YY" = ( /obj/machinery/airalarm/all_access{ @@ -12611,9 +10488,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "YZ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -12622,9 +10497,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) "Ze" = ( /obj/structure/cable{ @@ -12635,13 +10508,10 @@ locked = 0; name = "UO45 Bar APC"; pixel_y = 23; - req_access = null; start_charge = 100 }, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "Zh" = ( /obj/structure/cable{ @@ -12651,7 +10521,6 @@ dir = 5 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -12660,18 +10529,14 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) "Zl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "Zo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -12679,9 +10544,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "ZA" = ( /obj/structure/cable{ @@ -12695,7 +10558,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/research) @@ -12708,15 +10570,12 @@ pixel_x = 4; pixel_y = 2 }, -/turf/open/floor/carpet/grimy{ - heat_capacity = 1e+006 - }, +/turf/open/floor/carpet/grimy, /area/awaymission/undergroundoutpost45/central) "ZE" = ( /obj/structure/closet, /obj/item/storage/belt/utility, /turf/open/floor/plating{ - heat_capacity = 1e+006; burnt = 1 }, /area/awaymission/undergroundoutpost45/crew_quarters) @@ -12726,7 +10585,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/central) @@ -12739,9 +10597,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) "ZJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -12750,16 +10606,13 @@ network = list("uo45") }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) "ZK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating{ - heat_capacity = 1e+006; broken = 1 }, /area/awaymission/undergroundoutpost45/research) @@ -12776,9 +10629,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) (1,1,1) = {" diff --git a/_maps/RuinGeneration/13x13_ai-lab.dmm b/_maps/RuinGeneration/13x13_ai-lab.dmm index c070dca1389c1..5c318db19c6f9 100644 --- a/_maps/RuinGeneration/13x13_ai-lab.dmm +++ b/_maps/RuinGeneration/13x13_ai-lab.dmm @@ -198,7 +198,7 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/poddoor/shutters/preopen{ id = "AI Core shutters"; - name = "AI core shutters" + name = "AI Core Shutters" }, /turf/open/floor/circuit/red, /area/ruin/unpowered) @@ -353,7 +353,7 @@ /area/ruin/unpowered) "WX" = ( /obj/machinery/door/airlock/grunge{ - name = "AI research room" + name = "AI Research Room" }, /turf/open/floor/iron/tech/grid, /area/ruin/unpowered) diff --git a/_maps/RuinGeneration/13x13_hilberttest.dmm b/_maps/RuinGeneration/13x13_hilberttest.dmm index f6dd5717bc14b..4e1dec816fa19 100644 --- a/_maps/RuinGeneration/13x13_hilberttest.dmm +++ b/_maps/RuinGeneration/13x13_hilberttest.dmm @@ -128,7 +128,7 @@ /area/ruin/unpowered) "V" = ( /obj/machinery/door/airlock/vault{ - name = "secured door"; + name = "secured Door"; req_access = 207 }, /obj/effect/mapping_helpers/airlock/locked, diff --git a/_maps/RuinGeneration/13x13_listening_base.dmm b/_maps/RuinGeneration/13x13_listening_base.dmm index dc5cea8a72d4c..77b6075c3231d 100644 --- a/_maps/RuinGeneration/13x13_listening_base.dmm +++ b/_maps/RuinGeneration/13x13_listening_base.dmm @@ -347,8 +347,7 @@ /area/ruin/space/has_grav/listeningstation) "sQ" = ( /obj/structure/rack{ - dir = 8; - layer = 2.9 + dir = 8 }, /obj/item/mining_scanner, /obj/item/pickaxe, diff --git a/_maps/RuinGeneration/17x9_pubbybridgehall.dmm b/_maps/RuinGeneration/17x9_pubbybridgehall.dmm index 5bc36e6c0b68e..260436e59f851 100644 --- a/_maps/RuinGeneration/17x9_pubbybridgehall.dmm +++ b/_maps/RuinGeneration/17x9_pubbybridgehall.dmm @@ -97,9 +97,7 @@ /turf/open/floor/iron, /area/ruin/unpowered) "I" = ( -/obj/item/kirbyplants/photosynthetic{ - layer = 3.1 - }, +/obj/item/kirbyplants/photosynthetic, /obj/structure/window/fulltile, /turf/open/floor/plating, /area/ruin/unpowered) diff --git a/_maps/RuinGeneration/9x13_kitchen.dmm b/_maps/RuinGeneration/9x13_kitchen.dmm index d32ac78dcd336..4e16f38b5494a 100644 --- a/_maps/RuinGeneration/9x13_kitchen.dmm +++ b/_maps/RuinGeneration/9x13_kitchen.dmm @@ -1,9 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "b" = ( /obj/structure/table, -/obj/item/reagent_containers/food/condiment/enzyme{ - layer = 5 - }, +/obj/item/reagent_containers/food/condiment/enzyme, /obj/item/stack/package_wrap, /turf/open/floor/iron/cafeteria, /area/ruin/unpowered) diff --git a/_maps/RuinGeneration/9x9_chemlab.dmm b/_maps/RuinGeneration/9x9_chemlab.dmm index c907bcfb3aaa8..83c0acb084bf9 100644 --- a/_maps/RuinGeneration/9x9_chemlab.dmm +++ b/_maps/RuinGeneration/9x9_chemlab.dmm @@ -119,7 +119,7 @@ /area/ruin) "aT" = ( /obj/machinery/smartfridge/chemistry/preloaded, -/turf/closed/wall, +/turf/open/floor/iron/white, /area/ruin) "aV" = ( /obj/effect/abstract/doorway_marker{ @@ -269,9 +269,7 @@ /turf/open/floor/iron/white, /area/ruin) "Px" = ( -/obj/machinery/chem_dispenser{ - layer = 2.7 - }, +/obj/machinery/chem_dispenser, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, diff --git a/_maps/arenas/cargobelt.dmm b/_maps/arenas/cargobelt.dmm index 67b8c959d2809..993c8ff12bbb1 100644 --- a/_maps/arenas/cargobelt.dmm +++ b/_maps/arenas/cargobelt.dmm @@ -1,7 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "d" = ( /obj/machinery/conveyor/auto, -/obj/machinery/conveyor/auto, /turf/open/indestructible, /area/tdome/arena) "e" = ( @@ -78,10 +77,6 @@ /obj/effect/turf_decal/caution/stand_clear, /turf/open/indestructible, /area/tdome/arena) -"R" = ( -/obj/machinery/conveyor/auto, -/turf/open/indestructible, -/area/tdome/arena) "V" = ( /obj/machinery/conveyor/auto{ dir = 1 @@ -121,12 +116,12 @@ e "} (4,1,1) = {" d -R +d t t t t -R +d j "} (5,1,1) = {" diff --git a/_maps/arenas/solars.dmm b/_maps/arenas/solars.dmm index c1ca5307aa838..b32df50fb71df 100644 --- a/_maps/arenas/solars.dmm +++ b/_maps/arenas/solars.dmm @@ -3,9 +3,7 @@ /turf/open/floor/fakespace, /area/tdome/arena) "b" = ( -/obj/structure/lattice{ - layer = 2.9 - }, +/obj/structure/lattice, /turf/open/floor/fakespace, /area/tdome/arena) "c" = ( @@ -26,32 +24,23 @@ /turf/open/floor/iron/solarpanel/airless, /area/tdome/arena) "f" = ( -/obj/structure/lattice/catwalk{ - layer = 2.9 - }, +/obj/structure/lattice/catwalk, /obj/structure/cable{ - layer = 3; level = 2 }, /obj/item/screwdriver, /turf/open/floor/fakespace, /area/tdome/arena) "g" = ( -/obj/structure/lattice/catwalk{ - layer = 2.9 - }, +/obj/structure/lattice/catwalk, /obj/structure/cable{ - layer = 3; level = 2 }, /turf/open/floor/fakespace, /area/tdome/arena) "h" = ( -/obj/structure/lattice/catwalk{ - layer = 2.9 - }, +/obj/structure/lattice/catwalk, /obj/structure/cable{ - layer = 3; level = 2 }, /obj/item/clothing/suit/space/fragile{ @@ -64,11 +53,8 @@ /turf/open/floor/fakespace, /area/tdome/arena) "i" = ( -/obj/structure/lattice/catwalk{ - layer = 2.9 - }, +/obj/structure/lattice/catwalk, /obj/structure/cable{ - layer = 3; level = 2 }, /obj/item/stack/cable_coil, @@ -79,11 +65,8 @@ /turf/open/floor/fakespace, /area/tdome/arena) "k" = ( -/obj/structure/lattice/catwalk{ - layer = 2.9 - }, +/obj/structure/lattice/catwalk, /obj/structure/cable{ - layer = 3; level = 2 }, /obj/item/wrench, diff --git a/_maps/holodeck/basketball.dmm b/_maps/holodeck/basketball.dmm index e5415a411b535..8fdba8484b023 100644 --- a/_maps/holodeck/basketball.dmm +++ b/_maps/holodeck/basketball.dmm @@ -39,9 +39,7 @@ /turf/open/floor/holofloor, /area/template_noop) "t" = ( -/obj/structure/holohoop{ - layer = 3.9 - }, +/obj/structure/holohoop, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -89,8 +87,7 @@ /area/template_noop) "I" = ( /obj/structure/holohoop{ - dir = 1; - layer = 4.1 + dir = 1 }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 diff --git a/_maps/holodeck/kobayashi.dmm b/_maps/holodeck/kobayashi.dmm index c62656723d557..7e2deee47eb41 100644 --- a/_maps/holodeck/kobayashi.dmm +++ b/_maps/holodeck/kobayashi.dmm @@ -5,14 +5,12 @@ "c" = ( /obj/machinery/button/massdriver/indestructible{ id = "trektorpedo1"; - layer = 3.9; name = "photon torpedo button"; pixel_x = -16; pixel_y = -5 }, /obj/machinery/button/massdriver/indestructible{ id = "trektorpedo2"; - layer = 3.9; name = "photon torpedo button"; pixel_x = 16; pixel_y = -5 @@ -68,8 +66,7 @@ /area/template_noop) "n" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -205,8 +202,7 @@ /obj/item/clothing/under/trek/engsec, /obj/item/clothing/under/trek/engsec, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 diff --git a/_maps/holodeck/lounge.dmm b/_maps/holodeck/lounge.dmm index 81f5766186203..6c1c58f31c284 100644 --- a/_maps/holodeck/lounge.dmm +++ b/_maps/holodeck/lounge.dmm @@ -21,8 +21,7 @@ /obj/machinery/door/window{ base_state = "right"; dir = 4; - icon_state = "right"; - layer = 3 + icon_state = "right" }, /turf/open/floor/holofloor{ dir = 9; @@ -38,9 +37,7 @@ /area/template_noop) "f" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - layer = 3.3 - }, +/obj/item/flashlight/lamp/green, /turf/open/floor/holofloor{ dir = 9; icon_state = "wood" @@ -62,8 +59,7 @@ /area/template_noop) "j" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /turf/open/floor/holofloor{ dir = 9; @@ -81,8 +77,7 @@ "l" = ( /obj/structure/chair/stool/bar, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /turf/open/floor/holofloor{ dir = 9; @@ -293,8 +288,7 @@ "Y" = ( /obj/structure/table/wood/bar, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /turf/open/floor/holofloor{ dir = 9; diff --git a/_maps/holodeck/meeting.dmm b/_maps/holodeck/meeting.dmm index b88e582a4dc7c..237f313c7ec8c 100644 --- a/_maps/holodeck/meeting.dmm +++ b/_maps/holodeck/meeting.dmm @@ -44,8 +44,7 @@ /area/template_noop) "g" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /turf/open/floor/holofloor/carpet, /area/template_noop) @@ -156,9 +155,7 @@ /area/template_noop) "y" = ( /obj/structure/table/wood/bar, -/obj/item/flashlight/lamp/green{ - layer = 3.3 - }, +/obj/item/flashlight/lamp/green, /turf/open/floor/holofloor{ dir = 9; icon_state = "wood" diff --git a/_maps/holodeck/small/kobayashi.dmm b/_maps/holodeck/small/kobayashi.dmm index cef08f27f6494..bca2d999dd6d8 100644 --- a/_maps/holodeck/small/kobayashi.dmm +++ b/_maps/holodeck/small/kobayashi.dmm @@ -36,14 +36,12 @@ "j" = ( /obj/machinery/button/massdriver/indestructible{ id = "trektorpedo1"; - layer = 3.9; name = "photon torpedo button"; pixel_x = -5; pixel_y = -5 }, /obj/machinery/button/massdriver/indestructible{ id = "trektorpedo2"; - layer = 3.9; name = "photon torpedo button"; pixel_x = 5; pixel_y = -5 @@ -68,9 +66,7 @@ /turf/open/floor/holofloor/plating, /area/template_noop) "n" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, +/obj/structure/window/reinforced, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -100,8 +96,7 @@ /obj/item/clothing/under/trek/engsec, /obj/item/clothing/under/trek/engsec, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /turf/open/floor/holofloor/plating, /area/template_noop) @@ -239,8 +234,7 @@ /area/template_noop) "X" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /turf/open/floor/holofloor/plating, /area/template_noop) diff --git a/_maps/holodeck/small/lounge.dmm b/_maps/holodeck/small/lounge.dmm index bb037948677f9..cb3c53c73486f 100644 --- a/_maps/holodeck/small/lounge.dmm +++ b/_maps/holodeck/small/lounge.dmm @@ -3,8 +3,7 @@ /obj/machinery/door/window{ base_state = "right"; dir = 4; - icon_state = "right"; - layer = 3 + icon_state = "right" }, /turf/open/floor/holofloor{ dir = 9; @@ -27,8 +26,7 @@ "h" = ( /obj/structure/table/wood/bar, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/item/reagent_containers/food/drinks/shaker{ pixel_x = 4 @@ -59,8 +57,7 @@ /area/template_noop) "j" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /turf/open/floor/holofloor{ dir = 9; @@ -70,8 +67,7 @@ "l" = ( /obj/structure/chair/stool/bar, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /turf/open/floor/holofloor{ dir = 9; @@ -158,7 +154,6 @@ "C" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ - layer = 3.3; pixel_x = -6; pixel_y = 13 }, diff --git a/_maps/holodeck/small/meeting.dmm b/_maps/holodeck/small/meeting.dmm index 4009d11777435..c53ddab8ee5fe 100644 --- a/_maps/holodeck/small/meeting.dmm +++ b/_maps/holodeck/small/meeting.dmm @@ -113,8 +113,7 @@ /area/template_noop) "x" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /obj/machinery/photocopier, /obj/effect/turf_decal/bot, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 3531ec5ff39a5..62d532a7d9ebd 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -726,9 +726,7 @@ /turf/open/floor/iron/dark, /area/bridge) "aiR" = ( -/obj/structure/curtain{ - layer = 4.5 - }, +/obj/structure/curtain, /obj/item/bedsheet/medical, /obj/structure/bed, /turf/open/floor/iron/white, @@ -839,7 +837,7 @@ "akZ" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -978,7 +976,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Chamber" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1119,10 +1117,6 @@ dir = 1 }, /obj/machinery/telecomms/server/presets/exploration, -/obj/structure/window/reinforced/spawner{ - dir = 1 - }, -/obj/machinery/telecomms/server/presets/exploration, /obj/machinery/camera/autoname/directional/west, /turf/open/floor/circuit/telecomms/server, /area/quartermaster/exploration_dock) @@ -1631,12 +1625,11 @@ }, /area/hallway/secondary/entry) "axe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/tile/techfloorgrid{ + dir = 9 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/turf/open/floor/iron/tech, +/area/crew_quarters/fitness) "axj" = ( /obj/machinery/door/airlock/maintenance{ name = "Firefighting Equipment"; @@ -1916,16 +1909,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"aAI" = ( -/obj/structure/curtain/directional{ - dir = 8 - }, -/obj/structure/curtain/directional{ - dir = 8 - }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/medical/surgery) "aAM" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -3630,7 +3613,7 @@ /area/security/prison) "aSP" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/iron, /area/crew_quarters/kitchen) "aTb" = ( /obj/structure/cable/yellow{ @@ -5094,7 +5077,7 @@ "bhu" = ( /obj/machinery/door/poddoor/shutters{ id = "Skynet_launch"; - name = "mech bay" + name = "Mech Bay" }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -5106,7 +5089,7 @@ "bhy" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics"; - name = "robotics lab shutters" + name = "Robotics Lab" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -5117,7 +5100,7 @@ "bhC" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd"; - name = "research lab shutters" + name = "Research Lab" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -5177,8 +5160,7 @@ /obj/machinery/door/window{ base_state = "right"; dir = 4; - icon_state = "right"; - layer = 3 + icon_state = "right" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -5232,7 +5214,7 @@ "bic" = ( /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; - name = "biohazard containment door" + name = "biohazard Containment Door" }, /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5516,7 +5498,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Disposal Exit"; - name = "disposal exit vent" + name = "disposal Exit Vent" }, /turf/open/floor/plating, /area/maintenance/disposal) @@ -5771,9 +5753,7 @@ /area/quartermaster/storage) "bmK" = ( /obj/item/bedsheet/medical, -/obj/structure/curtain{ - layer = 4.5 - }, +/obj/structure/curtain, /obj/structure/bed, /turf/open/floor/iron/freezer, /area/medical/virology) @@ -5844,7 +5824,7 @@ "bnv" = ( /obj/machinery/door/poddoor{ id = "trash"; - name = "disposal bay door" + name = "disposal Bay Door" }, /obj/structure/fans/tiny, /turf/open/floor/plating, @@ -5941,7 +5921,7 @@ "boy" = ( /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; - name = "biohazard containment door" + name = "biohazard Containment Door" }, /obj/effect/turf_decal/bot, /obj/structure/noticeboard{ @@ -6109,7 +6089,7 @@ }, /obj/machinery/door/poddoor{ id = "QMLoaddoor2"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /turf/open/floor/plating, /area/quartermaster/storage) @@ -6206,7 +6186,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics2"; - name = "robotics lab shutters" + name = "Robotics Lab" }, /obj/item/folder/white, /obj/item/pen, @@ -6352,7 +6332,7 @@ "btX" = ( /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; - name = "Chemistry shutters" + name = "Chemistry Shutters" }, /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -6405,7 +6385,7 @@ "buj" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics2"; - name = "robotics lab shutters" + name = "Robotics Lab" }, /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -6481,7 +6461,7 @@ }, /obj/machinery/door/poddoor{ id = "QMLoaddoor"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /turf/open/floor/plating, /area/quartermaster/storage) @@ -6543,7 +6523,7 @@ "bwg" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "hopqueue"; - name = "HoP Queue Shutters" + name = "HoP Queue" }, /obj/effect/turf_decal/loading_area{ dir = 4 @@ -7167,7 +7147,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Chamber" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -7272,7 +7252,6 @@ /turf/open/floor/iron, /area/quartermaster/qm) "bFu" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, @@ -7685,7 +7664,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "misclab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, @@ -7696,7 +7675,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "misclab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, @@ -7718,7 +7697,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "misclab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -7728,7 +7707,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "misclab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, @@ -7891,7 +7870,7 @@ "bLl" = ( /obj/machinery/door/poddoor{ id = "toxinsdriver"; - name = "toxins launcher bay door" + name = "toxins Launcher Bay Door" }, /obj/structure/fans/tiny, /turf/open/floor/plating, @@ -8988,7 +8967,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio3"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, @@ -9035,7 +9014,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio8"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, @@ -9195,7 +9174,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio3"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -9231,7 +9210,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio8"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -9251,9 +9230,6 @@ /obj/machinery/camera/autoname/directional/north{ network = list("ss13, prison") }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/techmaint, /area/security/prison/shielded) @@ -9381,7 +9357,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio3"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -9416,7 +9392,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio8"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -9724,7 +9700,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio2"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, @@ -9755,7 +9731,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, @@ -9949,7 +9925,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio2"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -9964,7 +9940,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -10124,7 +10100,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -10136,7 +10112,7 @@ }, /obj/machinery/door/poddoor/shutters/window{ id = "courtcell"; - name = "Court cell Shutters" + name = "Court Cell Shutters" }, /turf/open/floor/iron/dark, /area/security/prison) @@ -10394,7 +10370,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "privacy Shutter" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -10412,7 +10388,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "privacy Shutter" }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -10488,7 +10464,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Chamber" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -10526,7 +10502,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio1"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, @@ -10557,7 +10533,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio6"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, @@ -10614,7 +10590,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, @@ -10704,7 +10680,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio1"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -10719,7 +10695,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio6"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -10838,7 +10814,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Chamber" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -10883,7 +10859,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio1"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -10902,7 +10878,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio6"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -11029,7 +11005,6 @@ }, /obj/machinery/button/door{ id = "SecJusticeChamber"; - layer = 4; name = "Justice Vent Control"; pixel_x = -36; pixel_y = 26; @@ -11341,9 +11316,7 @@ /turf/open/floor/prison, /area/security/prison) "ceE" = ( -/obj/item/kirbyplants/random{ - layer = 3.1 - }, +/obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 10 }, @@ -11406,7 +11379,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "privacy Shutter" }, /turf/open/floor/plating, /area/crew_quarters/heads/chief) @@ -11578,6 +11551,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/portable_atmospherics/canister/bz, /turf/open/floor/iron, /area/science/xenobiology) "cgz" = ( @@ -11635,7 +11609,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "privacy Shutter" }, /turf/open/floor/plating, /area/crew_quarters/heads/chief) @@ -11878,7 +11852,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "privacy Shutter" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -11938,7 +11912,7 @@ "ciY" = ( /obj/machinery/door/poddoor{ id = "Secure Storage"; - name = "secure storage" + name = "secure Storage" }, /turf/open/floor/plating, /area/engine/engineering) @@ -12379,7 +12353,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Chamber" }, /obj/structure/cable/yellow{ icon_state = "2-4" @@ -13066,8 +13040,6 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "csm" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple{ dir = 10 }, @@ -13200,7 +13172,7 @@ "csU" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -13266,7 +13238,7 @@ "ctH" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgewindow"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -13629,7 +13601,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "misclab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/general/visible, @@ -14910,7 +14882,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/poddoor/preopen{ id = "Engineering"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/orange/visible, @@ -15340,9 +15312,6 @@ /area/security/prison) "cMg" = ( /obj/structure/lattice, -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13", "minisat") - }, /obj/machinery/camera/autoname/directional/west{ network = list("ss13","minisat") }, @@ -16348,9 +16317,6 @@ /area/hallway/primary/central) "dgD" = ( /obj/machinery/holopad, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -16741,16 +16707,6 @@ /turf/open/floor/iron/white, /area/science/lab) "dpA" = ( -/obj/machinery/button/door{ - id = "rnd"; - name = "Shutters Control Button"; - pixel_x = -6; - pixel_y = 24; - req_access_txt = "47" - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/machinery/button/door{ id = "rnd"; name = "Shutters Control Button"; @@ -16920,7 +16876,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /obj/machinery/door/window/northleft{ dir = 4; - layer = 3.1; name = "Magboot Storage"; req_access_txt = "19" }, @@ -17665,7 +17620,7 @@ "dIp" = ( /obj/machinery/door/poddoor/preopen{ id = "testlab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/closeup{ @@ -17677,6 +17632,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/crew_quarters/fitness) "dIs" = ( @@ -17774,15 +17730,15 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) "dKn" = ( -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /obj/structure/table, /obj/item/paper/fluff/holodeck/disclaimer, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/techfloorgrid{ + dir = 9 + }, +/turf/open/floor/iron/tech, /area/crew_quarters/fitness) "dKr" = ( /obj/structure/cable/yellow{ @@ -17976,9 +17932,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/structure/curtain{ - layer = 4.5 - }, +/obj/structure/curtain, /obj/item/bedsheet/medical, /obj/structure/bed, /turf/open/floor/iron/white, @@ -18016,12 +17970,12 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "dOL" = ( -/obj/structure/bodycontainer/morgue, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/disposalpipe/sorting/mail/destination/xenobiology/flip{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/effect/turf_decal/loading_area, +/turf/open/floor/iron/white, +/area/science/xenobiology) "dOV" = ( /obj/machinery/computer/shuttle_flight/custom_shuttle/exploration{ dir = 8 @@ -18149,7 +18103,7 @@ "dRx" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd2"; - name = "research lab shutters" + name = "Research Lab" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -18465,12 +18419,8 @@ "dXK" = ( /obj/structure/table, /obj/item/folder/white, -/obj/item/pen{ - layer = 3.1 - }, -/obj/item/clothing/neck/stethoscope{ - layer = 3.2 - }, +/obj/item/pen, +/obj/item/clothing/neck/stethoscope, /obj/machinery/light/small{ dir = 4 }, @@ -18609,7 +18559,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; - name = "biohazard containment door" + name = "biohazard Containment Door" }, /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -18853,7 +18803,7 @@ "eek" = ( /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; - name = "biohazard containment door" + name = "biohazard Containment Door" }, /obj/effect/turf_decal/bot, /obj/machinery/door/firedoor, @@ -19104,8 +19054,8 @@ /turf/open/floor/iron, /area/maintenance/aft) "eke" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 9 }, /turf/closed/wall, /area/maintenance/aft) @@ -19575,9 +19525,6 @@ /turf/open/floor/engine, /area/gateway) "euG" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -19729,13 +19676,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - name = "Genie"; - sortType = 23 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail/destination/medbay{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/aft) "exD" = ( @@ -20054,12 +19999,8 @@ }, /obj/structure/table, /obj/item/folder/white, -/obj/item/pen{ - layer = 3.1 - }, -/obj/item/clothing/neck/stethoscope{ - layer = 3.2 - }, +/obj/item/pen, +/obj/item/clothing/neck/stethoscope, /obj/machinery/camera/autoname/directional/west{ network = list("ss13, engine") }, @@ -20084,7 +20025,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/airlock/science{ - name = "exploration preperation room"; + name = "exploration Preperation Room"; req_access_txt = "49" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -20362,7 +20303,7 @@ "eLa" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -20386,7 +20327,7 @@ "eLl" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgewindow"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -21029,9 +20970,7 @@ }, /area/science/research) "eWt" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, +/obj/structure/window/reinforced, /obj/machinery/door/window/northleft{ name = "Kitchen Delivery"; req_access_txt = "28"; @@ -21676,12 +21615,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/disposalpipe/junction/flip{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/xenobiology/flip, /turf/open/floor/plating, /area/maintenance/aft) "fkt" = ( @@ -21809,7 +21746,7 @@ /area/crew_quarters/toilet) "fnS" = ( /obj/machinery/door/airlock/security/glass{ - name = "Anti Radiation shielded room" + name = "Anti Radiation Shielded Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -22308,9 +22245,6 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/dark, /area/medical/morgue) @@ -22328,6 +22262,10 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"fzR" = ( +/obj/machinery/smartfridge/chemistry, +/turf/open/floor/iron/dark, +/area/medical/storage) "fAi" = ( /obj/docking_port/stationary/random{ dir = 4; @@ -22552,7 +22490,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Chamber" }, /turf/open/floor/iron/white, /area/medical/virology) @@ -23045,14 +22983,6 @@ pixel_y = 33 }, /obj/effect/landmark/prisonspawn, -/obj/effect/turf_decal/tile/red/anticorner_ramp/contrasted{ - dir = 4 - }, -/obj/structure/sign/warning/radiation_shelter{ - pixel_x = 1; - pixel_y = 33 - }, -/obj/effect/landmark/prisonspawn, /obj/machinery/camera/autoname/directional/north{ network = list("ss13, prison") }, @@ -23259,7 +23189,6 @@ }, /obj/structure/window/reinforced, /obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/grass/no_border, /area/crew_quarters/bar/atrium) "fTL" = ( @@ -23408,15 +23337,6 @@ /obj/effect/turf_decal/tile/dark_blue{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron/dark, /area/crew_quarters/heads/cmo) @@ -23663,7 +23583,6 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - layer = 4.1; name = "Secondary AI Core Access"; obj_integrity = 300; pixel_x = 4; @@ -23929,12 +23848,9 @@ /area/medical/chemistry) "gef" = ( /obj/structure/railing{ - dir = 10; - layer = 3.2 - }, -/obj/item/kirbyplants/random{ - layer = 3.1 + dir = 10 }, +/obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/end{ dir = 1 @@ -24354,7 +24270,7 @@ "gos" = ( /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -24520,7 +24436,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "briggate"; - name = "security shutters" + name = "Security Shutters" }, /obj/machinery/door/window/eastright{ name = "Brig Desk" @@ -24746,9 +24662,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/medical/morgue) @@ -25385,11 +25298,6 @@ }, /obj/machinery/firealarm/directional/east, /obj/structure/closet/bombcloset/security, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/firealarm/directional/east, -/obj/structure/closet/bombcloset/security, /obj/machinery/camera/autoname/directional/east{ network = list("ss13","security") }, @@ -25988,9 +25896,6 @@ /turf/closed/wall, /area/medical/surgery) "gWQ" = ( -/obj/structure/bodycontainer/crematorium{ - id = "crematoriumChapel" - }, /obj/structure/bodycontainer/crematorium{ id = "crematoriumChapel" }, @@ -27025,7 +26930,7 @@ "htR" = ( /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; - name = "Chemistry shutters" + name = "Chemistry Shutters" }, /obj/machinery/door/firedoor, /obj/structure/desk_bell{ @@ -27272,9 +27177,6 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) "hyV" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -28305,7 +28207,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/techfloorgrid{ + dir = 6 + }, +/turf/open/floor/iron/tech, /area/crew_quarters/fitness) "hRz" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, @@ -28368,8 +28273,6 @@ "hSX" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/tile/black/fourcorners, -/obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/turf_decal/tile/black/fourcorners, /obj/machinery/camera/motion/directional/west, /turf/open/floor/iron/grid/steel, /area/ai_monitored/storage/eva) @@ -28400,7 +28303,7 @@ /obj/machinery/door/airlock/security{ aiControlDisabled = 1; id_tag = "prisonereducation"; - name = "Prison access"; + name = "Prison Access"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/delivery/red, @@ -28507,7 +28410,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/science{ - name = "exploration preparation room"; + name = "exploration Preparation Room"; req_access_txt = "49" }, /turf/open/floor/iron/white, @@ -28710,7 +28613,6 @@ "hYY" = ( /obj/machinery/button/door{ id = "QMLoaddoor"; - layer = 4; name = "Loading Doors"; pixel_x = -24; pixel_y = -8; @@ -28718,7 +28620,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor2"; - layer = 4; name = "Loading Doors"; pixel_x = -24; pixel_y = 8; @@ -28738,7 +28639,6 @@ /turf/open/floor/iron, /area/quartermaster/storage) "hZj" = ( -/obj/structure/disposalpipe/segment, /obj/item/cigbutt/roach, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -28960,12 +28860,9 @@ /area/security/brig) "ifm" = ( /obj/structure/railing{ - dir = 6; - layer = 3.2 - }, -/obj/item/kirbyplants/photosynthetic{ - layer = 3.1 + dir = 6 }, +/obj/item/kirbyplants/photosynthetic, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/end{ dir = 1 @@ -29666,7 +29563,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -29952,7 +29849,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/techfloorgrid{ + dir = 6 + }, +/turf/open/floor/iron/tech, /area/crew_quarters/fitness) "iwc" = ( /obj/effect/turf_decal/stripes/line, @@ -29976,7 +29876,7 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /obj/machinery/door/poddoor/preopen{ id = "hosprivacy"; - name = "HoS Privacy Blast door" + name = "HoS Privacy Blast Door" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -30678,9 +30578,6 @@ /turf/open/space/basic, /area/space/nearstation) "iNn" = ( -/obj/structure/sign/departments/minsky/research/research{ - pixel_x = 32 - }, /obj/structure/sign/departments/minsky/research/research{ pixel_x = 32 }, @@ -31922,13 +31819,6 @@ /area/security/prison) "jnn" = ( /obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/sign/warning/deathsposal{ - pixel_x = -32 - }, -/obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -31945,7 +31835,7 @@ /area/medical/storage) "jnE" = ( /obj/machinery/door/airlock/science{ - name = "exploration preparation room"; + name = "exploration Preparation Room"; req_access_txt = "49" }, /obj/machinery/door/firedoor, @@ -32177,7 +32067,7 @@ dir = 4 }, /obj/machinery/door/window/westleft{ - name = "plumbing factory duct access"; + name = "plumbing Factory Duct Access"; red_alert_access = 1; req_access_txt = "5; 33"; dir = 4 @@ -32389,7 +32279,7 @@ "jvY" = ( /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -32763,7 +32653,14 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/techfloorgrid{ + dir = 9 + }, +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/flashlight, +/turf/open/floor/iron/tech, /area/crew_quarters/fitness) "jCm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -33321,19 +33218,6 @@ }, /turf/open/floor/engine/light, /area/engine/engineering) -"jOE" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/door/airlock{ - name = "Bar - Kitchen"; - req_one_access = "28;25"; - req_one_access_txt = "25,28,35" - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "jOR" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -33413,7 +33297,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindow"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -33991,7 +33875,6 @@ base_state = "leftsecure"; dir = 8; icon_state = "leftsecure"; - layer = 4.1; name = "Tertiary AI Core Access"; obj_integrity = 300; pixel_x = -3; @@ -34036,7 +33919,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -34655,8 +34538,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "kqw" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/structure/disposalpipe/junction/yjunction{ + dir = 4 }, /turf/closed/wall, /area/maintenance/starboard/aft) @@ -34784,9 +34667,6 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "ksf" = ( -/obj/structure/disposalpipe/sorting/mail{ - sortType = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -34799,6 +34679,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/cmo_office, /turf/open/floor/plating, /area/maintenance/aft) "ksm" = ( @@ -35299,11 +35180,6 @@ /turf/open/floor/carpet/green, /area/medical/exam_room) "kCc" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, /obj/machinery/atmospherics/pipe/manifold/green/visible{ dir = 1 }, @@ -35452,12 +35328,10 @@ "kEX" = ( /obj/structure/table, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = -4; pixel_y = 8 }, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = 2 }, /obj/machinery/button/flasher{ @@ -35485,7 +35359,7 @@ "kFv" = ( /obj/effect/turf_decal/box, /obj/machinery/door/window/westleft{ - name = "plumbing factory duct access"; + name = "plumbing Factory Duct Access"; red_alert_access = 1; req_access_txt = "5; 33"; dir = 4 @@ -35957,7 +35831,6 @@ }, /obj/machinery/door/window/eastright{ dir = 1; - layer = 3.1; name = "Bridge Delivery"; req_access_txt = "19" }, @@ -36582,8 +36455,7 @@ }, /obj/structure/bed/roller, /obj/machinery/camera{ - c_tag = "Security - Medbay"; - dir = 5 + c_tag = "Security - Medbay" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -36636,7 +36508,7 @@ }, /obj/machinery/door/window/brigdoor/security/cell/southright{ id = "cell"; - name = "Solitary confinement"; + name = "Solitary Confinement"; req_access_txt = "1" }, /obj/structure/cable/yellow{ @@ -36944,7 +36816,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindow"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -37215,9 +37087,6 @@ /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) "lmn" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -37227,6 +37096,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "lmr" = ( @@ -37764,7 +37636,7 @@ "lyg" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -38256,7 +38128,6 @@ /obj/structure/window/reinforced, /obj/machinery/door/window/northleft{ dir = 4; - layer = 3.1; name = "Jetpack Storage"; req_access_txt = "19" }, @@ -38341,8 +38212,7 @@ /obj/structure/rack, /obj/effect/turf_decal/bot, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -38561,8 +38431,7 @@ /obj/structure/rack, /obj/effect/turf_decal/bot, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/loot_jobscale/armoury/energy_gun, /turf/open/floor/iron, @@ -38854,10 +38723,6 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "lYV" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/structure/cable/yellow, /obj/structure/table, /obj/structure/bedsheetbin, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -38890,13 +38755,6 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line, /turf/open/floor/iron/dark, /area/bridge) -"mab" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "mat" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -38988,20 +38846,6 @@ }, /obj/item/storage/box/deputy, /obj/item/toy/figure/hos, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Head of Security's Desk"; - departmentType = 5; - name = "Head of Security RC"; - pixel_y = 30 - }, -/obj/structure/table/wood, -/obj/item/storage/box/seccarts{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/storage/box/deputy, -/obj/item/toy/figure/hos, /obj/machinery/camera/autoname/directional/north{ network = list("ss13","security") }, @@ -39158,7 +39002,7 @@ /area/crew_quarters/heads/captain/private) "mgQ" = ( /obj/machinery/door/airlock{ - name = "Cyborg Recharging station" + name = "Cyborg Recharging Station" }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, @@ -39385,20 +39229,6 @@ dir = 4 }, /obj/structure/cable/yellow, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/yellow, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/yellow, /obj/machinery/camera/autoname/directional/east, /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron, @@ -39566,9 +39396,6 @@ /turf/open/floor/iron/dark, /area/security/main) "moB" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, @@ -39748,12 +39575,6 @@ /obj/item/pen, /turf/open/floor/iron/dark, /area/security/main) -"mto" = ( -/obj/structure/disposalpipe/junction/yjunction{ - dir = 2 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "mtr" = ( /obj/structure/table, /obj/machinery/fax/sec, @@ -41577,7 +41398,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio2"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -41829,7 +41650,6 @@ "noV" = ( /obj/effect/spawner/randomvend/cola, /obj/machinery/status_display/evac{ - layer = 4; pixel_y = 32 }, /obj/machinery/light{ @@ -42034,19 +41854,10 @@ dir = 4 }, /obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/airalarm/directional/east, /obj/machinery/camera/motion/directional/east{ network = list("aiupload") }, -/obj/item/kirbyplants/photosynthetic{ - layer = 3.1 - }, +/obj/item/kirbyplants/photosynthetic, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, @@ -42324,12 +42135,6 @@ }, /turf/open/floor/plating, /area/security/prison) -"nyK" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "nyQ" = ( /obj/machinery/door/firedoor, /obj/structure/curtain, @@ -42717,8 +42522,7 @@ /area/security/warden) "nFW" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/firealarm{ dir = 8; @@ -42995,7 +42799,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindow"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -43069,9 +42873,7 @@ /turf/open/floor/iron, /area/security/courtroom) "nNQ" = ( -/obj/item/kirbyplants/random{ - layer = 3.1 - }, +/obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 6 }, @@ -43197,8 +42999,7 @@ /obj/structure/rack, /obj/effect/turf_decal/bot, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/loot_jobscale/armoury/laser_gun, /turf/open/floor/iron, @@ -43388,16 +43189,6 @@ icon_state = "4-8" }, /obj/machinery/firealarm/directional/south, -/obj/structure/table, -/obj/item/aiModule/reset, -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/firealarm/directional/south, /obj/machinery/camera/motion/directional/south{ network = list("aiupload") }, @@ -44656,9 +44447,7 @@ /turf/open/floor/iron, /area/storage/primary) "ovY" = ( -/obj/structure/curtain{ - layer = 4.5 - }, +/obj/structure/curtain, /obj/item/bedsheet/medical, /obj/structure/bed, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -45476,12 +45265,6 @@ /turf/open/floor/iron, /area/engine/engineering) "oRz" = ( -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 8 - }, -/obj/machinery/status_display/evac{ - pixel_x = -32 - }, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 }, @@ -45613,7 +45396,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Chamber" }, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -45719,7 +45502,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Chamber" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -46011,7 +45794,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "detective_shutters"; @@ -46609,7 +46392,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Chamber" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46838,7 +46621,10 @@ dir = 10 }, /obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/techfloorgrid{ + dir = 6 + }, +/turf/open/floor/iron/tech, /area/crew_quarters/fitness) "pti" = ( /obj/effect/turf_decal/tile/yellow{ @@ -46863,12 +46649,6 @@ /area/medical/medbay/central) "ptU" = ( /obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/recharger{ - pixel_y = 2 - }, /obj/machinery/light/small{ dir = 8 }, @@ -48219,15 +47999,6 @@ /mob/living/simple_animal/pet/dog/corgi/Ian, /obj/effect/turf_decal/siding/wood, /obj/structure/bed/dogbed/ian, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/light_switch{ - pixel_x = 27 - }, -/mob/living/simple_animal/pet/dog/corgi/Ian, -/obj/effect/turf_decal/siding/wood, -/obj/structure/bed/dogbed/ian, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -48443,8 +48214,7 @@ /area/teleporter) "pXX" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/table/reinforced, /obj/item/dest_tagger, @@ -48750,7 +48520,7 @@ /area/science/nanite) "qia" = ( /obj/machinery/door/airlock/science{ - name = "exploration shuttle dock"; + name = "exploration Shuttle Dock"; req_access_txt = "49" }, /obj/machinery/door/firedoor, @@ -48783,8 +48553,6 @@ "qiD" = ( /obj/machinery/computer/med_data, /obj/effect/turf_decal/tile/dark_blue, -/obj/machinery/computer/med_data, -/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/crew_quarters/heads/cmo) "qiH" = ( @@ -49368,7 +49136,7 @@ "qwc" = ( /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -50477,8 +50245,7 @@ }, /obj/effect/turf_decal/delivery, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) @@ -50650,7 +50417,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd"; - name = "research lab shutters" + name = "Research Lab" }, /obj/machinery/door/firedoor, /obj/structure/desk_bell{ @@ -50806,7 +50573,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Chamber" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -50985,7 +50752,7 @@ /obj/machinery/door/airlock/security{ aiControlDisabled = 1; id_tag = "prisonereducation"; - name = "Prison access"; + name = "Prison Access"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/delivery/red, @@ -51117,7 +50884,6 @@ /turf/open/floor/iron/white, /area/science/research) "ren" = ( -/obj/machinery/camera/autoname/directional/south, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -51946,7 +51712,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -52511,7 +52277,7 @@ "rDy" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -52920,7 +52686,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics"; - name = "robotics lab shutters" + name = "Robotics Lab" }, /obj/machinery/door/firedoor, /obj/structure/desk_bell{ @@ -53056,7 +52822,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -53082,7 +52848,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, @@ -53502,7 +53268,7 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, @@ -53559,9 +53325,11 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "rXI" = ( -/obj/structure/disposalpipe/junction, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/medical/morgue) "rYh" = ( @@ -54009,15 +53777,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = 30 - }, /obj/machinery/camera/autoname/directional/north, -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = 30 - }, /turf/open/floor/iron/white, /area/medical/virology) "siD" = ( @@ -54747,9 +54507,7 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "syA" = ( -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood, /area/lawoffice) @@ -54757,7 +54515,7 @@ /obj/machinery/door/airlock/security{ aiControlDisabled = 1; id_tag = "prisonereducation"; - name = "Interrogation room"; + name = "Interrogation Room"; req_access_txt = "63" }, /obj/machinery/door/firedoor, @@ -55176,7 +54934,7 @@ "sFz" = ( /obj/machinery/door/poddoor/shutters{ id = "qm_warehouse"; - name = "warehouse shutters" + name = "Warehouse Shutters" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -55453,7 +55211,7 @@ base_state = "right"; dir = 2; icon_state = "right"; - name = "gas ports" + name = "gas Ports" }, /turf/open/floor/iron/dark, /area/security/execution/transfer) @@ -56407,7 +56165,7 @@ /obj/structure/lattice/catwalk/over, /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /obj/structure/plasticflaps/opaque, @@ -56432,7 +56190,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "briggate"; - name = "security shutters" + name = "Security Shutters" }, /obj/machinery/door/firedoor, /obj/item/restraints/handcuffs, @@ -56768,9 +56526,6 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -31 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -31 - }, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/genetics/cloning) @@ -57218,8 +56973,7 @@ "tsM" = ( /obj/structure/closet/secure_closet/genpop, /obj/structure/railing{ - dir = 10; - layer = 3.2 + dir = 10 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 @@ -58900,9 +58654,7 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) "tWo" = ( -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/lawoffice) "tXd" = ( @@ -59023,14 +58775,6 @@ /area/space/nearstation) "tYZ" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -59440,8 +59184,7 @@ /obj/structure/rack, /obj/effect/turf_decal/bot, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -59684,7 +59427,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindow"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -60196,7 +59939,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -60522,7 +60265,6 @@ /obj/machinery/light_switch{ pixel_x = -28 }, -/obj/machinery/smartfridge/chemistry, /turf/closed/wall, /area/medical/apothecary) "uJp" = ( @@ -60756,8 +60498,7 @@ /area/engine/engineering) "uQf" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/table, /obj/item/storage/box, @@ -60994,7 +60735,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "briggate"; - name = "security shutters" + name = "Security Shutters" }, /obj/machinery/door/window/eastleft{ name = "Brig Desk" @@ -61038,7 +60779,7 @@ "uWw" = ( /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; - name = "Chemistry shutters" + name = "Chemistry Shutters" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -61236,9 +60977,6 @@ /area/security/prison) "vba" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/vending/medical{ - pixel_x = -2 - }, /obj/machinery/vending/medical{ pixel_x = -2 }, @@ -61542,7 +61280,7 @@ "vid" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd2"; - name = "research lab shutters" + name = "Research Lab" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -61697,9 +61435,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/security/detectives_office) @@ -61801,7 +61537,10 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/obj/machinery/portable_atmospherics/canister/bz, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/obj/structure/disposaloutlet, /turf/open/floor/iron, /area/science/xenobiology) "vmi" = ( @@ -62302,9 +62041,6 @@ /turf/open/space, /area/space/nearstation) "vtT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -62583,7 +62319,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd"; - name = "research lab shutters" + name = "Research Lab" }, /obj/machinery/modular_fabricator/autolathe, /obj/machinery/door/firedoor, @@ -62749,7 +62485,7 @@ "vFf" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced/prison, @@ -62837,7 +62573,7 @@ "vFY" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgewindow"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -62928,7 +62664,7 @@ "vHo" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd2"; - name = "research lab shutters" + name = "Research Lab" }, /obj/machinery/door/firedoor, /turf/open/floor/iron/white/side{ @@ -63386,7 +63122,7 @@ "vRe" = ( /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -63457,7 +63193,7 @@ "vSB" = ( /obj/machinery/door/poddoor/preopen{ id = "testlab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -63504,7 +63240,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/techfloorgrid{ + dir = 6 + }, +/obj/structure/closet/emcloset, +/turf/open/floor/iron/tech, /area/crew_quarters/fitness) "vTC" = ( /obj/machinery/door/firedoor, @@ -63607,7 +63347,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindow"; - name = "bridge blast door" + name = "bridge Blast Door" }, /turf/open/floor/plating, /area/hallway/secondary/command) @@ -63624,7 +63364,7 @@ dir = 1 }, /obj/machinery/door/airlock/security/glass{ - name = "Brig Medical outpost"; + name = "Brig Medical Outpost"; req_one_access_txt = "1;34" }, /obj/effect/turf_decal/stripes/closeup, @@ -63923,7 +63663,7 @@ dir = 4 }, /obj/machinery/door/window/westleft{ - name = "plumbing factory duct access"; + name = "plumbing Factory Duct Access"; red_alert_access = 1; req_access_txt = "5; 33"; dir = 4 @@ -64005,9 +63745,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, @@ -64221,7 +63958,10 @@ /area/security/brig) "wgY" = ( /obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/techfloorgrid{ + dir = 6 + }, +/turf/open/floor/iron/tech, /area/crew_quarters/fitness) "whi" = ( /obj/machinery/computer/secure_data{ @@ -64336,9 +64076,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "wki" = ( -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /obj/structure/reagent_dispensers/water_cooler, /obj/item/radio/intercom/directional/west, /turf/open/floor/wood, @@ -64394,7 +64132,7 @@ /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd2"; - name = "research lab shutters" + name = "Research Lab" }, /turf/open/floor/plating, /area/science/nanite) @@ -64427,12 +64165,14 @@ /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "wlI" = ( -/obj/structure/disposalpipe/trunk{ - dir = 2 +/obj/machinery/light/small{ + dir = 1 }, -/obj/machinery/disposal/bin, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/effect/turf_decal/tile/techfloorgrid{ + dir = 9 + }, +/turf/open/floor/iron/tech, +/area/crew_quarters/fitness) "wlO" = ( /obj/structure/window/reinforced, /obj/effect/turf_decal/siding/wood, @@ -65267,7 +65007,7 @@ "wEQ" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Chamber" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -65425,7 +65165,6 @@ /obj/effect/turf_decal/siding/dark_blue, /obj/machinery/door/window/westleft{ dir = 2; - layer = 3.1; name = "Upload Console Window"; req_access_txt = "16" }, @@ -65634,7 +65373,6 @@ dir = 8 }, /obj/machinery/door/window/northleft{ - layer = 3.1; name = "RCD Storage"; req_access_txt = "19" }, @@ -66023,7 +65761,6 @@ base_state = "right"; dir = 2; icon_state = "right"; - layer = 3.1; name = "Cyborg Upload Console Window"; req_access_txt = "16" }, @@ -66065,7 +65802,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "privacy Shutter" }, /turf/open/floor/plating, /area/crew_quarters/heads/chief) @@ -66511,6 +66248,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/wood, /area/medical/break_room) "xft" = ( @@ -66627,10 +66365,10 @@ /turf/open/floor/plating, /area/medical/surgery) "xhK" = ( -/obj/machinery/camera/autoname/directional/south, /obj/machinery/computer/card/minor/cmo{ dir = 1 }, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/crew_quarters/heads/cmo) "xhR" = ( @@ -66828,7 +66566,10 @@ /obj/machinery/computer/holodeck{ dir = 4 }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/techfloorgrid{ + dir = 9 + }, +/turf/open/floor/iron/tech, /area/crew_quarters/fitness) "xmd" = ( /obj/machinery/door/airlock/command/glass{ @@ -67738,9 +67479,6 @@ /area/hydroponics) "xEl" = ( /obj/structure/lattice, -/obj/machinery/camera/autoname/directional/east{ - network = list("ss13", "minisat") - }, /obj/machinery/camera/autoname/directional/east{ network = list("ss13","minisat") }, @@ -67836,13 +67574,6 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/grass, /area/hallway/secondary/command) -"xGT" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 28 - }, -/turf/closed/wall/r_wall, -/area/medical/virology) "xHj" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/trimline/yellow/filled/warning{ @@ -68053,7 +67784,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "briggate"; - name = "security shutters" + name = "Security Shutters" }, /obj/machinery/door/firedoor, /obj/machinery/door/window/southright{ @@ -68504,7 +68235,7 @@ /area/hallway/primary/fore) "xVK" = ( /obj/machinery/smartfridge, -/turf/closed/wall/r_wall, +/turf/open/floor/iron/white, /area/medical/virology) "xVS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -69054,7 +68785,6 @@ }, /obj/effect/turf_decal/bot, /obj/item/book/manual/wiki/security_space_law{ - layer = 4; pixel_y = -1 }, /obj/structure/filingcabinet/employment{ @@ -102526,9 +102256,9 @@ aRt aJq aJq aJq -cJr aJq aJq +cJr qVS bcp aJq @@ -103059,9 +102789,9 @@ gmx rsU aAW cBD -wlI +obY fzt -dOL +bDL ajG bDL cBD @@ -106408,8 +106138,8 @@ npm gWM gWM gYB -aAI -aAI +gYB +gYB gWM xdc bzs @@ -107166,7 +106896,7 @@ jhL fiR iNK uJl -dmb +fzR npq dmb bEP @@ -108413,10 +108143,10 @@ aaa gXs aaa arj -kSk +wlI dKn xlK -kSk +axe jBO arj jGU @@ -109264,12 +108994,12 @@ xBK lbh fsl eke -cko +cNW bFu -cko -cko -cnG -cko +cNW +cNW +cOe +cNW csm euG xPe @@ -109528,9 +109258,9 @@ cOe cOe wLJ cOe -mto -axe -nyK +cOe +cvO +cvO cOT aoV aoV @@ -109785,7 +109515,7 @@ cko cnG cko dfl -mab +cnG ioE cvO cOT @@ -110033,16 +109763,16 @@ ceL hqh tGR ciH -mAe -cnG -cnG -mhi -cnG -cnG +cOe +cOe +cOe +iBQ +cOe +cOe hZj -cko -cnG -jUc +cNW +cOe +cOe mAe qrL cNW @@ -110236,7 +109966,7 @@ nVY kAh hOj hOj -jOE +nVY maS oHH aIP @@ -110290,7 +110020,7 @@ aUu toA iOO ciH -rex +cNW cNW cNW sWn @@ -110803,7 +110533,7 @@ bNd bNd bNd bNd -xGT +ciH lmn kqw qVp @@ -113352,7 +113082,7 @@ bDb bJN bJN vmb -bPD +dOL bMi bMi rTA diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm index 53f06fc4f2f33..96863b1cf8f29 100644 --- a/_maps/map_files/CorgStation/CorgStation.dmm +++ b/_maps/map_files/CorgStation/CorgStation.dmm @@ -196,7 +196,7 @@ /obj/effect/turf_decal/delivery/red, /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/machinery/turnstile{ dir = 8 @@ -421,7 +421,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -667,9 +667,7 @@ /turf/open/floor/engine, /area/engine/engine_room) "afT" = ( -/obj/machinery/nuclearbomb/selfdestruct{ - layer = 2 - }, +/obj/machinery/nuclearbomb/selfdestruct, /turf/open/floor/iron/dark, /area/security/nuke_storage) "agb" = ( @@ -701,7 +699,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; @@ -1173,7 +1171,7 @@ "alp" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -1223,7 +1221,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -1736,7 +1734,7 @@ "atA" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/stripes/line, @@ -1795,6 +1793,9 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/engine/engine_room) "auw" = ( @@ -2423,6 +2424,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/engine/engine_room) "aDz" = ( @@ -2851,6 +2855,10 @@ }, /turf/open/floor/circuit/green, /area/engine/supermatter) +"aJa" = ( +/obj/machinery/smartfridge/chemistry/preloaded, +/turf/open/floor/iron/white, +/area/medical/chemistry) "aJg" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -3987,6 +3995,9 @@ /area/engine/atmos) "aWF" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/engine/engine_room) "aWL" = ( @@ -4198,6 +4209,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engine_room) "aYR" = ( @@ -4292,7 +4306,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio3"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/disposalpipe/segment{ dir = 1 @@ -4638,9 +4652,7 @@ /area/lawoffice) "bhx" = ( /obj/item/bedsheet/medical, -/obj/structure/curtain{ - layer = 4.5 - }, +/obj/structure/curtain, /obj/structure/bed, /turf/open/floor/iron/freezer, /area/medical/virology) @@ -4982,7 +4994,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics_shutters"; - name = "robotics shutters" + name = "robotics Shutters" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -5601,7 +5613,7 @@ }, /obj/machinery/door/window/brigdoor/security/cell/southleft{ id = "cell"; - name = "Solitary confinement"; + name = "Solitary Confinement"; req_access_txt = null; req_one_access_txt = "1;4" }, @@ -6245,7 +6257,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor/shutters/preopen{ id = "medbay_lockdown"; - name = "lockdown shutters" + name = "lockdown Shutters" }, /obj/machinery/door/firedoor, /turf/open/floor/plating, @@ -7166,7 +7178,7 @@ "bZW" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "detective_shutters"; - name = "detective's office shutters" + name = "detective's office Shutters" }, /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced, @@ -7764,7 +7776,7 @@ "ckh" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -8113,10 +8125,18 @@ /obj/machinery/teleport/hub, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/foyer) -"cpR" = ( -/obj/structure/curtain{ - layer = 4.5 +"cpQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/power/apc/auto_name/directional/east{ + areastring = "/area/engine/supermatter" }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/engine, +/area/engine/engine_room) +"cpR" = ( +/obj/structure/curtain, /obj/item/bedsheet/medical, /obj/structure/bed, /obj/structure/cable/yellow{ @@ -8486,7 +8506,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters"; - name = "research shutters" + name = "research Shutters" }, /turf/open/floor/plating, /area/science/lab) @@ -9414,12 +9434,8 @@ }, /obj/structure/table, /obj/item/folder/white, -/obj/item/pen{ - layer = 3.1 - }, -/obj/item/clothing/neck/stethoscope{ - layer = 3.2 - }, +/obj/item/pen, +/obj/item/clothing/neck/stethoscope, /turf/open/floor/iron/freezer, /area/medical/virology) "cQx" = ( @@ -9466,6 +9482,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engine_room) "cSf" = ( @@ -9756,7 +9775,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -9998,7 +10017,7 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, @@ -10352,7 +10371,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/caution/stand_clear, @@ -11437,7 +11456,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -12133,6 +12152,9 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 5 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/engine/engine_room) "dMk" = ( @@ -12588,7 +12610,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -12885,7 +12907,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -13510,12 +13532,12 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "medical_shutters"; - name = "medical shutters" + name = "medical Shutters" }, /obj/item/reagent_containers/glass/bottle/epinephrine, /obj/machinery/door/window/northleft{ dir = 4; - name = "medbay interior"; + name = "medbay Interior"; req_access_txt = "5" }, /turf/open/floor/iron/white, @@ -14389,6 +14411,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/engine, /area/science/mixing/chamber) "exL" = ( @@ -14786,6 +14811,12 @@ /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/medical/storage) +"eFA" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white, +/area/science/mixing) "eFK" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 @@ -15245,7 +15276,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hop"; - name = "privacy shutters" + name = "Privacy Shutters" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -15766,9 +15797,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "eZw" = ( -/obj/machinery/chem_dispenser{ - layer = 2.7 - }, +/obj/machinery/chem_dispenser, /obj/structure/window/reinforced, /turf/open/floor/iron/white, /area/medical/chemistry) @@ -15941,7 +15970,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio2"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/disposalpipe/segment{ dir = 1 @@ -16314,7 +16343,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/shutters/preopen{ id = "medbay_lockdown"; - name = "lockdown shutters" + name = "lockdown Shutters" }, /obj/effect/spawner/structure/window, /turf/open/floor/iron, @@ -17895,7 +17924,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron/freezer, /area/medical/virology) @@ -18707,7 +18736,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -19120,7 +19149,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics_shutters"; - name = "robotics shutters" + name = "robotics Shutters" }, /obj/structure/desk_bell{ pixel_x = -8 @@ -19172,11 +19201,9 @@ "gfM" = ( /obj/structure/table, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = 2 }, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = -4; pixel_y = 8 }, @@ -19313,7 +19340,6 @@ pixel_y = 4 }, /obj/item/taperecorder{ - layer = 2.9; pixel_x = -15; pixel_y = 4 }, @@ -19610,7 +19636,7 @@ "gmv" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced/prison, @@ -19960,6 +19986,9 @@ dir = 4; name = "Waste to Scrubbers" }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/engine/engine_room) "grD" = ( @@ -20285,6 +20314,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/white, /area/science/mixing) "gxR" = ( @@ -20820,7 +20852,7 @@ "gGS" = ( /obj/machinery/door/poddoor/preopen{ id = "testlab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/closeup, @@ -21005,6 +21037,18 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) +"gKh" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "gKA" = ( /obj/structure/table/wood, /obj/item/computer_hardware/hard_drive/role/lawyer, @@ -21290,7 +21334,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hop"; - name = "privacy shutters" + name = "Privacy Shutters" }, /obj/item/pen{ pixel_x = 6; @@ -21471,7 +21515,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio6"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -22696,7 +22740,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /turf/open/floor/plating, /area/security/prison) @@ -22821,7 +22865,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio1"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -22959,6 +23003,9 @@ /obj/effect/turf_decal/tile/brown, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "hqE" = ( @@ -23250,7 +23297,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -23750,7 +23797,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio3"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) @@ -24646,7 +24693,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio2"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) @@ -24889,7 +24936,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio3"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -26122,7 +26169,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio2"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -26248,7 +26295,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio1"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) @@ -26428,6 +26475,24 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) +"itY" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron/white, +/area/science/research) "ium" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -26486,9 +26551,7 @@ /turf/open/floor/iron, /area/science/lab) "ivu" = ( -/obj/structure/railing{ - layer = 3.1 - }, +/obj/structure/railing, /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, /area/hallway/primary/starboard) @@ -26545,7 +26608,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosoffice"; - name = "Head Of Security Blast door" + name = "Head Of Security Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -27510,7 +27573,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics_shutters"; - name = "robotics shutters" + name = "robotics Shutters" }, /turf/open/floor/plating, /area/science/robotics) @@ -27919,7 +27982,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosroom"; - name = "Head Of Security Blast door" + name = "Head Of Security Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -28032,7 +28095,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron/freezer, /area/medical/virology) @@ -28095,7 +28158,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -28180,7 +28243,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -29228,7 +29291,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /turf/open/floor/plating, /area/security/detectives_office) @@ -29420,7 +29483,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -29512,7 +29575,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters"; - name = "research shutters" + name = "research Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -30469,7 +30532,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -30542,7 +30605,7 @@ /area/hallway/primary/aft) "jNy" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/iron/dark, /area/crew_quarters/kitchen) "jNE" = ( /turf/closed/wall/r_wall, @@ -30621,7 +30684,7 @@ "jPL" = ( /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -30740,9 +30803,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "jRT" = ( -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /obj/item/screwdriver, /obj/item/stack/cable_coil/random/five, /obj/item/wrench, @@ -30776,7 +30837,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "medbay_lockdown"; - name = "lockdown shutters" + name = "lockdown Shutters" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -30889,7 +30950,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /turf/open/floor/plating, /area/security/brig) @@ -30954,7 +31015,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters"; - name = "research shutters" + name = "research Shutters" }, /obj/machinery/door/window/eastright{ dir = 2; @@ -31303,6 +31364,15 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"kbi" = ( +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "kbD" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -32319,6 +32389,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "kqw" = ( @@ -32344,7 +32417,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /turf/open/floor/plating, /area/security/prison) @@ -33907,6 +33980,9 @@ /area/engine/gravity_generator) "kUD" = ( /obj/effect/landmark/start/scientist, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/white, /area/science/mixing) "kUH" = ( @@ -33972,6 +34048,9 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "kVp" = ( @@ -34334,7 +34413,7 @@ "lbP" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/stripes/line, @@ -34689,6 +34768,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/crew_quarters/toilet) +"lhL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "lhX" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/delivery, @@ -34853,6 +34941,9 @@ "lla" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/white, /area/science/mixing) "lld" = ( @@ -34924,6 +35015,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "lmq" = ( @@ -35036,7 +35130,6 @@ /obj/machinery/computer/security/telescreen{ desc = "Used for watching the test chamber."; dir = 8; - layer = 4; name = "Test Chamber Telescreen"; network = list("toxins"); pixel_x = -32 @@ -35365,7 +35458,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics_shutters"; - name = "robotics shutters" + name = "robotics Shutters" }, /turf/open/floor/plating, /area/science/robotics/lab) @@ -35738,7 +35831,6 @@ /obj/machinery/computer/security/telescreen{ desc = "Used for watching the test chamber."; dir = 8; - layer = 4; name = "Test Chamber Telescreen"; network = list("toxins"); pixel_x = -32 @@ -35848,7 +35940,7 @@ "lBm" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "medical supplies"; + name = "medical Supplies"; req_access_txt = "5" }, /obj/structure/table/reinforced, @@ -36754,7 +36846,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio8"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -36795,7 +36887,7 @@ /area/maintenance/port/central) "lQY" = ( /obj/machinery/smartfridge, -/turf/closed/wall/r_wall, +/turf/open/floor/iron/white, /area/medical/virology) "lRk" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -37156,6 +37248,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "lWB" = ( @@ -37601,6 +37696,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mcH" = ( @@ -38453,7 +38551,7 @@ /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/shutters/preopen{ id = "medbay_lockdown"; - name = "lockdown shutters" + name = "lockdown Shutters" }, /turf/open/floor/plating, /area/medical/medbay/lobby) @@ -38923,6 +39021,10 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/engine, /area/science/mixing/chamber) "mwy" = ( @@ -39159,7 +39261,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosoffice"; - name = "Head Of Security Blast door" + name = "Head Of Security Blast Door" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -39360,7 +39462,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -39403,9 +39505,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "mCY" = ( -/obj/structure/railing{ - layer = 3.1 - }, +/obj/structure/railing, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass, @@ -39897,6 +39997,9 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/science/mixing/chamber) "mLY" = ( @@ -40025,6 +40128,9 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "mNl" = ( @@ -40311,7 +40417,7 @@ "mSG" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "detective_shutters"; - name = "detective's office shutters" + name = "detective's office Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -41054,12 +41160,8 @@ "nfs" = ( /obj/structure/table, /obj/item/folder/white, -/obj/item/pen{ - layer = 3.1 - }, -/obj/item/clothing/neck/stethoscope{ - layer = 3.2 - }, +/obj/item/pen, +/obj/item/clothing/neck/stethoscope, /turf/open/floor/iron/freezer, /area/medical/virology) "nfv" = ( @@ -41494,7 +41596,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -42031,7 +42133,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/caution/stand_clear, @@ -42814,7 +42916,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /turf/open/floor/plating, /area/security/prison) @@ -44392,8 +44494,7 @@ /turf/open/floor/plating, /area/bridge) "olj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/tinted/fulltile, +/obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/iron/dark, /area/chapel/office) "olI" = ( @@ -44927,7 +45028,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosoffice"; - name = "Head Of Security Blast door" + name = "Head Of Security Blast Door" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -45363,7 +45464,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/shutters/preopen{ id = "medbay_lockdown"; - name = "lockdown shutters" + name = "lockdown Shutters" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -45431,7 +45532,7 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ id = "hosroom"; - name = "Head Of Security Blast door" + name = "Head Of Security Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -45708,7 +45809,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "medbay_lockdown"; - name = "lockdown shutters" + name = "lockdown Shutters" }, /obj/machinery/door/firedoor, /turf/open/floor/plating, @@ -47301,7 +47402,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio6"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -47844,6 +47945,9 @@ "pwq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron/white, /area/science/mixing) "pwv" = ( @@ -47965,6 +48069,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/iron/white, /area/science/mixing) "pyu" = ( @@ -48399,8 +48506,7 @@ /area/crew_quarters/fitness/recreation) "pFx" = ( /obj/structure/railing{ - dir = 6; - layer = 3.1 + dir = 6 }, /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass, @@ -48479,6 +48585,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron, /area/science/mixing) "pGN" = ( @@ -48803,7 +48912,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "medbay_lockdown"; - name = "lockdown shutters" + name = "lockdown Shutters" }, /turf/open/floor/iron, /area/medical/medbay/lobby) @@ -48898,7 +49007,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -49184,6 +49293,9 @@ dir = 4 }, /obj/machinery/camera/autoname/directional/south, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron, /area/science/mixing) "pSB" = ( @@ -49655,6 +49767,19 @@ }, /turf/open/floor/iron, /area/security/brig) +"pZW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/iron/white, +/area/science/research) "pZZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/power/apc/auto_name/directional/west{ @@ -50154,6 +50279,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"qjU" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/engine, +/area/engine/engine_room) "qkk" = ( /obj/structure/table/reinforced, /obj/item/assembly/signaler{ @@ -50898,7 +51030,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -51488,7 +51620,7 @@ /obj/machinery/door/airlock/security{ aiControlDisabled = 1; id_tag = "prisonereducation"; - name = "Prison access"; + name = "Prison Access"; req_one_access_txt = "1;4" }, /obj/machinery/door/firedoor, @@ -52136,6 +52268,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/plating, /area/maintenance/department/bridge) "qRa" = ( @@ -52262,6 +52398,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"qTC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "qTO" = ( /obj/machinery/status_display/evac{ pixel_x = -32 @@ -53807,7 +53951,7 @@ /obj/structure/plasticflaps/opaque, /obj/machinery/door/poddoor/shutters/preopen{ id = "medbay_lockdown"; - name = "lockdown shutters" + name = "lockdown Shutters" }, /turf/open/floor/iron, /area/medical/sleeper) @@ -53977,12 +54121,12 @@ /area/science/xenobiology) "rwV" = ( /obj/machinery/door/window{ - name = "Pet cage"; + name = "Pet Cage"; req_one_access_txt = "12" }, /obj/machinery/door/window{ dir = 1; - name = "Pet cage"; + name = "Pet Cage"; req_one_access_txt = "12" }, /obj/effect/turf_decal/delivery, @@ -54002,7 +54146,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -54132,6 +54276,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engine_room) "rzK" = ( @@ -54249,7 +54396,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hop"; - name = "privacy shutters" + name = "Privacy Shutters" }, /obj/structure/desk_bell, /turf/open/floor/iron, @@ -54589,7 +54736,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) @@ -54784,7 +54931,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /obj/machinery/door/airlock/security{ name = "Detective's Office"; @@ -55040,6 +55187,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/engine, /area/engine/engine_room) "rOg" = ( @@ -55088,6 +55238,10 @@ }, /turf/open/floor/iron, /area/science/robotics/lab) +"rPt" = ( +/obj/machinery/smartfridge, +/turf/open/floor/iron, +/area/crew_quarters/kitchen) "rPB" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/bot, @@ -55434,7 +55588,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio8"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) @@ -55590,7 +55744,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "medbay_lockdown"; - name = "lockdown shutters" + name = "lockdown Shutters" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -55666,7 +55820,7 @@ "rZs" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/curtain, /obj/structure/cable/yellow{ @@ -56213,7 +56367,7 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ id = "hosoffice"; - name = "Head Of Security Blast door" + name = "Head Of Security Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -56898,7 +57052,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, @@ -57982,7 +58136,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosoffice"; - name = "Head Of Security Blast door" + name = "Head Of Security Blast Door" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -58117,7 +58271,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -58568,7 +58722,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics_shutters"; - name = "robotics shutters" + name = "robotics Shutters" }, /turf/open/floor/plating, /area/science/research) @@ -59298,7 +59452,7 @@ /area/maintenance/starboard/secondary) "tiJ" = ( /obj/machinery/smartfridge/organ, -/turf/closed/wall, +/turf/open/floor/iron/white, /area/medical/surgery) "tiU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -59333,6 +59487,14 @@ /obj/item/wrench, /turf/open/floor/engine, /area/engine/engine_room) +"tjA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "tjS" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, @@ -59431,7 +59593,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -59957,7 +60119,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -60773,9 +60935,7 @@ /turf/open/floor/iron, /area/hydroponics) "tIG" = ( -/obj/machinery/chem_dispenser{ - layer = 2.7 - }, +/obj/machinery/chem_dispenser, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -60973,7 +61133,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; @@ -62618,7 +62778,7 @@ /area/security/warden) "umy" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/iron, /area/hydroponics) "umK" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -62900,7 +63060,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "medical_shutters"; - name = "medical shutters" + name = "medical Shutters" }, /obj/item/folder/white, /obj/item/flashlight/pen, @@ -62912,7 +63072,7 @@ }, /obj/machinery/door/window/northright{ dir = 4; - name = "medbay interior"; + name = "medbay Interior"; req_access_txt = "5" }, /turf/open/floor/iron/white, @@ -63195,7 +63355,7 @@ "uxo" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -63533,7 +63693,7 @@ /obj/effect/turf_decal/stripes/box, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters"; - name = "research shutters" + name = "research Shutters" }, /obj/machinery/door/window/eastright{ dir = 2; @@ -63867,7 +64027,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio8"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -63994,7 +64154,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /turf/open/floor/plating, /area/security/prison) @@ -64035,7 +64195,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "medbay_lockdown"; - name = "lockdown shutters" + name = "lockdown Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/cmo) @@ -64196,6 +64356,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "uMk" = ( @@ -64492,7 +64655,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -64536,8 +64699,7 @@ /area/tcommsat/computer) "uRy" = ( /obj/structure/railing{ - dir = 10; - layer = 3.1 + dir = 10 }, /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/grass, @@ -64696,7 +64858,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio6"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) @@ -65462,7 +65624,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/northright{ dir = 4; - name = "medical supplies"; + name = "medical Supplies"; req_access_txt = "5" }, /obj/structure/cable/yellow{ @@ -65652,7 +65814,7 @@ "vlH" = ( /obj/machinery/door/poddoor/preopen{ id = "testlab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -66001,7 +66163,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "medbay_lockdown"; - name = "lockdown shutters" + name = "lockdown Shutters" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -67038,6 +67200,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "vEV" = ( @@ -67249,7 +67414,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "medical_shutters"; - name = "medical shutters" + name = "medical Shutters" }, /obj/structure/desk_bell{ pixel_x = -8 @@ -67479,6 +67644,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engine_room) "vLT" = ( @@ -67842,9 +68010,7 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "vSy" = ( -/obj/structure/curtain{ - layer = 4.5 - }, +/obj/structure/curtain, /obj/item/bedsheet/medical, /obj/structure/bed, /turf/open/floor/iron/white, @@ -68247,7 +68413,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio1"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/disposalpipe/segment{ dir = 1 @@ -68476,7 +68642,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "medbay_lockdown"; - name = "lockdown shutters" + name = "lockdown Shutters" }, /obj/machinery/door/firedoor, /turf/open/floor/plating, @@ -71318,7 +71484,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /turf/open/floor/plating, /area/security/prison) @@ -71824,6 +71990,18 @@ }, /turf/open/floor/iron, /area/security/prison) +"xmB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "xmD" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -72549,7 +72727,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "medical_shutters"; - name = "medical shutters" + name = "medical Shutters" }, /obj/item/folder/white{ pixel_x = 4; @@ -73008,7 +73186,7 @@ "xGi" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/curtain, /obj/structure/cable/yellow{ @@ -73134,9 +73312,7 @@ /turf/open/floor/iron, /area/maintenance/department/science) "xIx" = ( -/obj/structure/railing{ - layer = 3.1 - }, +/obj/structure/railing, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, @@ -73582,6 +73758,15 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/bar) +"xOa" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/closed/wall/r_wall, +/area/science/mixing/chamber) "xOb" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -73875,6 +74060,9 @@ codes_txt = "patrol;next_patrol=hall14"; location = "hall13" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "xSb" = ( @@ -74394,10 +74582,6 @@ /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /turf/open/floor/iron, /area/storage/tools) -"yco" = ( -/obj/machinery/smartfridge/chemistry/preloaded, -/turf/closed/wall, -/area/medical/chemistry) "ycp" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -87628,7 +87812,7 @@ aOR aOR adX aHE -aWF +qjU aus aWF aus @@ -87885,7 +88069,7 @@ alJ anh aaG ssV -asK +cpQ aMB asK aMB @@ -103091,7 +103275,7 @@ xYE rNy ver wxC -rhG +xOa vge uJJ pSu @@ -103608,7 +103792,7 @@ hZO bOW qqf vBK -lIO +eFA vKb iCv eey @@ -104379,7 +104563,7 @@ qvj kMZ cah nAV -lIO +eFA bpq anz qQo @@ -104636,7 +104820,7 @@ imd mbl cah fYh -lIO +eFA bpq anz opS @@ -104881,8 +105065,8 @@ lWn lWn lWn lWn -tNr -gAn +pZW +itY vuH buD eGD @@ -110051,7 +110235,7 @@ lYk kKu qyp djh -jNy +rPt cyL uuV uir @@ -114648,7 +114832,7 @@ plB ivu kah lWw -kEQ +kbi iDL hvg hFG @@ -115161,13 +115345,13 @@ igv lgH mCY akK -tSC +lhL pYT wSu wSu ttB psS -yco +aJa lBm vib wSu @@ -115418,7 +115602,7 @@ mFP aVD pFx dLb -tSC +lhL hJO wSu okw @@ -115662,14 +115846,14 @@ qeq fes mAn uKT -cUA -lTv -vhu -lTv -lTv -vhu -lTv -lTv +gKh +tjA +qTC +tjA +tjA +qTC +tjA +tjA mNh uMg vET @@ -115919,7 +116103,7 @@ qeq fes xSy uKT -nzt +oeF vnF vnF vnF @@ -116176,7 +116360,7 @@ mEt fes skk uKT -nzt +oeF vnF hXA ciw @@ -116433,7 +116617,7 @@ mEt fes jDX uKT -nzt +oeF vnF eYn ldw @@ -116690,7 +116874,7 @@ mEt fes cMX uKT -mqG +xmB vnF fQk onl @@ -116712,7 +116896,7 @@ pra wSu ttB ojQ -yco +aJa gOi khD fyI @@ -116947,7 +117131,7 @@ qeq fes sKE uKT -mqG +xmB vnF caG max @@ -117204,7 +117388,7 @@ qeq fes yiD uKT -mqG +xmB vnF hze ujG diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 72e3771251359..3b772282a8e01 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -874,9 +874,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "ahq" = ( /obj/structure/cable{ @@ -1152,9 +1150,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "ajm" = ( /obj/effect/decal/cleanable/dirt, @@ -1283,9 +1279,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "akj" = ( /obj/machinery/camera/directional/south{ @@ -1908,9 +1902,7 @@ /turf/open/floor/iron, /area/security/checkpoint) "aow" = ( -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "aox" = ( /obj/effect/spawner/room/fivexthree, @@ -2255,8 +2247,7 @@ /obj/machinery/door/window{ base_state = "right"; dir = 4; - icon_state = "right"; - layer = 3 + icon_state = "right" }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -2372,9 +2363,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/fore) "ary" = ( /obj/structure/girder, @@ -2987,9 +2976,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "auM" = ( /obj/structure/disposalpipe/segment{ @@ -4563,7 +4550,7 @@ }, /obj/machinery/door/poddoor{ id = "cargounload"; - name = "supply dock unloading door" + name = "supply Dock Unloading Door" }, /turf/open/floor/plating, /area/quartermaster/storage) @@ -4585,7 +4572,7 @@ }, /obj/machinery/door/poddoor{ id = "cargounload"; - name = "supply dock unloading door" + name = "supply Dock Unloading Door" }, /turf/open/floor/plating, /area/quartermaster/storage) @@ -4898,14 +4885,12 @@ "aEg" = ( /obj/machinery/button/door{ id = "cargounload"; - layer = 4; name = "Loading Doors"; pixel_x = 24; pixel_y = 8 }, /obj/machinery/button/door{ id = "cargoload"; - layer = 4; name = "Loading Doors"; pixel_x = 24; pixel_y = -8 @@ -5333,7 +5318,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor{ id = "cargoload"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /turf/open/floor/plating, /area/quartermaster/storage) @@ -5357,7 +5342,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor{ id = "cargoload"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /turf/open/floor/plating, /area/quartermaster/storage) @@ -6939,7 +6924,6 @@ dir = 1 }, /obj/structure/sink{ - layer = 4; pixel_y = 22 }, /obj/structure/mirror{ @@ -7433,9 +7417,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard) "aVt" = ( /obj/effect/turf_decal/bot, @@ -9079,11 +9061,11 @@ /area/hydroponics) "bhG" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/iron, /area/hydroponics) "bhK" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/iron, /area/crew_quarters/kitchen) "bhO" = ( /obj/structure/sink/kitchen{ @@ -9568,7 +9550,7 @@ "blo" = ( /obj/machinery/door/poddoor/preopen{ id = "brigfront"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced, @@ -10465,9 +10447,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "bqq" = ( /obj/structure/closet/secure_closet/personal/cabinet, @@ -10617,8 +10597,7 @@ "brL" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -10627,32 +10606,28 @@ /area/space/nearstation) "brM" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/lattice, /turf/open/space, /area/space/nearstation) "brN" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/space, /area/space/nearstation) "brO" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/space, /area/space/nearstation) "brQ" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/light, /turf/open/space, @@ -10660,8 +10635,7 @@ "brS" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -11455,7 +11429,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -11469,7 +11443,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -11483,7 +11457,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -11497,7 +11471,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -11514,7 +11488,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -11525,7 +11499,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -11651,7 +11625,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "atmoslock"; - name = "Atmospherics Lockdown Blast door" + name = "Atmospherics Lockdown Blast Door" }, /turf/open/floor/plating, /area/engine/atmos) @@ -12048,7 +12022,7 @@ "bAX" = ( /obj/machinery/door/poddoor/preopen{ id = "atmoslock"; - name = "Atmospherics Lockdown Blast door" + name = "Atmospherics Lockdown Blast Door" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -12059,7 +12033,7 @@ "bAZ" = ( /obj/machinery/door/poddoor/preopen{ id = "atmoslock"; - name = "Atmospherics Lockdown Blast door" + name = "Atmospherics Lockdown Blast Door" }, /obj/machinery/button/door{ id = "atmoslock"; @@ -12087,7 +12061,6 @@ /obj/machinery/computer/security/telescreen{ desc = "Used for watching the Engine."; dir = 4; - layer = 4; name = "Engine Monitor"; network = list("engine"); pixel_x = -24 @@ -12206,8 +12179,7 @@ /area/hallway/secondary/exit/departure_lounge) "bBX" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -12242,9 +12214,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/science/research) "bCt" = ( /obj/effect/spawner/structure/window/reinforced, @@ -12427,7 +12397,6 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - layer = 4.1; name = "Secondary AI Core Access"; pixel_x = 4; req_access_txt = "16" @@ -12482,7 +12451,6 @@ base_state = "leftsecure"; dir = 8; icon_state = "leftsecure"; - layer = 4.1; name = "Tertiary AI Core Access"; pixel_x = -3; req_access_txt = "16" @@ -12587,9 +12555,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "bFB" = ( /obj/structure/bed/roller, @@ -12695,7 +12661,7 @@ /area/science/mixing) "bGt" = ( /obj/machinery/door/airlock/security/glass{ - name = "Anti Radiation shielded room" + name = "Anti Radiation Shielded Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -13274,7 +13240,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "councilblast"; - name = "Council Chambers Blast door" + name = "Council Chambers Blast Door" }, /turf/open/floor/plating, /area/bridge/meeting_room/council) @@ -13413,8 +13379,7 @@ /area/science/misc_lab/range) "bNu" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -13433,8 +13398,7 @@ /area/quartermaster/warehouse) "bNB" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -14177,7 +14141,7 @@ }, /obj/effect/turf_decal/bot, /obj/machinery/door/window/southright{ - name = "Weapons storage"; + name = "Weapons Storage"; req_one_access_txt = "1;4" }, /obj/effect/loot_jobscale/armoury/energy_gun, @@ -14202,8 +14166,7 @@ name = "command camera" }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/item/book/manual/wiki/sopcommand, /turf/open/floor/carpet/royalblue, @@ -14227,8 +14190,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) @@ -14240,8 +14202,7 @@ }, /obj/item/storage/lockbox/medal, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) @@ -14848,7 +14809,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -14986,7 +14947,6 @@ /area/space/nearstation) "bYs" = ( /obj/structure/sink{ - layer = 4; pixel_y = 22 }, /obj/structure/mirror{ @@ -15395,7 +15355,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hopblast"; - name = "HoP Blast door" + name = "HoP Blast Door" }, /turf/open/floor/plating, /area/crew_quarters/heads/hop) @@ -15790,9 +15750,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, @@ -15832,8 +15790,7 @@ "cdc" = ( /obj/structure/chair, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark/textured_large, @@ -18079,9 +18036,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "cqA" = ( /obj/structure/cable/yellow{ @@ -18565,9 +18520,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/hallway/primary/central) "csP" = ( /obj/structure/cable/yellow{ @@ -20041,9 +19994,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/locker) "cAw" = ( /turf/closed/wall, @@ -20330,9 +20281,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/locker) "cCd" = ( /obj/structure/table_frame/wood, @@ -20532,9 +20481,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/vacant_room/commissary) "cCP" = ( /turf/closed/wall, @@ -20999,9 +20946,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/toilet/restrooms) "cFi" = ( /obj/structure/cable/yellow{ @@ -21010,9 +20955,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/toilet/restrooms) "cFj" = ( /obj/machinery/status_display/evac{ @@ -21024,9 +20967,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/toilet/restrooms) "cFk" = ( /obj/machinery/photocopier, @@ -21097,9 +21038,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/locker) "cFr" = ( /obj/effect/turf_decal/tile/neutral, @@ -21314,13 +21253,9 @@ /obj/item/clothing/neck/stethoscope, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, -/obj/structure/window/reinforced{ - layer = 2.9 - }, +/obj/structure/window/reinforced, /obj/effect/loot_jobscale/medical/first_aid_kit, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/medical/storage) "cGg" = ( /obj/machinery/status_display/ai{ @@ -21992,15 +21927,11 @@ pixel_y = -3 }, /obj/item/clothing/head/helmet{ - layer = 3.00001; pixel_x = -3; pixel_y = 3 }, +/obj/item/clothing/head/helmet, /obj/item/clothing/head/helmet{ - layer = 3.00001 - }, -/obj/item/clothing/head/helmet{ - layer = 3.00001; pixel_x = 3; pixel_y = -3 }, @@ -22010,7 +21941,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/door/window/southright{ dir = 1; - name = "Armour storage"; + name = "Armour Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -22308,7 +22239,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "councilblast"; - name = "Council Chambers Blast door" + name = "Council Chambers Blast Door" }, /turf/open/floor/plating, /area/bridge/meeting_room/council) @@ -22400,9 +22331,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/dorms) "cMx" = ( /obj/machinery/light, @@ -22421,9 +22350,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/dorms) "cMC" = ( /obj/structure/disposalpipe/segment{ @@ -24869,9 +24796,7 @@ /obj/effect/spawner/lootdrop/maintenance/two, /obj/item/retractor, /obj/structure/closet, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "ddt" = ( /obj/machinery/door/airlock/research{ @@ -24914,9 +24839,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "ddy" = ( /obj/item/kirbyplants/random, @@ -25468,7 +25391,7 @@ /area/bridge) "diu" = ( /obj/machinery/smartfridge/chemistry/preloaded, -/turf/closed/wall, +/turf/open/floor/iron/white, /area/medical/chemistry) "diL" = ( /obj/effect/decal/cleanable/dirt, @@ -25486,22 +25409,16 @@ /area/maintenance/starboard/aft) "diU" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "diV" = ( -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "diX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard) "dja" = ( /obj/machinery/vending/assist, @@ -26183,8 +26100,7 @@ /area/hallway/primary/aft) "dpf" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -26410,8 +26326,7 @@ req_access_txt = "2" }, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark/textured_large, @@ -26911,9 +26826,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "dvC" = ( /obj/structure/extinguisher_cabinet{ @@ -27300,7 +27213,7 @@ "dyP" = ( /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -27731,9 +27644,7 @@ /obj/effect/spawner/lootdrop/teratoma/robot, /obj/effect/spawner/lootdrop/maintenance/two, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "dBu" = ( /obj/structure/cable/yellow{ @@ -28371,7 +28282,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/plating, /area/medical/medbay/lobby) @@ -28492,9 +28403,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "dHe" = ( /obj/effect/decal/cleanable/dirt, @@ -28697,8 +28606,7 @@ /area/science/misc_lab) "dIs" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -29131,8 +29039,7 @@ /area/science/storage) "dKM" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -30023,7 +29930,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/medical/medbay/lobby) @@ -30305,9 +30212,7 @@ "dUM" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/spawner/lootdrop/trap/reusable, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "dUT" = ( /obj/effect/decal/cleanable/dirt, @@ -30525,7 +30430,7 @@ "dXm" = ( /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /obj/structure/cable/yellow, /obj/structure/cable/yellow{ @@ -31466,13 +31371,13 @@ /area/security/checkpoint/escape) "efK" = ( /obj/machinery/smartfridge/organ, -/turf/closed/wall, +/turf/open/floor/iron/white, /area/medical/surgery) "efM" = ( /obj/structure/cable/yellow, /obj/machinery/door/poddoor/shutters/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -31719,7 +31624,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/plating, /area/medical/medbay/lobby) @@ -31805,8 +31710,7 @@ /area/security/checkpoint/customs/auxiliary) "eiw" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/camera/directional/south, /turf/open/space, @@ -31851,7 +31755,7 @@ base_state = "left"; dir = 1; icon_state = "left"; - name = "Armour storage"; + name = "Armour Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -31951,9 +31855,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/toilet/auxiliary) "ekA" = ( /obj/effect/landmark/blobstart, @@ -32076,9 +31978,7 @@ dir = 4 }, /obj/item/wirecutters, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "emu" = ( /turf/closed/wall, @@ -32421,9 +32321,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "esh" = ( /obj/structure/cable/yellow{ @@ -32929,8 +32827,7 @@ /area/engine/atmos) "exW" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -33357,9 +33254,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/hallway/primary/central) "eDN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -33499,9 +33394,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "eGP" = ( /obj/structure/table, @@ -33881,7 +33774,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/machinery/door/airlock/maintenance_hatch{ name = "Medbay Maintenance"; @@ -33943,7 +33836,7 @@ "eML" = ( /obj/machinery/door/poddoor/preopen{ id = "brigfront"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced, @@ -34539,9 +34432,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "eYm" = ( /obj/structure/table, @@ -34589,9 +34480,7 @@ "eYY" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "eZb" = ( /obj/structure/cable/yellow{ @@ -35032,9 +34921,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "ffv" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -35448,9 +35335,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/dorms) "fkT" = ( /obj/structure/cable/yellow{ @@ -35556,9 +35441,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "fmn" = ( /obj/structure/sink{ @@ -35901,9 +35784,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/toilet/auxiliary) "fuK" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -36165,7 +36046,6 @@ }, /obj/machinery/shower{ dir = 8; - layer = 4; name = "emergency shower"; pixel_y = 6 }, @@ -36215,9 +36095,7 @@ dir = 1 }, /obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "fAO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -37177,7 +37055,7 @@ dir = 4 }, /obj/machinery/door/airlock/research/glass{ - name = "Shuttle dock"; + name = "Shuttle Dock"; req_one_access_txt = "47" }, /turf/open/floor/iron, @@ -37702,7 +37580,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -37877,9 +37755,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "fZF" = ( /obj/structure/cable/yellow{ @@ -37985,9 +37861,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/fore) "gbI" = ( /obj/effect/turf_decal/tile/neutral{ @@ -38566,7 +38440,6 @@ }, /obj/structure/table/wood, /obj/item/taperecorder{ - layer = 2.9; pixel_x = -1; pixel_y = 4 }, @@ -38722,9 +38595,7 @@ /obj/machinery/light_switch{ pixel_x = -26 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/locker) "gpu" = ( /obj/effect/turf_decal/delivery, @@ -38787,7 +38658,7 @@ "gqp" = ( /obj/machinery/door/poddoor/preopen{ id = "brigfront"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/structure/disposalpipe/segment{ dir = 8 @@ -38971,9 +38842,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "grN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -39210,9 +39079,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard) "gvP" = ( /obj/structure/table/reinforced, @@ -39263,8 +39130,7 @@ /area/security/detectives_office) "gwt" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -39783,7 +39649,7 @@ /area/security/checkpoint/customs/auxiliary) "gFA" = ( /obj/machinery/door/airlock/science{ - name = "exploration preperation room"; + name = "exploration Preperation Room"; req_access_txt = "49" }, /obj/machinery/door/firedoor, @@ -40055,7 +39921,7 @@ /obj/machinery/door/airlock/security{ aiControlDisabled = 1; id_tag = "prisonereducation"; - name = "Prison access"; + name = "Prison Access"; req_one_access_txt = "1;4" }, /turf/open/floor/iron/dark, @@ -40161,9 +40027,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "gKq" = ( /obj/structure/cable/yellow{ @@ -40244,9 +40108,7 @@ icon_state = "0-4" }, /obj/machinery/vending/wardrobe/medi_wardrobe, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/medical/storage) "gMm" = ( /obj/structure/disposalpipe/segment{ @@ -40278,9 +40140,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/dorms) "gNp" = ( /obj/effect/turf_decal/siding/white, @@ -40960,9 +40820,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "gWn" = ( /obj/machinery/power/solar_control{ @@ -41209,7 +41067,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 @@ -41225,7 +41083,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "atmoslock"; - name = "Atmospherics Lockdown Blast door" + name = "Atmospherics Lockdown Blast Door" }, /turf/open/floor/plating, /area/engine/atmos) @@ -41269,7 +41127,7 @@ base_state = "left"; dir = 1; icon_state = "left"; - name = "Disabler storage"; + name = "Disabler Storage"; req_one_access_txt = "1;4" }, /obj/effect/loot_jobscale/armoury/disabler, @@ -41450,8 +41308,7 @@ /area/maintenance/port) "hfJ" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/firealarm{ dir = 8; @@ -41541,7 +41398,6 @@ dir = 8 }, /obj/structure/showcase/machinery/implanter{ - layer = 2.7; pixel_y = 4 }, /turf/open/floor/carpet/grimy, @@ -41604,9 +41460,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/science/research) "hhb" = ( /obj/structure/cable/yellow, @@ -42689,9 +42543,7 @@ "hzY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/l3closet/virology, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "hAa" = ( /obj/structure/chair/wood/normal{ @@ -42920,7 +42772,7 @@ "hEs" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/structure/disposalpipe/segment{ dir = 9 @@ -43161,9 +43013,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/dorms) "hIi" = ( /obj/machinery/button/crematorium{ @@ -43589,7 +43439,7 @@ /area/engine/atmos) "hNU" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Medical outpost"; + name = "Brig Medical Outpost"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/stripes/closeup{ @@ -43814,7 +43664,7 @@ dir = 8 }, /obj/machinery/door/window/brigdoor/southright{ - name = "evidence chute"; + name = "evidence Chute"; req_access_txt = "1"; dir = 1 }, @@ -44034,7 +43884,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "atmoslock"; - name = "Atmospherics Lockdown Blast door" + name = "Atmospherics Lockdown Blast Door" }, /obj/machinery/door/window/westright{ name = "Atmospherics Desk"; @@ -44464,9 +44314,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "hZt" = ( /obj/machinery/light{ @@ -44592,8 +44440,7 @@ /area/maintenance/starboard/aft) "ibu" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -44681,9 +44528,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/dorms) "ict" = ( /obj/structure/cable{ @@ -45179,7 +45024,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/medical/medbay/lobby) @@ -45457,9 +45302,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard) "ipY" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -45617,7 +45460,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/medical/genetics) @@ -45902,9 +45745,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "ixH" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -46087,9 +45928,7 @@ "iAV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/blobstart, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "iBe" = ( /turf/closed/wall, @@ -46522,7 +46361,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/plating, /area/security/checkpoint/medical) @@ -47389,7 +47228,7 @@ /obj/machinery/door/window/southright{ base_state = "left"; icon_state = "left"; - name = "Balistic Weapons storage"; + name = "Balistic Weapons Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -48057,9 +47896,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "jlF" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, @@ -49003,7 +48840,7 @@ /obj/machinery/door/window/southright{ base_state = "left"; icon_state = "left"; - name = "Weapons storage"; + name = "Weapons Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -49815,9 +49652,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "jQN" = ( /obj/structure/chair/fancy/sofa/old/left{ @@ -49861,9 +49696,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "jRK" = ( /obj/item/kirbyplants/random, @@ -50372,9 +50205,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "jZo" = ( /obj/effect/decal/cleanable/dirt, @@ -50420,7 +50251,7 @@ "jZP" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -50755,7 +50586,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "atmoslock"; - name = "Atmospherics Lockdown Blast door" + name = "Atmospherics Lockdown Blast Door" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -50786,9 +50617,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/fore) "keP" = ( /obj/effect/turf_decal/stripes/line{ @@ -50864,7 +50693,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id = "brigfront"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -51302,9 +51131,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/hallway/primary/central) "klq" = ( /obj/structure/cable/yellow{ @@ -51329,9 +51156,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/heads/chief) "kly" = ( /obj/effect/decal/cleanable/dirt, @@ -51481,7 +51306,7 @@ dir = 4 }, /obj/machinery/door/morgue{ - name = "exploration preperation room"; + name = "exploration Preperation Room"; req_access_txt = "49" }, /turf/open/floor/iron/dark/telecomms, @@ -51502,9 +51327,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/locker) "koM" = ( /obj/structure/disposalpipe/segment{ @@ -51670,9 +51493,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard) "ksf" = ( /obj/structure/table/reinforced, @@ -52372,9 +52193,7 @@ /obj/item/folder/blue, /obj/item/pen, /obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/security/courtroom) "kFC" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted, @@ -52876,7 +52695,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/plating, /area/maintenance/department/medical/central) @@ -52893,9 +52712,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/heads/chief) "kPf" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -53649,9 +53466,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/toilet/restrooms) "lfj" = ( /obj/effect/decal/cleanable/dirt, @@ -53842,7 +53657,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/medical/medbay/lobby) @@ -54058,9 +53873,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "llz" = ( /obj/structure/cable/yellow{ @@ -55104,9 +54917,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "lDf" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -55391,9 +55202,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard) "lId" = ( /obj/machinery/nanite_program_hub, @@ -55802,9 +55611,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/toilet/restrooms) "lNI" = ( /obj/structure/table/wood, @@ -56560,7 +56367,7 @@ "lYJ" = ( /obj/machinery/door/poddoor/preopen{ id = "brigfront"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -57201,7 +57008,7 @@ "mlq" = ( /obj/machinery/door/poddoor/preopen{ id = "hosroom"; - name = "space shutters" + name = "space Shutters" }, /obj/structure/cable/yellow, /obj/structure/cable/yellow{ @@ -57382,9 +57189,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "moo" = ( /obj/structure/table/reinforced, @@ -57441,7 +57246,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "brigfront"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; @@ -57766,9 +57571,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/fore) "msL" = ( /obj/structure/cable/yellow{ @@ -58165,7 +57968,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "viroshutters"; - name = "viro shutters" + name = "viro Shutters" }, /turf/open/floor/plating, /area/medical/virology) @@ -58476,9 +58279,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "mGH" = ( /obj/effect/turf_decal/stripes/closeup, @@ -58554,9 +58355,7 @@ "mHN" = ( /obj/structure/closet/l3closet/virology, /obj/effect/spawner/lootdrop/teratoma/minor, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "mHO" = ( /obj/effect/decal/cleanable/dirt, @@ -58772,7 +58571,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/medical/morgue) @@ -59617,7 +59416,7 @@ /area/medical/genetics) "mZr" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Medical outpost"; + name = "Brig Medical Outpost"; req_one_access_txt = "1;34" }, /obj/effect/turf_decal/stripes/closeup, @@ -59658,9 +59457,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "mZE" = ( /obj/machinery/door/airlock{ @@ -59815,8 +59612,7 @@ req_access_txt = "39" }, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/structure/curtain, /turf/open/floor/iron/grid/steel, @@ -61526,7 +61322,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosprivacy"; - name = "HoS Privacy Blast door" + name = "HoS Privacy Blast Door" }, /turf/open/floor/plating, /area/security/main) @@ -61961,9 +61757,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "nGL" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ @@ -62014,9 +61808,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "nIb" = ( /obj/effect/decal/cleanable/dirt, @@ -62436,9 +62228,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "nPi" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -62472,9 +62262,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "nQl" = ( /obj/effect/decal/cleanable/dirt, @@ -62922,9 +62710,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/fore) "nWQ" = ( /obj/structure/window/reinforced{ @@ -63598,7 +63384,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/maintenance/starboard/aft) @@ -63663,9 +63449,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard) "okT" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -63782,8 +63566,7 @@ /area/security/main) "onI" = ( /obj/structure/railing{ - dir = 10; - layer = 3.2 + dir = 10 }, /obj/machinery/biogenerator, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -63808,8 +63591,7 @@ "oob" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -64040,9 +63822,7 @@ /area/hallway/primary/central) "orn" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "orI" = ( /obj/effect/decal/cleanable/dirt, @@ -64058,9 +63838,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/toilet/auxiliary) "orO" = ( /obj/structure/cable/yellow{ @@ -64161,7 +63939,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hopblast"; - name = "HoP Blast door" + name = "HoP Blast Door" }, /obj/machinery/door/airlock/command{ name = "Head of Personnel's Office"; @@ -64722,7 +64500,7 @@ }, /obj/item/clothing/suit/armor/laserproof, /obj/machinery/door/window/southright{ - name = "EMP storage"; + name = "EMP Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -64829,9 +64607,7 @@ req_one_access_txt = "32" }, /obj/machinery/door/firedoor, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/engine/storage_shared) "oEx" = ( /obj/structure/cable{ @@ -64873,9 +64649,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "oES" = ( /obj/structure/cable/yellow{ @@ -64923,9 +64697,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/science/misc_lab) "oFU" = ( /obj/structure/girder, @@ -65535,8 +65307,7 @@ /area/maintenance/port) "oQr" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 1 + dir = 1 }, /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -65553,7 +65324,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "viroshutters"; - name = "viro shutters" + name = "viro Shutters" }, /turf/open/floor/iron/grid/steel, /area/medical/virology) @@ -65667,9 +65438,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "oSm" = ( /obj/effect/decal/cleanable/dirt, @@ -66091,9 +65860,7 @@ /area/medical/medbay/central) "paG" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "paK" = ( /obj/effect/decal/cleanable/blood/old, @@ -66431,9 +66198,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "pjz" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -66611,9 +66376,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/engine/storage_shared) "plm" = ( /obj/structure/cable/yellow{ @@ -66700,9 +66463,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "pmA" = ( /obj/structure/cable/yellow{ @@ -66859,9 +66620,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/dorms) "poM" = ( /obj/effect/decal/cleanable/dirt, @@ -66911,8 +66670,7 @@ /area/engine/transit_tube) "ppV" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -66949,9 +66707,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "prL" = ( /obj/structure/chair/office{ @@ -67442,9 +67198,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "pzk" = ( /obj/structure/cable/yellow{ @@ -67489,7 +67243,7 @@ "pzZ" = ( /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -67557,9 +67311,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/vacant_room/commissary) "pAS" = ( /obj/structure/table/wood, @@ -68104,9 +67856,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "pJZ" = ( /obj/structure/cable/yellow{ @@ -68364,7 +68114,7 @@ dir = 4 }, /obj/machinery/door/window/southright{ - name = "Balistic Weapons storage"; + name = "Balistic Weapons Storage"; req_one_access_txt = "1;4" }, /obj/item/ammo_box/magazine/wt550m9/rubber{ @@ -68494,7 +68244,7 @@ /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /obj/machinery/door/poddoor/shutters/preopen{ id = "viroshutters"; - name = "viro shutters" + name = "viro Shutters" }, /turf/open/floor/iron/white, /area/medical/virology) @@ -68614,9 +68364,7 @@ /obj/structure/table/wood, /obj/item/clipboard, /obj/item/toy/figure/lawyer, -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/big, /area/lawoffice) "pTk" = ( @@ -68829,9 +68577,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard) "pVh" = ( /obj/structure/cable/yellow{ @@ -68910,9 +68656,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "pXs" = ( /obj/effect/decal/cleanable/dirt, @@ -69212,8 +68956,7 @@ req_access_txt = "39" }, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/structure/curtain, /turf/open/floor/iron/grid/steel, @@ -71260,7 +71003,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "viroshutters"; - name = "viro shutters" + name = "viro Shutters" }, /turf/open/floor/iron/dark, /area/medical/virology) @@ -71299,9 +71042,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "qLq" = ( /obj/structure/chair/office/light{ @@ -71526,7 +71267,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/door/window/southright{ dir = 1; - name = "Armour storage"; + name = "Armour Storage"; req_one_access_txt = "1;4" }, /obj/structure/window/reinforced{ @@ -71569,7 +71310,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hopblast"; - name = "HoP Blast door" + name = "HoP Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -71615,7 +71356,6 @@ pixel_y = 22 }, /obj/item/folder/red{ - layer = 2.9; pixel_x = 8 }, /turf/open/floor/iron/dark, @@ -72261,9 +72001,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/toilet/auxiliary) "qZM" = ( /obj/structure/cable/yellow{ @@ -72373,9 +72111,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "rbB" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -72799,9 +72535,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "rhW" = ( /obj/structure/cable/yellow{ @@ -72864,7 +72598,7 @@ "riw" = ( /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced, @@ -72882,9 +72616,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "riC" = ( /obj/machinery/gateway{ @@ -72978,7 +72710,7 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "gas ports" + name = "gas Ports" }, /obj/machinery/atmospherics/pipe/manifold/general/visible, /turf/open/floor/iron/dark, @@ -73006,9 +72738,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "rkh" = ( /obj/structure/cable/yellow{ @@ -73041,9 +72771,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/engine/storage_shared) "rkI" = ( /obj/structure/cable, @@ -73201,9 +72929,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/fore) "rob" = ( /obj/effect/turf_decal/stripes/line{ @@ -73314,9 +73040,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/engine/storage_shared) "rpw" = ( /obj/structure/cable/yellow{ @@ -73802,9 +73526,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/hallway/primary/central) "rwY" = ( /obj/structure/closet/cardboard, @@ -73935,9 +73657,7 @@ pixel_x = 26; pixel_y = 26 }, -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, @@ -74585,9 +74305,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/science/misc_lab) "rJU" = ( /obj/machinery/computer/nanite_cloud_controller, @@ -74622,7 +74340,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/medical/morgue) @@ -74859,7 +74577,7 @@ /area/security/prison) "rNn" = ( /obj/machinery/door/airlock/science{ - name = "exploration preperation room"; + name = "exploration Preperation Room"; req_access_txt = "49" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -74962,9 +74680,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "rOP" = ( /obj/effect/decal/cleanable/dirt, @@ -75123,7 +74839,7 @@ "rSU" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -76660,8 +76376,7 @@ "sqE" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -76903,7 +76618,7 @@ base_state = "left"; dir = 1; icon_state = "left"; - name = "Implants storage"; + name = "Implants Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/red{ @@ -77184,7 +76899,7 @@ /obj/machinery/door/airlock/security{ aiControlDisabled = 1; id_tag = "prisonereducation"; - name = "Prison access"; + name = "Prison Access"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/delivery/red, @@ -77596,7 +77311,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/maintenance/aft) @@ -77616,7 +77331,7 @@ /area/science/research) "sFG" = ( /obj/machinery/smartfridge/chemistry, -/turf/closed/wall/r_wall, +/turf/open/floor/iron/white, /area/medical/chemistry) "sFV" = ( /obj/effect/turf_decal/stripes/line{ @@ -77711,7 +77426,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/medical/medbay/lobby) @@ -77820,7 +77535,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "atmoslock"; - name = "Atmospherics Lockdown Blast door" + name = "Atmospherics Lockdown Blast Door" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -78116,7 +77831,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/medical/morgue) @@ -78170,7 +77885,7 @@ /area/vacant_room/office) "sMU" = ( /obj/machinery/door/airlock/security/glass{ - name = "Brig Medical outpost"; + name = "Brig Medical Outpost"; req_access_txt = "63" }, /obj/effect/turf_decal/stripes/closeup{ @@ -78272,9 +77987,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/department/medical/central) "sOR" = ( /obj/effect/turf_decal/stripes/line, @@ -78935,9 +78648,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/fore) "tam" = ( /obj/structure/cable/yellow{ @@ -79067,8 +78778,7 @@ "tcl" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -80138,9 +79848,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/heads/chief) "tst" = ( /obj/effect/turf_decal/siding/white{ @@ -80601,9 +80309,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard) "tAk" = ( /obj/structure/closet/crate/secure/weapon{ @@ -80674,9 +80380,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/hallway/primary/central) "tAW" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -81019,7 +80723,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hopblast"; - name = "HoP Blast door" + name = "HoP Blast Door" }, /obj/machinery/door/window/brigdoor/eastleft{ name = "Access Desk"; @@ -81269,8 +80973,7 @@ /obj/structure/lattice, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/space, /area/space/nearstation) @@ -81393,9 +81096,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/engine/storage_shared) "tPh" = ( /obj/effect/landmark/start/station_engineer, @@ -81592,9 +81293,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/locker) "tSP" = ( /obj/structure/table/reinforced, @@ -81654,7 +81353,7 @@ "tTz" = ( /obj/machinery/door/poddoor/preopen{ id = "testlab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -81752,9 +81451,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/engine/storage_shared) "tVe" = ( /obj/structure/cable/yellow{ @@ -81959,8 +81656,7 @@ /area/quartermaster/storage) "tZh" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -82050,7 +81746,7 @@ "tZZ" = ( /obj/machinery/door/poddoor/preopen{ id = "hosroom"; - name = "space shutters" + name = "space Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -82091,8 +81787,7 @@ /area/quartermaster/storage) "uaQ" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -82529,9 +82224,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "uhW" = ( -/obj/machinery/nuclearbomb/selfdestruct{ - layer = 2 - }, +/obj/machinery/nuclearbomb/selfdestruct, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -82593,9 +82286,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/department/medical/central) "uiR" = ( /obj/structure/cable/yellow{ @@ -82627,7 +82318,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/plating, /area/medical/medbay/lobby) @@ -82892,7 +82583,7 @@ "unH" = ( /obj/machinery/door/window/brigdoor/security/cell/southright{ id = "cell"; - name = "Solitary confinement"; + name = "Solitary Confinement"; dir = 1 }, /obj/structure/cable/yellow{ @@ -83205,9 +82896,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard) "urZ" = ( /obj/effect/turf_decal/tile/white, @@ -83391,7 +83080,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/security/checkpoint/medical) @@ -83420,9 +83109,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "uvO" = ( /obj/structure/table/wood, @@ -84016,7 +83703,7 @@ /obj/machinery/smartfridge{ name = "Sample Storage" }, -/turf/closed/wall, +/turf/open/floor/iron/grid/steel, /area/medical/virology) "uHw" = ( /obj/effect/turf_decal/tile/red/opposingcorners, @@ -84165,9 +83852,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "uIV" = ( /obj/effect/turf_decal/tile/blue, @@ -84499,9 +84184,7 @@ /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "uPe" = ( -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/security/detectives_office) "uPu" = ( @@ -85342,7 +85025,7 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/plating, /area/security/checkpoint/medical) @@ -85533,9 +85216,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/window/reinforced{ - layer = 2.9 - }, +/obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 }, @@ -85668,8 +85349,7 @@ req_access_txt = "39" }, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/structure/curtain, /turf/open/floor/iron/grid/steel, @@ -85734,9 +85414,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "vkf" = ( /obj/structure/cable/yellow{ @@ -85787,8 +85465,7 @@ /area/security/main) "vli" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -85903,7 +85580,7 @@ "vmN" = ( /obj/machinery/door/poddoor/preopen{ id = "hosroom"; - name = "space shutters" + name = "space Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -85990,7 +85667,7 @@ /area/science/research) "vnX" = ( /obj/machinery/smartfridge/chemistry/virology/preloaded, -/turf/closed/wall, +/turf/open/floor/iron/grid/steel, /area/medical/virology) "vog" = ( /obj/structure/window/reinforced{ @@ -86928,7 +86605,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/maintenance/starboard/aft) @@ -87487,9 +87164,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "vLr" = ( /obj/structure/cable/yellow{ @@ -87514,9 +87189,7 @@ "vLz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "vLI" = ( /obj/structure/girder, @@ -87758,9 +87431,7 @@ /turf/open/floor/iron, /area/medical/patients_rooms) "vQJ" = ( -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "vQV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -88251,8 +87922,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/grass/jungle/b, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, @@ -88573,9 +88243,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/heads/chief) "wdo" = ( /obj/machinery/light{ @@ -88613,7 +88281,7 @@ pixel_y = 3 }, /obj/machinery/door/window/southright{ - name = "Firing pins storage"; + name = "Firing Pins Storage"; req_one_access_txt = "1;4" }, /obj/structure/window/reinforced{ @@ -88681,9 +88349,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "weJ" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -88692,7 +88358,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/plating, /area/maintenance/department/medical/central) @@ -88785,7 +88451,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/science{ - name = "exploration preperation room"; + name = "exploration Preperation Room"; req_access_txt = "49" }, /turf/open/floor/iron, @@ -89674,9 +89340,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/heads/chief) "wsU" = ( /obj/structure/disposalpipe/segment{ @@ -89757,7 +89421,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -89788,9 +89452,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/crew_quarters/heads/chief) "wuy" = ( /obj/structure/chair/fancy/comfy{ @@ -90080,7 +89742,7 @@ "wyw" = ( /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced, @@ -90220,7 +89882,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/maintenance/starboard/aft) @@ -90397,8 +90059,7 @@ /area/medical/genetics) "wDz" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/airalarm/directional/west{ pixel_x = -22 @@ -90458,9 +90119,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "wEO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -90984,18 +90643,15 @@ /area/security/prison) "wLH" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 1 + dir = 1 }, /obj/effect/turf_decal/bot, /obj/structure/rack, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = -4; pixel_y = 8 }, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = 2 }, /obj/structure/extinguisher_cabinet{ @@ -91007,7 +90663,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "viroshutters"; - name = "viro shutters" + name = "viro Shutters" }, /turf/open/floor/iron/grid/steel, /area/medical/virology) @@ -91177,9 +90833,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "wNQ" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -91349,9 +91003,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "wQP" = ( /obj/item/kirbyplants/random, @@ -91548,16 +91200,13 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/obj/machinery/light{ - dir = 8 - }, /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/medical/chemistry) "wUr" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced/prison, @@ -91895,9 +91544,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/science/research) "xcs" = ( /obj/effect/landmark/event_spawn, @@ -91926,9 +91573,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/fore) "xcD" = ( /obj/structure/cable/yellow{ @@ -92129,9 +91774,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "xeU" = ( /obj/structure/cable/yellow{ @@ -92510,15 +92153,14 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/detectives_office) "xkx" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -92595,14 +92237,11 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port) "xml" = ( /obj/machinery/shower{ dir = 4; - layer = 4; name = "emergency shower"; pixel_y = 7 }, @@ -92672,7 +92311,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosprivacy"; - name = "HoS Privacy Blast door" + name = "HoS Privacy Blast Door" }, /turf/open/floor/plating, /area/security/prison) @@ -92882,8 +92521,7 @@ /area/maintenance/department/medical/central) "xrn" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 1 + dir = 1 }, /obj/item/kirbyplants/random, /obj/item/radio/intercom{ @@ -92892,7 +92530,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "viroshutters"; - name = "viro shutters" + name = "viro Shutters" }, /turf/open/floor/iron/grid/steel, /area/medical/virology) @@ -93015,7 +92653,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "councilblast"; - name = "Council Chambers Blast door" + name = "Council Chambers Blast Door" }, /turf/open/floor/plating, /area/bridge/meeting_room/council) @@ -93037,9 +92675,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "xvn" = ( /obj/structure/cable/yellow{ @@ -93242,9 +92878,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "xxJ" = ( /obj/structure/cable/yellow{ @@ -93252,7 +92886,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/structure/disposalpipe/segment{ dir = 10 @@ -93977,7 +93611,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -94268,9 +93902,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "xNg" = ( /obj/structure/cable/yellow{ @@ -94634,7 +94266,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/preopen{ id = "testlab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/engine, @@ -94648,7 +94280,7 @@ "xSN" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -94888,7 +94520,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -94946,9 +94578,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/aft) "xXe" = ( /obj/effect/turf_decal/stripes/line{ @@ -95274,7 +94904,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/plating, /area/medical/genetics) @@ -95388,7 +95018,6 @@ }, /obj/machinery/button/door{ id = "SecJusticeChamber"; - layer = 4; name = "Justice Vent Control"; pixel_x = -36; pixel_y = 26; @@ -95490,7 +95119,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/machinery/door/airlock/maintenance_hatch{ name = "Medbay Maintenance"; @@ -95768,9 +95397,7 @@ "yjf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/aft) "yjz" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index 8874fbae515d0..838f461d953a8 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -2,16 +2,6 @@ "aav" = ( /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness/recreation) -"aaz" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/computer/crew{ - req_one_access = list(5,4) - }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) "aaU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/stripes/line{ @@ -20,17 +10,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) -"aaX" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "abC" = ( /obj/item/assembly/igniter{ pixel_x = 6; @@ -86,12 +65,6 @@ }, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/ai_upload) -"abN" = ( -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) "abU" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -124,16 +97,6 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/iron/tech, /area/science/mixing) -"add" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "ade" = ( /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) @@ -150,25 +113,18 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"adk" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) +/area/hallway/primary/central) "adG" = ( /obj/structure/flora/rock, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"adM" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) "aej" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/sign/warning/vacuum{ @@ -176,6 +132,28 @@ }, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) +"aep" = ( +/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "Engidesk"; + name = "engineering Security Door" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/grass/no_border, +/area/crew_quarters/heads/chief) +"aer" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "aet" = ( /obj/effect/turf_decal/delivery, /obj/machinery/computer/rdservercontrol{ @@ -197,6 +175,58 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/science/mixing) +"aeH" = ( +/obj/item/barcodescanner{ + name = "Scanner"; + pixel_x = -2; + pixel_y = 3 + }, +/turf/open/floor/plating/beach/coastline_t/sandwater_inner{ + dir = 8 + }, +/area/asteroid/paradise/surface) +"aeM" = ( +/obj/structure/table/reinforced, +/obj/item/clipboard{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/paper/monitorkey{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/folder/yellow, +/obj/item/toy/figure/ce{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/stamp/chief_engineer{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 5 + }, +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","engine") + }, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Chief Engineer's Desk"; + departmentType = 4; + name = "Chief Engineer RC"; + pixel_x = 32; + pixel_y = 31 + }, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/mob/living/simple_animal/parrot/Poly, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/chief) "aeN" = ( /obj/effect/landmark/start/cook, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -204,36 +234,6 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) -"aeP" = ( -/obj/docking_port/stationary{ - dwidth = 12; - height = 69; - id = "whiteship_home"; - name = "Auxiliary Dock"; - width = 25 - }, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface/grass) -"aeQ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 9 - }, -/obj/machinery/meter, -/turf/closed/wall/r_wall, -/area/engine/supermatter) -"aeV" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "aeZ" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -256,9 +256,7 @@ network = list("ss13","engine","public") }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "afw" = ( /turf/closed/wall, /area/crew_quarters/kitchen) @@ -314,42 +312,13 @@ /obj/machinery/computer/operating, /turf/open/floor/iron/white, /area/science/robotics) -"ahk" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Head of Personnel's Paperwork Door"; - req_access_txt = "57" - }, -/obj/machinery/door/window/northleft{ - dir = 8; - name = "Paperwork Window" - }, -/obj/item/pen{ - pixel_x = 6; - pixel_y = 1 - }, -/obj/item/pen{ - pixel_x = 10; - pixel_y = 1 - }, -/obj/item/pen{ - pixel_x = 8; - pixel_y = -3 - }, -/obj/item/paper{ - pixel_x = -6 - }, -/obj/machinery/door/firedoor, -/obj/structure/desk_bell/speed_demon, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "hopshutter"; - name = "privacy shutters" +"ahD" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron, -/area/crew_quarters/heads/hop) +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/bar) "ahQ" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/line{ @@ -439,28 +408,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"ajX" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Mix to Turbine" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Mix to SM"; - piping_layer = 1 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) "ajZ" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -471,6 +418,13 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) +"akq" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/curtain/directional{ + dir = 1 + }, +/turf/open/floor/plating, +/area/crew_quarters/theatre/backstage) "aky" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/rust, @@ -517,6 +471,13 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/eva) +"akL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "ald" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -528,19 +489,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"alf" = ( -/obj/machinery/modular_computer/console/preset/engineering, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/iron, -/area/bridge) +/area/hallway/primary/central) "alg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/line, @@ -588,6 +537,12 @@ }, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) +"alM" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/glass/reinforced/plasma, +/area/maintenance/department/security/brig) "alO" = ( /obj/structure/chair/wood, /obj/structure/sign/painting/library{ @@ -679,10 +634,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "amO" = ( /obj/machinery/door/window/brigdoor{ dir = 1; @@ -720,9 +676,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "anP" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -769,10 +723,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"aoq" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/science/misc_lab) "aou" = ( /obj/structure/railing/corner{ dir = 8 @@ -790,26 +740,28 @@ /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/effect/landmark/start/scientist, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/numbers/two_nine{ dir = 1 }, +/obj/structure/disposalpipe/sorting/mail/destination/testing_range{ + dir = 1 + }, /turf/open/floor/iron/white/side{ dir = 5 }, /area/science/lab) -"aov" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow, -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison blast door" +"aoD" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/turf/open/floor/plating, -/area/security/prison) +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "aoG" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -840,54 +792,14 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) -"aoI" = ( -/obj/structure/closet/firecloset/full, -/obj/effect/turf_decal/tile/red{ - alpha = 180; - dir = 1 - }, -/turf/open/floor/iron/dark/side, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "aoM" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/brig) -"aoV" = ( -/obj/effect/turf_decal/box/white, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "aoY" = ( /obj/structure/lattice/catwalk/over, /turf/open/openspace, /area/asteroid/paradise/surface) -"apg" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/button/door{ - desc = "A remote control switch for the medbay foyer."; - id = "MedbayFoyer"; - name = "Medbay Doors Control"; - normaldoorcontrol = 1; - pixel_x = 4; - pixel_y = 36 - }, -/obj/machinery/button/door{ - id = "chemistry_shutters"; - id_tag = "cmoprivacy"; - name = "Chem Shutters Control"; - pixel_x = 4; - pixel_y = 27 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron/white, -/area/medical/apothecary) "apn" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -923,14 +835,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"apI" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/evac, -/turf/open/floor/iron, -/area/maintenance/department/science/central) "apP" = ( /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) @@ -962,27 +866,6 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) -"aqx" = ( -/obj/machinery/door/airlock/command{ - name = "Head of Personnel's Office"; - req_access_txt = "57" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/machinery/door/poddoor/preopen{ - id = "bridgedoors"; - name = "Bridge Access Blast door" - }, -/turf/open/floor/iron/dark, -/area/bridge) "aqI" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 @@ -1027,6 +910,15 @@ }, /turf/open/floor/iron/dark, /area/security/detectives_office) +"arF" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "arX" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -1050,30 +942,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"asf" = ( -/obj/machinery/door/airlock/highsecurity{ - id_tag = "Emergancycap"; - name = "Safe room"; - req_access_txt = "10"; - security_level = 6 - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/plating, -/area/crew_quarters/heads/captain) +/area/hallway/primary/fore) "asv" = ( /turf/open/floor/iron/dark, /area/engine/atmos) @@ -1089,6 +958,18 @@ }, /turf/open/floor/iron, /area/teleporter) +"asV" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/prison, +/area/security/prison) "ata" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, @@ -1130,9 +1011,7 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "aua" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input, /obj/machinery/sparker/toxmix{ @@ -1162,18 +1041,32 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"auy" = ( -/obj/structure/cable{ - icon_state = "4-8" +"auC" = ( +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Primary AI Core Access"; + obj_integrity = 300; + req_access_txt = "16" }, -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/door/poddoor/shutters/preopen{ + id = "AI Core shutters"; + name = "AI Core Shutter" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/light_switch{ + pixel_x = 6; + pixel_y = 24 }, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "4-8" }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) +/obj/machinery/camera/autoname/directional/south{ + network = list("aiupload") + }, +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) "auE" = ( /turf/closed/wall/r_wall, /area/science/robotics) @@ -1187,6 +1080,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/wood, /area/chapel/main) "auW" = ( @@ -1205,6 +1101,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/tech, /area/science/mixing/chamber) "avl" = ( @@ -1223,14 +1122,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"avB" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "avD" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plating/airless, @@ -1242,7 +1133,7 @@ pixel_y = -33 }, /turf/open/floor/wood, -/area/vacant_room/office) +/area/library/abandoned) "avP" = ( /obj/effect/landmark/start/head_of_personnel, /obj/machinery/newscaster{ @@ -1254,21 +1145,31 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) -"avS" = ( -/obj/structure/chair/stool/bar/directional/west, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 +"awd" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/camera/directional/north{ - network = list("ss13","engine") +/obj/structure/railing{ + dir = 8 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/hallway/primary/aft) +"awm" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/caution{ + dir = 1 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "aww" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible/layer4{ dir = 4 @@ -1305,31 +1206,25 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/quartermaster/storage) -"axj" = ( -/obj/effect/landmark/blobstart, -/turf/open/floor/plating, -/area/maintenance/department/science/central) -"axk" = ( -/obj/structure/closet/crate/science, -/obj/item/circuitboard/computer/shuttle/exploration_shuttle, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/circuitboard/machine/shuttle/heater, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) -"axr" = ( -/obj/structure/window/reinforced{ - dir = 4 +"axi" = ( +/obj/structure/cable{ + icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 4 }, -/turf/open/floor/iron/grid/steel, -/area/bridge) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) +"axj" = ( +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/maintenance/department/science/central) "axA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -1352,34 +1247,6 @@ /obj/effect/decal/cleanable/shreds, /turf/open/floor/iron/dark, /area/science/robotics) -"axZ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) -"aya" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/flasher{ - id = "AI"; - name = "Meatbag Pacifier"; - pixel_x = -33; - pixel_y = 1 - }, -/obj/item/kirbyplants/random, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("aiupload") - }, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "ayl" = ( /obj/structure/chair{ dir = 8 @@ -1392,9 +1259,13 @@ }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"ayp" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/closed/wall/r_wall, +/area/crew_quarters/heads/cmo) "ayz" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -1419,12 +1290,6 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"azd" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "azg" = ( /obj/machinery/modular_fabricator/autolathe, /obj/machinery/door/window/eastright{ @@ -1437,41 +1302,31 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/lab) -"azA" = ( -/obj/effect/turf_decal/bot, -/obj/item/pushbroom, -/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ - alpha = 180; - color = "#DE3A3A" - }, -/obj/structure/closet/secure_closet/brig{ - name = "Storage Locker"; - req_one_access_txt = "1;4" - }, -/obj/machinery/camera/directional/north{ - network = list("ss13","security") - }, -/turf/open/floor/iron/dark, -/area/security/brig) -"azL" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +"azl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/machinery/rnd/production/protolathe/department/engineering{ + req_access_txt = "32" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/window/plasma/reinforced, +/turf/open/floor/iron, +/area/engine/engineering) +"azs" = ( +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","engine") }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump{ + name = "Gas to Chamber" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4; - piping_layer = 1 +/obj/effect/turf_decal/delivery, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-8" }, -/turf/open/floor/iron/dark, -/area/engine/engineering) +/turf/open/floor/engine, +/area/engine/supermatter) "azS" = ( /obj/item/radio/intercom{ dir = 1; @@ -1483,17 +1338,6 @@ }, /turf/open/floor/wood, /area/hallway/secondary/service) -"aAe" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) "aAh" = ( /obj/effect/turf_decal/bot, /obj/structure/extinguisher_cabinet{ @@ -1502,30 +1346,17 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, /turf/open/floor/iron/dark, /area/science/server) -"aAj" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/clothing/glasses/meson/engine, -/obj/item/stack/sheet/mineral/copper{ - amount = 5; - pixel_x = -7; - pixel_y = 3 - }, -/obj/item/storage/belt/utility/full/engi, -/obj/structure/window/plasma/reinforced, -/turf/open/floor/iron, -/area/engine/engineering) +"aAu" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "aAy" = ( /obj/structure/railing/corner{ dir = 1 }, /obj/structure/lattice, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "aAB" = ( /obj/effect/decal/cleanable/oil, /obj/effect/turf_decal/stripes/line, @@ -1623,6 +1454,23 @@ "aCm" = ( /turf/closed/wall, /area/maintenance/department/bridge) +"aCq" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Mix to Turbine" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/tech, +/area/engine/atmos) "aCA" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/pump, @@ -1661,6 +1509,17 @@ }, /turf/open/floor/iron, /area/hydroponics) +"aDq" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/spawner/structure/window/reinforced/prison, +/obj/machinery/door/poddoor/preopen{ + id = "Prisongate"; + name = "Prison Blast Door" + }, +/turf/open/floor/plating, +/area/security/prison) "aDD" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ dir = 6 @@ -1677,47 +1536,6 @@ "aEi" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) -"aEx" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"aEB" = ( -/obj/structure/railing/corner, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/door/airlock/atmos/glass{ - req_access_txt = "11" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4; - piping_layer = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "aEG" = ( /obj/structure/railing{ dir = 1 @@ -1779,9 +1597,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "aFU" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet, @@ -1815,9 +1631,7 @@ "aGW" = ( /obj/structure/frame/machine, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "aHp" = ( /obj/machinery/telecomms/processor/preset_three, /obj/effect/turf_decal/stripes/line{ @@ -1863,9 +1677,7 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "aIx" = ( /obj/machinery/meter, /obj/structure/cable{ @@ -1918,6 +1730,9 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/tech, /area/science/mixing/chamber) "aJn" = ( @@ -2007,27 +1822,6 @@ }, /turf/open/floor/iron/tech, /area/science/mixing/chamber) -"aJD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/numbers/two_nine, -/turf/open/floor/iron, -/area/maintenance/department/cargo) -"aJI" = ( -/obj/effect/turf_decal/siding/dark, -/obj/structure/railing, -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "aJO" = ( /obj/item/radio/intercom{ pixel_x = -1; @@ -2115,6 +1909,32 @@ /obj/effect/landmark/start/botanist, /turf/open/floor/iron, /area/hydroponics) +"aKI" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) +"aKM" = ( +/obj/effect/landmark/start/quartermaster, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/carpet/orange, +/area/quartermaster/qm) "aLc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -2134,48 +1954,12 @@ /obj/machinery/door/poddoor/incinerator_toxmix, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) -"aLo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/light, -/obj/structure/sign/warning/pods{ - pixel_y = -32 - }, -/turf/open/floor/iron, -/area/maintenance/department/chapel) "aLz" = ( /obj/machinery/door/poddoor/incinerator_atmos_aux, /obj/structure/lattice/catwalk/over, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/asteroid/planetary, /area/maintenance/disposal/incinerator) -"aLD" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/glass/reinforced/plasma, -/area/maintenance/department/security/brig) -"aLI" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/suit_storage_unit/cmo, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) -"aLU" = ( -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "aMt" = ( /obj/machinery/vending/custom{ pixel_y = -1 @@ -2236,12 +2020,14 @@ dir = 4 }, /area/crew_quarters/cafeteria) -"aOt" = ( -/obj/effect/turf_decal/evac, -/turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +"aNW" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/hallway/primary/central) "aOw" = ( /obj/effect/turf_decal/stripes/corner, /obj/structure/railing/corner, @@ -2297,6 +2083,19 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/central) +"aOX" = ( +/mob/living/simple_animal/pet/dog/corgi/Ian{ + density = 0; + dir = 1; + pixel_y = 4 + }, +/obj/item/toy/plush/ian, +/obj/structure/bed/dogbed/ian, +/obj/item/storage/secure/safe{ + pixel_x = 38 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/hop) "aPc" = ( /turf/closed/wall, /area/science/explab) @@ -2351,7 +2150,7 @@ pixel_y = 32 }, /turf/open/floor/wood, -/area/vacant_room/office) +/area/library/abandoned) "aPL" = ( /obj/machinery/light/small, /turf/open/floor/plating/asteroid/basalt/planetary, @@ -2381,6 +2180,20 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) +"aPZ" = ( +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 4 + }, +/obj/item/radio/intercom{ + dir = 1; + pixel_x = 32; + pixel_y = 29 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/hallway/primary/central) "aQg" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -2404,26 +2217,12 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) -"aQF" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/siding/dark/corner, -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "aQK" = ( /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark/side{ dir = 9 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "aQW" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt/dust, @@ -2447,6 +2246,14 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) +"aRd" = ( +/obj/item/seeds/tower, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, +/obj/effect/turf_decal/delivery, +/obj/machinery/hydroponics, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "aRf" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/glowstick/lit, @@ -2458,9 +2265,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "aRi" = ( /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, /obj/effect/mapping_helpers/airlock/locked, @@ -2468,38 +2273,45 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/engine, /area/science/mixing/chamber) +"aRk" = ( +/obj/structure/disposalpipe/junction, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "aRB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light{ dir = 1 }, /turf/open/floor/plating/asteroid/planetary, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"aRO" = ( -/obj/machinery/light{ +/area/hallway/primary/fore) +"aRG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/status_display/ai{ - pixel_x = 32 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/restraints/handcuffs{ - pixel_y = 3 +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/machinery/camera/autoname/directional/east{ - c_tag = "Corporate Meeting Room" +/obj/structure/disposalpipe/segment{ + dir = 2 }, -/turf/open/floor/iron, -/area/bridge) +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 10 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "aRP" = ( /obj/structure/table, /obj/item/clipboard{ @@ -2523,20 +2335,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"aRU" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "brigfrontdoor"; - name = "Front Security Blast door" - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/security/brig) +/area/hallway/primary/fore) "aRY" = ( /obj/machinery/atmospherics/components/binary/pump, /obj/machinery/light/small{ @@ -2583,8 +2382,33 @@ }, /obj/structure/chair/office, /obj/effect/landmark/start/head_of_personnel, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) +"aSs" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/railing, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) "aSC" = ( /obj/machinery/door/airlock{ id_tag = "Cabin1"; @@ -2621,14 +2445,17 @@ /obj/machinery/computer/crew, /turf/open/floor/iron, /area/bridge) -"aTm" = ( -/obj/structure/railing{ - dir = 8; - layer = 4 +"aTh" = ( +/obj/item/toy/plush/moth/firewatch{ + name = "Zinnia"; + pixel_x = -10 }, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/maintenance/department/chapel) +/obj/item/toy/plush/lizard_plushie{ + name = "Walks-upon-Embers"; + pixel_x = 5 + }, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/asteroid/paradise) "aTx" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/closed/wall/r_wall, @@ -2639,9 +2466,7 @@ dir = 8 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "aTZ" = ( /obj/structure/chair/office/light{ dir = 8 @@ -2650,6 +2475,18 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark, /area/security/brig) +"aUd" = ( +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/spawner/structure/window/reinforced/prison, +/obj/machinery/door/poddoor/preopen{ + id = "Prisongate"; + name = "Prison Blast Door" + }, +/turf/open/floor/plating, +/area/security/prison) "aUf" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -2700,6 +2537,18 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) +"aUQ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/firealarm/directional/south, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "aVf" = ( /obj/item/stack/sheet/wood/ten, /obj/structure/table, @@ -2710,26 +2559,6 @@ /obj/structure/barricade/wooden, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) -"aVl" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "aVs" = ( /obj/machinery/status_display/ai{ pixel_x = 32 @@ -2757,15 +2586,6 @@ }, /turf/open/floor/iron/dark, /area/security/detectives_office) -"aVH" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/item/plant_analyzer{ - pixel_x = 2; - pixel_y = -8 - }, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "aVS" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/firecloset/full, @@ -2783,6 +2603,16 @@ /obj/effect/landmark/start/cook, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) +"aWi" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "aWm" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/effect/decal/cleanable/dirt/dust, @@ -2795,8 +2625,19 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/lab) +"aWs" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "aWy" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 @@ -2824,9 +2665,7 @@ }, /obj/machinery/power/port_gen/pacman, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "aXq" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -2846,14 +2685,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) -"aXM" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor{ - id = "AIwindows"; - name = "AI View Blast door" - }, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/ai) "aYa" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, @@ -2874,6 +2705,22 @@ }, /turf/open/floor/plating, /area/science/research) +"aYk" = ( +/obj/machinery/shower{ + dir = 8; + name = "emergency shower"; + pixel_y = -3 + }, +/obj/machinery/door/window/brigdoor{ + dir = 1; + name = "Creature Pen"; + req_access_txt = "47" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/circuit/telecomms/server, +/area/science/xenobiology) "aYp" = ( /obj/structure/table, /obj/item/storage/toolbox/electrical, @@ -2883,16 +2730,6 @@ }, /turf/open/floor/circuit/red, /area/ai_monitored/turret_protected/ai) -"aZa" = ( -/obj/structure/rack, -/obj/item/circuitboard/machine/telecomms/bus, -/obj/item/circuitboard/machine/telecomms/broadcaster, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","engine") - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "aZf" = ( /obj/structure/window/reinforced{ dir = 8 @@ -2915,9 +2752,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) -"aZV" = ( -/turf/closed/wall/r_wall/rust, -/area/quartermaster/storage) "baa" = ( /turf/closed/wall/r_wall, /area/medical/morgue) @@ -2970,9 +2804,7 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "bbg" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -2995,6 +2827,52 @@ }, /turf/open/floor/carpet/red, /area/security/detectives_office) +"bcb" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/grass/no_border, +/area/hallway/primary/aft) +"bce" = ( +/obj/structure/window/plasma/reinforced{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/supermatter) +"bcs" = ( +/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "Engidesk"; + name = "engineering Security Door" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/grass/no_border, +/area/crew_quarters/heads/chief) +"bcJ" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/vending/games{ + pixel_y = -1 + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "bcS" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -3073,9 +2951,7 @@ /obj/structure/lattice/catwalk/over, /obj/structure/ladder, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "bge" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3093,14 +2969,6 @@ }, /turf/open/floor/iron, /area/bridge) -"bgo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/space_heater, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/dark, -/area/engine/engineering) "bgs" = ( /turf/open/floor/plating/beach/coastline_b{ dir = 10 @@ -3141,48 +3009,18 @@ dir = 9 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "bhE" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) -"bhX" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/security/glass{ - id_tag = "brigentrance"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" - }, -/turf/open/floor/iron/dark, -/area/security/brig) -"bic" = ( -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/digital_clock/directional/east, -/turf/open/floor/iron/dark, -/area/bridge/meeting_room) +"bid" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/sand/plating, +/obj/structure/chair/fancy/plastic, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "bip" = ( /obj/structure/railing{ dir = 4 @@ -3196,6 +3034,26 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/asteroid/basalt/planetary, /area/quartermaster/storage) +"biD" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) +"biE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ + dir = 8 + }, +/obj/machinery/door/airlock/public/glass/incinerator{ + frequency = null; + req_access_txt = "11"; + req_one_access = null + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise) "biN" = ( /obj/machinery/door/airlock/public/glass{ name = "Holodeck Access" @@ -3213,6 +3071,47 @@ }, /turf/open/floor/prison/dark, /area/security/prison) +"biR" = ( +/obj/machinery/airalarm/all_access{ + dir = 4; + pixel_x = 24 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","engine") + }, +/obj/item/storage/toolbox/emergency{ + pixel_x = 3; + pixel_y = -1 + }, +/obj/item/extinguisher/advanced{ + pixel_x = -8; + pixel_y = 2 + }, +/obj/effect/loot_jobscale/medical/burn_kit, +/turf/open/floor/iron, +/area/maintenance/disposal/incinerator) "biV" = ( /obj/structure/sign/warning/radiation/rad_area, /turf/closed/wall/r_wall/rust, @@ -3223,41 +3122,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"bjB" = ( -/obj/item/wallframe/extinguisher_cabinet{ - pixel_x = 31; - pixel_y = 1 - }, -/obj/structure/closet/toolcloset, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/wood/fifty, -/obj/item/stack/sheet/wood/fifty, -/obj/item/stack/rods/fifty, -/obj/item/bluespace_capsule, -/obj/item/wrench{ - pixel_x = -4; - pixel_y = 5 - }, -/turf/open/floor/plating, -/area/vacant_room/office) -"bjJ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) +/area/hallway/primary/central) "bkn" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/southleft{ @@ -3317,20 +3182,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) -"bkP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) "bkW" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -3343,35 +3194,33 @@ }, /turf/open/floor/iron, /area/security/brig) +"bkZ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/open/floor/iron, +/area/engine/engineering) "ble" = ( /obj/structure/table, /obj/structure/bedsheetbin, /obj/item/storage/box/bodybags, /turf/open/floor/iron/dark, /area/medical/morgue) -"blt" = ( -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 9 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "blO" = ( /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"bmi" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - initialize_directions = 4 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "bmC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -3404,13 +3253,6 @@ /obj/structure/sign/departments/minsky/security/command, /turf/closed/wall/r_wall, /area/bridge/meeting_room) -"bnO" = ( -/obj/item/seeds/flower/poppy, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/machinery/hydroponics, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "bnW" = ( /obj/structure/table/reinforced, /obj/item/storage/box/flashbangs{ @@ -3462,21 +3304,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/department/cargo) -"bot" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/machinery/light, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/science/research) "bov" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ dir = 9 @@ -3523,22 +3350,21 @@ dir = 8 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"bpp" = ( -/obj/structure/fence, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) -"bpL" = ( -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 4 +/area/hallway/primary/fore) +"bpx" = ( +/obj/structure/table, +/obj/item/shovel/spade, +/obj/item/reagent_containers/glass/bottle/nutrient/rh{ + pixel_x = 5 + }, +/obj/item/reagent_containers/glass/bottle/nutrient/ez{ + pixel_x = -5 }, +/obj/item/reagent_containers/syringe, +/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/machinery/photocopier, -/turf/open/floor/iron/dark, -/area/bridge/meeting_room) +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "bpM" = ( /obj/structure/sink/kitchen{ pixel_y = 28 @@ -3620,6 +3446,14 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/aisat_interior) +"bqR" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/hallway/primary/fore) "bra" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -3627,18 +3461,6 @@ }, /turf/open/floor/plating, /area/storage/tech) -"brs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/airalarm/directional/north, -/obj/machinery/firealarm/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/blackbox_recorder, -/turf/open/floor/circuit/telecomms/mainframe{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, -/area/tcommsat/computer) "brZ" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -3672,17 +3494,35 @@ /obj/structure/railing, /turf/open/openspace, /area/maintenance/department/crew_quarters/bar) +"bsL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/window/reinforced, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","security") + }, +/obj/structure/table, +/turf/open/floor/iron, +/area/security/brig) "btw" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/maintenance/department/engine) -"bty" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/frame/computer{ - anchored = 1 +"btE" = ( +/obj/structure/disposalpipe/segment{ + dir = 2 }, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/landmark/start/medical_doctor, +/obj/structure/chair/fancy/plastic, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/medical/surgery) "btG" = ( /obj/machinery/light_switch{ pixel_x = 25; @@ -3695,6 +3535,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/wood, /area/chapel/office) "btK" = ( @@ -3719,6 +3562,18 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"buj" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_one_access_txt = "7;29;12" + }, +/turf/open/floor/plating, +/area/maintenance/department/science/central) "bum" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -3752,6 +3607,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"bvt" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "bvw" = ( /turf/open/openspace, /area/asteroid/paradise) @@ -3788,7 +3649,23 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/lawyer, /turf/open/floor/plating, -/area/vacant_room/office) +/area/library/abandoned) +"bwk" = ( +/obj/machinery/light, +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","rd") + }, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 8 + }, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "bwp" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -3825,6 +3702,20 @@ /obj/machinery/power/smes/engineering, /turf/open/floor/iron/dark, /area/engine/engineering) +"bwC" = ( +/obj/effect/turf_decal/box/white, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/medical/surgery) "bwI" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, @@ -3872,55 +3763,40 @@ /obj/machinery/space_heater, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) -"byk" = ( -/obj/structure/closet/secure_closet/lethalshots, -/obj/effect/turf_decal/bot, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ - alpha = 180; - color = "#DE3A3A" +"byi" = ( +/obj/machinery/nanite_program_hub, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science RC"; + pixel_y = 30; + receive_ore_updates = 1 }, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","rd") }, -/obj/machinery/light{ +/turf/open/floor/iron, +/area/science/research) +"bym" = ( +/obj/machinery/computer/teleporter{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) -"byq" = ( -/obj/machinery/light{ - dir = 1; - light_color = "#7AC3FF" - }, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/sign/poster/official/ian{ - pixel_y = 32 - }, -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/camera/directional/north{ - network = list("ss13","medbay") - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"byu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 +/obj/item/hand_tele{ + pixel_x = 1; + pixel_y = 7 }, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/machinery/requests_console{ + department = "EVA"; + pixel_x = 1; + pixel_y = -33 }, -/turf/open/floor/iron, -/area/maintenance/department/security/brig) +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark, +/area/teleporter) "byH" = ( /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, @@ -3933,9 +3809,7 @@ pixel_y = -31 }, /turf/open/floor/pod/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "bzr" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -3948,9 +3822,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "bzE" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3967,14 +3839,6 @@ name = "mainframe floor" }, /area/tcommsat/server) -"bzO" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12"; - security_level = 6 - }, -/turf/open/floor/plating, -/area/maintenance/department/security/brig) "bAa" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -3985,27 +3849,32 @@ /turf/open/floor/iron/dark/side{ dir = 6 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"bAc" = ( -/obj/machinery/camera/autoname{ - c_tag = "Corporate Meeting Room"; - dir = 5 - }, -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 +/area/hallway/primary/central) +"bAs" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/atmos/glass{ + req_access_txt = "11" }, -/obj/structure/cable/yellow, /obj/structure/cable/yellow{ - icon_state = "1-4" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 + dir = 4 }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/atmos) "bAw" = ( /turf/open/floor/plating/dirt/jungle/wasteland, /area/asteroid/paradise/surface/sand) @@ -4028,6 +3897,41 @@ /obj/structure/railing/corner, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) +"bBJ" = ( +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, +/area/chapel/office) +"bBK" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/secure_closet/freezer/meat{ + req_access = null; + req_one_access_txt = "28;25;35" + }, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "bBQ" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/flora/rock, @@ -4047,6 +3951,12 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"bDq" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "bDz" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 9 @@ -4079,7 +3989,7 @@ /area/quartermaster/storage) "bDV" = ( /turf/open/floor/wood, -/area/vacant_room/office) +/area/library/abandoned) "bDW" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ @@ -4123,29 +4033,26 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"bEQ" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +"bEO" = ( +/turf/open/floor/glass/reinforced/plasma, +/area/engineering/hallway) "bFY" = ( /obj/machinery/atmospherics/miner/station/n2o, /obj/machinery/atmospherics/pipe/simple/green/hidden, /turf/open/floor/engine/n2o, /area/engine/atmos) -"bGc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +"bGh" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow, +/obj/machinery/door/poddoor/preopen{ + id = "Prisongate"; + name = "Prison Blast Door" }, -/obj/machinery/ai_slipper{ - uses = 10 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/bridge) +/turf/open/floor/plating, +/area/security/prison) "bGl" = ( /obj/machinery/power/compressor{ comp_id = "incineratorturbineLeft"; @@ -4161,6 +4068,23 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) +"bGq" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/effect/spawner/structure/window/reinforced/prison, +/obj/machinery/door/poddoor/preopen{ + id = "Prisongate"; + name = "Prison Blast Door" + }, +/turf/open/floor/plating, +/area/security/prison) "bGD" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -4178,17 +4102,6 @@ }, /turf/open/floor/prison/dark, /area/security/prison) -"bGP" = ( -/obj/machinery/power/solar{ - id = "portsolar"; - name = "Port Solar Array" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/iron/solarpanel, -/area/asteroid/paradise/surface) "bHi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/railing/corner, @@ -4241,19 +4154,17 @@ "bIK" = ( /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"bIO" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +"bIZ" = ( +/obj/structure/sign/painting/library{ + pixel_y = 32 }, -/obj/structure/toilet{ - dir = 4; - pixel_y = 2 +/obj/machinery/shower{ + name = "emergency shower"; + pixel_y = 7 }, -/turf/open/floor/prison/dark, -/area/security/prison/shielded) +/obj/effect/turf_decal/stripes/end, +/turf/open/floor/noslip/white, +/area/medical/medbay/central) "bJi" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -4275,14 +4186,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) -"bJS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/rnd/production/circuit_imprinter, -/obj/structure/window/plasma/reinforced, -/turf/open/floor/iron, -/area/engine/engineering) "bKc" = ( /obj/machinery/air_sensor/atmos/nitrogen_tank, /obj/machinery/atmospherics/pipe/manifold/yellow/hidden/layer2{ @@ -4326,9 +4229,7 @@ }, /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "bLZ" = ( /obj/effect/turf_decal/siding/white{ alpha = 100 @@ -4347,40 +4248,6 @@ /obj/effect/decal/cleanable/shreds, /turf/open/floor/plating/airless, /area/science/mixing) -"bMe" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/northright{ - dir = 2; - name = "Chemistry Desk"; - req_one_access_txt = "5;33" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chemistry_shutters"; - name = "chemistry shutters" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/obj/structure/desk_bell{ - pixel_x = -8 - }, -/obj/item/paper_bin{ - pixel_x = 7; - pixel_y = 2 - }, -/obj/item/folder/white{ - pixel_x = 7; - pixel_y = 2 - }, -/obj/item/folder/white{ - pixel_x = 5; - pixel_y = 2 - }, -/obj/item/pen{ - pixel_x = 6; - pixel_y = 3 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "bMh" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -4425,9 +4292,7 @@ /turf/open/floor/iron/dark/side{ dir = 5 }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "bMN" = ( /obj/effect/turf_decal/siding/white{ alpha = 100 @@ -4445,42 +4310,37 @@ dir = 9 }, /area/asteroid/paradise/surface/water) -"bMW" = ( -/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ - alpha = 180; - color = "#DE3A3A" +"bNd" = ( +/obj/structure/railing{ + dir = 4 }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) +"bNF" = ( +/obj/effect/turf_decal/box/white, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/effect/landmark/start/security_officer, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) +"bOd" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/ai_slipper{ - uses = 10 +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/iron, -/area/security/brig) -"bNd" = ( -/obj/structure/railing{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/open/floor/plating/asteroid/planetary, +/turf/open/floor/catwalk_floor/iron_dark, /area/asteroid/paradise/surface) "bOh" = ( /obj/structure/lattice/catwalk/over, /obj/item/kirbyplants/random, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "bOi" = ( /obj/structure/fence/corner{ dir = 4 @@ -4497,9 +4357,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "bOo" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -4512,6 +4370,51 @@ dir = 4 }, /area/science/research) +"bOv" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/department/chapel) +"bOK" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/britcup{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/restraints/handcuffs{ + pixel_x = -2; + pixel_y = -2 + }, +/turf/open/floor/iron, +/area/security/brig) +"bOM" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/machinery/newscaster{ + pixel_y = -30 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/light, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "bOR" = ( /obj/effect/turf_decal/delivery, /obj/item/xenoartifact, @@ -4532,6 +4435,13 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) +"bPd" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/dark_blue{ + alpha = 180 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "bPo" = ( /obj/machinery/door/airlock/mining{ name = "Quartermaster's Office"; @@ -4540,7 +4450,7 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/quartermaster/qm) -"bPr" = ( +"bPK" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -4550,25 +4460,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"bPL" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/sopengineering, -/obj/item/clothing/glasses/meson{ - pixel_y = 1 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/yellow/corner{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "bQr" = ( /obj/structure/table/reinforced, /obj/structure/desk_bell{ @@ -4594,6 +4485,21 @@ }, /turf/open/floor/iron, /area/security/brig) +"bQM" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/orange/visible{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "bRk" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -4608,18 +4514,16 @@ }, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) -"bRn" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable/yellow{ - icon_state = "1-2" +"bRN" = ( +/obj/structure/disposalpipe/segment{ + dir = 2 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) +/turf/open/floor/iron/white, +/area/medical/surgery) "bSm" = ( /obj/item/radio/intercom{ broadcasting = 1; @@ -4630,7 +4534,7 @@ pixel_y = -4 }, /turf/open/floor/plating, -/area/vacant_room/office) +/area/library/abandoned) "bSF" = ( /obj/machinery/meter{ target_layer = 4 @@ -4645,6 +4549,7 @@ /area/engine/atmos) "bSK" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/brig) "bSM" = ( @@ -4664,19 +4569,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"bSX" = ( -/obj/machinery/computer/prisoner/management, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/keycard_auth{ - pixel_x = -32 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/hos) "bTi" = ( /obj/effect/turf_decal/siding/red{ alpha = 100; @@ -4694,17 +4586,6 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/engine/engineering) -"bUa" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/machinery/camera/directional/north{ - network = list("ss13","rd") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/science/mixing) "bUy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -4722,31 +4603,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/cafeteria) -"bUC" = ( -/obj/structure/window/plasma/reinforced{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/rad_collector/anchored, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "bUT" = ( /obj/structure/sign/directions/supply{ dir = 8; pixel_y = 10 }, /turf/closed/wall, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "bVa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4754,28 +4617,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/bridge) -"bVo" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4; - piping_layer = 1 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) "bVS" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -4800,6 +4641,16 @@ /obj/machinery/icecream_vat, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) +"bWA" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/evac/evac_big{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/department/eva) "bXa" = ( /obj/machinery/modular_fabricator/autolathe, /obj/effect/turf_decal/stripes/box, @@ -4826,14 +4677,6 @@ /obj/effect/spawner/room/tenxfive, /turf/open/floor/plating, /area/maintenance/department/eva) -"bYf" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) "bYh" = ( /obj/effect/turf_decal/tile/dark_blue{ alpha = 180 @@ -4850,15 +4693,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/structure/disposalpipe/junction{ + dir = 8 }, /turf/open/floor/iron/dark/side{ dir = 9 }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "bYj" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -4878,21 +4719,32 @@ }, /turf/open/floor/plating, /area/hydroponics) -"bYp" = ( -/obj/structure/closet/l3closet/virology, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +"bZb" = ( +/obj/machinery/button/door{ + id = "Chefwindow"; + name = "Chef Shutters Control"; + pixel_y = -27; + req_one_access_txt = "28;25;35" }, -/obj/item/storage/box/beakers{ - pixel_x = 4; - pixel_y = 14 +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/clipboard{ + name = "menu"; + pixel_x = -2; + pixel_y = 4 }, -/obj/item/storage/bag/bio, -/obj/item/slime_scanner, -/obj/item/storage/box/syringes, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/item/paper{ + pixel_y = 3 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Chefwindow"; + name = "Chef Window" + }, +/turf/open/floor/plating, +/area/crew_quarters/kitchen) "bZe" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -4978,17 +4830,25 @@ name = "mainframe floor" }, /area/tcommsat/server) -"caT" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/bot, -/obj/machinery/digital_clock/directional/south, -/turf/open/floor/wood, -/area/crew_quarters/heads/hop) +"caO" = ( +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plating, +/area/maintenance/department/medical/central) "cbd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/broken, -/area/vacant_room/office) +/area/library/abandoned) +"cbg" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/fans/tiny{ + density = 1; + icon = 'icons/effects/effects.dmi'; + icon_state = "m_shield"; + max_integrity = 1e+007 + }, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/quartermaster/storage) "cbh" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt/dust, @@ -5001,19 +4861,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"cbl" = ( -/obj/machinery/camera/directional/north, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 1; - pixel_x = 1; - pixel_y = 23 - }, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/iron, -/area/janitor) "cbm" = ( /turf/closed/mineral/random/air, /area/quartermaster/storage) @@ -5027,6 +4874,15 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) +"cci" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/science/mixing) "ccl" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/plating/asteroid/basalt/planetary, @@ -5056,24 +4912,6 @@ }, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"cdn" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "cdq" = ( /obj/structure/window/plasma/reinforced{ dir = 4 @@ -5118,9 +4956,7 @@ /turf/open/floor/iron/dark/side{ dir = 10 }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "cel" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/power/apc/auto_name/directional/west{ @@ -5143,12 +4979,11 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/side{ dir = 5 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "ceR" = ( /obj/structure/table, /obj/machinery/status_display/ai{ @@ -5197,19 +5032,7 @@ /obj/structure/stairs, /obj/machinery/firealarm/directional/west, /turf/open/floor/pod/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"cfJ" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/effect/landmark/start/chief_medical_officer, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) +/area/hallway/primary/fore) "cgb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -5217,32 +5040,28 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/trunk/multiz/down{ +/obj/structure/disposalpipe/multiz/down{ dir = 8 }, /turf/open/floor/catwalk_floor/iron_dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"cgI" = ( -/obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/area/hallway/primary/fore) +"cgu" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/iron/showroomfloor, -/area/crew_quarters/fitness/recreation) -"cgQ" = ( -/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/structure/railing, -/obj/effect/turf_decal/siding/white, -/obj/machinery/ai_slipper{ - uses = 10 +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) +"cgP" = ( +/obj/structure/railing{ + dir = 1 }, -/turf/open/floor/iron/white, -/area/science/lab) +/turf/open/openspace, +/area/maintenance/department/security/brig) "chG" = ( /turf/open/floor/plating/beach/coastline_b{ dir = 8 @@ -5254,9 +5073,24 @@ dir = 8 }, /turf/open/floor/plating, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"cid" = ( +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/science/robotics) "cii" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/service, @@ -5290,25 +5124,16 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) -"cjG" = ( -/obj/structure/chair/fancy/sofa/old/right{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/structure/railing{ - layer = 3 - }, -/obj/effect/turf_decal/siding/white, -/obj/effect/landmark/start/assistant, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "cjH" = ( /obj/effect/spawner/lootdrop/maintenance/two, /obj/structure/closet/crate, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"cjI" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/fancy/plastic, +/turf/open/floor/iron, +/area/maintenance/department/chapel) "cjJ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -5335,24 +5160,15 @@ /obj/structure/railing/corner, /obj/effect/turf_decal/siding/dark/corner, /turf/open/floor/iron/dark/corner, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"cle" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/spawner/structure/window, -/obj/structure/curtain/directional{ - color = "#ACD1E9"; - icon_state = "bathroom-open"; - icon_type = "bathroom" +/area/hallway/primary/central) +"clm" = ( +/obj/structure/fence{ + dir = 8 }, -/turf/open/floor/plating, -/area/medical/surgery) +/obj/structure/sign/warning/securearea, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "clO" = ( /obj/machinery/vending/boozeomat, /turf/closed/wall, @@ -5364,57 +5180,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/cargo) -"cmy" = ( -/obj/effect/turf_decal/siding/white{ - alpha = 100; - dir = 4 - }, -/obj/structure/sink{ - dir = 1; - pixel_y = 28 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/camera/directional/north, -/turf/open/floor/iron/white, -/area/crew_quarters/fitness/recreation) -"cmD" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/department/crew_quarters/bar) -"cmT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "cmX" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted, /obj/machinery/photocopier, @@ -5473,6 +5238,13 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"cnD" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/map/echo{ + pixel_x = -32 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "cnJ" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/plating/asteroid/planetary, @@ -5510,6 +5282,9 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/wood, /area/security/detectives_office) "com" = ( @@ -5544,10 +5319,19 @@ }, /turf/open/floor/iron/dark, /area/teleporter) -"coy" = ( -/obj/effect/spawner/structure/window/shuttle, -/turf/open/floor/plating, -/area/asteroid/paradise/surface) +"coB" = ( +/obj/structure/chair/stool/bar/directional/west, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway) "coF" = ( /obj/structure/closet/crate/hydroponics{ req_access_txt = "35;28" @@ -5557,6 +5341,15 @@ /obj/item/clothing/mask/vape, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) +"coO" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/sign/map/echo{ + pixel_x = -32 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) "coR" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -5571,6 +5364,10 @@ /obj/item/clothing/head/chaplain/nun_hood, /turf/open/floor/carpet/green, /area/chapel/main) +"cpc" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "cpg" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -5579,6 +5376,38 @@ }, /turf/open/floor/iron, /area/science/robotics) +"cpt" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-16" + }, +/obj/effect/turf_decal/trimline/yellow, +/obj/effect/landmark/start/station_engineer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) "cpL" = ( /obj/machinery/door/airlock/command{ name = "Gateway Access"; @@ -5597,42 +5426,16 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/gateway) -"cpM" = ( -/obj/effect/turf_decal/tile/black/opposingcorners{ +"cqi" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light{ dir = 1 }, -/obj/machinery/photocopier, -/obj/effect/turf_decal/bot, -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/hor) -"cpR" = ( -/obj/effect/spawner/lootdrop/aimodule_harmless, -/obj/effect/spawner/lootdrop/aimodule_harmless, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/flasher{ - id = "AI"; - pixel_x = -1; - pixel_y = 32 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/spawner/lootdrop/aimodule_harmless, -/obj/machinery/power/apc/auto_name/directional/east{ - pixel_x = 24 - }, -/obj/structure/cable{ - icon_state = "0-2" +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","cargo") }, -/obj/structure/table/reinforced, -/turf/open/floor/circuit, -/area/ai_monitored/turret_protected/ai_upload) +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/quartermaster/storage) "cqs" = ( /obj/machinery/holopad, /obj/structure/cable/yellow{ @@ -5643,6 +5446,14 @@ }, /turf/open/floor/carpet/red, /area/medical/exam_room) +"cqv" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/hallway/primary/aft) "cqD" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/preopen{ @@ -5667,26 +5478,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/security/detectives_office) -"crm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/dirt/jungle/wasteland, -/area/asteroid/paradise/surface) -"cry" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" - }, -/turf/open/floor/plating, -/area/security/warden) "crG" = ( /turf/open/floor/iron, /area/science/robotics) @@ -5714,6 +5510,11 @@ /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) +"csf" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/department/science/xenobiology) "csB" = ( /obj/effect/turf_decal/tile/dark_red{ alpha = 180; @@ -5730,9 +5531,7 @@ /turf/open/floor/iron/dark/side{ dir = 6 }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "csG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/delivery, @@ -5744,8 +5543,8 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/junction{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 10 }, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) @@ -5770,15 +5569,7 @@ /area/asteroid/paradise/surface) "csX" = ( /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"ctk" = ( -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/engine, -/area/engine/supermatter) +/area/hallway/primary/fore) "cto" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5822,11 +5613,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/crew_quarters/heads/chief) -"cwc" = ( -/obj/machinery/shuttle/engine/plasma{ - dir = 1 - }, -/turf/open/floor/plating/dirt/planetary, +"cwu" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "cwz" = ( /obj/structure/cable/yellow{ @@ -5845,17 +5636,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/bridge) -"cxj" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 12; - pixel_y = 3 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) "cxy" = ( /obj/machinery/light{ dir = 4 @@ -5873,6 +5653,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/security/brig) "cxL" = ( @@ -5894,11 +5675,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sorting/mail/destination/chapel{ + dir = 1 + }, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "cyj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -5940,16 +5721,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/crew_quarters/dorms) -"cyT" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/maintenance/department/medical/central) +"cyP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron, +/area/maintenance/department/crew_quarters/bar) "czv" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "czB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -6007,47 +5789,38 @@ /obj/item/paicard, /turf/open/floor/plating, /area/hallway/secondary/service) -"cAK" = ( -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 +"cBo" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 7 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/item/pen{ - pixel_x = 5; - pixel_y = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/light{ +/obj/machinery/light, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/power/terminal{ +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/catwalk_floor/iron_dark, +/area/crew_quarters/heads/hop) +"cBp" = ( +/obj/structure/railing/corner{ dir = 1 }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/camera/autoname/directional/east{ - network = list("ss13","engine") - }, -/obj/item/storage/toolbox/emergency{ - pixel_x = 3; - pixel_y = -1 +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 }, -/obj/item/extinguisher/advanced{ - pixel_x = -8; - pixel_y = 2 +/turf/open/floor/iron/dark/side{ + dir = 9 }, -/obj/effect/loot_jobscale/medical/burn_kit, -/turf/open/floor/iron, -/area/maintenance/disposal/incinerator) +/area/hallway/primary/central) "cBs" = ( /obj/machinery/holopad, /obj/effect/turf_decal/stripes/line, @@ -6066,6 +5839,23 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/eva) +"cCc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft) +"cCy" = ( +/obj/effect/turf_decal/siding/dark, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner, +/turf/open/floor/iron/dark/side, +/area/hallway/primary/central) "cCz" = ( /obj/structure/sign/departments/minsky/security/security, /turf/closed/wall/r_wall, @@ -6075,15 +5865,33 @@ /obj/effect/turf_decal/bot, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"cCH" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/vending/wallmed{ + pixel_x = -32 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","medbay") + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer_4, +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/central) "cDv" = ( /obj/structure/table/wood, /obj/item/screwdriver, /obj/item/hatchet, /obj/item/paicard, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "cDx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -6127,17 +5935,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"cDT" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/bookcase/manuals/medical, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/wood, -/area/medical/exam_room) "cDV" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/directional{ @@ -6149,7 +5946,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sorting/mail/destination/threatre{ + dir = 1 + }, /turf/open/floor/wood, /area/crew_quarters/cafeteria) "cDY" = ( @@ -6172,12 +5971,10 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/thermomachine/heater{ - piping_layer = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer_4, /turf/open/floor/iron, /area/engine/atmos) "cEk" = ( @@ -6189,32 +5986,24 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"cEM" = ( -/obj/machinery/button/door{ - id = "Chefwindow"; - name = "Chef Shutters Control"; - pixel_y = -27; - req_one_access_txt = "28;25;35" +"cED" = ( +/obj/machinery/power/terminal{ + dir = 4 }, -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/clipboard{ - name = "menu"; - pixel_x = -2; - pixel_y = 4 +/obj/machinery/light{ + dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 }, -/obj/item/paper{ - pixel_y = 3 +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "Chefwindow"; - name = "Chef window" +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, +/turf/open/floor/iron/dark/telecomms{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, -/turf/open/floor/plating, -/area/crew_quarters/kitchen) +/area/tcommsat/computer) "cEZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -6223,6 +6012,9 @@ dir = 8 }, /obj/effect/landmark/start/scientist, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/grid/steel, /area/science/mixing) "cFb" = ( @@ -6269,16 +6061,32 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"cHd" = ( -/obj/effect/turf_decal/siding/dark/corner{ - dir = 4 +"cGz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/iron/dark/corner{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/numbers/two_nine{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) +"cGQ" = ( +/obj/machinery/camera/autoname/directional/north, +/turf/open/openspace, +/area/crew_quarters/kitchen) +"cHc" = ( +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","rd") }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/turf/open/openspace, +/area/science/explab) "cHg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/atmos_control/tank/mix_tank, @@ -6334,20 +6142,6 @@ /mob/living/simple_animal/bot/cleanbot/medbay, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) -"cJd" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - alpha = 180; - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_y = 33 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/rnd/production/techfab/department/security, -/turf/open/floor/iron/dark, -/area/security/warden) "cJf" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -6356,12 +6150,13 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) -"cJm" = ( -/obj/machinery/camera/directional/north{ - network = list("ss13","rd") +"cJx" = ( +/obj/effect/spawner/structure/window, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/openspace, -/area/science/explab) +/turf/open/floor/plating, +/area/science/mixing) "cJP" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/airlock/engineering{ @@ -6391,9 +6186,7 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "cKi" = ( /obj/structure/table/reinforced, /obj/item/aiModule/supplied/freeform, @@ -6428,6 +6221,20 @@ /obj/machinery/telecomms/processor/preset_two, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) +"cLp" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" + }, +/turf/open/floor/plating, +/area/security/brig) "cLw" = ( /obj/structure/toilet{ pixel_x = -1; @@ -6442,9 +6249,7 @@ }, /obj/machinery/light/small, /turf/open/floor/iron/techmaint/planetary, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "cLN" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 @@ -6455,7 +6260,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/structure/disposalpipe/trunk/multiz{ +/obj/structure/disposalpipe/multiz{ dir = 8 }, /turf/open/floor/carpet/royalblue, @@ -6477,23 +6282,32 @@ /obj/structure/reflector/box, /turf/open/floor/iron, /area/engine/engineering) -"cNG" = ( -/obj/effect/turf_decal/box, -/obj/machinery/holopad, -/obj/structure/disposalpipe/segment{ +"cNt" = ( +/obj/machinery/turretid{ + control_area = "/area/ai_monitored/turret_protected/ai"; + icon_state = "control_stun"; + name = "AI Chamber turret control"; + pixel_x = -1; + pixel_y = 33 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/obj/machinery/camera/autoname/directional/north{ + network = list("aiupload") + }, +/turf/open/floor/iron/tech/grid, +/area/ai_monitored/turret_protected/aisat_interior) "cNI" = ( /obj/effect/turf_decal/evac, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "cOp" = ( /turf/open/openspace, /area/crew_quarters/kitchen) @@ -6509,47 +6323,62 @@ }, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) -"cOO" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/effect/spawner/structure/window/reinforced/prison, -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison blast door" - }, -/turf/open/floor/plating, -/area/security/prison) "cPg" = ( /obj/structure/fence/corner{ dir = 1 }, /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface) -"cPh" = ( +"cPi" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 1 + }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) +"cPv" = ( +/obj/structure/disposalpipe/segment{ + dir = 2 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ - icon_state = "2-8" + icon_state = "1-8" }, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 40 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/medical/surgery) "cQe" = ( /obj/structure/stairs{ dir = 8 }, /turf/open/floor/pod/dark, /area/engine/atmos) +"cQs" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/button/door{ + desc = "A remote control-switch for secure storage."; + id = "engsm"; + name = "Radiation shutters Toggle"; + pixel_y = 26; + req_access_txt = "11" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/caution{ + dir = 1 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "cRd" = ( /obj/structure/sign/directions/evac{ pixel_y = 7 @@ -6565,16 +6394,14 @@ /turf/closed/wall/r_wall, /area/bridge) "cRh" = ( -/obj/machinery/atmospherics/components/trinary/mixer{ - dir = 4; - name = "plasma mixer"; - piping_layer = 4 - }, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/trinary/mixer/layer4{ + dir = 4 + }, /turf/open/floor/iron/tech, /area/engine/atmos) "cRo" = ( @@ -6590,9 +6417,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "cRp" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -6612,50 +6437,34 @@ }, /turf/open/floor/iron, /area/security/brig) -"cRw" = ( -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +"cRT" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "medbay" - }, -/obj/machinery/door/airlock/medical/glass{ - emergency = 1; - id_tag = "MedbayFoyer"; - name = "Medbay"; - req_one_access_txt = "5" +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"cRE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/item/paper/pamphlet/centcom/visitor_info{ + default_raw_text = " XCC-P5831 Visitor Information
          \ntGreetings, visitor, to XCC-P5831! As you may know, this outpost was once \ntused as Nanotrasen's CENTRAL COMMAND STATION, organizing and coordinating company \ntprojects across the vastness of space.
          \ntSince the completion of the much more efficient CC-A5831 on March 8, 2553, XCC-P5831 no longer \ntacts as NT's base of operations but still plays a very important role its corporate affairs; \ntserving as a supply and repair depot, as well as being host to its most important legal proceedings\nt and the thrilling pay-per-view broadcasts of PLASTEEL CHEF and THUNDERDOME LIVE.
          \ntWe hope you enjoy your stay!"; + pixel_x = -3; + pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/item/paper/pamphlet/centcom/visitor_info{ + default_raw_text = " XCC-P5831 Visitor Information
          \ntGreetings, visitor, to XCC-P5831! As you may know, this outpost was once \ntused as Nanotrasen's CENTRAL COMMAND STATION, organizing and coordinating company \ntprojects across the vastness of space.
          \ntSince the completion of the much more efficient CC-A5831 on March 8, 2553, XCC-P5831 no longer \ntacts as NT's base of operations but still plays a very important role its corporate affairs; \ntserving as a supply and repair depot, as well as being host to its most important legal proceedings\nt and the thrilling pay-per-view broadcasts of PLASTEEL CHEF and THUNDERDOME LIVE.
          \ntWe hope you enjoy your stay!"; + pixel_x = 1; + pixel_y = 4 }, -/obj/machinery/ai_slipper{ - uses = 10 +/obj/item/paper/pamphlet/centcom/visitor_info{ + default_raw_text = " XCC-P5831 Visitor Information
          \ntGreetings, visitor, to XCC-P5831! As you may know, this outpost was once \ntused as Nanotrasen's CENTRAL COMMAND STATION, organizing and coordinating company \ntprojects across the vastness of space.
          \ntSince the completion of the much more efficient CC-A5831 on March 8, 2553, XCC-P5831 no longer \ntacts as NT's base of operations but still plays a very important role its corporate affairs; \ntserving as a supply and repair depot, as well as being host to its most important legal proceedings\nt and the thrilling pay-per-view broadcasts of PLASTEEL CHEF and THUNDERDOME LIVE.
          \ntWe hope you enjoy your stay!"; + pixel_x = 7; + pixel_y = 2 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/fore) "cSx" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/n2{ - dir = 8; - piping_layer = 4 - }, /obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{ dir = 4 }, @@ -6667,6 +6476,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/atmos) "cSZ" = ( @@ -6691,7 +6503,7 @@ /area/engine/engineering) "cTe" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/trunk/multiz/down{ +/obj/structure/disposalpipe/multiz/down{ dir = 1 }, /turf/open/floor/plating, @@ -6712,7 +6524,7 @@ dir = 4 }, /obj/machinery/camera/preset/toxins{ - dir = 8 + dir = 4 }, /turf/open/floor/plating/rust, /area/science/test_area) @@ -6723,9 +6535,7 @@ /turf/open/floor/iron/dark/side{ dir = 5 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "cUA" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -6767,7 +6577,7 @@ "cWg" = ( /obj/structure/filingcabinet/employment, /turf/open/floor/wood/broken, -/area/vacant_room/office) +/area/library/abandoned) "cXb" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -6789,7 +6599,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool/directional/west, /turf/open/floor/carpet/royalblack, -/area/vacant_room/office) +/area/library/abandoned) "cXy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -6810,6 +6620,10 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"cXB" = ( +/obj/structure/fence, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "cXD" = ( /obj/effect/turf_decal/bot, /obj/machinery/light{ @@ -6843,6 +6657,16 @@ /obj/effect/decal/cleanable/oil/slippery, /turf/open/floor/plating/airless, /area/science/mixing) +"cYu" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/siding/dark/corner, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/hallway/primary/central) "cYK" = ( /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 @@ -6867,22 +6691,12 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating/rust, /area/science/test_area) -"cZG" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "cZZ" = ( /obj/structure/disposalpipe/segment{ dir = 6 }, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "dao" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -6890,6 +6704,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/tech, /area/engine/atmos) +"dap" = ( +/obj/docking_port/stationary{ + dwidth = 12; + height = 69; + id = "whiteship_home"; + name = "Auxiliary Dock"; + width = 25 + }, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface/grass) "dav" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/beach/sand, @@ -6938,19 +6762,49 @@ }, /turf/open/floor/iron, /area/teleporter) -"dbT" = ( -/obj/machinery/seed_extractor, -/obj/machinery/status_display/evac{ - pixel_y = -32 - }, -/obj/item/reagent_containers/glass/bucket, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "dbV" = ( /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"dcz" = ( +/obj/effect/turf_decal/siding/white{ + alpha = 100; + dir = 4 + }, +/obj/structure/sink{ + dir = 1; + pixel_y = 28 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/white, +/area/crew_quarters/fitness/recreation) +"dcB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/hallway/primary/aft) +"dcS" = ( +/obj/item/storage/pod{ + pixel_x = 5; + pixel_y = 32 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -30 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/iron, +/area/medical/surgery) "dcZ" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/dock/drydock, @@ -6964,9 +6818,7 @@ "ddQ" = ( /obj/structure/stairs, /turf/open/floor/pod/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "ddW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -7027,27 +6879,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light, /turf/open/floor/iron/freezer, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"dfH" = ( -/obj/structure/bed, -/obj/item/bedsheet/purple{ - name = "Holy bedsheet" - }, -/obj/machinery/newscaster{ - pixel_y = 34 - }, -/obj/machinery/camera/directional/north, -/obj/item/storage/secure/safe{ - pixel_x = -27; - pixel_y = 1 - }, -/obj/item/storage/book/bible{ - pixel_x = 1 - }, -/turf/open/floor/wood, -/area/chapel/office) +/area/hallway/primary/fore) "dfX" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -7070,19 +6902,7 @@ /turf/open/floor/iron/dark/side{ dir = 6 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"dgd" = ( -/obj/effect/turf_decal/box/white, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 5 - }, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) +/area/hallway/primary/aft) "dgf" = ( /obj/structure/closet/secure_closet/genpop{ anchored = 0 @@ -7100,6 +6920,33 @@ }, /turf/open/floor/iron, /area/maintenance/department/medical/central) +"dgZ" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface/sand) +"dhb" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/hallway/primary/fore) +"dhj" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" + }, +/turf/open/floor/plating, +/area/security/brig) "dhL" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -7173,20 +7020,6 @@ /obj/item/paicard, /turf/open/floor/plating, /area/maintenance/department/bridge) -"diV" = ( -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/landmark/start/medical_doctor, -/obj/structure/chair/fancy/plastic, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/plating, -/area/medical/surgery) "djm" = ( /turf/open/openspace, /area/crew_quarters/heads/hor) @@ -7206,6 +7039,27 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating/dirt/jungle/wasteland, /area/asteroid/paradise/surface) +"djP" = ( +/obj/machinery/door/airlock/highsecurity{ + id_tag = "Emergancycap"; + name = "Safe Room"; + req_access_txt = "10"; + security_level = 6 + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/plating, +/area/crew_quarters/heads/captain) "dkt" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -7237,12 +7091,30 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/science/lab) -"dkR" = ( -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/structure/reagent_dispensers/water_cooler, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/bridge) +"dkC" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chemistry_shutters"; + name = "chemistry Shutters" + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/medical/apothecary) +"dlf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "dlh" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/office, @@ -7252,12 +7124,6 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"dlw" = ( -/obj/machinery/door/airlock/external/glass{ - autoclose = 0.1 - }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "dme" = ( /obj/structure/railing{ dir = 4 @@ -7274,9 +7140,7 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "dmN" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -7300,12 +7164,25 @@ }, /turf/open/floor/engine/airless, /area/engine/atmos) +"dnD" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron, +/area/medical/medbay/central) "dnQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 9 }, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) @@ -7313,14 +7190,17 @@ /obj/structure/ladder, /turf/open/floor/pod/dark, /area/maintenance/department/bridge) -"dou" = ( -/obj/machinery/light{ - dir = 1 +"doQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/effect/turf_decal/delivery, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/engine, -/area/science/explab) +/obj/machinery/door/poddoor{ + id = "AIwindows"; + name = "AI View Blast Door" + }, +/turf/open/floor/plating, +/area/ai_monitored/turret_protected/ai) "doY" = ( /obj/machinery/door/poddoor/shutters/radiation/preopen{ id = "engsm"; @@ -7341,17 +7221,26 @@ "dpo" = ( /turf/open/floor/plating, /area/maintenance/department/eva) -"dpV" = ( -/obj/effect/spawner/structure/window/reinforced, +"dpQ" = ( /obj/structure/cable{ - icon_state = "0-2" + icon_state = "1-4" }, -/obj/machinery/door/poddoor{ - id = "AIwindows"; - name = "AI View Blast door" +/obj/structure/cable{ + icon_state = "2-4" }, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/ai) +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) +"dqd" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/primary/central) "dqm" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/engine/light, @@ -7360,9 +7249,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "dqs" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -7380,13 +7267,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/apothecary) -"drs" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/department/crew_quarters/bar) "dry" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -7433,6 +7313,14 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/central) +"drY" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) "dsq" = ( /obj/structure/window/reinforced{ dir = 8 @@ -7443,18 +7331,20 @@ /obj/machinery/computer/card, /turf/open/floor/iron, /area/bridge) -"dsF" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +"dsu" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/chair/fancy/bench{ - layer = 2.5 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8; + initialize_directions = 8 }, -/turf/open/floor/iron, -/area/security/prison) +/turf/open/floor/iron/tech, +/area/engine/engineering) "dta" = ( /obj/structure/sign/warning/radiation/rad_area, /turf/closed/wall, @@ -7471,6 +7361,16 @@ /obj/structure/railing/corner, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"dul" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/grass/no_border, +/area/hallway/primary/aft) "dur" = ( /turf/closed/wall, /area/bridge) @@ -7480,7 +7380,7 @@ }, /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk/multiz{ +/obj/structure/disposalpipe/multiz{ dir = 1 }, /turf/open/floor/iron/dark, @@ -7530,16 +7430,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"dwr" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/bot, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/iron, -/area/security/brig) "dxm" = ( /obj/effect/turf_decal/trimline/yellow, /obj/structure/cable/yellow{ @@ -7556,9 +7446,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "dxs" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, @@ -7567,13 +7455,15 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"dxw" = ( +/obj/structure/lattice, +/turf/open/openspace, +/area/crew_quarters/heads/cmo) "dxx" = ( /obj/structure/lattice/catwalk/over, /obj/structure/marker_beacon, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "dxH" = ( /obj/structure/chair/fancy/plastic{ dir = 8 @@ -7600,27 +7490,6 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"dyQ" = ( -/obj/machinery/camera/autoname/directional/south{ - network = list("ss13","security") - }, -/obj/structure/lattice/catwalk/over, -/turf/open/openspace, -/area/maintenance/department/security/brig) -"dzb" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8; - initialize_directions = 8 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "dzp" = ( /obj/structure/flora/grass/jungle/b, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -7738,6 +7607,12 @@ }, /turf/open/floor/iron, /area/medical/surgery) +"dCe" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "dCl" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -7755,7 +7630,7 @@ }, /obj/structure/light_construct, /turf/open/floor/wood, -/area/vacant_room/office) +/area/library/abandoned) "dCq" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -7773,12 +7648,17 @@ /turf/open/floor/iron/dark/corner{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "dCr" = ( /turf/open/floor/plating/beach/coastline_t, /area/asteroid/paradise/surface/sand) +"dCA" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -32; + pixel_y = -1 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "dCL" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/turf_decal/bot, @@ -7787,17 +7667,23 @@ }, /turf/open/floor/iron/dark, /area/science/mixing) -"dDA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +"dCZ" = ( +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating, +/area/asteroid/paradise/surface) +"dDB" = ( +/obj/structure/window/plasma/reinforced{ + dir = 8 }, -/obj/structure/window/reinforced, -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13","security") +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/structure/table, -/turf/open/floor/iron, -/area/security/brig) +/obj/machinery/power/rad_collector/anchored, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 9 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "dDM" = ( /obj/machinery/door/airlock{ id_tag = "Cabin4"; @@ -7806,6 +7692,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) +"dDR" = ( +/obj/structure/flora/ash/tall_shroom, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise) "dEr" = ( /obj/machinery/door/airlock/command{ name = "Research Director's Office"; @@ -7846,7 +7736,7 @@ pixel_y = -6 }, /turf/open/floor/wood, -/area/vacant_room/office) +/area/library/abandoned) "dEU" = ( /obj/machinery/nuclearbomb/selfdestruct, /turf/open/floor/circuit/green{ @@ -7894,6 +7784,35 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"dGg" = ( +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Brig"; + req_one_access_txt = "1;4" + }, +/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ + alpha = 180; + color = "#DE3A3A" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" + }, +/turf/open/floor/iron/dark, +/area/security/brig) "dGh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -7920,9 +7839,6 @@ /obj/structure/closet/crate, /turf/open/floor/plating, /area/maintenance/department/chapel) -"dGX" = ( -/turf/open/openspace, -/area/asteroid/paradise/surface) "dHc" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -8039,24 +7955,6 @@ "dIK" = ( /turf/open/floor/plating/airless, /area/science/mixing) -"dJL" = ( -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, -/turf/open/floor/iron/dark/telecomms{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, -/area/tcommsat/computer) "dJP" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 @@ -8071,13 +7969,28 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 2 +/obj/structure/disposalpipe/junction{ + dir = 8 }, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"dJY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/power/port_gen/pacman, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow, +/obj/item/stack/sheet/mineral/plasma/ten, +/obj/item/wrench{ + pixel_x = -4; + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "dKx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -8104,24 +8017,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"dLq" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/iron, -/area/engine/engineering) "dLt" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/purple{ @@ -8130,7 +8025,7 @@ /turf/open/floor/iron/white/side{ dir = 9 }, -/area/science/misc_lab) +/area/asteroid/paradise) "dLK" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/structure/table, @@ -8162,6 +8057,32 @@ "dMS" = ( /turf/closed/wall/rust, /area/quartermaster/storage) +"dMX" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "Prisongate"; + name = "Prison Blast Door" + }, +/turf/open/floor/plating, +/area/security/prison) +"dNe" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/digital_clock/directional/east, +/turf/open/floor/iron/dark, +/area/bridge/meeting_room) "dNl" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -8223,9 +8144,7 @@ /turf/open/floor/iron/dark/corner{ dir = 1 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "dOG" = ( /obj/structure/tank_dispenser/oxygen{ pixel_x = -1; @@ -8239,6 +8158,32 @@ }, /turf/open/floor/iron/dark, /area/teleporter) +"dOQ" = ( +/obj/item/wallframe/extinguisher_cabinet{ + pixel_x = 31; + pixel_y = 1 + }, +/obj/structure/closet/toolcloset, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/wood/fifty, +/obj/item/stack/sheet/wood/fifty, +/obj/item/stack/rods/fifty, +/obj/item/bluespace_capsule, +/obj/item/wrench{ + pixel_x = -4; + pixel_y = 5 + }, +/turf/open/floor/plating, +/area/library/abandoned) "dOT" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -8263,10 +8208,11 @@ /area/asteroid/paradise/surface) "dPx" = ( /obj/item/kirbyplants/random, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "dPG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -8310,19 +8256,6 @@ }, /turf/open/floor/plating/beach/water, /area/asteroid/paradise/surface/water) -"dQy" = ( -/obj/effect/turf_decal/siding/dark, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, -/turf/open/floor/iron/dark/side, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "dQC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -8351,6 +8284,16 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) +"dRN" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "dRP" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plating, @@ -8391,9 +8334,7 @@ dir = 9 }, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "dSI" = ( /obj/structure/table/reinforced, /obj/item/clipboard{ @@ -8480,20 +8421,6 @@ }, /turf/open/floor/iron/dark, /area/storage/tech) -"dVA" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/secure_closet/freezer/meat{ - req_access = null; - req_one_access_txt = "28;25;35" - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "dWd" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8527,10 +8454,33 @@ name = "Medbay"; req_one_access_txt = "5" }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/white/side{ dir = 1 }, /area/medical/genetics/cloning) +"dWt" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) +"dWz" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron, +/area/medical/surgery) "dXb" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, @@ -8549,6 +8499,10 @@ /area/medical/storage) "dXj" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Mix to SM" + }, /turf/open/floor/iron/tech, /area/engine/atmos) "dXH" = ( @@ -8574,51 +8528,18 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron, -/area/maintenance/department/engine/atmos) -"dYY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/wood, -/area/crew_quarters/cafeteria) -"dZF" = ( -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, -/area/engine/supermatter) +/turf/open/floor/iron, +/area/maintenance/department/engine/atmos) "eaA" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) "ebd" = ( /turf/open/floor/iron, -/area/science/misc_lab) -"ebh" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_one_access_txt = "7;29;12" - }, -/turf/open/floor/plating, -/area/maintenance/department/science/central) +/area/asteroid/paradise) "ebn" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -8641,10 +8562,13 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin, /turf/open/floor/iron/white, /area/medical/genetics/cloning) "ebG" = ( @@ -8677,25 +8601,19 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"ecx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-2" +"edh" = ( +/obj/structure/railing{ + dir = 4 }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8; - initialize_directions = 8 +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/iron/tech, -/area/engine/engineering) -"ecH" = ( -/obj/structure/stairs{ - dir = 4 +/obj/machinery/camera/autoname/directional/north{ + network = list("aiupload") }, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/pod/dark, -/area/crew_quarters/cafeteria) +/obj/machinery/firealarm/directional/north, +/turf/open/openspace, +/area/hallway/primary/fore) "eec" = ( /obj/structure/railing, /turf/open/openspace, @@ -8729,6 +8647,12 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"eeI" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner, +/area/hallway/primary/fore) "eff" = ( /obj/item/target, /obj/structure/window/reinforced, @@ -8737,25 +8661,56 @@ }, /turf/open/floor/plating/rust, /area/science/test_area) +"efm" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance/three, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/maintenance/department/engine/atmos) +"eft" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/department/engine) +"efu" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/structure/sign/warning/electricshock, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "efD" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"egg" = ( -/obj/structure/railing{ - dir = 8 +"efR" = ( +/obj/structure/table, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/machinery/light/small{ + dir = 1 }, -/obj/structure/closet/firecloset/full, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"egS" = ( -/obj/machinery/biogenerator, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) +/obj/item/book/manual/wiki/tcomms{ + pixel_x = 17; + pixel_y = 4 + }, +/obj/item/radio/intercom{ + pixel_y = 28 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/turf/open/floor/iron/dark, +/area/engine/atmos) "eha" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt/dust, @@ -8812,6 +8767,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/tech, /area/science/mixing/chamber) "ehD" = ( @@ -8841,9 +8799,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small, /turf/open/floor/iron/techmaint/planetary, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "eiO" = ( /obj/machinery/gateway{ dir = 1 @@ -8865,12 +8821,23 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/central) +"eiZ" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) "ejm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/vending/wardrobe/curator_wardrobe, /obj/effect/turf_decal/bot, /turf/open/floor/carpet/royalblack, -/area/vacant_room/office) +/area/library/abandoned) "ejD" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/stripes/line{ @@ -8896,24 +8863,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"ekb" = ( -/obj/item/kirbyplants/random{ - pixel_y = 22 - }, -/obj/machinery/power/apc/auto_name/directional/west{ - pixel_x = -24 - }, -/obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "ekv" = ( /obj/machinery/light, /obj/effect/turf_decal/stripes/line{ @@ -8927,17 +8877,14 @@ }, /turf/open/floor/iron/dark, /area/science/robotics) -"ekN" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/door/poddoor/preopen{ - id = "Engidesk"; - name = "engineering security door" +"ekI" = ( +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + pixel_x = -13; + pixel_y = -11 }, -/turf/open/floor/plating, -/area/engine/engineering) +/obj/structure/chair/fancy/plastic, +/turf/open/floor/plating/beach/sand, +/area/asteroid/paradise/surface/sand) "ekR" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/glass, @@ -8954,26 +8901,58 @@ /obj/structure/sign/departments/minsky/research/research, /turf/closed/wall/r_wall, /area/science/research) -"elK" = ( -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"elM" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-4" +"elD" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/effect/turf_decal/delivery, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","rd") }, +/turf/open/floor/iron/dark, +/area/science/mixing) +"elZ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "1-2" }, -/obj/effect/turf_decal/sand/plating, /turf/open/floor/catwalk_floor/iron_dark, /area/asteroid/paradise/surface) "emp" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/explab) +"emr" = ( +/obj/machinery/light{ + dir = 1; + light_color = "#7AC3FF" + }, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/sign/poster/official/ian{ + pixel_y = 32 + }, +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","medbay") + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"emw" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/chair/fancy/bench, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/security/prison) "enb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -8995,43 +8974,28 @@ }, /obj/machinery/space_heater, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"enN" = ( -/obj/effect/turf_decal/siding/white, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/recharge_station, -/obj/structure/railing{ - layer = 4 +/area/hallway/primary/central) +"enI" = ( +/obj/effect/turf_decal/box/white, +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/turf/open/floor/iron, -/area/science/robotics) +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "eog" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/machinery/photocopier, /obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 4 +/obj/structure/disposalpipe/multiz{ + dir = 2 }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"eoh" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/evac{ - dir = 1 - }, -/turf/open/floor/iron, -/area/maintenance/department/science/xenobiology) "eop" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/secure_closet/freezer/kitchen{ @@ -9052,6 +9016,26 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) +"eoG" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/status_display/ai{ + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/restraints/handcuffs{ + pixel_y = 3 + }, +/turf/open/floor/iron, +/area/bridge) "eoQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -9077,12 +9061,6 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"epb" = ( -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/closed/mineral/random/air, -/area/engine/atmos) "epj" = ( /obj/machinery/stasis{ dir = 8 @@ -9097,34 +9075,14 @@ }, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/aisat/foyer) -"epm" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) -"epO" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/machinery/chem_dispenser/drinks, -/obj/structure/table, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" +"epN" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "cmoshutter"; + name = "CMO Office Shutters" }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron/dark, -/area/crew_quarters/kitchen) +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/medical/medbay/central) "epS" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -9132,6 +9090,23 @@ /obj/machinery/telecomms/server/presets/security, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) +"epX" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) +"eqb" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/button/door{ + id = "commissaryshutters1"; + name = "Commissary Shutters Control #1"; + pixel_x = -32; + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/maintenance/department/chapel) "eqi" = ( /obj/structure/plasticflaps/opaque, /obj/machinery/navbeacon{ @@ -9139,11 +9114,22 @@ freq = 1400; location = "Kitchen" }, -/obj/structure/disposalpipe/trunk/multiz{ +/obj/structure/disposalpipe/multiz{ dir = 8 }, /turf/open/floor/plating, /area/crew_quarters/kitchen/coldroom) +"eqG" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "detectivewindows"; + name = "Detective Privacy Blast Door" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/security/detectives_office) "eqK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -9173,9 +9159,7 @@ network = list("ss13","public") }, /turf/open/floor/plating/asteroid/planetary, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "erT" = ( /obj/structure/closet/crate/trashcart, /obj/effect/decal/cleanable/dirt/dust, @@ -9194,9 +9178,7 @@ dir = 4 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "esx" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -9228,60 +9210,37 @@ /obj/effect/turf_decal/sand/plating, /obj/effect/landmark/observer_start, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"esU" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/iron, +/area/maintenance/department/eva) "esW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) +"ety" = ( +/obj/structure/fence, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "etV" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ - piping_layer = 4 - }, +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input/layer4, /turf/open/floor/engine/n2, /area/engine/atmos) -"eur" = ( -/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{ - dir = 8; - node1_concentration = 0.21; - node2_concentration = 0.79; - on = 0; - piping_layer = 2 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/turf/open/floor/iron, -/area/engine/atmos) "euN" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/engine) -"evc" = ( -/obj/structure/chair/fancy/plastic, -/obj/item/cigbutt{ - pixel_x = -13; - pixel_y = -9 - }, -/obj/effect/decal/cleanable/ash{ - pixel_x = -18; - pixel_y = -4 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) "eve" = ( /obj/machinery/light_switch{ pixel_x = 23; @@ -9301,6 +9260,22 @@ /obj/effect/spawner/lootdrop/costume, /turf/open/floor/plating, /area/maintenance/department/chapel) +"evw" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/junction/flip, +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "evM" = ( /obj/structure/flora/rock/pile, /turf/open/floor/plating/grass, @@ -9330,27 +9305,40 @@ /obj/effect/turf_decal/trimline/yellow, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) -"ewJ" = ( +"ewn" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/button/door{ - id = "commissaryshutters1"; - name = "Commissary Shutters Control #1"; - pixel_x = -32; - pixel_y = -32 +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 }, -/turf/open/floor/iron, -/area/maintenance/department/chapel) -"exf" = ( -/obj/structure/fence/cut/large, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) -"exl" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "0-2" }, /turf/open/floor/plating, -/area/maintenance/department/crew_quarters/bar) +/area/maintenance/department/medical/morgue) +"ewP" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron, +/area/hallway/primary/central) +"exd" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "exo" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ @@ -9378,9 +9366,7 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "exx" = ( /obj/structure/railing/corner{ dir = 4 @@ -9390,9 +9376,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "exI" = ( /obj/structure/chair/wood/normal{ dir = 1; @@ -9406,14 +9390,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"exY" = ( -/turf/open/floor/glass/reinforced, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "eyh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -9503,20 +9480,6 @@ /obj/effect/turf_decal/caution, /turf/open/floor/plating, /area/engine/supermatter) -"eAb" = ( -/obj/effect/turf_decal/tile/black/opposingcorners{ - dir = 1 - }, -/obj/machinery/light, -/obj/machinery/camera/autoname/directional/south{ - network = list("ss13","rd") - }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/hor) "eAc" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -9527,13 +9490,44 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/science/mixing) +"eAu" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "eAO" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/evac{ +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) +"eAU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron, -/area/maintenance/department/science/central) +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ + dir = 9 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "eAX" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/vending/clothing, @@ -9549,6 +9543,13 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) +"eBt" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/cmo, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "eBA" = ( /obj/machinery/computer/station_alert{ dir = 1 @@ -9564,6 +9565,20 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"eBH" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "eBK" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -9626,6 +9641,13 @@ /obj/effect/spawner/room/fivexfour, /turf/open/floor/plating, /area/maintenance/department/medical/central) +"eCL" = ( +/obj/item/seeds/tea, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/hydroponics, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "eDg" = ( /obj/effect/turf_decal/siding/white{ alpha = 100 @@ -9650,24 +9672,6 @@ }, /turf/open/floor/pod/dark, /area/maintenance/department/crew_quarters/dorms) -"eDl" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/medical/medbay/central) "eDq" = ( /obj/machinery/light_switch{ pixel_x = 25; @@ -9690,6 +9694,25 @@ dir = 4 }, /area/science/research) +"eDU" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/medical/medbay/central) "eDW" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 @@ -9703,7 +9726,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/obj/structure/disposalpipe/trunk/multiz{ +/obj/structure/disposalpipe/multiz{ dir = 2 }, /turf/open/floor/iron/white/side, @@ -9736,17 +9759,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/security/prison) -"eEl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 8; - name = "External Gas to Loop" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/dark, -/area/engine/engineering) "eEo" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -9763,14 +9775,44 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"eEY" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/security/warden) +"eFi" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/science/mixing) +"eFl" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/surgery) "eFA" = ( /obj/structure/railing/corner{ dir = 8 }, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "eFI" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -9779,37 +9821,6 @@ "eFS" = ( /turf/open/openspace, /area/science/robotics) -"eFW" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating/asteroid/planetary, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"eFY" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 8 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark/corner, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "eGc" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/sand/plating, @@ -9829,6 +9840,12 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"eGE" = ( +/obj/structure/sign/poster/official/moth8{ + pixel_y = 31 + }, +/turf/open/floor/glass/reinforced, +/area/crew_quarters/heads/cmo) "eGO" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -9876,42 +9893,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/fitness/recreation) -"eHH" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/folder/red{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/taperecorder{ - layer = 2.9; - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/flashlight/lamp{ - pixel_x = -5; - pixel_y = 8 - }, -/obj/item/radio/intercom{ - broadcasting = 1; - frequency = 1423; - listening = 0; - name = "Interrogation Intercom"; - pixel_x = 3; - pixel_y = -34 - }, -/turf/open/floor/iron, -/area/security/brig) "eHY" = ( /obj/structure/closet/secure_closet/freezer/fridge{ req_access = null; @@ -9925,51 +9906,23 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) -"eIb" = ( -/obj/structure/lattice, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "eIc" = ( /turf/closed/wall/r_wall, /area/maintenance/department/engine) "eIe" = ( /obj/structure/frame/machine, /turf/open/floor/wood, -/area/vacant_room/office) -"eIP" = ( -/obj/structure/table/reinforced, -/obj/machinery/button/door{ - id = "bridgewindows"; - name = "Bridge View Blast doors"; - pixel_x = -6; - pixel_y = -2; - req_access_txt = "19" - }, -/obj/machinery/button/door{ - id = "bridgedoors"; - name = "Bridge Access Blast door"; - pixel_x = -6; - pixel_y = 8 - }, -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ - alpha = 180 - }, -/obj/machinery/light, -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow, -/obj/item/camera{ - pixel_x = 2; - pixel_y = 6 +/area/library/abandoned) +"eIh" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/under/suit/tan, +/obj/item/reagent_containers/food/drinks/bottle/champagne{ + pixel_x = 6; + pixel_y = 10 }, -/turf/open/floor/iron/dark, -/area/bridge) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/purple, +/area/crew_quarters/dorms) "eJw" = ( /obj/structure/cable{ icon_state = "1-4" @@ -9988,20 +9941,14 @@ /obj/effect/turf_decal/delivery, /obj/item/soap/nanotrasen, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"eKt" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) +/area/hallway/primary/fore) "eKX" = ( /turf/closed/wall, /area/chapel/office) "eLG" = ( /obj/structure/chair/wood/wings, /turf/open/floor/carpet/green, -/area/vacant_room/office) +/area/library/abandoned) "eMb" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -10037,18 +9984,14 @@ dir = 8 }, /turf/open/floor/noslip/standard, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "eMU" = ( /obj/structure/railing{ dir = 6 }, /obj/structure/lattice, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "eMV" = ( /obj/effect/turf_decal/trimline/dark/warning{ dir = 4 @@ -10060,9 +10003,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "eNg" = ( /obj/effect/turf_decal/siding/wood, /obj/item/reagent_containers/glass/bucket{ @@ -10092,24 +10033,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"eNE" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"eNV" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small, -/turf/open/floor/plating, -/area/maintenance/department/chapel) "eOa" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -10161,12 +10084,16 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) -"ePf" = ( -/obj/machinery/ai_slipper{ - uses = 10 +"eOX" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 2 }, -/turf/open/floor/iron/tech, -/area/engine/atmos) +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","security") + }, +/turf/open/floor/iron, +/area/security/brig) "ePt" = ( /obj/structure/cable{ icon_state = "1-2" @@ -10202,41 +10129,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/chapel/office) -"eQh" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = -5 - }, -/obj/item/holosign_creator/medical{ - pixel_x = -4; - pixel_y = 17 - }, -/obj/item/toy/figure/cmo{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/stamp/cmo{ - pixel_x = -2 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring medbay to ensure patient safety."; - dir = 1; - name = "Medbay Monitor"; - network = list("medbay"); - pixel_x = 1; - pixel_y = -32 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/cmo) "eQo" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/bot, @@ -10267,16 +10159,14 @@ /obj/item/clothing/glasses/hud/security/sunglasses, /turf/open/floor/carpet/red, /area/security/detectives_office) -"eQW" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, +"eQz" = ( +/obj/effect/turf_decal/trimline/yellow, +/obj/structure/lattice/catwalk/over, /obj/structure/cable/yellow{ - icon_state = "0-4" + icon_state = "2-16" }, -/obj/machinery/space_heater, -/turf/open/floor/iron, -/area/maintenance/department/medical/central) +/turf/open/floor/plating, +/area/maintenance/department/chapel) "eSh" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -10301,6 +10191,16 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"eTo" = ( +/obj/structure/fence/cut/large, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) +"eTr" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "eTz" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -10319,18 +10219,52 @@ /area/quartermaster/storage) "eTC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "Theatre"; - sortType = 18 +/obj/structure/disposalpipe/sorting/mail/destination/bar{ + dir = 1 }, /turf/open/floor/wood/broken, /area/crew_quarters/cafeteria) +"eTE" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/central) "eTK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"eUd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/processor, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","security","prison","public") + }, +/obj/item/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + name = "Prison Intercom (General)"; + pixel_y = 24; + prison_radio = 1 + }, +/turf/open/floor/prison/dark, +/area/security/prison) "eUf" = ( /obj/effect/turf_decal/bot, /obj/machinery/camera/autoname/directional/east, @@ -10349,13 +10283,11 @@ }, /area/bridge) "eUh" = ( -/obj/structure/disposalpipe/trunk/multiz/down{ +/obj/structure/disposalpipe/multiz/down{ dir = 4 }, /turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "eUm" = ( /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ @@ -10373,21 +10305,6 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"eUG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ - dir = 8 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "eUY" = ( /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/planetary, @@ -10419,14 +10336,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) -"eVs" = ( -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/effect/turf_decal/delivery, -/obj/machinery/camera/directional/north{ - network = list("ss13","rd") - }, -/turf/open/floor/iron/dark, -/area/science/mixing) "eVv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -10453,52 +10362,17 @@ }, /turf/open/floor/iron, /area/medical/apothecary) -"eWf" = ( -/obj/structure/railing{ - dir = 6; - layer = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 6 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "eWh" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/tree/jungle{ plane = -3 }, /turf/open/floor/grass/no_border, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"eWs" = ( -/obj/structure/flora/rock/pile, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) -"eWv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/ladder, -/turf/open/floor/pod/dark, -/area/maintenance/department/chapel) +/area/hallway/primary/aft) +"eWn" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/department/engine) "eWC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -10524,6 +10398,9 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/central) +"eXk" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/asteroid/paradise/surface) "eXn" = ( /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) @@ -10542,44 +10419,6 @@ "eXB" = ( /turf/closed/wall, /area/maintenance/department/crew_quarters/dorms) -"eXD" = ( -/obj/machinery/power/solar{ - id = "portsolar"; - name = "Port Solar Array" - }, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/cable, -/turf/open/floor/iron/solarpanel, -/area/asteroid/paradise/surface) -"eXG" = ( -/obj/machinery/door/airlock/security/glass{ - id_tag = "outerbrig"; - name = "Brig"; - req_one_access_txt = "1;4" - }, -/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ - alpha = 180; - color = "#DE3A3A" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" - }, -/turf/open/floor/iron/dark, -/area/security/brig) "eYg" = ( /obj/structure/stairs{ dir = 8 @@ -10600,29 +10439,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/science/central) -"eYC" = ( -/obj/machinery/atmospherics/components/binary/pump/layer4{ - dir = 4; - name = "Port to Filter" - }, -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 8; - name = "Air to Ports" - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4; - piping_layer = 1 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) "eYE" = ( /obj/item/kirbyplants/random, /obj/effect/decal/cleanable/dirt/dust, @@ -10656,6 +10472,15 @@ "eZt" = ( /turf/closed/wall/rust, /area/science/xenobiology) +"eZv" = ( +/obj/structure/railing, +/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/effect/turf_decal/siding/white, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/science/lab) "eZE" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, @@ -10673,12 +10498,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/crew_quarters/fitness/recreation) -"eZG" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "eZI" = ( /obj/structure/lattice/catwalk/over, /turf/open/openspace, @@ -10693,10 +10512,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) -"eZZ" = ( -/obj/structure/frame/machine, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "fae" = ( /obj/machinery/camera/motion/directional/south{ c_tag = "MiniSat Exterior 1"; @@ -10709,44 +10524,6 @@ /obj/machinery/light, /turf/open/openspace, /area/crew_quarters/heads/hor) -"fap" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/table, -/obj/item/pipe_dispenser{ - pixel_x = 1; - pixel_y = 12 - }, -/obj/item/pipe_dispenser{ - pixel_y = 7 - }, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/glasses/meson{ - pixel_y = 1 - }, -/obj/item/clothing/glasses/meson{ - pixel_x = 2 - }, -/obj/item/card/id/job/atmospheric_technician{ - access = list(11); - pixel_y = -5 - }, -/obj/item/clothing/glasses/meson/engine{ - pixel_y = -6 - }, -/obj/item/clothing/head/beret/atmos{ - pixel_x = 4; - pixel_y = -2 - }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "faZ" = ( /turf/closed/wall/r_wall, /area/quartermaster/warehouse) @@ -10821,10 +10598,26 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/theatre/backstage) -"fcl" = ( -/obj/effect/turf_decal/siding/blue, -/turf/open/floor/glass/reinforced, -/area/medical/medbay/central) +"fcg" = ( +/obj/effect/turf_decal/siding/dark/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/hallway/primary/central) +"fck" = ( +/obj/effect/turf_decal/tile/black/opposingcorners{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/kirbyplants/random, +/obj/machinery/firealarm/directional/south, +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","rd") + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/hor) "fcz" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -10841,9 +10634,7 @@ /area/ai_monitored/turret_protected/aisat/maint) "fdi" = ( /turf/closed/wall, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "fdK" = ( /obj/structure/curtain/directional{ dir = 8 @@ -10950,11 +10741,29 @@ }, /turf/open/floor/plating, /area/maintenance/department/eva) +"fgK" = ( +/obj/machinery/computer/objective, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "fgP" = ( /turf/closed/wall, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"fhE" = ( +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","medbay") + }, +/obj/machinery/vending/medical, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/machinery/status_display/evac{ + pixel_x = -32 + }, +/turf/open/floor/iron, +/area/medical/surgery) "fhM" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall/rust, @@ -10967,9 +10776,7 @@ /turf/open/floor/iron/dark/side{ dir = 5 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "fhV" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/bot, @@ -11011,6 +10818,9 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/engine) "fiC" = ( @@ -11051,14 +10861,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"fjc" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/delivery, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/iron, -/area/maintenance/department/crew_quarters/bar) "fjp" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, @@ -11088,6 +10890,13 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"fkN" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "fkW" = ( /obj/item/canvas/twentythree_twentythree, /obj/item/canvas/twentythree_twentythree, @@ -11097,20 +10906,30 @@ /obj/structure/easel, /turf/open/floor/wood, /area/crew_quarters/cafeteria) -"flm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +"fli" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/rack, +/obj/item/clothing/suit/armor/bulletproof{ + pixel_y = 7 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/item/clothing/suit/armor/bulletproof{ + pixel_x = 6; + pixel_y = 8 }, -/obj/structure/railing{ - dir = 4 +/obj/item/clothing/head/helmet/alt{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/alt{ + pixel_y = 1 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ + alpha = 180; + color = "#DE3A3A" }, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/ai_monitored/security/armory) "flo" = ( /turf/closed/wall, /area/crew_quarters/heads/chief) @@ -11141,9 +10960,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "fna" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -11175,20 +10992,44 @@ }, /turf/open/floor/iron/dark, /area/medical/morgue) -"fnx" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" +"fnz" = ( +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ + alpha = 180 }, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) +/obj/structure/table/reinforced, +/obj/item/paicard{ + pixel_x = -10; + pixel_y = 2 + }, +/obj/item/storage/fancy/donut_box{ + pixel_x = 9; + pixel_y = -1 + }, +/obj/item/book/manual/wiki/sopcommand, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark, +/area/bridge) "fnC" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/open/floor/iron, /area/maintenance/department/chapel) +"fnL" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = 7; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/security/brig) "fnQ" = ( /turf/open/floor/plating, /area/maintenance/department/medical/morgue) @@ -11200,6 +11041,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/crew_quarters/cafeteria) +"foo" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "foz" = ( /obj/machinery/door/airlock{ name = "Theatre"; @@ -11249,7 +11096,7 @@ pixel_y = 10 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/asteroid/paradise) "fpY" = ( /obj/structure/flora/ausbushes/fernybush, /obj/effect/turf_decal/siding/white/corner{ @@ -11275,9 +11122,7 @@ /turf/open/floor/iron/dark/side{ dir = 5 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "fqC" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/disposalpipe/segment{ @@ -11297,7 +11142,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/firealarm/directional/north, /obj/item/toy/spinningtoy, -/obj/structure/disposalpipe/trunk/multiz{ +/obj/structure/disposalpipe/multiz{ dir = 2 }, /turf/open/floor/iron, @@ -11309,9 +11154,7 @@ "frz" = ( /obj/structure/lattice/catwalk/over, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "frC" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/structure/cable/yellow{ @@ -11327,9 +11170,7 @@ dir = 10 }, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "fsb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -11343,6 +11184,27 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) +"fss" = ( +/obj/structure/table, +/obj/item/geiger_counter{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/toy/plush/plushvar{ + pixel_x = -2; + pixel_y = 9 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway) "fta" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 @@ -11357,15 +11219,32 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - name = "Xenobiology Junction"; - sortType = 28 +/obj/structure/disposalpipe/segment{ + dir = 9 }, /turf/open/floor/iron/white/side{ dir = 5 }, /area/science/lab) +"ftk" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/machinery/light, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/science/mixing) "ftq" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/bot{ @@ -11376,19 +11255,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"ftK" = ( -/obj/structure/railing{ - dir = 10; - layer = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "ftM" = ( /obj/machinery/gateway, /obj/effect/turf_decal/delivery, @@ -11412,45 +11278,15 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"fuJ" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/spawner/structure/window/reinforced/prison, -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison blast door" - }, -/turf/open/floor/plating, -/area/security/prison) -"fuO" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/asteroid/paradise/surface) -"fuQ" = ( -/obj/structure/fence/corner{ - dir = 5 - }, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "fuT" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/bottle/beer{ - pixel_x = -3; - pixel_y = 16 - }, /obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = 6; pixel_y = 27 }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 1; - pixel_y = 3 +/obj/structure/disposalpipe/trunk{ + dir = 8 }, +/obj/machinery/disposal/bin, /turf/open/floor/iron/dark, /area/science/mixing) "fvf" = ( @@ -11488,6 +11324,24 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"fvB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/turf_decal/numbers{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/sorting/mail/destination/hop_office/flip{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/hallway/primary/fore) "fvT" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -11540,6 +11394,20 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"fwI" = ( +/obj/machinery/computer/xenoartifact_console, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","rd") + }, +/turf/open/floor/iron, +/area/science/explab) "fwN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -11572,9 +11440,7 @@ /obj/item/stack/sheet/wood/ten, /obj/item/storage/bag/trash, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "fyA" = ( /turf/closed/wall, /area/science/robotics) @@ -11606,6 +11472,15 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"fzs" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/surgery) "fzw" = ( /obj/effect/turf_decal/stripes/end{ dir = 8 @@ -11616,10 +11491,6 @@ /obj/structure/ladder, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"fzx" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface/grass) "fzZ" = ( /obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 4 @@ -11653,19 +11524,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) -"fAC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner{ - dir = 8 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "fBc" = ( /obj/structure/mirror{ pixel_x = -32; @@ -11682,19 +11540,15 @@ /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) -"fBA" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +"fBx" = ( +/obj/machinery/light/small{ + dir = 1 }, -/turf/open/floor/iron/dark/side{ - dir = 4 +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","cargo") }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/turf/open/floor/plating, +/area/quartermaster/warehouse) "fBG" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, @@ -11729,9 +11583,7 @@ }, /obj/machinery/firealarm/directional/east, /turf/open/floor/pod/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "fBW" = ( /obj/structure/closet/crate/medical, /obj/effect/spawner/lootdrop/ruinloot/medical, @@ -11773,19 +11625,16 @@ /obj/effect/turf_decal/bot, /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"fCA" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_x = 6; - pixel_y = 4 +/area/hallway/primary/fore) +"fCz" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, +/obj/effect/turf_decal/evac, +/turf/open/floor/iron, +/area/maintenance/department/science/central) +"fCA" = ( /obj/item/storage/fancy/donut_box{ name = "Holy donut box"; pixel_x = -4; @@ -11796,10 +11645,10 @@ pixel_x = 33; pixel_y = -2 }, -/obj/item/organ/heart{ - pixel_x = -5; - pixel_y = -1 +/obj/structure/disposalpipe/trunk{ + dir = 8 }, +/obj/machinery/disposal/bin, /turf/open/floor/wood, /area/chapel/office) "fCB" = ( @@ -11821,12 +11670,24 @@ /turf/open/floor/carpet, /area/asteroid/paradise/surface) "fDC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ - dir = 4; - piping_layer = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output/layer4{ + dir = 4 }, /turf/open/floor/engine/co2, /area/engine/atmos) +"fDJ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/numbers/two_nine{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron, +/area/maintenance/department/chapel) "fEe" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ @@ -11868,6 +11729,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/crew_quarters/dorms) +"fFe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/space_heater, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/engine/engineering) "fFu" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/table/reinforced, @@ -11885,27 +11754,6 @@ }, /turf/open/openspace, /area/crew_quarters/kitchen) -"fGm" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "fGn" = ( /obj/machinery/door/airlock/vault{ name = "Vault Door"; @@ -11927,9 +11775,7 @@ "fGM" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "fHo" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -12038,14 +11884,6 @@ dir = 8 }, /area/science/research) -"fKS" = ( -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ - pixel_x = -13; - pixel_y = -11 - }, -/obj/structure/chair/fancy/plastic, -/turf/open/floor/plating/beach/sand, -/area/asteroid/paradise/surface/sand) "fLl" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -12055,19 +11893,16 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) -"fLs" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +"fLu" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/effect/turf_decal/bot, +/obj/machinery/computer/crew{ + req_one_access = list(5,4) }, -/obj/effect/turf_decal/siding/white, -/turf/open/floor/iron, -/area/medical/medbay/central) +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "fLS" = ( /turf/closed/wall/r_wall, /area/ai_monitored/security/armory) @@ -12077,30 +11912,11 @@ }, /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface) -"fMc" = ( -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13","medbay") - }, -/obj/machinery/vending/medical, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/machinery/status_display/evac{ - pixel_x = -32 - }, -/turf/open/floor/iron, -/area/medical/surgery) "fMh" = ( /obj/structure/ladder, /obj/structure/railing, /turf/open/floor/pod/dark, /area/maintenance/department/bridge) -"fMk" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "fMC" = ( /obj/structure/cable{ icon_state = "1-2" @@ -12111,6 +11927,41 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/engine/engineering) +"fMH" = ( +/obj/machinery/keycard_auth{ + pixel_x = 33; + pixel_y = -5 + }, +/obj/machinery/button/door{ + id = "Capoffice"; + id_tag = "cmoprivacy"; + name = "Captain blast door"; + pixel_x = 32; + pixel_y = 5 + }, +/obj/structure/table/wood, +/obj/machinery/computer/security/wooden_tv{ + pixel_x = 2; + pixel_y = 8 + }, +/obj/machinery/firealarm/directional/south, +/obj/item/melee/chainofcommand{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/machinery/camera/autoname/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/item/radio/intercom{ + dir = 8; + freerange = 1; + name = "Station Intercom (Command)"; + pixel_x = 33; + pixel_y = -35 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/captain/private) "fMJ" = ( /obj/structure/railing/corner{ dir = 4 @@ -12166,16 +12017,17 @@ }, /obj/item/crowbar/red, /turf/open/floor/wood, -/area/vacant_room/office) +/area/library/abandoned) +"fMV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/hallway/primary/aft) "fMX" = ( /turf/closed/wall, /area/crew_quarters/dorms) -"fNB" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/openspace, -/area/maintenance/department/chapel) "fNN" = ( /obj/structure/chair/fancy/bench/pew/left{ dir = 1 @@ -12207,6 +12059,10 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/science/mixing) +"fOw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/maintenance/department/medical/central) "fOH" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -12230,9 +12086,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "fPa" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -12260,25 +12114,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/department/science/central) -"fPV" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/carpet/purple, -/area/crew_quarters/cafeteria) "fQo" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -12373,17 +12208,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/carpet/purple, /area/crew_quarters/cafeteria) -"fRu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) "fRN" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/white, @@ -12427,25 +12251,11 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/plating, /area/quartermaster/qm) -"fSJ" = ( -/obj/machinery/shower{ - dir = 8; - layer = 4; - name = "emergency shower"; - pixel_y = -3 - }, -/obj/machinery/door/window/brigdoor{ - dir = 1; - name = "Creature Pen"; - req_access_txt = "47" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/circuit/telecomms/server, -/area/science/xenobiology) "fSZ" = ( /obj/machinery/modular_computer/console/preset/research{ dir = 8 @@ -12468,6 +12278,16 @@ /obj/effect/landmark/start/research_director, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) +"fTr" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/chair/fancy/bench, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/prison) "fTY" = ( /obj/structure/chair{ dir = 8 @@ -12496,7 +12316,7 @@ name = "Medbay Storage RC"; pixel_y = 29 }, -/obj/structure/disposalpipe/trunk/multiz{ +/obj/structure/disposalpipe/multiz{ dir = 8 }, /turf/open/floor/plating, @@ -12505,11 +12325,6 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - dir = 1; - initialize_directions = 1; - piping_layer = 4 - }, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -12517,6 +12332,9 @@ dir = 8 }, /obj/machinery/light, +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on/layer_4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/engine/atmos) "fUP" = ( @@ -12556,6 +12374,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/warden) "fUZ" = ( @@ -12582,23 +12401,6 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, /area/tcommsat/computer) -"fVb" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave{ - desc = "It looks really dirty."; - name = "maintenance microwave"; - pixel_y = 5 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/iron, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "fVf" = ( /obj/structure/stairs{ dir = 8 @@ -12608,6 +12410,25 @@ }, /turf/open/floor/pod/dark, /area/engine/atmos) +"fVl" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/carpet/purple, +/area/crew_quarters/cafeteria) "fVy" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -12633,22 +12454,21 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/crew_quarters/cafeteria) -"fWn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ +"fWw" = ( +/obj/machinery/camera/autoname/directional/north, +/obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 +/obj/item/radio/intercom{ + dir = 1; + pixel_x = 1; + pixel_y = 23 }, -/turf/open/floor/iron/dark, -/area/engine/engineering) +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/iron, +/area/janitor) "fWy" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ - piping_layer = 2 - }, +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input/layer2, /turf/open/floor/engine/air, /area/engine/atmos) "fWA" = ( @@ -12657,9 +12477,7 @@ }, /obj/structure/lattice, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "fWE" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Disposal Access"; @@ -12676,13 +12494,6 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"fWF" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron, -/area/maintenance/department/crew_quarters/bar) "fWU" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -12701,6 +12512,13 @@ }, /turf/open/floor/engine, /area/science/explab) +"fYa" = ( +/obj/structure/flora/rock/pile, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "fYK" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -12709,14 +12527,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"fYP" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - initialize_directions = 4 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "fYS" = ( /obj/effect/turf_decal/box, /obj/machinery/shower{ @@ -12763,9 +12573,7 @@ /obj/machinery/holopad, /obj/effect/turf_decal/box, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "fZm" = ( /obj/machinery/computer/bounty{ dir = 4 @@ -12774,9 +12582,7 @@ dir = 9 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "fZv" = ( /obj/structure/table/reinforced, /obj/item/mmi{ @@ -12817,22 +12623,16 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"gaf" = ( -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 1; - pixel_x = 32; - pixel_y = 29 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark/corner{ +"fZY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron, +/area/maintenance/department/science/central) "gaj" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 10 @@ -12854,38 +12654,32 @@ /turf/open/floor/iron/dark/side{ dir = 1 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "gax" = ( /obj/structure/railing{ dir = 10 }, /obj/structure/lattice, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "gbj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/structure/reflector/box, /turf/open/floor/iron, /area/engine/engineering) -"gbz" = ( -/obj/effect/turf_decal/siding/wood/corner, -/obj/structure/closet/secure_closet/captains, -/obj/item/book/manual/wiki/security_space_law, -/obj/item/reagent_containers/food/drinks/flask/gold{ - pixel_x = 3; - pixel_y = 8 +"gbq" = ( +/obj/structure/chair/fancy/plastic, +/obj/item/cigbutt{ + pixel_x = -13; + pixel_y = -9 }, -/obj/item/pinpointer/nuke{ - layer = 6; - pixel_y = 5 +/obj/effect/decal/cleanable/ash{ + pixel_x = -18; + pixel_y = -4 }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain/private) +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "gbP" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/line{ @@ -12898,6 +12692,23 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"gcn" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "gcq" = ( /obj/machinery/light_switch{ pixel_x = 25; @@ -12906,16 +12717,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/kitchen) -"gdb" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/engine/engineering) "gdk" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, @@ -12940,9 +12741,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, +/obj/structure/disposalpipe/sorting/mail/destination/qm_office/flip, /turf/open/floor/iron/sepia, /area/quartermaster/storage) "gdF" = ( @@ -12950,14 +12749,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"gdO" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/grass/no_border, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "gdP" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/box/corners{ @@ -13075,9 +12866,7 @@ pixel_y = -2 }, /turf/open/floor/iron/freezer, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "gfQ" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -13100,6 +12889,21 @@ "ggs" = ( /turf/closed/wall/rust, /area/maintenance/department/engine) +"ggB" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/numbers/two_nine, +/turf/open/floor/iron, +/area/maintenance/department/cargo) +"ggL" = ( +/obj/effect/landmark/observer_start, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/central) "ghc" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -13113,24 +12917,14 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) +"ghg" = ( +/obj/effect/landmark/loneops, +/turf/open/floor/plating/beach/sand, +/area/asteroid/paradise/surface/sand) "ghT" = ( /obj/machinery/air_sensor/atmos/sm_core, /turf/open/floor/engine, /area/engine/supermatter) -"ghV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/holohoop{ - dir = 4; - layer = 3 - }, -/turf/open/floor/prison/dark, -/area/security/prison) "gij" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plating, @@ -13174,11 +12968,6 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/bridge) -"giQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/dark_green, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "giS" = ( /turf/open/floor/plating/asteroid/planetary, /area/engine/atmos) @@ -13194,6 +12983,15 @@ }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/cafeteria) +"gjm" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "gjn" = ( /obj/machinery/newscaster{ pixel_x = 31; @@ -13207,6 +13005,30 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) +"gjv" = ( +/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ + alpha = 180; + color = "#DE3A3A" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron, +/area/security/brig) "gjA" = ( /obj/structure/table/wood, /obj/item/gavelblock{ @@ -13217,7 +13039,7 @@ pixel_y = 6 }, /turf/open/floor/plating, -/area/vacant_room/office) +/area/library/abandoned) "gjC" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/security, @@ -13245,6 +13067,24 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/aisat_interior) +"gka" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ + dir = 9 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "gkj" = ( /obj/structure/window/reinforced/spawner/north, /obj/effect/turf_decal/stripes/line{ @@ -13257,26 +13097,12 @@ }, /turf/open/floor/circuit/telecomms/server, /area/science/server) -"gkv" = ( -/obj/structure/table/wood, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 10; - layer = 2 - }, -/turf/open/floor/carpet/green, -/area/vacant_room/office) "gkG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark/side{ dir = 9 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "gkJ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -13285,8 +13111,19 @@ name = "Maintenance Hatch"; req_one_access_txt = "12;7;29" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/engine) +"gkT" = ( +/obj/effect/decal/cleanable/robot_debris/old{ + name = "Seamoth fragment"; + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/plating/beach/water, +/area/asteroid/paradise/surface/water) "gkU" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -13297,7 +13134,7 @@ dir = 10 }, /turf/open/floor/wood/broken, -/area/vacant_room/office) +/area/library/abandoned) "gkY" = ( /obj/structure/railing{ dir = 4 @@ -13308,9 +13145,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "gla" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -13323,19 +13158,6 @@ /obj/item/circuitboard/machine/smes, /turf/open/floor/iron, /area/engine/engineering) -"glt" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/turf_decal/caution{ - dir = 1 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "glJ" = ( /obj/structure/table, /obj/item/stock_parts/subspace/filter, @@ -13348,21 +13170,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"glM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - dir = 8; - freq = 1400; - location = "Security" - }, -/obj/structure/plasticflaps/opaque, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" - }, -/turf/open/floor/plating, -/area/maintenance/department/eva) "gmf" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, @@ -13407,28 +13214,6 @@ }, /turf/open/floor/iron, /area/science/lab) -"gmi" = ( -/obj/machinery/door/poddoor/preopen{ - id = "testlab"; - name = "test chamber blast door" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/closeup{ - dir = 1 - }, -/turf/open/floor/engine, -/area/science/explab) -"gmo" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison blast door" - }, -/turf/open/floor/plating, -/area/security/prison) "gmt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/office{ @@ -13459,20 +13244,16 @@ }, /obj/item/beacon, /obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) -"gnb" = ( -/obj/machinery/computer/objective, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "gnc" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/engine) "gnm" = ( @@ -13485,13 +13266,37 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) +"gnr" = ( +/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ + alpha = 180; + color = "#DE3A3A" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/security/brig) +"gnE" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/structure/sign/warning/electricshock, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "gnR" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) +"goq" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + id = "qm_warehouse"; + name = "warehouse Shutters" + }, +/turf/open/floor/iron/sepia, +/area/quartermaster/warehouse) "gos" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -13518,10 +13323,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "goV" = ( /obj/effect/turf_decal/box/corners, /turf/open/floor/dock/drydock, @@ -13556,15 +13362,20 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"gpl" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 +"gpr" = ( +/obj/effect/landmark/start/medical_doctor, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) +"gpt" = ( +/obj/item/beacon{ + pixel_y = 3 }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/ai_slipper{ + uses = 10 }, -/turf/open/floor/iron/tech/grid, -/area/ai_monitored/turret_protected/aisat_interior) +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "gpR" = ( /obj/machinery/telecomms/processor/preset_one, /obj/effect/turf_decal/stripes/line{ @@ -13578,31 +13389,32 @@ "gqb" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "gqv" = ( /obj/effect/spawner/structure/window/depleteduranium, /turf/open/floor/plating, /area/engine/engineering) -"gqC" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +"gqF" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_x = -5; + pixel_y = 19 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/randomvend/snack, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","medbay") +/obj/machinery/power/apc/auto_name/directional/west{ + pixel_x = -24 }, -/obj/machinery/status_display/evac{ - pixel_y = 32 +/obj/structure/cable/yellow{ + icon_state = "0-2" }, /turf/open/floor/iron, -/area/medical/medbay/central) -"grk" = ( -/obj/structure/lattice, -/turf/open/openspace, -/area/crew_quarters/heads/cmo) +/area/medical/apothecary) "grl" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 @@ -13616,39 +13428,22 @@ }, /turf/open/floor/pod/dark, /area/bridge/meeting_room) -"grx" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 5 - }, -/obj/machinery/meter, -/turf/closed/wall/r_wall, -/area/engine/supermatter) "grQ" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","rd"); + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/robotics) "grS" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 5 + }, /turf/open/floor/iron/tech, /area/engine/atmos) -"gsi" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - alpha = 180; - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "gsF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -13707,6 +13502,23 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"gux" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/evac, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, +/area/hallway/primary/fore) +"guH" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/evac{ + dir = 1 + }, +/turf/open/floor/iron, +/area/maintenance/department/science/central) "guS" = ( /obj/machinery/door/airlock/mining/glass{ name = "Delivery Office"; @@ -13730,6 +13542,38 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) +"gvc" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/table/reinforced, +/obj/item/folder/white{ + pixel_x = -5 + }, +/obj/item/holosign_creator/medical{ + pixel_x = -4; + pixel_y = 17 + }, +/obj/item/toy/figure/cmo{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/stamp/cmo{ + pixel_x = -2 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen{ + desc = "Used for monitoring medbay to ensure patient safety."; + dir = 1; + name = "Medbay Monitor"; + network = list("medbay"); + pixel_x = 1; + pixel_y = -32 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/cmo) "gvg" = ( /obj/machinery/light_switch{ pixel_x = 26; @@ -13748,6 +13592,15 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) +"gvk" = ( +/obj/effect/turf_decal/siding/dark/end{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore) "gvQ" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/scrubber/huge, @@ -13780,6 +13633,7 @@ pixel_x = 6; pixel_y = -6 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/warden) "gwg" = ( @@ -13801,9 +13655,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "gwH" = ( /obj/structure/window/reinforced{ dir = 4 @@ -13849,9 +13701,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "gyq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -13872,17 +13722,6 @@ "gyy" = ( /turf/open/openspace, /area/crew_quarters/cafeteria) -"gyC" = ( -/obj/machinery/atmospherics/miner/station/carbon_dioxide, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","engine") - }, -/obj/machinery/atmospherics/pipe/simple/green/hidden{ - dir = 8 - }, -/turf/open/floor/engine/co2, -/area/engine/atmos) "gyH" = ( /obj/structure/railing/corner{ dir = 8 @@ -13900,20 +13739,14 @@ icon_state = "4-8" }, /obj/structure/lattice/catwalk/over, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/science/mixing) -"gyO" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/iron, -/area/maintenance/department/crew_quarters/bar) "gzS" = ( /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "gzY" = ( /obj/structure/bodycontainer/crematorium{ dir = 1; @@ -13928,24 +13761,6 @@ /obj/machinery/light, /turf/open/floor/wood, /area/chapel/office) -"gAf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/numbers/two_nine{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "gAn" = ( /obj/machinery/door/airlock/security{ name = "Evidence"; @@ -13963,16 +13778,34 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"gAp" = ( -/obj/structure/light_construct, -/obj/structure/disposalpipe/segment{ - dir = 4 +"gAu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/sign/warning/pods{ - pixel_y = -32 +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8; + initialize_directions = 8 }, -/turf/open/floor/plating, -/area/vacant_room/office) +/turf/open/floor/iron/tech, +/area/engine/engineering) +"gAV" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/pod/dark, +/area/maintenance/department/crew_quarters/dorms) "gAW" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -14003,6 +13836,15 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) +"gBe" = ( +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre/backstage) "gBj" = ( /obj/machinery/door/window/brigdoor{ dir = 4; @@ -14017,31 +13859,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/science/test_area) -"gBO" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/light, -/obj/machinery/camera/autoname{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/crew_quarters/heads/hop) "gBS" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/sand/plating, @@ -14049,24 +13866,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"gCg" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/northright{ - dir = 2; - name = "Engi Desk"; - req_one_access_txt = "32;19" - }, -/obj/item/toy/figure/engineer{ - pixel_x = 3; - pixel_y = -1 - }, -/obj/machinery/door/poddoor/preopen{ - id = "Engidesk"; - name = "engineering security door" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "gCM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small, @@ -14108,9 +13907,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "gDB" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -14129,14 +13926,6 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) -"gDX" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - id = "qm_warehouse"; - name = "warehouse shutters" - }, -/turf/open/floor/iron/sepia, -/area/quartermaster/warehouse) "gDY" = ( /turf/closed/wall/r_wall, /area/tcommsat/computer) @@ -14157,46 +13946,12 @@ }, /turf/open/floor/iron, /area/bridge/meeting_room) -"gEl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/engineering_hacking{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/book/manual/wiki/engineering_guide, -/obj/item/book/manual/wiki/engineering_construction{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/window/plasma/reinforced, -/turf/open/floor/iron, -/area/engine/engineering) "gEN" = ( /turf/closed/wall, /area/maintenance/department/security/brig) "gEP" = ( /turf/closed/wall, /area/crew_quarters/theatre/backstage) -"gEU" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/iron, -/area/ai_monitored/turret_protected/aisat/maint) "gFd" = ( /obj/machinery/air_sensor/atmos/plasma_tank, /obj/machinery/atmospherics/pipe/layer_manifold/visible, @@ -14225,9 +13980,7 @@ /obj/structure/lattice/catwalk/over, /obj/machinery/firealarm/directional/east, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "gFM" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -14245,6 +13998,34 @@ }, /turf/open/floor/iron/white, /area/science/lab) +"gFS" = ( +/obj/machinery/door/airlock{ + name = "Service Hall"; + req_one_access_txt = "22;25;26;28;35;37;38;46" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/service) +"gFW" = ( +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + desc = "It looks really dirty."; + name = "maintenance microwave"; + pixel_y = 5 + }, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/iron, +/area/engineering/hallway) "gGp" = ( /obj/machinery/camera/autoname/directional/west{ network = list("ss13","medbay") @@ -14266,6 +14047,18 @@ "gGJ" = ( /turf/closed/mineral/iron, /area/quartermaster/storage) +"gHa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/carpet/green, +/area/library/abandoned) "gHf" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -14277,9 +14070,7 @@ name = "bathroom" }, /turf/open/floor/iron/freezer, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "gHj" = ( /obj/machinery/teleport/hub, /obj/effect/turf_decal/stripes/line{ @@ -14287,17 +14078,13 @@ }, /turf/open/floor/iron/dark, /area/teleporter) -"gHq" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/door/poddoor/preopen{ - id = "Engidesk"; - name = "engineering security door" +"gHn" = ( +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","security") }, -/turf/open/floor/plating, -/area/engine/engineering) +/obj/structure/lattice/catwalk/over, +/turf/open/openspace, +/area/maintenance/department/security/brig) "gHx" = ( /obj/structure/railing{ dir = 8 @@ -14307,6 +14094,15 @@ }, /turf/open/floor/iron, /area/science/mixing) +"gHK" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/evac{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/maintenance/department/engine) "gHV" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -14333,10 +14129,15 @@ }, /turf/open/floor/iron, /area/maintenance/department/bridge) -"gIa" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface/grass) +"gIs" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "gIO" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/stripes/line{ @@ -14398,10 +14199,31 @@ }, /turf/open/floor/circuit/red, /area/ai_monitored/turret_protected/ai) +"gJk" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 32 + }, +/obj/item/kirbyplants/random{ + pixel_y = 22 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) "gJv" = ( /obj/structure/ladder, /turf/open/floor/pod/dark, /area/maintenance/department/cargo) +"gJz" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" + }, +/turf/open/floor/plating, +/area/security/brig) "gJG" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/stripes/line{ @@ -14482,9 +14304,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "gMG" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/hor) @@ -14515,21 +14335,12 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"gND" = ( -/obj/structure/table, -/obj/item/glove_box{ - pixel_x = 8 - }, -/obj/item/reagent_containers/dropper{ - pixel_x = -2; - pixel_y = -4 - }, -/obj/item/storage/firstaid/advanced{ - pixel_x = -3; - pixel_y = 9 +"gNy" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ + dir = 6 }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) +/turf/closed/wall, +/area/engine/supermatter) "gNG" = ( /obj/structure/flora/junglebush, /obj/effect/decal/cleanable/dirt, @@ -14554,6 +14365,25 @@ }, /turf/open/floor/iron/tech, /area/engine/atmos) +"gOB" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","rd") + }, +/obj/machinery/firealarm/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron/white/side, +/area/science/research) "gOE" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -14620,9 +14450,19 @@ dir = 1 }, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) +"gQd" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/evac{ + dir = 1 + }, +/obj/structure/disposalpipe/multiz, +/turf/open/floor/iron, +/area/maintenance/department/science/xenobiology) "gQh" = ( /obj/structure/railing/corner{ dir = 4 @@ -14639,35 +14479,7 @@ /turf/open/floor/iron/dark/side{ dir = 10 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"gQK" = ( -/obj/machinery/shower{ - layer = 4; - name = "emergency shower"; - pixel_y = 12 - }, -/obj/effect/turf_decal/stripes/end, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/noslip/standard, -/area/science/lab) -"gQY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "gRg" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -14680,15 +14492,36 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"gRw" = ( -/obj/effect/turf_decal/sand/plating, +"gRi" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/numbers/two_nine, +/turf/open/floor/iron, +/area/maintenance/department/science/xenobiology) +"gRz" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/rock/pile, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "0-2" }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) +/turf/open/floor/iron, +/area/ai_monitored/turret_protected/aisat/maint) "gRR" = ( /obj/machinery/door/morgue{ dir = 1; @@ -14697,7 +14530,7 @@ }, /obj/structure/barricade/wooden/crude, /turf/open/floor/carpet/royalblack, -/area/vacant_room/office) +/area/library/abandoned) "gSq" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/cobweb, @@ -14719,6 +14552,28 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) +"gTz" = ( +/obj/effect/spawner/lootdrop/aimodule_harmless, +/obj/effect/spawner/lootdrop/aimodule_harmless, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/flasher{ + id = "AI"; + pixel_x = -1; + pixel_y = 32 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/spawner/lootdrop/aimodule_harmless, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/table/reinforced, +/turf/open/floor/circuit, +/area/ai_monitored/turret_protected/ai_upload) "gTA" = ( /obj/structure/closet/secure_closet/CMO, /obj/effect/turf_decal/bot{ @@ -14732,9 +14587,7 @@ "gUx" = ( /obj/structure/railing, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "gUQ" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 @@ -14781,35 +14634,26 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) -"gVN" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" +"gVM" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plating, -/area/security/brig) +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "gWa" = ( /turf/open/floor/grass/no_border, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"gWg" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/camera/autoname/directional/west, -/obj/machinery/digital_clock/directional/west, -/turf/open/floor/iron/dark/side{ +/area/hallway/primary/aft) +"gWk" = ( +/obj/machinery/atmospherics/miner/station/carbon_dioxide, +/obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 8 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/turf/open/floor/engine/co2, +/area/engine/atmos) "gWp" = ( /obj/machinery/light{ dir = 4 @@ -14843,6 +14687,27 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/department/medical/central) +"gWy" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/chem_dispenser, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/medical/apothecary) +"gWY" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "gXb" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -14873,9 +14738,7 @@ alpha = 180 }, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "gXq" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -14891,41 +14754,6 @@ dir = 8 }, /area/bridge) -"gXz" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "garbage" - }, -/obj/item/trash/tray{ - pixel_x = 11 - }, -/obj/item/trash/semki{ - pixel_x = 12; - pixel_y = 4 - }, -/obj/item/trash/can/food/peaches/maint{ - pixel_x = -7; - pixel_y = 7 - }, -/obj/item/trash/candle{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/trash/can{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/machinery/camera/directional/north{ - network = list("ss13","security") - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/plating, -/area/maintenance/disposal) "gXA" = ( /obj/effect/turf_decal/tile/dark_green{ dir = 4 @@ -14955,6 +14783,24 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) +"gYf" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 5 + }, +/obj/machinery/meter, +/turf/closed/wall/r_wall, +/area/engine/supermatter) +"gYk" = ( +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/corner, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/yellow/corner, +/turf/open/floor/iron/dark, +/area/engineering/hallway) "gYA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -14967,12 +14813,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) -"gYQ" = ( -/obj/structure/railing/corner, -/turf/open/floor/iron/dark/corner, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "gYZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/sand/plating, @@ -14983,6 +14823,9 @@ /area/crew_quarters/dorms) "gZh" = ( /obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) "gZy" = ( @@ -14993,28 +14836,6 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/plating/rust, /area/science/test_area) -"gZM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"hag" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "ham" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -15028,6 +14849,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/carpet/red, /area/security/detectives_office) "han" = ( @@ -15040,21 +14862,6 @@ }, /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface/grass) -"haE" = ( -/obj/machinery/status_display/evac{ - pixel_x = -33 - }, -/obj/structure/table/wood, -/obj/machinery/recharger{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_x = 13; - pixel_y = 9 - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) "haF" = ( /obj/structure/chair/stool/bar/directional/west, /obj/structure/extinguisher_cabinet{ @@ -15075,29 +14882,27 @@ pixel_y = -6 }, /turf/closed/wall, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "hbs" = ( /obj/structure/sign/painting/library{ pixel_y = -32 }, /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) -"hbu" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/structure/fireaxecabinet/directional/south, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/bridge) "hbL" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/iron/white/side, -/area/science/misc_lab) +/area/asteroid/paradise) +"hbZ" = ( +/obj/structure/fans/tiny{ + density = 1; + icon = 'icons/effects/effects.dmi'; + icon_state = "m_shield"; + max_integrity = 1e+007 + }, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/quartermaster/storage) "hcA" = ( /obj/structure/chair/stool/directional/west, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -15105,6 +14910,24 @@ }, /turf/open/floor/prison, /area/security/prison) +"hcC" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12"; + security_level = 6 + }, +/turf/open/floor/plating, +/area/maintenance/department/security/brig) +"hcH" = ( +/obj/effect/turf_decal/evac{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/maintenance/department/engine) "hcI" = ( /obj/effect/turf_decal/siding/white{ alpha = 100; @@ -15166,6 +14989,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/brig) +"hey" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "heG" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/line{ @@ -15217,27 +15050,10 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"hgw" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/sign/map/echo{ - pixel_x = -32 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "hgB" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/science/mixing) -"hgC" = ( -/obj/structure/fence{ - dir = 8 - }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "hgG" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -15248,11 +15064,6 @@ }, /turf/open/floor/iron, /area/bridge) -"hgS" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/sepia, -/area/quartermaster/storage) "hha" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -15266,6 +15077,12 @@ }, /turf/open/floor/iron, /area/bridge) +"hhk" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/central) "hhm" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/structure/disposalpipe/segment{ @@ -15273,6 +15090,16 @@ }, /turf/open/floor/iron, /area/security/brig) +"hhn" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/obj/structure/closet/firecloset/full, +/obj/structure/railing{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "hht" = ( /obj/machinery/door/window/brigdoor{ dir = 8; @@ -15286,19 +15113,12 @@ "hhu" = ( /turf/closed/wall, /area/crew_quarters/cafeteria) -"hhH" = ( -/turf/open/floor/engine/light, -/area/holodeck/small{ - dynamic_lighting = 1 - }) "hib" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, /turf/open/floor/iron/freezer, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "hif" = ( /obj/structure/cable/yellow{ icon_state = "4-32" @@ -15314,15 +15134,17 @@ "hiB" = ( /turf/closed/wall, /area/asteroid/paradise) -"hiE" = ( -/obj/structure/chair/office/light{ - dir = 4 +"hja" = ( +/obj/machinery/power/solar_control, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +/obj/structure/cable{ + icon_state = "0-2" }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "hjp" = ( /obj/machinery/door/airlock/medical/glass{ name = "Medbay Storage"; @@ -15347,17 +15169,19 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/storage) +"hjQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/bot, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/security/brig) "hjU" = ( /turf/open/openspace, /area/science/mixing) -"hkG" = ( -/obj/effect/decal/cleanable/robot_debris/old{ - name = "Seamoth fragment"; - pixel_x = -3; - pixel_y = 5 - }, -/turf/open/floor/plating/beach/water, -/area/asteroid/paradise/surface/water) "hkP" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/plasma, @@ -15378,6 +15202,14 @@ }, /turf/open/floor/iron/dark, /area/storage/primary) +"hlB" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/hallway/primary/central) "hlL" = ( /obj/effect/turf_decal/stripes/box, /obj/machinery/vendor/mining, @@ -15395,29 +15227,32 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) -"hmF" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 6 +"hmU" = ( +/obj/structure/table, +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, +/obj/item/stack/cable_coil, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/structure/railing{ - dir = 6; - layer = 4 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 }, -/obj/structure/closet/emcloset, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"hns" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/item/storage/backpack/duffelbag/sec/surgery{ + pixel_y = 5 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/item/melee/baseball_bat{ + desc = "A staple of security force interrogations."; + icon_state = "baseball_bat_metal"; + name = "kneecapper" }, -/turf/open/floor/iron/white, -/area/medical/apothecary) +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/structure/cable/yellow, +/turf/open/floor/iron/dark, +/area/security/execution/education) "hny" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -15425,21 +15260,17 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating/airless, /area/science/test_area) +"hnH" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "hnY" = ( /obj/structure/sign/departments/minsky/research/research, /turf/closed/wall/r_wall, /area/science/lab) -"hog" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 32 - }, -/obj/item/kirbyplants/random{ - pixel_y = 22 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "hos" = ( /obj/machinery/power/terminal{ dir = 8 @@ -15455,33 +15286,12 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) -"how" = ( -/turf/closed/indestructible/rock/snow, -/area/space) -"hoH" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/britcup{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/item/restraints/handcuffs{ - pixel_x = -2; - pixel_y = -2 - }, -/turf/open/floor/iron, -/area/security/brig) "hoN" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/effect/spawner/lootdrop/glowstick/lit, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) "hoO" = ( @@ -15491,11 +15301,9 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) -"hoX" = ( +"hpg" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/iron/techmaint/planetary, +/turf/open/floor/plating/dirt/jungle/wasteland, /area/asteroid/paradise/surface) "hph" = ( /obj/structure/bed{ @@ -15513,39 +15321,31 @@ dir = 4 }, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"hpO" = ( -/obj/machinery/requests_console{ - department = "AI"; - departmentType = 5; - name = "AI RC"; - pixel_x = 30; - pixel_y = -30 +/area/hallway/primary/fore) +"hpA" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/vending/wardrobe/robo_wardrobe, +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, +/turf/open/floor/iron/dark, +/area/science/robotics) +"hpE" = ( +/obj/effect/turf_decal/numbers/two_nine, +/turf/open/floor/iron, +/area/hallway/primary/aft) +"hpJ" = ( +/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/structure/railing, +/obj/effect/turf_decal/siding/white, /obj/machinery/ai_slipper{ uses = 10 }, -/obj/effect/turf_decal/box, -/obj/machinery/flasher{ - id = "AI"; - name = "Meatbag Pacifier"; - pixel_x = 24; - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("aiupload") +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) +/turf/open/floor/iron/white, +/area/science/lab) "hpP" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -15553,47 +15353,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/tech, /area/engine/atmos) -"hpW" = ( -/obj/effect/turf_decal/box/white, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - external_pressure_bound = 120; - name = "server vent" - }, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) -"hqd" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 8 - }, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/reagent_containers/dropper{ - pixel_x = -3; - pixel_y = -4 - }, -/obj/item/reagent_containers/glass/beaker/large{ - pixel_x = 9; - pixel_y = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/item/clothing/glasses/science{ - pixel_x = -4 - }, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/iron, -/area/science/lab) "hqu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -15661,9 +15420,7 @@ "hsh" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "hsv" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -15686,6 +15443,17 @@ }, /turf/open/floor/iron, /area/security/brig) +"hsG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "hsN" = ( /obj/structure/railing, /turf/open/openspace, @@ -15728,37 +15496,34 @@ /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) "htu" = ( -/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ - alpha = 180; - color = "#DE3A3A" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/structure/table/wood, +/obj/machinery/light, +/obj/item/storage/fancy/candle_box{ + pixel_x = 3; + pixel_y = 3 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/item/storage/fancy/candle_box{ + pixel_x = -1; + pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 2 +/obj/item/pen/fountain/captain{ + pixel_x = 1; + pixel_y = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/item/food/grown/flower/harebell{ + pixel_x = -12; + pixel_y = 5 }, -/obj/machinery/ai_slipper{ - uses = 10 +/obj/item/food/grown/flower/harebell{ + pixel_x = 14; + pixel_y = 5 }, -/turf/open/floor/iron, -/area/security/brig) -"htB" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "33" +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/apothecary) +/obj/structure/cable/yellow, +/turf/open/floor/carpet/green, +/area/chapel/main) "htC" = ( /obj/machinery/requests_console{ department = "Cargo Bay"; @@ -15769,15 +15534,13 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/structure/disposalpipe/junction, /turf/open/floor/iron, /area/quartermaster/sorting) "htV" = ( @@ -15789,46 +15552,18 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) -"huH" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "huR" = ( /obj/structure/lattice, /obj/structure/railing{ dir = 4 }, /turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "hvb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/bridge) -"hvh" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 10 - }, -/obj/machinery/light{ - light_color = "#7AC3FF" - }, -/obj/machinery/digital_clock/directional/south, -/turf/open/floor/glass/reinforced, -/area/medical/medbay/central) "hvu" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -15850,7 +15585,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/disposalpipe/trunk/multiz/down{ +/obj/structure/disposalpipe/multiz/down{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -15879,20 +15614,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"hwq" = ( -/obj/structure/chair/fancy/bench/corporate/right{ - dir = 1 - }, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "hwy" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -15940,9 +15661,7 @@ /area/asteroid/paradise/surface) "hyo" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/general/hidden/layer2{ - dir = 9 - }, +/obj/effect/mapping_helpers/simple_pipes/general/visible, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) "hyx" = ( @@ -15950,10 +15669,11 @@ /obj/structure/railing/corner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "hyz" = ( /obj/structure/table, /obj/structure/window/reinforced{ @@ -15984,6 +15704,13 @@ }, /turf/open/floor/iron/dark, /area/science/server) +"hyP" = ( +/obj/structure/fence/corner{ + dir = 8 + }, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "hyQ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -15993,6 +15720,13 @@ }, /turf/open/floor/iron, /area/security/brig) +"hyR" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "hyZ" = ( /obj/structure/railing{ dir = 1 @@ -16024,6 +15758,17 @@ "hzQ" = ( /turf/open/floor/plating, /area/maintenance/department/engine) +"hzX" = ( +/obj/effect/turf_decal/siding/wideplating/terracotta{ + dir = 8 + }, +/obj/structure/no_effect_signpost{ + name = "Echo station"; + pixel_x = -4; + pixel_y = 3 + }, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "hAp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -16041,6 +15786,14 @@ }, /turf/open/floor/wood, /area/chapel/main) +"hAC" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/machinery/computer/security, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/bridge) "hAS" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating, @@ -16055,9 +15808,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "hAV" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 @@ -16069,9 +15820,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "hAX" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 25 @@ -16133,22 +15882,15 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/maintenance/department/cargo) -"hCo" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "hCs" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/maintenance/department/engine) "hCx" = ( @@ -16170,9 +15912,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "hDF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -16195,6 +15935,41 @@ }, /turf/open/floor/iron/white, /area/science/research) +"hEA" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/folder/red{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/taperecorder{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/flashlight/lamp{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/radio/intercom{ + broadcasting = 1; + frequency = 1423; + listening = 0; + name = "Interrogation Intercom"; + pixel_x = 3; + pixel_y = -34 + }, +/turf/open/floor/iron, +/area/security/brig) "hED" = ( /obj/effect/turf_decal/bot, /obj/machinery/computer/secure_data{ @@ -16206,6 +15981,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/warden) "hFP" = ( @@ -16219,6 +15997,12 @@ }, /turf/open/floor/plating, /area/hallway/secondary/service) +"hFQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/maintenance/department/engine) "hGq" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/glowstick/lit, @@ -16245,12 +16029,6 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) -"hHp" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "hHO" = ( /obj/structure/railing{ dir = 1 @@ -16290,37 +16068,37 @@ name = "mainframe floor" }, /area/tcommsat/server) +"hIr" = ( +/obj/machinery/modular_computer/console/preset/engineering, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron, +/area/bridge) "hIX" = ( /obj/machinery/light{ dir = 8 }, /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness/recreation) -"hIY" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/obj/structure/closet/firecloset/full, -/obj/structure/railing{ - dir = 10; - layer = 4 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +"hJl" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "hJA" = ( /obj/structure/window/reinforced, /turf/open/floor/engine, /area/science/xenobiology) -"hJJ" = ( -/obj/effect/turf_decal/sand/plating, -/obj/item/chair/plastic, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +"hJD" = ( +/obj/machinery/ai_slipper{ + uses = 10 }, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "hJN" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, @@ -16370,41 +16148,17 @@ /turf/open/floor/iron/dark/corner{ dir = 1 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "hKX" = ( /obj/effect/turf_decal/tile/neutral, -/obj/item/clothing/mask/surgical{ - pixel_x = 3; - pixel_y = -8 - }, /obj/effect/decal/cleanable/dirt, -/obj/structure/table, /obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin, /turf/open/floor/iron/dark, /area/security/detectives_office) -"hLa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/structure/railing, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4; - piping_layer = 1 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) "hLc" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance/two, @@ -16429,6 +16183,35 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) +"hLx" = ( +/obj/machinery/shower{ + name = "emergency shower"; + pixel_y = 12 + }, +/obj/effect/turf_decal/stripes/end, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/noslip/standard, +/area/science/lab) +"hLy" = ( +/obj/effect/turf_decal/tile/blue/half{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "hLF" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -16437,9 +16220,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /turf/open/floor/iron/white, /area/science/research) "hLT" = ( @@ -16456,7 +16236,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/junction/flip{ +/obj/structure/disposalpipe/sorting/mail/destination/security/flip{ dir = 4 }, /turf/open/floor/iron, @@ -16493,6 +16273,19 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) +"hMy" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/evac/evac_big{ + dir = 1 + }, +/turf/open/floor/iron, +/area/maintenance/department/science/xenobiology) "hMH" = ( /obj/machinery/button/door{ id = "Cabin1"; @@ -16503,6 +16296,40 @@ }, /turf/open/floor/carpet/orange, /area/crew_quarters/dorms) +"hMI" = ( +/obj/machinery/door/airlock/shuttle, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) +"hML" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) +"hMW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/firealarm/directional/north, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","medbay") + }, +/obj/machinery/vending/cigarette, +/turf/open/floor/iron, +/area/medical/surgery) "hNH" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/flora/rock/pile, @@ -16529,6 +16356,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) "hPk" = ( @@ -16549,6 +16379,15 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/chapel) +"hPN" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/hallway/primary/central) "hQk" = ( /turf/open/floor/plating/rust, /area/science/mixing) @@ -16559,23 +16398,6 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"hRD" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/chair/fancy/bench{ - layer = 2.5 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = 1; - pixel_y = 32 - }, -/turf/open/floor/iron, -/area/security/prison) "hRI" = ( /obj/structure/ladder, /obj/structure/railing{ @@ -16599,22 +16421,24 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) -"hSg" = ( -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ - alpha = 180 +"hRU" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/structure/table/reinforced, -/obj/item/paicard{ - pixel_x = -10; - pixel_y = 2 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/item/storage/fancy/donut_box{ - pixel_x = 9; - pixel_y = -1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ + dir = 4 }, -/obj/item/book/manual/wiki/sopcommand, /turf/open/floor/iron/dark, -/area/bridge) +/area/engine/engineering) "hSk" = ( /obj/structure/railing{ dir = 1 @@ -16631,6 +16455,12 @@ }, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"hSz" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ + dir = 9 + }, +/turf/closed/wall, +/area/engine/supermatter) "hSD" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -16659,26 +16489,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating/rust, /area/science/mixing) -"hST" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/machinery/button/door{ - desc = "A remote control-switch for secure storage."; - id = "engsm"; - name = "Radiation shutters Toggle"; - pixel_y = 26; - req_access_txt = "11" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/caution{ - dir = 1 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "hSX" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -16694,22 +16504,6 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"hTi" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/iron, -/area/maintenance/department/chapel) "hTq" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -16725,9 +16519,7 @@ pixel_y = -2 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "hTE" = ( /obj/machinery/telecomms/message_server/preset, /obj/effect/turf_decal/stripes/closeup, @@ -16754,9 +16546,7 @@ network = list("ss13","engine","public") }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "hUc" = ( /obj/machinery/computer/card/minor/cmo{ dir = 8 @@ -16775,12 +16565,6 @@ }, /turf/open/floor/plating, /area/medical/surgery) -"hUj" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 6 - }, -/turf/open/floor/glass/reinforced, -/area/medical/medbay/central) "hUk" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -16816,6 +16600,12 @@ }, /turf/open/floor/plating/rust, /area/science/test_area) +"hVn" = ( +/obj/machinery/firealarm/directional/south, +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/tech, +/area/engine/engineering) "hVs" = ( /obj/effect/spawner/room/fivexthree, /turf/open/floor/plating, @@ -16826,6 +16616,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) +"hVU" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/asteroid/paradise/surface) "hWZ" = ( /obj/machinery/light/small{ dir = 1 @@ -16836,9 +16630,7 @@ /obj/effect/turf_decal/siding/yellow, /obj/effect/turf_decal/trimline/yellow/warning, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "hYk" = ( /obj/effect/turf_decal/pool{ dir = 8 @@ -16849,18 +16641,18 @@ }, /turf/open/floor/noslip/white, /area/crew_quarters/fitness/recreation) +"hYl" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plating, +/area/maintenance/department/chapel) "hYp" = ( /obj/effect/landmark/start/assistant, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"hYz" = ( -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "hYK" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Experimentation Chamber"; @@ -16928,34 +16720,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/department/science/central) -"hZM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/power/port_gen/pacman, -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow, -/obj/item/stack/sheet/mineral/plasma/ten, -/obj/item/wrench{ - pixel_x = -4; - pixel_y = 5 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"iad" = ( -/obj/machinery/power/solar{ - id = "portsolar"; - name = "Port Solar Array" - }, -/turf/open/floor/iron/solarpanel, -/area/asteroid/paradise/surface) -"ial" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "iao" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -16965,28 +16729,6 @@ }, /turf/open/floor/iron, /area/security/prison) -"ias" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/security/glass{ - id_tag = "brigentrance"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" - }, -/turf/open/floor/iron/dark, -/area/security/brig) "iaG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, @@ -17038,6 +16780,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/science/mixing) +"icJ" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/effect/turf_decal/bot, +/obj/structure/sign/departments/minsky/supply/hydroponics{ + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "icQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17048,6 +16801,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "idf" = ( @@ -17094,6 +16850,29 @@ }, /turf/open/floor/iron/dark, /area/medical/medbay/central) +"iev" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/door/airlock/command{ + name = "Chief Medical Officer's Office"; + req_access_txt = "40" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "ifm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -17114,9 +16893,7 @@ /area/engine/engineering) "ifA" = ( /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "ifB" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -17187,7 +16964,16 @@ dir = 1 }, /turf/open/floor/carpet/royalblack, -/area/vacant_room/office) +/area/library/abandoned) +"igM" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/hop) "ihA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -17202,24 +16988,24 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"ihG" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) "ihK" = ( -/obj/structure/disposalpipe/trunk/multiz/down{ +/obj/structure/disposalpipe/multiz/down{ dir = 8 }, /turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "ihL" = ( /turf/closed/wall/r_wall/rust, /area/maintenance/disposal/incinerator) +"ihR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/hallway/primary/fore) "iil" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 8 @@ -17236,17 +17022,6 @@ }, /turf/open/floor/iron/dark, /area/storage/primary) -"iis" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" - }, -/turf/open/floor/plating, -/area/security/warden) "iiz" = ( /obj/item/kirbyplants/random, /obj/structure/sign/poster/official/random{ @@ -17255,9 +17030,7 @@ /turf/open/floor/iron/dark/side{ dir = 10 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "iiY" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -17265,6 +17038,10 @@ /obj/structure/table_frame, /turf/open/floor/iron, /area/engine/atmos) +"iiZ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "ijh" = ( /obj/effect/turf_decal/tile/blue/half{ dir = 8 @@ -17280,15 +17057,12 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"ijF" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, +"ijj" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/bot, +/obj/machinery/digital_clock/directional/south, /turf/open/floor/wood, -/area/crew_quarters/theatre/backstage) +/area/crew_quarters/heads/hop) "ijM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/disposalpipe/segment{ @@ -17307,20 +17081,6 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) -"ijV" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/item/radio/intercom{ - pixel_y = -33 - }, -/obj/machinery/light, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "ikr" = ( /obj/structure/railing{ dir = 1 @@ -17345,33 +17105,20 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"ikz" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +"ikL" = ( +/obj/structure/chair/fancy/comfy{ + color = "#596479" }, -/turf/open/floor/plating/beach/sand, -/area/asteroid/paradise/surface) -"ili" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 }, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) -"ill" = ( +/obj/effect/landmark/start/captain, /obj/machinery/light{ - dir = 1; - light_color = "#7AC3FF" - }, -/obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) +/obj/item/radio/intercom/directional/north, +/turf/open/floor/carpet/blue, +/area/bridge/meeting_room) "ilG" = ( /turf/closed/wall, /area/science/lab) @@ -17415,19 +17162,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/engine) -"inv" = ( -/obj/effect/turf_decal/tile/black/opposingcorners{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/kirbyplants/random, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","rd") - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/hor) "inI" = ( /obj/effect/turf_decal/trimline/yellow, /obj/structure/railing{ @@ -17442,6 +17176,21 @@ /obj/structure/lattice/catwalk/over, /turf/open/openspace, /area/maintenance/department/security/brig) +"inX" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, +/obj/structure/cable/yellow, +/turf/open/floor/iron/tech, +/area/science/mixing/chamber) "inZ" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -17455,6 +17204,25 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) +"ioD" = ( +/obj/structure/safe, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c500, +/obj/item/stack/spacecash/c500, +/obj/item/ammo_box/a357, +/obj/item/gun/ballistic/automatic/pistol/deagle, +/obj/item/gun/ballistic/revolver/russian, +/obj/structure/sign/warning/securearea{ + pixel_y = -32 + }, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/security/nuke_storage) "ioR" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -17464,9 +17232,7 @@ "ipb" = ( /obj/structure/lattice, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "ipu" = ( /obj/machinery/microwave{ desc = "Cooks and boils stuff, somehow."; @@ -17491,24 +17257,25 @@ }, /turf/open/openspace, /area/security/brig) -"ipT" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +"iqL" = ( +/obj/structure/railing{ + dir = 8 }, -/obj/machinery/ai_slipper{ - uses = 10 +/turf/open/floor/glass/reinforced, +/area/crew_quarters/heads/cmo) +"irl" = ( +/obj/structure/railing{ + dir = 8 }, -/turf/open/floor/iron/tech, -/area/engine/engineering) +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore) "irp" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "isa" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -17528,9 +17295,25 @@ "isl" = ( /obj/structure/railing, /turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) +"isM" = ( +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_x = -32; + pixel_y = -33; + receive_ore_updates = 1 + }, +/obj/machinery/airalarm/directional/west, +/obj/machinery/monkey_recycler, +/obj/machinery/camera/autoname/directional/west{ + c_tag = "Xenobiology Lab"; + name = "Xeno camera"; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/iron/grid/steel, +/area/science/xenobiology) "isW" = ( /obj/machinery/atmospherics/pipe/multiz/layer4{ dir = 1 @@ -17568,6 +17351,12 @@ "itn" = ( /turf/open/indestructible/sound/pool/end, /area/crew_quarters/fitness/recreation) +"ito" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/maintenance/department/science/xenobiology) "itG" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/bot, @@ -17613,9 +17402,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "iuX" = ( /obj/effect/turf_decal/siding/white{ alpha = 100; @@ -17665,26 +17452,6 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) -"iwF" = ( -/obj/machinery/light{ - light_color = "#7AC3FF" - }, -/obj/structure/bed, -/obj/item/bedsheet/medical, -/obj/effect/turf_decal/bot, -/obj/item/radio/intercom{ - dir = 1; - pixel_y = -29 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) "iwI" = ( /turf/open/floor/plating, /area/maintenance/department/engine/atmos) @@ -17720,6 +17487,22 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/dock/drydock, /area/quartermaster/storage) +"ixC" = ( +/obj/structure/window/plasma/reinforced{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/rad_collector/anchored, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "iya" = ( /obj/effect/turf_decal/sand/plating, /turf/closed/mineral/random/air, @@ -17751,22 +17534,7 @@ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"iyC" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/hydroponics, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) -"iyL" = ( -/obj/item/kirbyplants/random, -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) +/area/hallway/primary/central) "iyS" = ( /turf/closed/wall, /area/medical/exam_room) @@ -17775,50 +17543,27 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"izi" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron/dark/corner{ - dir = 8 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"izj" = ( -/turf/closed/wall, -/area/science/misc_lab) "izl" = ( /obj/item/kirbyplants/random, /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark/side{ dir = 10 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"iAz" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ +/area/hallway/primary/central) +"izI" = ( +/obj/machinery/computer/cloning, +/obj/effect/turf_decal/bot, +/obj/machinery/light{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 }, -/turf/open/floor/iron/dark/side{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/area/bridge) +/turf/open/floor/iron, +/area/medical/genetics/cloning) "iAE" = ( /obj/structure/cable{ icon_state = "1-2" @@ -17831,19 +17576,6 @@ name = "mainframe floor" }, /area/tcommsat/server) -"iAM" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/chair/fancy/bench{ - layer = 2.5 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron, -/area/security/prison) "iAN" = ( /obj/structure/chair/office{ dir = 1 @@ -17875,19 +17607,29 @@ /turf/open/floor/iron/dark/side{ dir = 6 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "iCD" = ( /obj/structure/frame/machine, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"iDc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/item/electronics/apc{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/structure/sign/warning/explosives{ + pixel_y = -32 + }, +/turf/open/floor/iron/sepia, +/area/quartermaster/warehouse) "iDI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/plating/asteroid/basalt/planetary, -/area/science/misc_lab) +/area/asteroid/paradise) "iEa" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -17949,9 +17691,7 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "iEP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -17980,20 +17720,18 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/crew_quarters/heads/hor) -"iFx" = ( -/obj/machinery/computer/cloning, -/obj/effect/turf_decal/bot, -/obj/machinery/light{ - dir = 1 +"iFN" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/structure/railing{ + dir = 4 }, -/turf/open/floor/iron, -/area/medical/genetics/cloning) +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) "iGq" = ( /turf/closed/wall/rust, /area/quartermaster/warehouse) @@ -18006,15 +17744,13 @@ dir = 4 }, /area/bridge) -"iGw" = ( -/obj/effect/turf_decal/stripes/line{ +"iGt" = ( +/obj/structure/fence/corner{ dir = 1 }, -/obj/structure/chair/fancy/plastic{ - dir = 8 - }, -/turf/open/floor/iron, -/area/maintenance/department/chapel) +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "iGU" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -18035,6 +17771,40 @@ dir = 8 }, /area/science/lab) +"iHo" = ( +/obj/machinery/power/solar{ + id = "portsolar"; + name = "Port Solar Array" + }, +/obj/structure/cable, +/turf/open/floor/iron/solarpanel, +/area/asteroid/paradise/surface) +"iId" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Brig"; + req_access_txt = "63" + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigfrontdoor"; + name = "Front Security Blast Door" + }, +/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ + alpha = 180; + color = "#DE3A3A" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/brig) "iIl" = ( /obj/machinery/vending/hydroseeds, /obj/effect/turf_decal/stripes/line, @@ -18052,24 +17822,11 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "iIO" = ( /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) -"iIS" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "iIV" = ( /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; @@ -18154,9 +17911,6 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) "iKC" = ( @@ -18172,20 +17926,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"iKU" = ( -/obj/machinery/door/airlock/medical{ - name = "Surgery Theatre"; - req_access_txt = "45" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/medical/surgery) "iKX" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -18213,9 +17953,7 @@ "iKY" = ( /obj/machinery/status_display/evac, /turf/closed/wall, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "iLy" = ( /obj/effect/turf_decal/siding/white{ alpha = 100; @@ -18231,6 +17969,10 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, /area/science/research) +"iMz" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "iMI" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 @@ -18242,22 +17984,17 @@ }, /turf/open/floor/carpet/orange, /area/quartermaster/qm) +"iMK" = ( +/obj/machinery/door/poddoor/incinerator_toxmix{ + id = "EmergancyescapeShutter"; + name = "Emergancy Escape Shutters" + }, +/turf/open/floor/plating, +/area/science/mixing/chamber) "iNk" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, /area/science/mixing) -"iNo" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow, -/obj/machinery/door/poddoor/preopen{ - id = "Engidesk"; - name = "engineering security door" - }, -/turf/open/floor/plating, -/area/storage/tech) "iNC" = ( /obj/machinery/door/airlock{ name = "Custodial Closet"; @@ -18295,24 +18032,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"iOD" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_blue{ - alpha = 180; - dir = 4 - }, -/turf/open/floor/iron/dark/side, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"iPj" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/tech, -/area/engine/engineering) "iPs" = ( /obj/effect/turf_decal/siding/dark, /obj/effect/turf_decal/siding/dark{ @@ -18322,9 +18041,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "iPK" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/decal/cleanable/dirt, @@ -18336,9 +18053,7 @@ pixel_y = 10 }, /turf/closed/wall, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "iQa" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -18361,18 +18076,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/evac, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"iQr" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Foyer"; - req_one_access_txt = "32" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/tech, -/area/engine/engineering) +/area/hallway/primary/central) "iRc" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -18396,9 +18100,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "iSr" = ( /obj/machinery/computer/card{ dir = 4; @@ -18424,6 +18126,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"iSJ" = ( +/obj/structure/fence{ + dir = 8 + }, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "iSX" = ( /turf/closed/wall, /area/security/brig) @@ -18440,7 +18148,7 @@ pixel_y = 34 }, /obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk/multiz{ +/obj/structure/disposalpipe/multiz{ dir = 4 }, /obj/item/kirbyplants/random, @@ -18453,19 +18161,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/central) -"iTy" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "iTz" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ @@ -18483,9 +18178,7 @@ "iUt" = ( /obj/structure/railing, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "iUx" = ( /obj/machinery/button/door{ id = "Cabin2"; @@ -18517,16 +18210,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/medical/central) -"iUO" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/iron/dark/corner{ - dir = 8 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "iUP" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -18567,17 +18250,6 @@ dir = 8 }, /area/asteroid/paradise/surface) -"iWs" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/vending/wardrobe/robo_wardrobe, -/obj/machinery/camera/directional/north{ - network = list("ss13","rd") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/science/robotics) "iWK" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -18593,9 +18265,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/techmaint/planetary, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "iXj" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -18625,14 +18295,6 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"iXD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) "iYl" = ( /obj/structure/sink{ dir = 1; @@ -18643,10 +18305,6 @@ }, /turf/open/floor/prison/dark, /area/security/prison/shielded) -"iYn" = ( -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plating, -/area/maintenance/department/medical/central) "iYo" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ alpha = 180 @@ -18655,7 +18313,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/firealarm/directional/west, -/obj/structure/disposalpipe/trunk/multiz{ +/obj/structure/disposalpipe/multiz{ dir = 1 }, /turf/open/floor/iron, @@ -18666,7 +18324,7 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/wood, -/area/vacant_room/office) +/area/library/abandoned) "iYB" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -18675,9 +18333,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "iYE" = ( /obj/effect/turf_decal/bot, /obj/item/reagent_containers/glass/bucket, @@ -18699,19 +18355,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/tech, /area/engine/atmos) -"iZg" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on, -/turf/open/floor/iron, -/area/engine/atmos) "iZu" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -18727,9 +18370,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/techmaint/planetary, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "iZO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/wardrobe/pink, @@ -18753,6 +18394,20 @@ }, /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness/recreation) +"jai" = ( +/obj/structure/table, +/obj/item/seeds/flower/lily{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/seeds/flower/geranium, +/obj/effect/decal/cleanable/dirt, +/obj/item/food/grown/wheat, +/obj/item/food/grown/corn, +/obj/item/food/grown/apple, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "jap" = ( /obj/machinery/light{ dir = 4 @@ -18773,9 +18428,7 @@ dir = 1 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "jaF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -18805,6 +18458,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"jcn" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "jcz" = ( /obj/machinery/light{ dir = 4 @@ -18818,9 +18484,27 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) +"jcQ" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Medbay Maintenance"; + req_access_txt = "5" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "Isolation Shutters" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/maintenance/department/medical/central) "jdh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -18879,6 +18563,24 @@ }, /turf/open/floor/plating, /area/maintenance/department/eva) +"jhz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "Isolation Shutters" + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Medbay Maintenance"; + req_access_txt = "5" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/closeup, +/turf/open/floor/iron/dark, +/area/maintenance/department/medical/central) "jhG" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, /obj/machinery/atmospherics/components/binary/pump{ @@ -18895,21 +18597,10 @@ /turf/open/floor/iron/dark/corner{ dir = 1 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "jij" = ( /turf/open/openspace, /area/security/brig) -"jiz" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/pod/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "jiG" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 6 @@ -18925,6 +18616,18 @@ /obj/effect/landmark/start/chaplain, /turf/open/floor/wood, /area/chapel/main) +"jjw" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/fans/tiny{ + density = 1; + icon = 'icons/effects/effects.dmi'; + icon_state = "m_shield"; + max_integrity = 1e+007 + }, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/quartermaster/storage) "jjW" = ( /turf/open/floor/iron, /area/engine/engineering) @@ -18941,18 +18644,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/server) -"jkt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "jkx" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -18960,43 +18651,18 @@ }, /turf/open/floor/plating, /area/tcommsat/server) -"jkD" = ( -/obj/item/toy/plush/moth/firewatch{ - name = "Zinnia"; - pixel_x = -10 - }, -/obj/item/toy/plush/lizard_plushie{ - name = "Walks-upon-Embers"; - pixel_x = 5 - }, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) -"jkI" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/atmos/glass{ - req_access_txt = "11" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +"jky" = ( +/obj/structure/chair/fancy/bench/corporate/right{ + dir = 1 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 +/obj/effect/turf_decal/siding/yellow{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4; - piping_layer = 1 +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 }, /turf/open/floor/iron/dark, -/area/engine/atmos) +/area/engineering/hallway) "jkK" = ( /obj/machinery/light_switch{ pixel_x = -24; @@ -19042,17 +18708,6 @@ }, /turf/open/floor/iron/dark, /area/science/robotics) -"jlR" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "detectivewindows"; - name = "Detective Privacy Blast door" - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/security/detectives_office) "jlT" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -19090,9 +18745,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "jnJ" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -19113,17 +18766,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"jnM" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "jnO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ dir = 4 @@ -19148,14 +18790,6 @@ }, /turf/open/floor/iron, /area/medical/medbay/central) -"joi" = ( -/obj/effect/turf_decal/siding/dark/end{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "jor" = ( /obj/structure/lattice/catwalk/over, /obj/structure/chair/foldable{ @@ -19163,27 +18797,10 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"joy" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" - }, -/turf/open/floor/plating, -/area/security/brig) "joL" = ( /obj/structure/flora/rock/pile, /turf/closed/mineral/random/air, /area/asteroid/paradise) -"jpr" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "jqb" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -19192,12 +18809,6 @@ /obj/machinery/smartfridge/extract/preloaded, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"jqp" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron, -/area/maintenance/department/crew_quarters/bar) "jqA" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -19224,9 +18835,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) -"jqW" = ( -/turf/closed/wall/mineral/plastitanium, -/area/asteroid/paradise/surface) "jqY" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -1 @@ -19253,21 +18861,6 @@ }, /turf/open/floor/iron/tech, /area/engine/engineering) -"jrl" = ( -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 7; - pixel_y = 6 - }, -/turf/open/floor/iron, -/area/security/brig) "jrq" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 8 @@ -19279,39 +18872,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/storage/primary) -"jrB" = ( -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8; - pixel_x = 4 - }, -/obj/item/storage/firstaid/brute{ - pixel_y = 5 - }, -/obj/structure/closet/boxinggloves, -/turf/open/floor/iron/white, -/area/crew_quarters/fitness/recreation) -"jrE" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_y = 25 - }, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_y = 21 - }, -/obj/effect/turf_decal/siding/wood, -/obj/item/food/spaghetti/beefnoodle{ - pixel_x = -1; - pixel_y = 2 - }, -/obj/effect/turf_decal/siding/white, -/obj/structure/railing{ - layer = 3 - }, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "jrH" = ( /obj/structure/table/wood, /obj/item/staff/broom, @@ -19321,14 +18881,9 @@ /obj/effect/spawner/lootdrop/costume, /turf/open/floor/wood, /area/crew_quarters/cafeteria) -"jrL" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plating, -/area/maintenance/department/medical/central) "jrU" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/iron/grid/steel, /area/hydroponics) "jsb" = ( /obj/machinery/atmospherics/components/trinary/mixer/flipped{ @@ -19385,19 +18940,6 @@ /obj/item/trash/plate, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) -"jso" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/evac{ - dir = 4 - }, -/turf/open/floor/iron, -/area/maintenance/department/science/xenobiology) "jsp" = ( /turf/closed/indestructible/rock/bedrock, /area/asteroid/paradise) @@ -19407,6 +18949,11 @@ }, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) +"jss" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/glowstick/lit, +/turf/open/floor/plating, +/area/maintenance/department/chapel) "jst" = ( /obj/structure/chair, /obj/effect/turf_decal/siding/wood{ @@ -19421,6 +18968,10 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"jtl" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "jtr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -19455,6 +19006,11 @@ }, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"jtW" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/spawner/lootdrop/grille_or_trash, +/turf/open/floor/plating, +/area/maintenance/department/medical/central) "jue" = ( /obj/machinery/door/airlock/engineering{ name = "Engineering Foyer"; @@ -19464,10 +19020,11 @@ dir = 1 }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "juz" = ( /obj/structure/bed{ dir = 8 @@ -19485,40 +19042,50 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) -"jwG" = ( -/obj/structure/railing/corner{ - dir = 1 +"jvX" = ( +/obj/item/radio/intercom{ + pixel_x = 33; + pixel_y = -3 }, -/turf/open/openspace, -/area/medical/medbay/central) -"jwL" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - id = "qm_warehouse"; - name = "warehouse shutters" +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) +"jwN" = ( +/obj/machinery/door/airlock/command{ + name = "Head of Personnel's Office"; + req_access_txt = "57" }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/sepia, -/area/quartermaster/warehouse) -"jwU" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/newscaster{ - pixel_y = 34 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Corporate Meeting Room" +/obj/structure/disposalpipe/segment{ + dir = 1 }, -/obj/structure/chair/fancy/comfy{ - color = "#596479" +/obj/machinery/door/poddoor/preopen{ + id = "bridgedoors"; + name = "Bridge Access Blast Door" }, -/turf/open/floor/carpet/blue, -/area/bridge/meeting_room) +/turf/open/floor/iron/dark, +/area/bridge) "jxa" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -19538,14 +19105,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"jxw" = ( -/obj/effect/turf_decal/siding/white, -/obj/item/kirbyplants/random, -/obj/structure/railing{ - layer = 4 - }, -/turf/open/floor/iron, -/area/science/robotics) "jxW" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -19567,18 +19126,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"jyb" = ( -/obj/machinery/computer/security/wooden_tv{ - desc = "Welcome to KOZU 5... your number one source for weather, news, and entertainment. And now, the weather forecast for tomorrow..."; - layer = 3; - name = "Budget TV"; - network = list("public"); - pixel_x = 2; - pixel_y = 8 - }, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/asteroid/paradise/surface) "jyd" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -19628,9 +19175,7 @@ /obj/structure/railing, /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark/side, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "jzm" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /obj/structure/railing{ @@ -19664,7 +19209,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/wood/broken, -/area/vacant_room/office) +/area/library/abandoned) "jzW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -19677,7 +19222,7 @@ /turf/open/floor/iron/white/side{ dir = 1 }, -/area/science/misc_lab) +/area/asteroid/paradise) "jAg" = ( /obj/item/flashlight/lantern{ pixel_x = -6; @@ -19706,13 +19251,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"jAB" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/iron, -/area/maintenance/department/chapel) "jAN" = ( /obj/machinery/conveyor{ id = "QMLoad2" @@ -19725,6 +19263,15 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) +"jAX" = ( +/obj/structure/fans/tiny{ + density = 1; + icon = 'icons/effects/effects.dmi'; + icon_state = "m_shield"; + max_integrity = 1e+007 + }, +/turf/open/floor/plating/asteroid/planetary, +/area/quartermaster/storage) "jBj" = ( /obj/machinery/power/smes{ charge = 2e+007 @@ -19753,34 +19300,6 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/rust, /area/science/test_area) -"jDe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/rack, -/obj/item/electronics/apc{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/structure/sign/warning/explosives{ - pixel_y = -32 - }, -/turf/open/floor/iron/sepia, -/area/quartermaster/warehouse) -"jDq" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/department/chapel) -"jDz" = ( -/obj/item/seeds/tower, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, -/obj/effect/turf_decal/delivery, -/obj/machinery/hydroponics, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "jDC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -19816,14 +19335,6 @@ }, /turf/open/floor/wood, /area/chapel/main) -"jEa" = ( -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "jEr" = ( /obj/machinery/light{ dir = 4 @@ -19851,7 +19362,7 @@ dir = 1 }, /obj/item/kirbyplants/random, -/obj/structure/disposalpipe/trunk/multiz/down{ +/obj/structure/disposalpipe/multiz/down{ dir = 4 }, /turf/open/floor/iron, @@ -19862,6 +19373,20 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) +"jER" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/hallway/primary/central) "jES" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -19878,9 +19403,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "jEW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/landmark/start/assistant, @@ -19903,6 +19426,19 @@ /obj/structure/window/reinforced, /turf/open/floor/iron/dark, /area/security/warden) +"jFA" = ( +/obj/machinery/computer/prisoner/management, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/keycard_auth{ + pixel_x = -32 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/hos) "jFB" = ( /obj/machinery/light/floor, /turf/open/floor/iron/sepia, @@ -19915,6 +19451,40 @@ /obj/structure/closet/secure_closet/engineering_personal, /turf/open/floor/iron, /area/engine/engineering) +"jFT" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/northright{ + dir = 2; + name = "Chemistry Desk"; + req_one_access_txt = "5;33" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chemistry_shutters"; + name = "chemistry Shutters" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/obj/item/paper_bin{ + pixel_x = 7; + pixel_y = 2 + }, +/obj/item/folder/white{ + pixel_x = 7; + pixel_y = 2 + }, +/obj/item/folder/white{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/pen{ + pixel_x = 6; + pixel_y = 3 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "jFW" = ( /obj/effect/mapping_helpers/dead_body_placer, /turf/open/floor/plating/dirt/planetary, @@ -19943,20 +19513,6 @@ /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/iron/dark, /area/storage/primary) -"jGg" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" - }, -/turf/open/floor/plating, -/area/security/brig) "jGk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -20018,6 +19574,11 @@ }, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"jGO" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "jGY" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -20035,6 +19596,18 @@ /obj/effect/landmark/start/botanist, /turf/open/floor/iron, /area/hydroponics) +"jHa" = ( +/obj/structure/chair/fancy/bench/corporate/left{ + dir = 1 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway) "jHd" = ( /obj/structure/railing, /turf/open/openspace, @@ -20044,9 +19617,7 @@ dir = 5 }, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "jHA" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -20060,49 +19631,20 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/central) -"jHF" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/musician/piano{ - icon_state = "piano" - }, -/obj/machinery/light{ - dir = 1; - light_color = "#7AC3FF" - }, -/obj/machinery/camera/directional/north{ - c_tag = "Captain's Quarters"; - network = list("ss13","public") - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/barsign{ - pixel_x = 1; - pixel_y = 33 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/cafeteria) -"jIs" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ +"jIb" = ( +/obj/effect/turf_decal/siding/blue{ dir = 1 }, -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/pump, -/turf/open/floor/iron/tech, -/area/engine/engineering) -"jIW" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "1-8" +/turf/open/floor/glass/reinforced, +/area/medical/medbay/central) +"jJF" = ( +/obj/machinery/light_switch{ + pixel_x = 24; + pixel_y = 24 }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron/white, +/area/medical/apothecary) "jJH" = ( /obj/structure/chair/stool/directional/west, /obj/effect/landmark/start/assistant, @@ -20125,35 +19667,16 @@ /obj/machinery/space_heater, /turf/open/floor/iron/dark, /area/engine/atmos) -"jKl" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/dark/corner{ - dir = 4 - }, -/obj/machinery/light/small, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "jKp" = ( /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "jKs" = ( /obj/structure/railing/corner{ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "jKK" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 @@ -20167,6 +19690,25 @@ "jKL" = ( /turf/closed/wall/r_wall, /area/science/research) +"jKY" = ( +/obj/item/seeds/flower/harebell, +/obj/machinery/light/small, +/obj/effect/turf_decal/delivery, +/obj/machinery/hydroponics, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) +"jLd" = ( +/obj/structure/chair/fancy/sofa/old/right{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/railing, +/obj/effect/turf_decal/siding/white, +/obj/effect/landmark/start/assistant, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "jLe" = ( /obj/effect/turf_decal/bot, /obj/structure/bodycontainer/morgue{ @@ -20184,9 +19726,22 @@ dir = 6 }, /turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"jLj" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) +"jLo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/sand/plating, +/obj/structure/grille, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/asteroid/paradise) "jLp" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -20204,36 +19759,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"jLG" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 1 - }, -/obj/structure/table, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -2; - pixel_y = 12 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 9 - }, -/obj/item/storage/pill_bottle/mannitol{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/wrench/medical{ - pixel_x = 5; - pixel_y = 6 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) "jLI" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -20269,24 +19794,10 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"jMw" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/wood, -/area/chapel/office) +"jMd" = ( +/obj/structure/flora/rock, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise) "jMz" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -20295,10 +19806,6 @@ "jME" = ( /turf/closed/wall, /area/medical/apothecary) -"jMW" = ( -/obj/structure/sign/departments/medbay/alt, -/turf/closed/wall/r_wall, -/area/medical/medbay/central) "jNd" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light{ @@ -20343,6 +19850,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/security/execution/education) +"jOE" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "jOI" = ( /obj/effect/turf_decal/bot, /obj/structure/table, @@ -20363,9 +19879,6 @@ pixel_x = -2; pixel_y = 3 }, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -20439,11 +19952,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) -"jRA" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "jRB" = ( /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/planetary, @@ -20475,12 +19983,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"jSR" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/department/chapel) "jTj" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -20515,18 +20017,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/grid/steel, /area/science/mixing) -"jTE" = ( -/obj/effect/turf_decal/box, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/plating, -/area/engine/engineering) "jUk" = ( /obj/effect/landmark/start/assistant, /obj/structure/cable/yellow{ @@ -20535,9 +20030,7 @@ /obj/effect/turf_decal/trimline/yellow, /obj/structure/lattice/catwalk/over, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "jUp" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/bot{ @@ -20559,29 +20052,6 @@ "jUw" = ( /turf/open/floor/plating/asteroid/basalt/planetary, /area/quartermaster/storage) -"jUL" = ( -/obj/item/radio/intercom{ - pixel_x = 33; - pixel_y = -3 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "jUM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -20623,23 +20093,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/trunk/multiz/down{ - dir = 8 +/obj/structure/disposalpipe/multiz/down{ + dir = 4 }, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) -"jVJ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/evac, -/turf/open/floor/iron/dark/side{ - dir = 6 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "jVL" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 @@ -20682,10 +20140,22 @@ pixel_x = 32; pixel_y = -2 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) +"jWv" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/white, +/area/science/explab) "jWU" = ( /obj/effect/turf_decal/tile/blue/half{ dir = 1 @@ -20761,6 +20231,20 @@ }, /turf/open/floor/iron, /area/hydroponics) +"jYk" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/hallway/primary/central) "jYA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -20800,20 +20284,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) -"jZf" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/turf_decal/bot, -/obj/structure/sign/departments/minsky/supply/hydroponics{ - pixel_x = 32 - }, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) +/area/engineering/hallway) "jZh" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -20852,6 +20323,27 @@ "jZu" = ( /turf/closed/mineral/random/air, /area/science/mixing) +"jZv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/closet/secure_closet/medical3, +/obj/effect/spawner/lootdrop/techstorage/medical, +/obj/item/folder/white{ + pixel_x = -1; + pixel_y = -4 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","medbay","public") + }, +/turf/open/floor/iron, +/area/medical/storage) "jZG" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 @@ -20874,6 +20366,13 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) +"kad" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "kao" = ( /obj/structure/chair/office/light{ dir = 1 @@ -20887,66 +20386,10 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/iron/dark, /area/engine/engineering) -"kax" = ( -/obj/structure/chair/fancy/sofa/old/left{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/effect/turf_decal/siding/white, -/obj/structure/railing{ - layer = 3 - }, -/obj/item/radio/intercom{ - dir = 1; - pixel_x = 29; - pixel_y = -3 - }, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) -"kaW" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "kbq" = ( /obj/structure/sign/warning/radiation/rad_area, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) -"kbW" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/poddoor/preopen{ - id = "bridgedoors"; - name = "Bridge Access Blast door" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/bridge/meeting_room) "kct" = ( /obj/structure/railing{ dir = 4 @@ -20995,6 +20438,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron, /area/maintenance/department/engine) "kdn" = ( @@ -21004,16 +20450,34 @@ }, /turf/open/floor/prison/dark, /area/security/prison) -"kdJ" = ( -/obj/effect/turf_decal/stripes/line{ +"kdV" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/obj/structure/closet/secure_closet/atmospherics{ + anchored = 1; + req_access = null; + req_one_access_txt = "11" + }, +/obj/item/radio/intercom{ + pixel_x = -1; + pixel_y = 29 + }, +/turf/open/floor/iron, +/area/engine/atmos) +"ked" = ( +/obj/structure/railing, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ dir = 1 }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) -"kdO" = ( -/obj/structure/sink/puddle, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/hallway/primary/central) "kef" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -21045,29 +20509,6 @@ "kfl" = ( /turf/closed/wall/r_wall, /area/bridge/meeting_room) -"kfK" = ( -/obj/structure/table, -/obj/item/geiger_counter{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/toy/plush/plushvar{ - pixel_x = -2; - pixel_y = 9 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/yellow/corner{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "kgl" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -21082,6 +20523,13 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) +"kgo" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/maintenance/department/science/xenobiology) "kgt" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/fence/cut{ @@ -21132,10 +20580,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) -"khr" = ( -/obj/item/sbeacondrop/exploration, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "khs" = ( /turf/closed/wall/rust, /area/science/lab) @@ -21152,6 +20596,24 @@ dir = 6 }, /area/asteroid/paradise/surface/water) +"kjt" = ( +/obj/structure/musician/piano{ + icon_state = "piano" + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "kjC" = ( /obj/effect/turf_decal/stripes/end{ dir = 8 @@ -21162,6 +20624,13 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"kjU" = ( +/obj/item/seeds/flower/poppy, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/hydroponics, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "kkA" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, @@ -21169,17 +20638,23 @@ "kkD" = ( /turf/closed/mineral/bscrystal, /area/asteroid/paradise) -"kkJ" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "kkN" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, /turf/open/floor/plating, /area/ai_monitored/security/armory) +"kkW" = ( +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/structure/cable/yellow, +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "klh" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/effect/decal/cleanable/dirt, @@ -21287,35 +20762,12 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) -"kne" = ( -/obj/structure/fans/tiny{ - density = 1; - icon = 'icons/effects/effects.dmi'; - icon_state = "m_shield"; - layer = 5; - max_integrity = 1e+007 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/quartermaster/storage) -"knl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "knv" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "knJ" = ( /obj/structure/chair/fancy/bench/pew/right{ dir = 1 @@ -21323,6 +20775,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/carpet/green, /area/chapel/main) "knM" = ( @@ -21330,6 +20785,14 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/eva) +"koe" = ( +/obj/effect/turf_decal/siding/dark, +/obj/structure/railing, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "koj" = ( /obj/structure/railing/corner{ dir = 4 @@ -21342,9 +20805,7 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "koJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -21434,6 +20895,18 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) +"kqF" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "kqG" = ( /obj/machinery/atmospherics/miner/station/nitrogen, /obj/machinery/atmospherics/pipe/simple/green/hidden/layer4, @@ -21487,14 +20960,15 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"krW" = ( -/obj/structure/railing{ - dir = 8 +"ksb" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "ksj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -21551,9 +21025,7 @@ /area/storage/tech) "ktI" = ( /turf/closed/wall, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "ktL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -21561,13 +21033,6 @@ }, /turf/open/floor/plating, /area/security/warden) -"ktV" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/flora/rock/pile, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "ktY" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, @@ -21578,14 +21043,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/quartermaster/sorting) -"kuu" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "kuD" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Telecommunications"; @@ -21626,9 +21083,7 @@ dir = 4 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "kvM" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/bot, @@ -21655,19 +21110,11 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "kwk" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/royalblack, -/area/vacant_room/office) -"kwz" = ( -/obj/machinery/firealarm/directional/south, -/obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/tech, -/area/engine/engineering) +/area/library/abandoned) "kwK" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -21719,7 +21166,7 @@ "kxe" = ( /obj/effect/landmark/start/librarian, /turf/open/floor/plating, -/area/vacant_room/office) +/area/library/abandoned) "kxf" = ( /turf/closed/wall, /area/medical/genetics/cloning) @@ -21754,17 +21201,6 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"kxR" = ( -/obj/structure/table, -/obj/item/stack/package_wrap, -/obj/effect/decal/cleanable/dirt, -/obj/item/hand_labeler, -/obj/item/food/grown/tea, -/obj/item/food/grown/grapes, -/obj/item/food/grown/cherries, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "kxS" = ( /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface/grass) @@ -21775,10 +21211,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/security/brig) -"kyp" = ( -/obj/effect/landmark/loneops, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface/grass) "kyr" = ( /obj/machinery/door/window/brigdoor/northright{ id = "Cell 1"; @@ -21819,40 +21251,15 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) -"kzr" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/junction/flip, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 6; - piping_layer = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) +"kzn" = ( +/turf/closed/wall/r_wall, +/area/quartermaster/storage) "kzA" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"kzK" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "kzL" = ( /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, @@ -21861,27 +21268,12 @@ /obj/structure/chair/stool/bar/directional/west, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/cafeteria) -"kAk" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/iron, -/area/maintenance/department/crew_quarters/bar) "kAn" = ( /obj/structure/chair/stool/bar/directional/west, /obj/structure/railing, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "kAp" = ( /turf/open/floor/plating/airless, /area/maintenance/disposal) @@ -21895,45 +21287,29 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 +/obj/structure/disposalpipe/sorting/mail/destination/xenobiology{ + dir = 4 }, /turf/open/floor/iron/white, /area/science/research) -"kAQ" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/camera/directional/north, -/obj/machinery/vending/games{ - pixel_y = -1 - }, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) -"kAS" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell{ - piping_layer = 2 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) "kAX" = ( /obj/structure/sign/directions/evac{ dir = 4 }, /turf/closed/wall/mineral/titanium/survival, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "kBd" = ( /obj/structure/railing{ dir = 1 }, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) +"kBk" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/maintenance/department/engine) "kBm" = ( /obj/machinery/computer/aifixer{ dir = 8 @@ -21957,6 +21333,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) +"kBJ" = ( +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/iron/tech/grid, +/area/ai_monitored/turret_protected/aisat_interior) "kBM" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -21981,9 +21366,7 @@ /turf/open/floor/iron/dark/side{ dir = 1 }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "kCc" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig Control"; @@ -22037,20 +21420,20 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) -"kDx" = ( -/obj/structure/filingcabinet, -/obj/item/folder/documents, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/east{ - pixel_x = 24 +"kDB" = ( +/obj/machinery/door/window/brigdoor/southright{ + dir = 4; + name = "Command Chair"; + req_access_txt = "19" }, /obj/structure/cable/yellow{ - icon_state = "0-8" + icon_state = "4-8" }, -/turf/open/floor/iron/dark, -/area/security/nuke_storage) +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/grid/steel, +/area/bridge) "kDO" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -22061,6 +21444,10 @@ /obj/structure/reagent_dispensers/cooking_oil, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) +"kEj" = ( +/obj/effect/landmark/loneops, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface/grass) "kEO" = ( /obj/structure/sign/warning/securearea{ pixel_y = 32 @@ -22079,23 +21466,22 @@ dir = 8 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "kFj" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/maintenance/department/bridge) -"kFv" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) +"kFU" = ( +/obj/item/kirbyplants/random, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "kGr" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, -/area/science/misc_lab) +/area/asteroid/paradise) "kGw" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/disposal/deliveryChute{ @@ -22107,6 +21493,11 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/sorting) +"kGF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/maintenance/department/engine) "kGH" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -22120,40 +21511,6 @@ }, /turf/open/floor/plating, /area/science/robotics) -"kHe" = ( -/obj/effect/turf_decal/evac{ - dir = 1 - }, -/turf/open/floor/iron, -/area/maintenance/department/engine) -"kHt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 10 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) -"kHD" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/iron, -/area/science/mixing) "kHF" = ( /obj/machinery/portable_atmospherics/canister/plasma, /obj/effect/turf_decal/delivery, @@ -22168,28 +21525,6 @@ }, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) -"kHW" = ( -/obj/machinery/computer/teleporter{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/hand_tele{ - pixel_x = 1; - pixel_y = 7 - }, -/obj/machinery/requests_console{ - department = "EVA"; - pixel_x = 1; - pixel_y = -33 - }, -/obj/machinery/camera/autoname{ - c_tag = "Corporate Meeting Room"; - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/teleporter) "kIo" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/stripes/line{ @@ -22201,23 +21536,6 @@ }, /turf/open/floor/noslip/standard, /area/quartermaster/storage) -"kIV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Gas to Chamber" - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "kJA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -22229,9 +21547,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "kJL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -22293,18 +21609,6 @@ }, /turf/open/floor/iron/white, /area/medical/storage) -"kKL" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/tech, -/area/engine/engineering) "kKY" = ( /obj/item/clothing/shoes/sandal{ pixel_x = -18 @@ -22325,13 +21629,26 @@ dir = 4 }, /turf/open/floor/iron, -/area/science/misc_lab) -"kLl" = ( -/turf/open/floor/mineral/titanium, +/area/asteroid/paradise) +"kLz" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, /area/asteroid/paradise/surface) "kLU" = ( /turf/open/floor/iron, /area/engine/atmos) +"kMD" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","medbay") + }, +/turf/open/floor/iron, +/area/medical/medbay/central) "kMG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -22339,6 +21656,36 @@ }, /turf/open/floor/iron, /area/maintenance/department/eva) +"kMH" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 1 + }, +/obj/structure/table, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = -2; + pixel_y = 12 + }, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 9 + }, +/obj/item/storage/pill_bottle/mannitol{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/wrench/medical{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/central) "kMN" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -22350,24 +21697,25 @@ "kMU" = ( /turf/closed/wall/r_wall/rust, /area/science/mixing) -"kMZ" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"kNb" = ( -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "kNj" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/lab) +"kNp" = ( +/obj/machinery/status_display/evac{ + pixel_x = -33 + }, +/obj/structure/table/wood, +/obj/machinery/recharger{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/storage/fancy/cigarettes/cigars/havana{ + pixel_x = 13; + pixel_y = 9 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "kNq" = ( /obj/effect/decal/cleanable/food/flour, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -22384,6 +21732,9 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) +"kNr" = ( +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore) "kND" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -22399,6 +21750,19 @@ }, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) +"kNT" = ( +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","rd") + }, +/obj/machinery/computer/security/telescreen/toxins{ + pixel_x = 1; + pixel_y = 30 + }, +/obj/machinery/doppler_array/research/science{ + dir = 4 + }, +/turf/open/floor/iron, +/area/science/mixing) "kNX" = ( /obj/structure/railing/corner{ dir = 1 @@ -22419,6 +21783,45 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) +"kOd" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chemistry_shutters"; + name = "chemistry Shutters" + }, +/turf/open/floor/plating, +/area/medical/apothecary) +"kOh" = ( +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/structure/cable/yellow, +/obj/structure/filingcabinet{ + pixel_x = -8 + }, +/obj/structure/filingcabinet/security{ + pixel_x = 8 + }, +/turf/open/floor/wood, +/area/security/detectives_office) +"kOl" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/donkpockets{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = -6; + pixel_y = 9 + }, +/obj/item/food/mint, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Chefwindow"; + name = "Chef Window" + }, +/turf/open/floor/iron/white, +/area/crew_quarters/kitchen) "kOu" = ( /obj/effect/turf_decal/siding/wood, /obj/item/kirbyplants/random, @@ -22426,13 +21829,21 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"kPl" = ( +"kOI" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","cargo") }, -/turf/open/floor/iron, -/area/maintenance/department/crew_quarters/bar) +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/sign/departments/minsky/supply/mining{ + pixel_x = -1; + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/quartermaster/storage) "kPn" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -22445,9 +21856,7 @@ }, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "kPB" = ( /obj/machinery/mineral/stacking_machine{ input_dir = 8; @@ -22458,26 +21867,6 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"kPR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - name = "HOS"; - sortType = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/effect/turf_decal/numbers{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "kPS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -22526,15 +21915,6 @@ "kQw" = ( /turf/closed/wall, /area/maintenance/department/medical/morgue) -"kQJ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "kQZ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -22574,47 +21954,49 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/security/brig) -"kSY" = ( -/obj/structure/table, -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/reagent_containers/glass/bucket, -/obj/effect/turf_decal/bot, +"kSJ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/landmark/start/quartermaster, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/maintenance/department/medical/morgue) +/area/hallway/primary/central) "kTG" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"kTN" = ( -/obj/machinery/door/airlock{ - name = "Service Hall"; - req_one_access_txt = "22;25;26;28;35;37;38;46" +"kTK" = ( +/obj/structure/fence/cut/medium{ + dir = 8 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) +"kTW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/iron, -/area/hallway/secondary/service) -"kUg" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) +"kTX" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 }, -/turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "kUn" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/flora/ausbushes/sparsegrass, @@ -22662,9 +22044,16 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"kVn" = ( +/obj/machinery/power/solar{ + id = "portsolar"; + name = "Port Solar Array" + }, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/cable, +/turf/open/floor/iron/solarpanel, +/area/asteroid/paradise/surface) "kVv" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -22724,52 +22113,17 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) -"kWQ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "kWT" = ( /obj/machinery/hydroponics/soil, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"kXp" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ - dir = 5 - }, -/turf/closed/wall, -/area/engine/supermatter) -"kXu" = ( -/obj/machinery/vending/autodrobe/all_access, -/obj/machinery/airalarm/directional/north, -/obj/machinery/camera/directional/north, -/turf/open/floor/wood, -/area/crew_quarters/theatre/backstage) -"kXP" = ( -/obj/structure/disposalpipe/segment{ - dir = 2 +"kXc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "kXQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -22777,10 +22131,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/trunk/multiz{ +/obj/structure/disposalpipe/multiz{ dir = 2 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -22788,6 +22139,14 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"kXY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "kXZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -22795,6 +22154,14 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) +"kYp" = ( +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/hallway/primary/central) "kYy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -22825,9 +22192,14 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) +"lab" = ( +/obj/structure/fence/corner{ + dir = 5 + }, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "lad" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -22858,17 +22230,8 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"lal" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/catwalk_floor/iron_dark, +"law" = ( +/turf/closed/wall/mineral/plastitanium, /area/asteroid/paradise/surface) "laI" = ( /obj/machinery/conveyor/inverted{ @@ -22892,6 +22255,9 @@ dir = 6 }, /obj/structure/lattice/catwalk/over, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/science/mixing) "laO" = ( @@ -22918,12 +22284,12 @@ /obj/item/kitchen/rollingpin, /turf/open/floor/iron, /area/hallway/secondary/service) -"lbv" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 1 +"lby" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/turf/open/floor/glass/reinforced, -/area/medical/medbay/central) +/turf/open/floor/grass/no_border, +/area/hallway/primary/aft) "lbA" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -22976,6 +22342,19 @@ }, /turf/open/floor/plating, /area/engine/engineering) +"ldz" = ( +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on, +/turf/open/floor/iron, +/area/engine/atmos) "lea" = ( /obj/item/beacon{ pixel_y = 3 @@ -23005,6 +22384,22 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) +"lfc" = ( +/obj/structure/filingcabinet/chestdrawer{ + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + alpha = 180; + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/iron/dark, +/area/security/warden) "lfe" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -23043,90 +22438,31 @@ }, /turf/open/floor/wood/broken, /area/crew_quarters/cafeteria) -"lfV" = ( -/obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) -"lgq" = ( -/obj/effect/turf_decal/stripes/box, -/obj/machinery/mineral/ore_redemption{ - input_dir = 2; - layer = 2.5 - }, -/obj/item/food/donkpocket/pizza{ - pixel_x = 10; - pixel_y = 9 - }, -/obj/item/reagent_containers/food/drinks/coffee{ - pixel_x = 4; - pixel_y = 12 - }, -/turf/open/floor/iron/dark, -/area/quartermaster/storage) "lgt" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/chapel) -"lgQ" = ( -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AI Core shutters"; - name = "AI Core Shutter" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/light_switch{ - pixel_x = 6; - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) -"lgS" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 6 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +"lgM" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "lhc" = ( /obj/structure/railing{ dir = 8 }, /turf/open/openspace, /area/medical/medbay/central) -"lhd" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/camera/directional/north{ - network = list("ss13","cargo") +"lhm" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 }, -/obj/machinery/light{ - dir = 1 +/obj/structure/railing{ + dir = 8 }, -/obj/structure/sign/departments/minsky/supply/mining{ - pixel_x = -1; - pixel_y = 32 +/turf/open/floor/iron/dark/side{ + dir = 10 }, -/turf/open/floor/iron/dark, -/area/quartermaster/storage) +/area/hallway/primary/central) "lhn" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/landmark/start/security_officer, @@ -23139,39 +22475,20 @@ /obj/structure/girder/displaced, /turf/open/floor/plating, /area/engine/atmos) -"lhu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/iron/white, -/area/science/explab) -"lhv" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "lhB" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/railing, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"lhR" = ( -/obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +"lig" = ( +/obj/structure/railing/corner{ dir = 4 }, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) +/obj/effect/turf_decal/siding/dark/corner, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/hallway/primary/central) "lii" = ( /obj/machinery/computer/secure_data{ dir = 8 @@ -23252,10 +22569,23 @@ /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, /area/maintenance/department/bridge) -"ljz" = ( -/obj/effect/landmark/loneops, -/turf/open/floor/plating/beach/sand, -/area/asteroid/paradise/surface/sand) +"ljK" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = 4; + pixel_y = 9 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Chefwindow"; + name = "Chef Window" + }, +/obj/item/toy/figure/chef{ + pixel_x = -4; + pixel_y = -1 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/kitchen) "ljQ" = ( /turf/closed/wall, /area/maintenance/department/eva) @@ -23271,16 +22601,6 @@ }, /turf/open/floor/iron/white, /area/science/robotics) -"lkw" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "llb" = ( /obj/item/paper/fluff/holodeck/disclaimer{ pixel_x = -4; @@ -23291,6 +22611,16 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) +"llk" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "lly" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -23321,22 +22651,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/trunk/multiz/down{ +/obj/structure/disposalpipe/multiz/down{ dir = 4 }, /turf/open/floor/catwalk_floor/iron_dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "lmC" = ( /obj/structure/railing{ dir = 6 }, /obj/structure/lattice, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "lmF" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/spawner/structure/window/depleteduranium, @@ -23388,48 +22714,19 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) -"lnK" = ( -/obj/structure/filingcabinet/chestdrawer{ - pixel_y = 2 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - alpha = 180; - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/iron/dark, -/area/security/warden) +/area/engineering/hallway) "lnM" = ( /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"lnW" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/power/apc/auto_name/directional/east{ - pixel_x = 24 - }, -/obj/structure/cable/yellow, -/turf/open/floor/iron/tech, -/area/science/mixing/chamber) "lnY" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, /turf/open/floor/iron/tech, /area/science/mixing) "lob" = ( @@ -23459,16 +22756,20 @@ /area/engine/atmos) "loD" = ( /turf/closed/wall, -/area/vacant_room/office) +/area/library/abandoned) "loS" = ( /obj/structure/railing{ dir = 4 }, /obj/structure/lattice, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) +"loV" = ( +/obj/structure/fence/corner{ + dir = 1 + }, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "lpc" = ( /obj/structure/railing{ dir = 5 @@ -23483,29 +22784,26 @@ pixel_y = -2 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"lpZ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) -"lqc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/rnd/production/techfab/department/cargo, -/obj/machinery/power/apc/auto_name/directional/east{ - pixel_x = 24 +/area/hallway/primary/central) +"lpq" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 }, +/obj/machinery/light, /obj/structure/cable/yellow{ - icon_state = "0-8" + icon_state = "4-8" }, -/obj/machinery/light{ - dir = 4 +/obj/machinery/ai_slipper{ + uses = 10 }, -/turf/open/floor/iron/dark, -/area/quartermaster/storage) +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/science/research) +"lpZ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise) "lqn" = ( /obj/item/radio/intercom{ dir = 1; @@ -23540,19 +22838,38 @@ }, /turf/open/floor/iron, /area/janitor) +"lrC" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8; + initialize_directions = 8 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) +"lrQ" = ( +/obj/effect/turf_decal/box, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"lrW" = ( +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output/layer2, +/turf/open/floor/engine/n2, +/area/engine/atmos) "lsj" = ( /obj/structure/lattice/catwalk/over, /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) -"lsm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/tree/jungle, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) "lsu" = ( /obj/machinery/computer/bank_machine{ dir = 1 @@ -23582,19 +22899,6 @@ /obj/item/reagent_containers/glass/bucket, /turf/open/floor/prison/dark, /area/security/prison) -"lsV" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "ltd" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -23605,6 +22909,14 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) +"lti" = ( +/obj/structure/table, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/reagent_containers/glass/bucket, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "ltt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -23620,17 +22932,65 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/crew_quarters/heads/hor) +"ltD" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Bridge Access"; + req_access_txt = "19" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/door/poddoor/preopen{ + id = "bridgedoors"; + name = "Bridge Access Blast Door" + }, +/turf/open/floor/iron/dark, +/area/bridge) "ltJ" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/chair/fancy/bench/pew/left, /turf/open/floor/iron, /area/crew_quarters/dorms) +"ltK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/structure/railing, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) "ltQ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) +"luf" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/maintenance/department/crew_quarters/bar) "luk" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/plating/asteroid/planetary, @@ -23643,38 +23003,10 @@ "luF" = ( /turf/open/floor/iron, /area/maintenance/department/medical/morgue) -"lvc" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/item/wrench, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/tech, -/area/engine/engineering) "lvj" = ( /obj/structure/bookcase/random/adult, /turf/open/floor/plating, -/area/vacant_room/office) -"lvL" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/machinery/door/window/northleft{ - dir = 8; - name = "Kitchen Delivery"; - req_one_access_txt = "28;25;35" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +/area/library/abandoned) "lvV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -23687,12 +23019,36 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) -"lwo" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" +"lwi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/plating/asteroid/planetary, +/obj/item/clothing/under/rank/cargo/exploration{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/radio/headset/headset_exploration{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/effect/decal/cleanable/blood/gibs/torso, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) +"lwz" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/warning/pods{ + pixel_x = 1; + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/department/science/xenobiology) "lwX" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /obj/machinery/door/airlock/medical/glass{ @@ -23711,21 +23067,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hydroponics) -"lxl" = ( -/obj/machinery/nanite_program_hub, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science RC"; - pixel_y = 30; - receive_ore_updates = 1 - }, -/obj/machinery/camera/directional/north{ - network = list("ss13","rd") - }, -/turf/open/floor/iron, -/area/science/research) "lxo" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/two, @@ -23737,6 +23078,9 @@ dir = 4 }, /obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/quartermaster/storage) "lxu" = ( @@ -23755,9 +23099,7 @@ pixel_y = 5 }, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "lxZ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -23771,15 +23113,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) -"lyd" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "lys" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, @@ -23825,41 +23158,16 @@ /obj/machinery/space_heater, /turf/open/floor/iron, /area/maintenance/department/engine) -"lyZ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) -"lzi" = ( -/obj/machinery/door/poddoor/shutters{ - id = "exploration" - }, -/obj/machinery/button/door{ - desc = "A remote control switch."; - id = "exploration"; - name = "Exploration Shuttle Shutters"; - pixel_y = 24 - }, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) -"lzp" = ( -/obj/structure/railing{ +"lzc" = ( +/obj/machinery/computer/security/mining, +/obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, -/obj/structure/closet/emcloset, -/obj/structure/sign/map/echo{ - pixel_y = 32 +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/turf/open/floor/iron, +/area/bridge) "lAn" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/girder, @@ -23871,9 +23179,7 @@ pixel_y = -2 }, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "lAt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -23895,51 +23201,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) -"lAM" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Gas to Filter" - }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "lAN" = ( /turf/closed/wall/mineral/wood, /area/asteroid/paradise/surface) -"lAS" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron/tech, -/area/science/mixing) -"lBD" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/maintenance/department/engine/atmos) "lBL" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating, -/area/vacant_room/office) +/area/library/abandoned) "lBS" = ( /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/iron, @@ -23959,9 +23227,29 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/department/bridge) -"lCB" = ( -/turf/closed/wall/r_wall/rust, -/area/asteroid/paradise) +"lCH" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plating, +/area/maintenance/department/medical/central) +"lCI" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/east{ + c_tag = "Interrogation room"; + name = "Interrogation room"; + network = list("interrogation") + }, +/obj/machinery/light_switch{ + pixel_x = 21; + pixel_y = 22 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/brig) "lCL" = ( /obj/structure/railing, /obj/effect/turf_decal/tile/blue/half{ @@ -23976,8 +23264,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/sorting/mail/destination/genetics{ + dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -24014,30 +23302,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"lDt" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" - }, -/turf/open/floor/plating, -/area/security/brig) -"lDA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 9 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) -"lDM" = ( -/obj/structure/fence/corner{ - dir = 1 - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "lDU" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 4 @@ -24050,16 +23314,13 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"lEc" = ( -/obj/structure/fence{ - dir = 8 - }, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "lEg" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat/foyer) "lEj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/science/mixing) "lEl" = ( @@ -24071,9 +23332,25 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) +"lEo" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) +"lEp" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/turf/open/floor/plating, +/area/maintenance/department/medical/morgue) "lEt" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 @@ -24115,6 +23392,30 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/quartermaster/sorting) +"lFh" = ( +/obj/structure/closet/crate/science, +/obj/item/circuitboard/computer/shuttle/exploration_shuttle, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/circuitboard/machine/shuttle/heater, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) +"lFj" = ( +/obj/structure/closet/l3closet/virology, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/storage/box/beakers{ + pixel_x = 4; + pixel_y = 14 + }, +/obj/item/storage/bag/bio, +/obj/item/slime_scanner, +/obj/item/storage/box/syringes, +/turf/open/floor/iron/grid/steel, +/area/science/xenobiology) "lFC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/line{ @@ -24135,9 +23436,8 @@ /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "lFQ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ - dir = 4; - piping_layer = 4 +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste/layer4{ + dir = 4 }, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) @@ -24146,6 +23446,16 @@ /obj/machinery/space_heater, /turf/open/floor/iron, /area/maintenance/department/medical/morgue) +"lGn" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "lGq" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -24162,16 +23472,18 @@ pixel_y = 8 }, /turf/open/floor/wood, -/area/vacant_room/office) +/area/library/abandoned) "lGG" = ( /turf/open/floor/prison, /area/security/prison) -"lHB" = ( +"lHk" = ( +/obj/effect/turf_decal/sand/plating, +/obj/item/chair/plastic, /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 4 }, -/turf/open/floor/iron, -/area/maintenance/department/chapel) +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "lHU" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ @@ -24203,11 +23515,39 @@ /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) +"lID" = ( +/obj/structure/fence, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) +"lIF" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "lII" = ( /obj/structure/closet/cardboard, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) +"lIK" = ( +/obj/machinery/door/poddoor/preopen{ + id = "testlab"; + name = "test Chamber Blast Door" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/turf/open/floor/engine, +/area/science/explab) "lIL" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -24235,24 +23575,24 @@ /obj/item/wrench, /obj/item/circuitboard/machine/paystand, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "lJP" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/engine/atmos) -"lKm" = ( -/obj/structure/disposalpipe/junction, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "2-8" +"lJZ" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/effect/turf_decal/stripes/line, +/obj/machinery/microwave{ + pixel_x = -2; + pixel_y = 5 }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/prison/dark, +/area/security/prison) "lKR" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/line{ @@ -24293,6 +23633,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/brig) "lMj" = ( @@ -24301,13 +23642,33 @@ }, /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface/grass) -"lNu" = ( -/turf/closed/wall/r_wall, -/area/medical/medbay/central) +"lMI" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/maintenance/department/engine) "lOf" = ( /obj/structure/sign/departments/minsky/security/command, /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) +"lOl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/turf/open/floor/plating, +/area/quartermaster/warehouse) "lOq" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -24383,26 +23744,23 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"lPj" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/warning/pods{ - pixel_x = 1; - pixel_y = 32 - }, -/turf/open/floor/plating, -/area/maintenance/department/science/xenobiology) "lPu" = ( /obj/structure/railing{ dir = 4 }, /turf/open/openspace, /area/asteroid/paradise) +"lPI" = ( +/obj/effect/turf_decal/siding/dark/corner, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/corner, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway) "lPQ" = ( /obj/machinery/teleport/hub, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -24439,24 +23797,6 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) -"lQd" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/bot, -/obj/machinery/camera/autoname/directional/west, -/obj/structure/sign/warning/nosmoking/circle{ - pixel_x = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "lQi" = ( /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) @@ -24470,19 +23810,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"lQr" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/numbers/two_nine, -/turf/open/floor/iron, -/area/maintenance/department/science/xenobiology) "lQx" = ( /obj/machinery/computer/atmos_alert{ dir = 1 @@ -24526,15 +23853,6 @@ /obj/effect/landmark/start/captain, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain/private) -"lRf" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 1 - }, -/obj/structure/window/reinforced/survival_pod{ - dir = 1 - }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "lRg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, @@ -24584,26 +23902,15 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"lSA" = ( -/obj/structure/railing{ - layer = 3 - }, -/obj/structure/closet/bombcloset, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/science/mixing) -"lTh" = ( -/obj/effect/turf_decal/siding/dark, -/obj/effect/turf_decal/siding/dark{ - dir = 1 +"lTj" = ( +/obj/structure/rack, +/obj/item/stack/cable_coil/white, +/obj/item/circuitboard/machine/rtg/advanced{ + pixel_x = -1; + pixel_y = -3 }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "lTB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/fancy/comfy{ @@ -24614,7 +23921,7 @@ dir = 8 }, /turf/open/floor/carpet/purple, -/area/vacant_room/office) +/area/library/abandoned) "lTW" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -24699,6 +24006,30 @@ /obj/structure/railing/corner, /turf/open/openspace, /area/medical/medbay/central) +"lVH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "lVP" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -24744,20 +24075,11 @@ dir = 8 }, /area/asteroid/paradise/surface) -"lWF" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "lWH" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/iron, /area/maintenance/department/bridge) -"lWK" = ( -/obj/structure/fence, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "lWU" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /obj/effect/decal/cleanable/food/tomato_smudge, @@ -24775,14 +24097,23 @@ }, /turf/open/floor/iron, /area/hydroponics) -"lXf" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" +"lXC" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) +"lXD" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 6 }, -/turf/open/floor/plating, -/area/security/brig) +/obj/effect/turf_decal/siding/dark/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark/corner{ + dir = 1 + }, +/obj/machinery/light/small, +/turf/open/floor/iron/dark, +/area/engineering/hallway) "lXL" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/black/opposingcorners{ @@ -24792,39 +24123,38 @@ /obj/structure/displaycase/labcage, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) -"lYg" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +"lXT" = ( +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 }, -/obj/structure/railing/corner{ - dir = 8 +/obj/structure/extinguisher_cabinet{ + pixel_x = -27 }, +/obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "0-4" }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/machinery/rnd/production/protolathe/department/science, +/turf/open/floor/iron, +/area/science/lab) +"lYh" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 }, /obj/structure/cable/yellow{ - icon_state = "2-16" + icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/yellow, -/obj/effect/landmark/start/station_engineer, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4; - piping_layer = 1 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) +/turf/open/floor/iron, +/area/engine/engineering) "lYF" = ( /obj/machinery/power/terminal{ dir = 1 @@ -24843,6 +24173,25 @@ }, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) +"lYL" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/showroomfloor, +/area/crew_quarters/fitness/recreation) +"lZb" = ( +/obj/structure/railing{ + dir = 6 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "lZd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24850,17 +24199,17 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/bridge) +"lZj" = ( +/obj/structure/sign/departments/minsky/supply/hydroponics{ + pixel_x = -33 + }, +/obj/effect/turf_decal/tile/dark_green, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "lZV" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"mab" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/flora/rock/pile, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "man" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -24874,6 +24223,18 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) +"maC" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" + }, +/turf/open/floor/plating, +/area/security/warden) "maU" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -24954,6 +24315,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/white, /area/medical/genetics/cloning) "mdk" = ( @@ -25018,19 +24382,22 @@ "mev" = ( /turf/closed/wall/r_wall, /area/quartermaster/qm) -"mfh" = ( -/obj/effect/turf_decal/siding/dark/corner, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 +"meI" = ( +/obj/effect/turf_decal/box/white, +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/corner, -/obj/effect/turf_decal/siding/yellow/corner{ - dir = 8 +/turf/open/floor/circuit/telecomms/server, +/area/science/server) +"mfJ" = ( +/obj/effect/turf_decal/box, +/obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron, +/area/hallway/primary/fore) "mgk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -25045,23 +24412,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/bridge) -"mgu" = ( -/obj/effect/landmark/loneops, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface/grass) "mgK" = ( /obj/structure/railing, /turf/open/openspace, /area/quartermaster/qm) -"mgL" = ( -/obj/machinery/camera/directional/north{ - network = list("ss13","engine") - }, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ - piping_layer = 2 - }, -/turf/open/floor/engine/n2, -/area/engine/atmos) "mgX" = ( /obj/machinery/cryopod{ dir = 4 @@ -25107,6 +24461,22 @@ /obj/effect/turf_decal/numbers/two_nine, /turf/open/floor/iron, /area/maintenance/department/cargo) +"mhD" = ( +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface/sand) +"mhE" = ( +/obj/structure/window/plasma/reinforced{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/rad_collector/anchored, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "mhI" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -25120,6 +24490,11 @@ }, /turf/open/floor/iron, /area/science/research) +"mic" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/aft) "mik" = ( /obj/structure/cable{ icon_state = "4-8" @@ -25147,6 +24522,11 @@ /obj/item/paicard, /turf/open/floor/iron/dark, /area/maintenance/department/crew_quarters/dorms) +"miE" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/security/warden) "mjt" = ( /obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -25159,6 +24539,36 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"mjX" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/reagent_containers/glass/beaker{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/reagent_containers/dropper{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = 9; + pixel_y = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/item/clothing/glasses/science{ + pixel_x = -4 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/science/lab) "mjZ" = ( /obj/machinery/flasher{ id = "AI"; @@ -25226,10 +24636,11 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "mll" = ( /turf/open/openspace, /area/maintenance/department/crew_quarters/bar) @@ -25237,6 +24648,44 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall/r_wall, /area/security/brig) +"mlY" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/pipe_dispenser{ + pixel_x = 1; + pixel_y = 12 + }, +/obj/item/pipe_dispenser{ + pixel_y = 7 + }, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/glasses/meson{ + pixel_y = 1 + }, +/obj/item/clothing/glasses/meson{ + pixel_x = 2 + }, +/obj/item/card/id/job/atmospheric_technician{ + access = list(11); + pixel_y = -5 + }, +/obj/item/clothing/glasses/meson/engine{ + pixel_y = -6 + }, +/obj/item/clothing/head/beret/atmos{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "mma" = ( /obj/item/toy/beach_ball/holoball, /obj/effect/turf_decal/bot, @@ -25287,20 +24736,19 @@ /obj/effect/spawner/lootdrop/maintenance/five, /turf/open/openspace, /area/maintenance/department/engine/atmos) +"mny" = ( +/obj/machinery/seed_extractor, +/obj/machinery/status_display/evac{ + pixel_y = -32 + }, +/obj/item/reagent_containers/glass/bucket, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "mnV" = ( /obj/effect/decal/cleanable/robot_debris, /turf/open/floor/plating/airless, /area/science/mixing) -"moh" = ( -/obj/machinery/firealarm/directional/east, -/obj/effect/spawner/lootdrop/grille_or_trash, -/turf/open/floor/plating, -/area/maintenance/department/medical/central) -"mon" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "moy" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 @@ -25308,22 +24756,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, /turf/open/floor/carpet/orange, /area/quartermaster/qm) "moz" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) -"moC" = ( -/obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/trimline/yellow/warning, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "moQ" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -25356,41 +24798,42 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"mpq" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +/area/hallway/primary/fore) +"mpI" = ( +/obj/structure/sign/departments/restroom, +/turf/closed/wall/mineral/titanium/survival/nodiagonal, +/area/hallway/primary/fore) +"mpS" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 }, -/obj/machinery/computer/operating{ - dir = 1 +/obj/structure/chair/fancy/bench, +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/item/radio/intercom{ - pixel_y = -27 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = 1; + pixel_y = 32 }, /turf/open/floor/iron, -/area/medical/surgery) -"mpz" = ( -/obj/structure/table, -/obj/structure/bedsheetbin, -/obj/effect/turf_decal/siding/white{ - alpha = 100 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 +/area/security/prison) +"mqv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + id = "qm_warehouse"; + name = "warehouse Shutters" }, -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/machinery/button/door{ + id = "qm_warehouse"; + name = "Warehouse Door Control"; + pixel_x = 32; + pixel_y = 1; + req_access_txt = "31" }, -/turf/open/floor/iron/white, -/area/crew_quarters/fitness/recreation) -"mpI" = ( -/obj/structure/sign/departments/restroom, -/turf/closed/wall/mineral/titanium/survival/nodiagonal, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/turf/open/floor/iron/sepia, +/area/quartermaster/warehouse) "mqS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -25400,19 +24843,14 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) -"mrp" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible/layer2, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 +"mrg" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4; - piping_layer = 1 +/turf/open/floor/iron/dark/side{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/engine/atmos) +/area/hallway/primary/central) "mrx" = ( /obj/structure/railing/corner{ dir = 8 @@ -25444,9 +24882,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "mss" = ( /obj/structure/railing{ dir = 1 @@ -25481,6 +24917,20 @@ }, /turf/closed/wall, /area/medical/storage) +"mtH" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + alpha = 180; + dir = 4 + }, +/obj/machinery/newscaster{ + pixel_y = 33 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/rnd/production/techfab/department/security, +/turf/open/floor/iron/dark, +/area/security/warden) "mtK" = ( /obj/structure/table/reinforced, /obj/item/computer_hardware/hard_drive/role/engineering{ @@ -25502,9 +24952,6 @@ /obj/item/book/manual/wiki/sopengineering, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) -"mtO" = ( -/turf/open/floor/iron/white, -/area/medical/apothecary) "muw" = ( /obj/machinery/pool_filter, /obj/effect/turf_decal/siding/blue{ @@ -25527,6 +24974,45 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) +"mvx" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/musician/piano{ + icon_state = "piano" + }, +/obj/machinery/light{ + dir = 1; + light_color = "#7AC3FF" + }, +/obj/machinery/camera/autoname/directional/north{ + c_tag = "Captain's Quarters"; + network = list("ss13","public") + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/barsign{ + pixel_x = 1; + pixel_y = 33 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/cafeteria) +"mvN" = ( +/obj/machinery/door/airlock/grunge{ + name = "Morgue"; + req_one_access_txt = "6;5;4;28" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "Isolation Shutters" + }, +/turf/open/floor/plating, +/area/medical/morgue) "mvX" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 @@ -25538,9 +25024,6 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/iron/white/side, /area/science/lab) "mwj" = ( @@ -25554,29 +25037,6 @@ /obj/effect/spawner/lootdrop/costume, /turf/open/floor/iron/dark, /area/maintenance/department/crew_quarters/dorms) -"mwP" = ( -/obj/machinery/turretid{ - control_area = "/area/ai_monitored/turret_protected/ai"; - icon_state = "control_stun"; - name = "AI Chamber turret control"; - pixel_x = -1; - pixel_y = 33 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("aiupload") - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/tech/grid, -/area/ai_monitored/turret_protected/aisat_interior) "mxd" = ( /obj/structure/sign/departments/minsky/research/robotics, /turf/closed/wall, @@ -25591,22 +25051,6 @@ /obj/structure/flora/grass/jungle/b, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) -"mxu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/iron, -/area/medical/surgery) "mxy" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/vending/dinnerware, @@ -25621,6 +25065,18 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"mxH" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 9 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/cmo) "mxW" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -25661,11 +25117,24 @@ }, /turf/open/floor/iron/grid/steel, /area/hydroponics) -"myx" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/science/misc_lab) +"myy" = ( +/obj/item/radio/intercom{ + pixel_y = 23 + }, +/obj/machinery/button/door{ + id = "psypriv"; + name = "Psycology Shutters Control"; + pixel_y = 37 + }, +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop{ + pixel_y = 4 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","medbay") + }, +/turf/open/floor/wood, +/area/medical/exam_room) "myN" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -25688,39 +25157,13 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) -"myX" = ( -/obj/structure/table/optable{ - pixel_y = 7 - }, -/obj/item/surgical_drapes{ - pixel_y = 4 - }, -/obj/machinery/light, -/obj/item/clothing/gloves/color/latex{ - pixel_x = -1; - pixel_y = -1 - }, -/turf/open/floor/iron, -/area/medical/surgery) -"myY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/evac/evac_big{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/department/eva) "mzo" = ( /obj/structure/railing{ dir = 5 }, /obj/structure/lattice, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "mzC" = ( /obj/effect/spawner/xmastree, /turf/open/floor/wood, @@ -25754,22 +25197,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"mAk" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "Engidesk"; - name = "engineering security door" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/grass/no_border, -/area/crew_quarters/heads/chief) +/area/hallway/primary/central) "mAp" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, @@ -25780,24 +25208,10 @@ }, /obj/structure/lattice, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) -"mBp" = ( -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/obj/machinery/shower{ - layer = 4; - name = "emergency shower"; - pixel_y = 7 - }, -/obj/effect/turf_decal/stripes/end, -/turf/open/floor/noslip/white, -/area/medical/medbay/central) +/area/engineering/hallway) "mBs" = ( /obj/machinery/smartfridge/sci, -/turf/closed/wall, +/turf/open/floor/iron/white, /area/science/robotics) "mBS" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -25818,6 +25232,20 @@ /obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/open/floor/engine/n2o, /area/engine/atmos) +"mCp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/hydroponics/constructable, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/item/paper/guides/jobs/hydroponics{ + default_raw_text = "

          Hey there,

          Sorry about the cramped space! � I know it's a bit tight in here.

          But just so you know, I found a few more hydroponic trays stashed behind botany in maintenance. Feel free to grab them if you need!

          Take care!

          "; + pixel_x = 6 + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "mCw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -25833,6 +25261,28 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/quartermaster/storage) +"mCz" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/button/door{ + desc = "A remote control switch for the medbay foyer."; + id = "MedbayFoyer"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + pixel_x = 4; + pixel_y = 36 + }, +/obj/machinery/button/door{ + id = "chemistry_shutters"; + id_tag = "cmoprivacy"; + name = "Chem Shutters Control"; + pixel_x = 4; + pixel_y = 27 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/white, +/area/medical/apothecary) "mDm" = ( /obj/structure/rack, /obj/item/rollerbed{ @@ -25861,49 +25311,28 @@ pixel_y = -32 }, /turf/open/floor/wood, -/area/vacant_room/office) +/area/library/abandoned) "mDY" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/storage/primary) -"mEl" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, +"mEn" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) +/turf/open/floor/iron, +/area/maintenance/department/crew_quarters/bar) "mEr" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/openspace, /area/engine/atmos) -"mEL" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/north{ - network = list("ss13","engine") - }, -/obj/structure/closet/secure_closet/atmospherics{ - anchored = 1; - req_access = null; - req_one_access_txt = "11" - }, -/obj/item/radio/intercom{ - pixel_x = -1; - pixel_y = 29 - }, -/turf/open/floor/iron, -/area/engine/atmos) +"mEw" = ( +/obj/effect/turf_decal/siding/blue, +/turf/open/floor/glass/reinforced, +/area/medical/medbay/central) "mEO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/rock/pile, @@ -25916,6 +25345,9 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) "mFq" = ( @@ -25942,67 +25374,22 @@ /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) "mFz" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"mFB" = ( -/obj/structure/table/glass, -/obj/item/book/manual/wiki/grenades{ - pixel_x = 4; - pixel_y = 19 - }, -/obj/item/storage/box/beakers{ - pixel_x = -6; - pixel_y = 24 - }, -/obj/item/grenade/chem_grenade{ - pixel_x = 12; - pixel_y = 11 - }, -/obj/item/grenade/chem_grenade{ - pixel_x = 10; - pixel_y = 7 - }, -/obj/item/grenade/chem_grenade{ - pixel_x = 11; - pixel_y = 2 - }, -/obj/item/assembly/igniter{ - pixel_x = 3; - pixel_y = 7 - }, -/obj/item/assembly/igniter{ - pixel_y = 5 - }, -/obj/item/assembly/timer{ - pixel_y = 2 - }, -/obj/item/assembly/timer, -/obj/item/screwdriver{ - pixel_x = -3; - pixel_y = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/railing{ + dir = 8 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/light, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + alpha = 180; dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/item/kirbyplants/random, +/obj/structure/sign/map/echo{ + pixel_y = -32 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/turf/open/floor/iron/dark/corner{ + dir = 1 }, -/turf/open/floor/iron, -/area/medical/apothecary) +/area/hallway/primary/central) "mFI" = ( /obj/effect/turf_decal/siding/wideplating/dark, /obj/structure/chair/fancy/comfy{ @@ -26053,47 +25440,23 @@ }, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"mHA" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/iron/tech, -/area/engine/engineering) -"mHK" = ( -/obj/machinery/keycard_auth{ - pixel_x = 33; - pixel_y = -5 - }, -/obj/machinery/button/door{ - id = "Capoffice"; - id_tag = "cmoprivacy"; - name = "Captain blast door"; - pixel_x = 32; - pixel_y = 5 - }, -/obj/structure/table/wood, -/obj/machinery/computer/security/wooden_tv{ - layer = 3; - pixel_x = 2; - pixel_y = 8 +"mHk" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/sopengineering, +/obj/item/clothing/glasses/meson{ + pixel_y = 1 }, -/obj/machinery/firealarm/directional/south, -/obj/item/melee/chainofcommand{ - pixel_x = -8; - pixel_y = 4 +/obj/effect/turf_decal/siding/dark{ + dir = 8 }, -/obj/machinery/camera/autoname/directional/south, -/obj/effect/turf_decal/siding/wood{ - dir = 6 +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 4 }, -/obj/item/radio/intercom{ - dir = 8; - freerange = 1; - name = "Station Intercom (Command)"; - pixel_x = 33; - pixel_y = -35 +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 4 }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain/private) +/turf/open/floor/iron/dark, +/area/engineering/hallway) "mHX" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -26102,6 +25465,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/science/test_area) +"mIl" = ( +/obj/effect/turf_decal/siding/white/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 9 + }, +/turf/open/floor/glass/reinforced, +/area/medical/medbay/central) "mIx" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -26109,8 +25481,8 @@ /obj/structure/railing{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 9 }, /turf/open/floor/wood, /area/crew_quarters/cafeteria) @@ -26168,15 +25540,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/janitor) -"mJk" = ( -/obj/structure/cable/yellow, -/obj/effect/spawner/structure/window/reinforced/prison, -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison blast door" - }, -/turf/open/floor/plating, -/area/security/prison) "mJs" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 @@ -26210,9 +25573,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "mLQ" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/effect/decal/cleanable/dirt, @@ -26226,15 +25587,26 @@ /turf/closed/indestructible/riveted, /area/quartermaster/storage) "mMc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"mMf" = ( -/turf/open/floor/plating/dirt/jungle/wasteland, -/area/asteroid/paradise/surface) +/area/hallway/primary/fore) +"mMj" = ( +/obj/machinery/airalarm/engine{ + dir = 8; + pixel_x = -23 + }, +/obj/machinery/light/small, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Gas to Filter" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/engine/supermatter) "mMl" = ( /obj/structure/bed, /obj/item/bedsheet/hop, @@ -26246,6 +25618,14 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) +"mMm" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/engine, +/area/science/explab) "mMn" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, @@ -26275,6 +25655,15 @@ }, /turf/open/floor/iron/tech, /area/science/mixing/chamber) +"mNh" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "mNk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/line{ @@ -26310,40 +25699,51 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"mNH" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/engine, -/area/science/xenobiology) -"mNS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 4 +"mNC" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/structure/table, -/obj/item/clothing/mask/gas{ - pixel_x = -4; - pixel_y = 10 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/item/analyzer{ - pixel_x = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/obj/item/crowbar/red{ - pixel_x = -2; - pixel_y = 11 +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/obj/item/tank/internals/plasma{ - pixel_x = 7; - pixel_y = 7 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 }, /turf/open/floor/iron/dark, +/area/bridge) +"mNF" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/item/stock_parts/micro_laser/ultra, +/obj/item/stock_parts/micro_laser/ultra, +/obj/item/stock_parts/matter_bin/super, +/obj/item/stock_parts/matter_bin/super, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 4 + }, +/turf/open/floor/iron/tech, /area/engine/engineering) +"mNH" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/xenobiology) +"mNQ" = ( +/obj/structure/disposalpipe/sorting/mail/destination/xenobiology{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/science/mixing) "mOp" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -26367,12 +25767,11 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) -"mPv" = ( -/obj/structure/fence/corner{ +"mPN" = ( +/obj/machinery/atmospherics/components/unary/plasma_refiner{ dir = 8 }, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/plating/grass, +/turf/open/floor/mineral/titanium, /area/asteroid/paradise/surface) "mQm" = ( /obj/structure/cable/yellow{ @@ -26388,6 +25787,25 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/bridge) +"mQH" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/plating, +/area/engine/supermatter) +"mQJ" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/central) "mQK" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -26398,23 +25816,6 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"mQR" = ( -/obj/machinery/door/airlock/grunge{ - name = "Morgue"; - req_one_access_txt = "6;5;4;28" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, -/turf/open/floor/plating, -/area/medical/morgue) "mRe" = ( /obj/machinery/button/flasher{ id = "brigentryaux"; @@ -26450,6 +25851,9 @@ dir = 4; req_one_access = list(5,4,3) }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/security/warden) "mRH" = ( @@ -26458,29 +25862,7 @@ pixel_y = 33 }, /turf/open/floor/carpet/royalblack, -/area/vacant_room/office) -"mRY" = ( -/obj/structure/table/reinforced, -/obj/item/toy/figure/qm{ - pixel_x = 7; - pixel_y = 2 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/item/melee/classic_baton/police/deputy{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/camera/directional/north{ - network = list("ss13","cargo") - }, -/turf/open/floor/iron/dark, -/area/quartermaster/qm) +/area/library/abandoned) "mRZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -26506,6 +25888,15 @@ "mSE" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain/private) +"mSK" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/hallway/primary/aft) "mSM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -26529,11 +25920,6 @@ }, /turf/open/floor/prison/dark, /area/security/prison) -"mTe" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) "mTi" = ( /obj/structure/lattice/catwalk/over, /turf/open/openspace, @@ -26557,10 +25943,12 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"mUP" = ( -/obj/machinery/door/airlock/shuttle, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) +"mUU" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 5 + }, +/turf/open/floor/glass/reinforced, +/area/medical/medbay/central) "mVg" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/plating/asteroid/planetary, @@ -26579,16 +25967,18 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/bridge) -"mVt" = ( -/obj/structure/cable/yellow{ - icon_state = "1-16" +"mVr" = ( +/obj/structure/fence/corner{ + dir = 6 }, -/obj/effect/turf_decal/trimline/yellow, -/obj/machinery/light/small{ - dir = 4 +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) +"mVX" = ( +/obj/structure/fence/cut/large{ + dir = 8 }, -/turf/open/floor/pod/dark, -/area/maintenance/department/medical/morgue) +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "mWc" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -26603,9 +25993,7 @@ /turf/open/floor/iron/dark/corner{ dir = 4 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "mWt" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -26614,9 +26002,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"mWC" = ( -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/science/misc_lab) "mWD" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/line{ @@ -26678,19 +26063,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/science/central) -"mYe" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) "mYL" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, @@ -26724,15 +26096,6 @@ /mob/living/simple_animal/slime, /turf/open/floor/engine, /area/science/xenobiology) -"mZC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "mZT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -26743,44 +26106,16 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/central) -"mZW" = ( +"naa" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/ai_slipper{ - uses = 10 + icon_state = "4-8" }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) -"naW" = ( -/obj/effect/turf_decal/box/white, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/iron/white, -/area/medical/surgery) -"naX" = ( -/obj/item/kirbyplants/random, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) +/turf/open/floor/iron/dark, +/area/bridge) "nbf" = ( /obj/machinery/door/window/southleft{ dir = 1; @@ -26804,6 +26139,19 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/maintenance/department/eva) +"nbG" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "nbS" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, @@ -26836,20 +26184,11 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"ncK" = ( -/obj/machinery/holopad{ - pixel_x = 16; - pixel_y = 16 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/turf/open/floor/iron, +/area/hallway/primary/aft) "ncM" = ( /obj/structure/reagent_dispensers/beerkeg{ pixel_x = 6; @@ -26878,14 +26217,19 @@ pixel_y = 7 }, /turf/closed/wall, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) +"ndI" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "ndP" = ( /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "ndU" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -26906,46 +26250,14 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"ned" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +"neX" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/processor, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/camera/directional/north{ - network = list("ss13","security","prison","public") - }, -/obj/item/radio/intercom{ - desc = "Talk through this. It looks like it has been modified to not broadcast."; - name = "Prison Intercom (General)"; - pixel_y = 24; - prison_radio = 1 - }, -/turf/open/floor/prison/dark, -/area/security/prison) -"neX" = ( /turf/open/floor/iron/dark/side{ dir = 5 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"nfQ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/central) "nfX" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -26960,7 +26272,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 10 }, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) @@ -26988,12 +26300,16 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"nhl" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ - dir = 9 +"ngW" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/closed/wall, -/area/engine/supermatter) +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/bar) +"nhp" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface/grass) "nhs" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -27009,31 +26325,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) -"nhz" = ( -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/obj/machinery/newscaster{ - pixel_y = -30 +"nhW" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/turf_decal/bot{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, /obj/machinery/light, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) -"nhC" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/sign/warning/pods{ + pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/medical/medbay/central) +/turf/open/floor/iron, +/area/maintenance/department/chapel) "nhY" = ( /mob/living/basic/mothroach{ density = 0; @@ -27056,9 +26361,7 @@ "niw" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "niN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/trinary/filter/flipped, @@ -27067,35 +26370,23 @@ }, /turf/open/floor/iron/dark, /area/maintenance/disposal/incinerator) -"niR" = ( -/obj/machinery/light, -/obj/machinery/camera/autoname/directional/south{ - network = list("ss13","rd") - }, -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 8 +"njI" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) -"nkb" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chemistry_shutters"; - name = "chemistry shutters" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/plating, -/area/medical/apothecary) +/turf/open/floor/iron, +/area/hallway/primary/aft) "nkk" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/siding/white{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/wood, /area/crew_quarters/cafeteria) "nlo" = ( @@ -27115,12 +26406,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/side, /area/science/lab) -"nlE" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/maintenance/department/security/brig) "nlH" = ( /obj/structure/chair/fancy/comfy{ dir = 4 @@ -27134,6 +26419,16 @@ }, /turf/open/floor/carpet/red, /area/medical/exam_room) +"nlO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/ladder, +/turf/open/floor/pod/dark, +/area/maintenance/department/chapel) "nlW" = ( /obj/structure/table/wood, /obj/item/paper, @@ -27142,7 +26437,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, -/area/vacant_room/office) +/area/library/abandoned) "nlX" = ( /obj/machinery/power/emitter/welded{ dir = 4 @@ -27152,12 +26447,6 @@ /obj/machinery/light/small, /turf/open/floor/plating, /area/engine/engineering) -"nmv" = ( -/obj/structure/sign/poster/official/moth8{ - pixel_y = 31 - }, -/turf/open/floor/glass/reinforced, -/area/crew_quarters/heads/cmo) "nmz" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -27194,7 +26483,7 @@ "nnv" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating/asteroid/basalt/planetary, -/area/science/misc_lab) +/area/asteroid/paradise) "nnF" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -27222,15 +26511,14 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) "nnQ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 1 - }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/open/floor/iron/dark, -/area/engine/engineering) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/dark_green/half/contrasted, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "nnR" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/rock/pile, @@ -27246,9 +26534,7 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "noh" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -27263,18 +26549,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/white/side{ dir = 1 }, /area/science/research) -"nom" = ( -/obj/machinery/door/poddoor/preopen{ - id = "testlab"; - name = "test chamber blast door" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/science/explab) "npi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/line, @@ -27296,21 +26577,26 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) -"npY" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, -/turf/open/floor/iron/tech, -/area/engine/engineering) -"nqa" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/camera/autoname{ - dir = 6; - network = list("ss13","security") +"npW" = ( +/obj/machinery/power/smes{ + charge = 5e+006; + name = "ai power storage unit" }, -/obj/structure/disposalpipe/segment{ - dir = 2 +/obj/machinery/flasher{ + id = "AI"; + name = "Meatbag Pacifier"; + pixel_x = 23; + pixel_y = 22 }, -/turf/open/floor/iron, -/area/security/brig) +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/item/toy/plush/lizard_plushie{ + pixel_x = 1; + pixel_y = 14 + }, +/turf/open/floor/circuit/red, +/area/ai_monitored/turret_protected/ai) "nqk" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -33 @@ -27324,6 +26610,14 @@ }, /turf/open/floor/carpet/orange, /area/crew_quarters/dorms) +"nqv" = ( +/obj/item/kirbyplants/random, +/obj/machinery/status_display/evac{ + pixel_y = 32 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "nqP" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/light{ @@ -27345,6 +26639,21 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) +"nrf" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/tech, +/area/engine/atmos) "nrw" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ @@ -27367,30 +26676,9 @@ }, /turf/open/floor/iron/dark, /area/security/warden) -"nrA" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/glass/reinforced, -/area/crew_quarters/heads/cmo) -"nrK" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/spawner/structure/window, -/obj/structure/curtain/directional{ - color = "#ACD1E9"; - dir = 8; - icon_state = "bathroom-open"; - icon_type = "bathroom" - }, -/turf/open/floor/plating, -/area/medical/surgery) "nrQ" = ( /turf/closed/wall/mineral/titanium/survival/nodiagonal, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "nst" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -27408,6 +26696,15 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/security/prison) +"nsH" = ( +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/door/poddoor/preopen{ + id = "meetingshutter"; + name = "Council Blast Doors" + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/bridge/meeting_room) "ntA" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/dark_blue/opposingcorners{ @@ -27425,11 +26722,33 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "nub" = ( -/obj/item/kirbyplants/random, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) +/obj/effect/turf_decal/stripes/line{ + dir = 8; + pixel_x = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/flora/rock/pile, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) +"nuy" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/frame/computer{ + anchored = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) +"nuA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "nuD" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/misc/assistantformal, @@ -27468,14 +26787,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, -/area/vacant_room/office) -"nvz" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/evac{ - dir = 4 - }, -/turf/open/floor/iron, -/area/maintenance/department/engine) +/area/library/abandoned) "nvB" = ( /obj/structure/railing, /obj/machinery/light{ @@ -27496,19 +26808,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/central) -"nww" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "nwN" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -27545,6 +26844,13 @@ /obj/item/coin/gold, /turf/open/floor/carpet/orange, /area/crew_quarters/dorms) +"nxR" = ( +/obj/structure/table, +/obj/item/clothing/suit/apron/overalls, +/obj/item/cultivator, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "nye" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -27572,6 +26878,24 @@ }, /turf/open/floor/plating, /area/maintenance/department/chapel) +"nyK" = ( +/obj/structure/closet/secure_closet/lethalshots, +/obj/effect/turf_decal/bot, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ + alpha = 180; + color = "#DE3A3A" + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ai_monitored/security/armory) "nyO" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -27627,15 +26951,16 @@ dir = 10 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "nzr" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/engine) "nzU" = ( @@ -27674,7 +26999,7 @@ /area/maintenance/department/crew_quarters/dorms) "nAw" = ( /obj/machinery/smartfridge/organ, -/turf/closed/wall, +/turf/open/floor/iron/dark, /area/medical/morgue) "nAy" = ( /obj/machinery/meter, @@ -27701,30 +27026,10 @@ pixel_y = -3 }, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"nBm" = ( -/obj/machinery/power/smes{ - charge = 5e+006; - name = "ai power storage unit" - }, -/obj/machinery/flasher{ - id = "AI"; - name = "Meatbag Pacifier"; - pixel_x = 23; - pixel_y = 22 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/item/toy/plush/lizard_plushie{ - layer = 5; - pixel_x = 1; - pixel_y = 14 - }, -/turf/open/floor/circuit/red, -/area/ai_monitored/turret_protected/ai) +/area/hallway/primary/fore) +"nAN" = ( +/turf/open/floor/iron/white, +/area/medical/apothecary) "nBs" = ( /obj/structure/flora/rock/pile, /turf/open/floor/iron/techmaint/planetary, @@ -27734,16 +27039,12 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) -"nCU" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 +"nCH" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ + dir = 10 }, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) +/turf/closed/wall, +/area/engine/supermatter) "nDA" = ( /obj/structure/table, /obj/machinery/fax/service, @@ -27802,14 +27103,6 @@ /obj/item/bedsheet/dorms, /turf/open/floor/wood, /area/asteroid/paradise/surface) -"nFm" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "nFv" = ( /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -27823,32 +27116,33 @@ }, /turf/open/floor/iron, /area/security/brig) -"nFx" = ( -/obj/structure/window/plasma/reinforced{ - dir = 4 +"nFK" = ( +/obj/structure/cable{ + icon_state = "1-2" }, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "1-4" }, -/obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/plating, -/area/engine/supermatter) +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "nFR" = ( /turf/closed/wall/r_wall/rust, /area/science/explab) -"nFX" = ( -/obj/structure/railing/corner, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/effect/turf_decal/siding/white/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +"nFY" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/landmark/start/chemist, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, /turf/open/floor/iron/white, -/area/science/lab) +/area/medical/apothecary) "nGn" = ( /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -7; @@ -27870,6 +27164,15 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) +"nGJ" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "nGN" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -27882,18 +27185,58 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/science/xenobiology) +"nGU" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"nHb" = ( +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/stack/sheet/plasteel{ + amount = 10; + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/stack/sheet/rglass{ + amount = 30; + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 1; + pixel_y = 1 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 4; + pixel_y = -1 + }, +/obj/item/stack/rods/fifty, +/obj/structure/table, +/turf/open/floor/iron/tech, +/area/engine/engineering) "nHd" = ( /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/maintenance/department/engine) -"nHh" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/grass/no_border, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "nHi" = ( /turf/closed/wall, /area/gateway) @@ -27902,6 +27245,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/engine) "nHL" = ( @@ -27956,34 +27302,19 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/maintenance/department/engine) +"nHZ" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/pod/dark, +/area/hallway/primary/aft) "nId" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"nIe" = ( -/obj/machinery/light/small, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, -/obj/item/storage/box/lights/mixed{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = -7 - }, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "nIh" = ( /obj/machinery/vending/hydronutrients, /obj/effect/turf_decal/stripes/line{ @@ -28008,6 +27339,22 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/science/mixing) +"nIu" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "nIw" = ( /obj/structure/stairs{ dir = 4 @@ -28016,9 +27363,7 @@ dir = 1 }, /turf/open/floor/pod/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "nIy" = ( /obj/machinery/air_sensor/atmos/carbon_tank, /obj/machinery/atmospherics/pipe/simple/yellow/hidden/layer4{ @@ -28032,29 +27377,6 @@ }, /turf/open/openspace, /area/crew_quarters/heads/hor) -"nIC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/clothing/under/rank/cargo/exploration{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/item/radio/headset/headset_exploration{ - pixel_x = -1; - pixel_y = -1 - }, -/obj/effect/decal/cleanable/blood/gibs/torso, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) -"nIF" = ( -/obj/structure/fence{ - dir = 8 - }, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "nIN" = ( /obj/machinery/door/airlock/command{ name = "Head of Security's Office"; @@ -28077,9 +27399,7 @@ "nIZ" = ( /obj/structure/railing/corner, /turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "nJl" = ( /obj/structure/railing/corner{ dir = 8 @@ -28088,30 +27408,7 @@ dir = 4 }, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) -"nJy" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/bridge) +/area/engineering/hallway) "nJX" = ( /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -28150,28 +27447,31 @@ /obj/structure/flora/rock, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"nKs" = ( -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "nKB" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/sepia/planetary{ slowdown = 0 }, /area/asteroid/paradise/surface) +"nKC" = ( +/obj/effect/turf_decal/bot, +/obj/item/pushbroom, +/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ + alpha = 180; + color = "#DE3A3A" + }, +/obj/structure/closet/secure_closet/brig{ + name = "Storage Locker"; + req_one_access_txt = "1;4" + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","security") + }, +/turf/open/floor/iron/dark, +/area/security/brig) "nKL" = ( /obj/machinery/smartfridge/chemistry, -/turf/closed/wall, +/turf/open/floor/iron/white, /area/medical/apothecary) "nKV" = ( /obj/effect/turf_decal/siding/white{ @@ -28205,18 +27505,18 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"nMm" = ( -/obj/effect/spawner/structure/window/reinforced, +"nMt" = ( +/turf/open/floor/plating/dirt/jungle/wasteland, +/area/asteroid/paradise/surface) +"nME" = ( /obj/structure/cable/yellow{ - icon_state = "1-8" + icon_state = "1-2" }, -/obj/structure/cable/yellow, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 }, -/turf/open/floor/plating, -/area/security/warden) +/turf/open/floor/iron/dark/corner, +/area/hallway/primary/aft) "nMG" = ( /obj/machinery/computer/atmos_control/tank/nitrous_tank, /obj/effect/turf_decal/bot, @@ -28232,22 +27532,6 @@ /obj/structure/railing, /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) -"nNY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/loading_area{ - dir = 8 - }, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) -"nOn" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/status_display/evac{ - pixel_y = -32 - }, -/turf/open/floor/iron, -/area/security/brig) "nOq" = ( /obj/structure/window/reinforced{ dir = 8 @@ -28295,69 +27579,31 @@ }, /turf/open/floor/wood, /area/asteroid/paradise/surface) -"nQB" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/railing, +"nQs" = ( +/obj/structure/lattice/catwalk/over, +/obj/effect/turf_decal/trimline/yellow, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4; - piping_layer = 1 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) -"nQC" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) -"nQI" = ( -/obj/structure/fence{ - dir = 8 - }, -/obj/structure/sign/warning/securearea, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) -"nQV" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/northleft{ - dir = 2; - name = "Engi Desk"; - req_one_access_txt = "32;19" - }, -/obj/item/paper_bin{ - pixel_x = 7; - pixel_y = 2 - }, -/obj/item/pen{ - pixel_x = 7; - pixel_y = 4 + icon_state = "8-32" }, -/obj/structure/desk_bell{ - pixel_x = -6; - pixel_y = 3 +/obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plating, +/area/maintenance/department/science/central) +"nRz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + dir = 8; + freq = 1400; + location = "Security" }, +/obj/structure/plasticflaps/opaque, /obj/machinery/door/poddoor/preopen{ - id = "Engidesk"; - name = "engineering security door" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 + id = "brigentrance"; + name = "Brig Blast Door" }, -/turf/open/floor/iron/dark, -/area/engine/engineering) +/turf/open/floor/plating, +/area/maintenance/department/eva) "nRX" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/stripes/line{ @@ -28381,6 +27627,9 @@ alpha = 180; dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/security/warden) "nSF" = ( @@ -28423,6 +27672,13 @@ /obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) +"nTP" = ( +/obj/effect/turf_decal/siding/dark, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore) "nTR" = ( /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, @@ -28439,6 +27695,17 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"nUN" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, +/area/hallway/primary/central) "nVd" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/cardboard, @@ -28446,6 +27713,12 @@ /obj/item/paicard, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) +"nVj" = ( +/obj/machinery/atmospherics/pipe/manifold/purple/visible{ + dir = 1 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "nVn" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -28486,13 +27759,24 @@ }, /turf/open/floor/iron, /area/science/research) +"nVt" = ( +/obj/structure/cable/yellow, +/obj/effect/spawner/structure/window/reinforced/prison, +/obj/machinery/door/poddoor/preopen{ + id = "Prisongate"; + name = "Prison Blast Door" + }, +/turf/open/floor/plating, +/area/security/prison) "nVI" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/asteroid/paradise/surface) -"nWb" = ( -/turf/closed/wall/r_wall, -/area/maintenance/department/cargo) +"nWp" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/dark_green, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "nWu" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -28501,6 +27785,21 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/engine/engineering) +"nWB" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/spawner/structure/window, +/obj/structure/curtain/directional{ + color = "#ACD1E9"; + icon_state = "bathroom-open"; + icon_type = "bathroom" + }, +/turf/open/floor/plating, +/area/medical/surgery) "nXa" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -28533,18 +27832,6 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"nYi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/flora/tree/jungle/small, -/turf/open/floor/grass/no_border, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "nYl" = ( /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 @@ -28579,9 +27866,7 @@ /turf/open/floor/iron/dark/corner{ dir = 1 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "nYE" = ( /obj/machinery/light/small{ dir = 1 @@ -28590,43 +27875,34 @@ /area/maintenance/department/chapel) "nYL" = ( /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"nYP" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "nZB" = ( /obj/structure/stairs, /turf/open/floor/pod/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "nZG" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/department/medical/central) -"nZZ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/machinery/atmospherics/components/binary/pump/on/layer4{ - dir = 8; - name = "Waste to Filter" - }, -/obj/machinery/atmospherics/components/binary/pump/on/layer2{ - dir = 4; - name = "Air to Distro"; - target_pressure = 500 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4; - piping_layer = 1 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) +"oae" = ( +/obj/structure/sign/departments/medbay/alt, +/turf/closed/wall/r_wall, +/area/medical/medbay/central) "oam" = ( /turf/closed/wall/r_wall, /area/teleporter) @@ -28638,9 +27914,7 @@ /turf/open/floor/iron/dark/side{ dir = 9 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "oaM" = ( /obj/structure/cable{ icon_state = "0-8" @@ -28707,13 +27981,37 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/medical/medbay/central) -"ocv" = ( -/obj/effect/turf_decal/sand/plating, +"obH" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/turnstile{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery/red, +/obj/machinery/door/poddoor/preopen{ + id = "Prisongate"; + name = "Prison Blast Door" + }, +/obj/structure/fans/tiny, +/turf/open/floor/iron/dark, +/area/security/prison) "ocx" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 10 @@ -28729,14 +28027,49 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/sorting) +"odp" = ( +/obj/structure/filingcabinet, +/obj/item/folder/documents, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/dark, +/area/security/nuke_storage) +"odA" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/tree/jungle, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) +"odK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/crew_quarters/fitness/recreation) "odM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small{ @@ -28759,77 +28092,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/techmaint/planetary, /area/storage/tech) -"oer" = ( -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -5; - pixel_y = 1 - }, -/obj/item/stack/sheet/plasteel{ - amount = 10; - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/stack/sheet/rglass{ - amount = 30; - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 1; - pixel_y = 1 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 4; - pixel_y = -1 +"oeH" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Foyer"; + req_one_access_txt = "32" }, -/obj/item/stack/rods/fifty, -/obj/structure/table, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron/tech, /area/engine/engineering) -"oeG" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"oeL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/grass/no_border, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"ofC" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "ofE" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/railing, @@ -28848,7 +28119,7 @@ dir = 1 }, /turf/open/floor/wood, -/area/vacant_room/office) +/area/library/abandoned) "ofU" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/stripes/line{ @@ -28879,19 +28150,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/security/brig) -"ogE" = ( -/obj/machinery/airalarm/engine{ - dir = 8; - pixel_x = -23 - }, -/obj/machinery/light/small, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Gas to Filter" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/engine/supermatter) "ogJ" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/corner, @@ -28904,6 +28162,12 @@ /obj/machinery/vending/wardrobe/hydro_wardrobe, /turf/open/floor/iron/grid/steel, /area/hydroponics) +"ogP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "ohg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/caution/stand_clear, @@ -28913,16 +28177,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/science/robotics) -"ohx" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) "ohC" = ( /obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor/plating/dirt/planetary, @@ -28934,6 +28188,13 @@ }, /turf/open/floor/plating/beach/water, /area/asteroid/paradise/surface/water) +"ohY" = ( +/obj/machinery/power/solar{ + id = "portsolar"; + name = "Port Solar Array" + }, +/turf/open/floor/iron/solarpanel, +/area/asteroid/paradise/surface) "oiG" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -28955,7 +28216,6 @@ /area/science/lab) "oiK" = ( /obj/machinery/airalarm/directional/north{ - dir = 1; pixel_y = -23 }, /mob/living/simple_animal/bot/mulebot{ @@ -28976,17 +28236,24 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/medical/morgue) -"oju" = ( -/obj/effect/turf_decal/stripes/line{ +"oiT" = ( +/obj/machinery/door/airlock{ + name = "Service Hall"; + req_one_access_txt = "22;25;26;28;35;37;38;46" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/rnd/production/protolathe/department/engineering{ - req_access_txt = "32" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/obj/structure/window/plasma/reinforced, +/obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, -/area/engine/engineering) +/area/hallway/secondary/service) "ojw" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/sand/plating, @@ -29012,26 +28279,6 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) -"okt" = ( -/obj/machinery/airalarm/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Medbay Maintenance"; - req_access_txt = "5" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/maintenance/department/medical/central) "okx" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -29052,9 +28299,7 @@ "oln" = ( /obj/effect/spawner/structure/window, /turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "olB" = ( /obj/structure/table/glass, /obj/item/storage/box/bodybags{ @@ -29101,9 +28346,21 @@ dir = 4 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"omw" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/hallway/primary/central) "omN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -29121,42 +28378,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/pod/dark, /area/maintenance/department/cargo) -"onw" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 6 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark/corner{ - dir = 1 - }, -/obj/machinery/light/small, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) -"onx" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "19" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/door/poddoor/preopen{ - id = "bridgedoors"; - name = "Bridge Access Blast door" - }, -/turf/open/floor/iron/dark, -/area/bridge) "onC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -29209,6 +28430,31 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) +"ooQ" = ( +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ + alpha = 180 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/evac, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) "ooY" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/sand/plating, @@ -29220,7 +28466,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/item/pickaxe, /turf/open/floor/plating/asteroid/basalt/planetary, -/area/science/misc_lab) +/area/asteroid/paradise) "opm" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/chair/office{ @@ -29237,38 +28483,10 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "opN" = ( /turf/open/floor/plating, /area/maintenance/department/bridge) -"opX" = ( -/obj/machinery/firealarm/directional/south, -/obj/structure/rack, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_y = 7 - }, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; - pixel_y = 1 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ - alpha = 180; - color = "#DE3A3A" - }, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) "oqi" = ( /obj/structure/railing, /obj/effect/decal/cleanable/dirt/dust, @@ -29289,13 +28507,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) -"oqm" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -32; - pixel_y = -1 - }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "oqn" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 32; @@ -29327,9 +28538,7 @@ /turf/open/floor/iron/dark/side{ dir = 6 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "oqF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/trimline/yellow, @@ -29355,6 +28564,15 @@ /obj/machinery/airalarm/directional/east, /turf/open/openspace, /area/crew_quarters/heads/chief) +"orv" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/evac, +/turf/open/floor/iron, +/area/hallway/primary/central) "orA" = ( /obj/item/storage/book/bible{ pixel_x = 6; @@ -29404,20 +28622,6 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) -"orR" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/structure/window/reinforced/prison, -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison blast door" - }, -/turf/open/floor/plating, -/area/security/prison) "orX" = ( /turf/closed/wall, /area/maintenance/department/engine) @@ -29430,6 +28634,18 @@ }, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) +"osB" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/structure/sign/warning/nosmoking{ + pixel_x = -32 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "osP" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -29455,9 +28671,7 @@ icon_state = "1-2" }, /turf/open/floor/plating, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "oth" = ( /obj/structure/sign/warning/explosives, /turf/closed/wall, @@ -29486,18 +28700,6 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) -"otu" = ( -/mob/living/simple_animal/chicken/turkey{ - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0); - desc = "A veteran of Nanotrasen's Animal Experimentation Program that attempted to replicate the organic space suit that some hostile entities are known to have exhibited, Tom now serves Nanotrasen as the mascot of the Exploration Crew."; - health = 200; - maxHealth = 200; - melee_damage = 5; - minbodytemp = 2.7; - name = "Tom" - }, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "otW" = ( /obj/effect/turf_decal/box, /obj/machinery/holopad, @@ -29556,15 +28758,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/lab) -"ove" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8; - pixel_x = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/rock/pile, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "ovg" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -29618,9 +28811,7 @@ /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "ovX" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/sand/plating, @@ -29631,24 +28822,6 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) -"oxf" = ( -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Interrogation room"; - name = "Interrogation room"; - network = list("interrogation") - }, -/obj/machinery/light_switch{ - pixel_x = 21; - pixel_y = 22 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/security/brig) "oxg" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -29680,18 +28853,14 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "oxK" = ( /turf/open/floor/iron/dark, /area/maintenance/department/crew_quarters/dorms) -"oyg" = ( -/obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) "oyk" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -29719,35 +28888,15 @@ dir = 4 }, /obj/machinery/digital_clock/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/wood, /area/chapel/main) "ozj" = ( /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"ozt" = ( -/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ - alpha = 180; - color = "#DE3A3A" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/camera/autoname{ - dir = 10; - network = list("ss13","engine") - }, -/turf/open/floor/iron, -/area/security/brig) "ozD" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -29805,19 +28954,6 @@ }, /turf/open/floor/plating, /area/crew_quarters/cafeteria) -"oBg" = ( -/obj/machinery/camera/directional/north{ - network = list("ss13","rd") - }, -/obj/machinery/computer/security/telescreen/toxins{ - pixel_x = 1; - pixel_y = 30 - }, -/obj/machinery/doppler_array/research/science{ - dir = 4 - }, -/turf/open/floor/iron, -/area/science/mixing) "oBi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, @@ -29845,20 +28981,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"oBS" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/bot, -/obj/item/radio/intercom{ - dir = 1; - pixel_x = 1; - pixel_y = 23 - }, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","medbay") - }, -/turf/open/floor/iron, -/area/medical/genetics/cloning) "oCE" = ( /turf/open/openspace, /area/engine/atmos) @@ -29867,15 +28989,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"oDI" = ( -/obj/structure/fence/corner{ - dir = 6 - }, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) +/area/hallway/primary/central) "oDR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -29947,20 +29061,6 @@ /obj/effect/turf_decal/bot/right, /turf/open/floor/iron/white, /area/science/xenobiology) -"oEI" = ( -/obj/structure/chair/fancy/bench/corporate/left{ - dir = 1 - }, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "oEJ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -29984,6 +29084,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) +"oFr" = ( +/obj/structure/railing/corner, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/effect/turf_decal/siding/white/corner, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/science/lab) "oFs" = ( /obj/structure/railing/corner{ dir = 1 @@ -30064,14 +29174,19 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "oHn" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/portable_atmospherics/canister, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ - dir = 4 +/obj/structure/table/optable{ + pixel_y = 7 }, -/turf/open/floor/iron/tech, -/area/engine/engineering) +/obj/item/surgical_drapes{ + pixel_y = 4 + }, +/obj/machinery/light, +/obj/item/clothing/gloves/color/latex{ + pixel_x = -1; + pixel_y = -1 + }, +/turf/open/floor/iron, +/area/medical/surgery) "oHx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -30094,22 +29209,6 @@ }, /turf/open/floor/iron, /area/hydroponics) -"oHX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - id = "qm_warehouse"; - name = "warehouse shutters" - }, -/obj/machinery/button/door{ - id = "qm_warehouse"; - name = "Warehouse Door Control"; - pixel_x = 32; - pixel_y = 1; - req_access_txt = "31" - }, -/turf/open/floor/iron/sepia, -/area/quartermaster/warehouse) "oIh" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/blue/half{ @@ -30135,22 +29234,11 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "oIi" = ( +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"oIY" = ( -/obj/machinery/camera/autoname/directional/south{ - network = list("ss13","engine") - }, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{ - dir = 1; - piping_layer = 4 - }, -/turf/open/floor/engine/n2o, -/area/engine/atmos) +/area/hallway/primary/aft) "oJf" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -30179,21 +29267,6 @@ /obj/structure/window/plasma/reinforced, /turf/open/floor/iron, /area/engine/atmos) -"oKf" = ( -/obj/structure/closet/secure_closet/hop, -/obj/item/modular_computer/tablet/pda, -/obj/item/modular_computer/tablet/pda, -/obj/item/modular_computer/tablet/pda, -/obj/item/modular_computer/tablet/pda, -/obj/item/modular_computer/tablet/pda, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/hop) "oKy" = ( /obj/machinery/holopad, /obj/effect/turf_decal/stripes/line{ @@ -30214,6 +29287,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/brig) "oLi" = ( @@ -30258,17 +29332,12 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) -"oLC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +"oLq" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/turf/open/floor/plating, +/area/maintenance/department/chapel) "oLK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool/directional/west, @@ -30297,13 +29366,24 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/engine/engineering) +"oLX" = ( +/obj/item/kirbyplants/random{ + pixel_y = 22 + }, +/obj/machinery/power/apc/auto_name/directional/west{ + pixel_x = -24 + }, +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) "oMd" = ( /turf/open/floor/iron/dark/side{ dir = 6 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "oMe" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/frame/computer{ @@ -30314,7 +29394,17 @@ pixel_y = 29 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/asteroid/paradise) +"oMj" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -28 + }, +/obj/machinery/ore_silo, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/security/nuke_storage) "oMm" = ( /obj/machinery/power/emitter/welded{ dir = 8 @@ -30436,19 +29526,28 @@ /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"oOr" = ( -/obj/effect/spawner/structure/window, +"oNR" = ( +/obj/effect/decal/cleanable/oil, +/obj/machinery/food_cart, /turf/open/floor/plating, -/area/crew_quarters/dorms) -"oOz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/area/hallway/secondary/service) +"oNY" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/effect/spawner/randomvend/snack, +/obj/machinery/status_display/evac{ + pixel_y = 32 }, -/turf/open/floor/iron/showroomfloor, -/area/crew_quarters/fitness/recreation) +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","medbay") + }, +/turf/open/floor/iron, +/area/medical/medbay/central) +"oOr" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/crew_quarters/dorms) "oOA" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /mob/living/simple_animal/hostile/retaliate/frog{ @@ -30463,37 +29562,21 @@ }, /turf/open/floor/iron, /area/hydroponics) -"oOM" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +"oOT" = ( +/obj/structure/closet/secure_closet/hop, +/obj/item/modular_computer/tablet/pda, +/obj/item/modular_computer/tablet/pda, +/obj/item/modular_computer/tablet/pda, +/obj/item/modular_computer/tablet/pda, +/obj/item/modular_computer/tablet/pda, +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/obj/machinery/telecomms/hub/preset, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/tcommsat/server) -"oOS" = ( -/obj/structure/flora/grass/jungle/b, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/window/reinforced{ +/obj/machinery/light{ dir = 1 }, -/obj/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "Engidesk"; - name = "engineering security door" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/grass/no_border, -/area/crew_quarters/heads/chief) -"oPa" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/hop) "oPi" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -30521,10 +29604,6 @@ }, /turf/open/floor/iron/grid/steel, /area/bridge) -"oPp" = ( -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "oPC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -30546,11 +29625,37 @@ }, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) +"oQj" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "oQk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/grille/broken, /turf/open/floor/plating, /area/maintenance/department/bridge) +"oQq" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/item/wrench, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/tech, +/area/engine/engineering) "oQu" = ( /obj/effect/spawner/room/fivexfour, /turf/open/floor/plating, @@ -30563,18 +29668,6 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"oQF" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/firealarm/directional/south, -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "oQQ" = ( /obj/machinery/camera/autoname/directional/south{ network = list("ss13","security") @@ -30588,15 +29681,27 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/security/prison) +"oRf" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ + alpha = 180 + }, +/obj/item/aicard{ + pixel_x = 6 + }, +/obj/item/storage/secure/briefcase{ + pixel_x = -2 + }, +/obj/item/storage/lockbox/loyalty, +/turf/open/floor/iron/dark, +/area/bridge) "oRo" = ( /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/plating, /area/maintenance/department/engine) -"oRp" = ( -/obj/effect/decal/cleanable/oil, -/obj/machinery/food_cart, -/turf/open/floor/plating, -/area/hallway/secondary/service) "oRs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -30612,13 +29717,13 @@ }, /turf/open/floor/wood, /area/chapel/main) -"oRT" = ( -/obj/structure/fence{ - dir = 8 +"oSR" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/structure/sign/warning/securearea, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/grass, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) "oSY" = ( /obj/machinery/door/poddoor/shutters{ @@ -30637,12 +29742,6 @@ }, /turf/open/floor/plating, /area/crew_quarters/cafeteria) -"oTq" = ( -/obj/effect/turf_decal/numbers/two_nine, -/turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "oTt" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/animalhide/mothroach, @@ -30658,6 +29757,18 @@ }, /turf/open/floor/iron/white, /area/science/research) +"oUo" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/structure/sign/painting/library{ + pixel_x = 1; + pixel_y = -32 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron, +/area/medical/surgery) "oUH" = ( /obj/structure/table/optable{ name = "Forensics Operating Table" @@ -30686,9 +29797,50 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/bridge) +"oVc" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) +"oVg" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "oVh" = ( /turf/open/floor/plating/beach/coastline_t/sandwater_inner, /area/asteroid/paradise/surface) +"oVk" = ( +/turf/closed/wall/r_wall, +/area/medical/medbay/central) +"oVD" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = -6; + pixel_y = 14 + }, +/obj/item/bikehorn/rubberducky{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/storage/photo_album{ + pixel_x = 3; + pixel_y = -1 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/captain/private) "oVJ" = ( /obj/effect/turf_decal/bot, /obj/item/clothing/suit/armor/riot{ @@ -30742,6 +29894,26 @@ /obj/item/radio, /turf/open/floor/iron/dark, /area/gateway) +"oWj" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 4 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) +"oWy" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/central) "oXd" = ( /obj/structure/railing{ dir = 9 @@ -30752,9 +29924,7 @@ /obj/structure/closet/emcloset, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "oXe" = ( /turf/closed/wall, /area/maintenance/department/medical/central) @@ -30767,22 +29937,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/eva) -"oYL" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "oYP" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -30826,6 +29980,13 @@ }, /turf/open/floor/plating, /area/maintenance/department/chapel) +"oZk" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "oZn" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -30873,6 +30034,9 @@ /obj/item/borg/upgrade/ai{ pixel_x = 2 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/science/robotics) "oZT" = ( @@ -30931,9 +30095,7 @@ "pbk" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "pbq" = ( /obj/machinery/door/airlock/command{ name = "Head of Personnel's Office"; @@ -30971,15 +30133,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hydroponics) -"pcu" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 9 - }, -/turf/open/floor/glass/reinforced, -/area/medical/medbay/central) "pcy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -30993,6 +30146,32 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/central) +"pcJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor{ + id = "AIwindows"; + name = "AI View Blast Door" + }, +/turf/open/floor/plating, +/area/ai_monitored/turret_protected/ai) +"pcL" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/northright{ + dir = 2; + name = "Engi Desk"; + req_one_access_txt = "32;19" + }, +/obj/item/toy/figure/engineer{ + pixel_x = 3; + pixel_y = -1 + }, +/obj/machinery/door/poddoor/preopen{ + id = "Engidesk"; + name = "engineering Security Door" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "pcP" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -31026,15 +30205,6 @@ dir = 8 }, /area/asteroid/paradise/surface/sand) -"pdo" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" - }, -/turf/open/floor/plating, -/area/security/warden) "pdu" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/planetary, @@ -31064,26 +30234,24 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"pei" = ( -/obj/item/seeds/tea, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/machinery/hydroponics, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) -"pfq" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 +"pfh" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = 4; + pixel_y = 3 }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/microwave{ - pixel_x = -2; - pixel_y = 5 +/obj/item/pen{ + pixel_x = 4; + pixel_y = 4 }, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/prison/dark, -/area/security/prison) +/obj/machinery/light{ + dir = 1 + }, +/obj/item/radio/intercom{ + pixel_y = 20 + }, +/turf/open/floor/iron, +/area/medical/surgery) "pfN" = ( /obj/structure/window/reinforced{ dir = 1 @@ -31106,30 +30274,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) -"pgl" = ( -/obj/machinery/firealarm/directional/north, -/obj/structure/lattice/catwalk/over, -/turf/open/openspace, -/area/maintenance/department/security/brig) -"pgp" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/light, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - alpha = 180; - dir = 8 - }, -/obj/item/kirbyplants/random, -/obj/structure/sign/map/echo{ - pixel_y = -32 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "pgy" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/lavendergrass, @@ -31145,9 +30289,7 @@ dir = 4 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "phc" = ( /obj/machinery/light/small{ dir = 4 @@ -31160,6 +30302,37 @@ }, /turf/open/openspace, /area/crew_quarters/kitchen) +"phm" = ( +/obj/machinery/door/poddoor/shutters{ + id = "exploration" + }, +/obj/machinery/button/door{ + desc = "A remote control switch."; + id = "exploration"; + name = "Exploration Shuttle Shutters"; + pixel_y = 24 + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) +"pih" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/security/glass{ + id_tag = "brigentrance"; + name = "Brig"; + req_access_txt = "63" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" + }, +/turf/open/floor/iron/dark, +/area/security/brig) "pij" = ( /obj/structure/sign/departments/minsky/research/research, /turf/closed/wall/r_wall, @@ -31180,18 +30353,6 @@ "piQ" = ( /turf/closed/wall/rust, /area/maintenance/disposal) -"piY" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 9 - }, -/turf/open/floor/carpet/blue, -/area/bridge/meeting_room) "pjs" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/recharge_station, @@ -31208,9 +30369,7 @@ /turf/open/floor/iron/dark/corner{ dir = 4 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "pjN" = ( /obj/machinery/light_switch{ pixel_x = 8; @@ -31238,6 +30397,10 @@ }, /turf/open/floor/iron, /area/security/brig) +"pjV" = ( +/obj/structure/sink/puddle, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "pka" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -31281,6 +30444,21 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) +"plh" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/item/radio/intercom{ + dir = 1; + pixel_x = 32; + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/fore) "pll" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/dark_green{ @@ -31310,6 +30488,15 @@ }, /turf/open/floor/engine/light, /area/holodeck/small) +"pmo" = ( +/obj/item/kirbyplants/random, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "pmx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -31319,14 +30506,15 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/structure/window/hollow/survival_pod/directional, /turf/open/floor/plating, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "pnn" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) "pob" = ( @@ -31345,7 +30533,7 @@ pixel_y = -2 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/asteroid/paradise) "ppj" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -31364,6 +30552,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/brig) +"ppr" = ( +/obj/machinery/atmospherics/components/unary/shuttle/heater{ + dir = 1 + }, +/obj/structure/window/reinforced/survival_pod{ + dir = 1 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "ppQ" = ( /obj/machinery/light/small{ dir = 1 @@ -31376,32 +30573,47 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/crew_quarters/cryopods) -"ppX" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/hop) "pqi" = ( /obj/structure/stairs, /turf/open/floor/pod/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) +"pqu" = ( +/obj/machinery/light{ + light_color = "#7AC3FF" + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/obj/effect/turf_decal/bot, +/obj/item/radio/intercom{ + dir = 1; + pixel_y = -29 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "pqE" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/crew_quarters/cafeteria) -"prd" = ( -/obj/structure/chair/fancy/shuttle{ - dir = 1 +"pqZ" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "psm" = ( /obj/effect/spawner/lootdrop/aimodule_neutral, /obj/effect/spawner/lootdrop/aimodule_neutral, @@ -31442,9 +30654,18 @@ /turf/open/floor/iron/dark/corner{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) +"psv" = ( +/obj/structure/table, +/obj/item/stack/package_wrap, +/obj/effect/decal/cleanable/dirt, +/obj/item/hand_labeler, +/obj/item/food/grown/tea, +/obj/item/food/grown/grapes, +/obj/item/food/grown/cherries, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "psS" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -31458,9 +30679,7 @@ /turf/open/floor/iron/dark/side{ dir = 1 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "psZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -31469,16 +30688,12 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "ptb" = ( /obj/machinery/light{ dir = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ pixel_x = 5; @@ -31505,48 +30720,44 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) -"ptj" = ( -/obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = 24 +"pti" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/iron/white, -/area/medical/apothecary) +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "ptP" = ( /obj/machinery/nanite_programmer, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/science/research) -"pub" = ( -/turf/open/openspace, -/area/maintenance/department/security/brig) -"pug" = ( -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","medbay") - }, -/obj/item/radio/intercom{ - pixel_y = 23 +"ptZ" = ( +/obj/effect/turf_decal/stripes/box, +/obj/machinery/mineral/ore_redemption{ + input_dir = 2 }, -/obj/machinery/button/door{ - id = "psypriv"; - name = "Psycology Shutters Control"; - pixel_y = 37 +/obj/item/food/donkpocket/pizza{ + pixel_x = 10; + pixel_y = 9 }, -/obj/structure/table/wood, -/obj/machinery/computer/med_data/laptop{ - pixel_y = 4 +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = 4; + pixel_y = 12 }, -/turf/open/floor/wood, -/area/medical/exam_room) +/turf/open/floor/iron/dark, +/area/quartermaster/storage) +"pub" = ( +/turf/open/openspace, +/area/maintenance/department/security/brig) "pvd" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ - piping_layer = 4 - }, +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input/layer4, /turf/open/floor/engine/o2, /area/engine/atmos) "pvC" = ( @@ -31622,10 +30833,24 @@ "pxs" = ( /turf/closed/mineral/bscrystal, /area/quartermaster/storage) +"pxu" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "pyd" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/cargo) +"pyn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/iron/dark, +/area/engine/engineering) "pyw" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -31649,19 +30874,33 @@ }, /turf/open/floor/carpet/red, /area/medical/exam_room) +"pyH" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/bridge) "pyM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"pyQ" = ( -/obj/machinery/door/poddoor/incinerator_toxmix{ - id = "EmergancyescapeShutter"; - name = "Emergancy escape Shutters" - }, -/turf/open/floor/plating, -/area/maintenance/department/science/central) "pyW" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, @@ -31680,9 +30919,7 @@ dir = 8 }, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "pAe" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -31717,6 +30954,13 @@ dir = 1 }, /area/asteroid/paradise/surface/water) +"pBq" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/pod/dark, +/area/crew_quarters/cafeteria) "pBB" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -31741,16 +30985,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"pBL" = ( -/obj/item/barcodescanner{ - name = "Scanner"; - pixel_x = -2; - pixel_y = 3 - }, -/turf/open/floor/plating/beach/coastline_t/sandwater_inner{ - dir = 8 - }, -/area/asteroid/paradise/surface) "pCa" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; @@ -31758,6 +30992,9 @@ req_access_txt = "10" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/engine/supermatter) "pCc" = ( @@ -31800,6 +31037,17 @@ dir = 4 }, /area/medical/genetics/cloning) +"pDv" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","public") + }, +/turf/open/floor/iron, +/area/maintenance/department/crew_quarters/dorms) "pDD" = ( /obj/effect/turf_decal/stripes/line, /obj/item/radio/intercom{ @@ -31819,6 +31067,17 @@ }, /turf/open/floor/iron, /area/security/brig) +"pDR" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/bookcase/manuals/medical, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/wood, +/area/medical/exam_room) "pEf" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -31843,15 +31102,11 @@ }, /obj/machinery/camera/autoname/directional/east, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "pEJ" = ( /obj/structure/lattice/catwalk/over, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "pEN" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 8 @@ -31860,9 +31115,6 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/iron/white/side{ dir = 10 }, @@ -31941,6 +31193,13 @@ }, /turf/open/floor/iron, /area/maintenance/department/bridge) +"pGy" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "pGA" = ( /obj/effect/decal/cleanable/blood/old, /obj/item/hatchet, @@ -31951,12 +31210,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"pGF" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ - dir = 6 - }, -/turf/closed/wall, -/area/engine/supermatter) "pHe" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/airlock/maintenance_hatch{ @@ -32035,7 +31288,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/junction/flip, +/obj/structure/disposalpipe/sorting/mail/destination/cargo_bay/flip{ + dir = 2 + }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) "pHN" = ( @@ -32057,11 +31312,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"pIB" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/plating, -/area/engine/supermatter) "pKj" = ( /obj/structure/flora/rock/pile, /obj/effect/turf_decal/sand/plating, @@ -32090,46 +31340,22 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) -"pKx" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/science/robotics) -"pKz" = ( -/obj/machinery/door/window/brigdoor/southright{ - dir = 4; - name = "Command Chair"; - req_access_txt = "19" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 6 +"pKG" = ( +/obj/item/radio/intercom{ + pixel_x = 1; + pixel_y = -30 }, -/turf/open/floor/iron/grid/steel, -/area/bridge) +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/tech, +/area/engine/engineering) "pKX" = ( /obj/machinery/light{ dir = 4 }, /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark/corner, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "pLd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -32149,7 +31375,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/disposalpipe/trunk/multiz/down{ +/obj/structure/disposalpipe/multiz/down{ dir = 4 }, /obj/structure/cable/yellow{ @@ -32219,35 +31445,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"pMI" = ( -/obj/structure/table/wood, -/obj/machinery/light, -/obj/item/storage/fancy/candle_box{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/fancy/candle_box{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/pen/fountain/captain{ - pixel_x = 1; - pixel_y = 1 - }, -/obj/item/food/grown/flower/harebell{ - pixel_x = -12; - pixel_y = 5 - }, -/obj/item/food/grown/flower/harebell{ - pixel_x = 14; - pixel_y = 5 - }, -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow, -/turf/open/floor/carpet/green, -/area/chapel/main) "pMV" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/bot, @@ -32255,25 +31452,12 @@ dir = 8 }, /obj/machinery/firealarm/directional/east, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "pMW" = ( /turf/closed/wall/r_wall/rust, /area/maintenance/department/engine) -"pMY" = ( -/obj/structure/chair, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","medbay") - }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron, -/area/medical/medbay/central) "pMZ" = ( /obj/structure/ladder, /obj/structure/sign/warning/pods{ @@ -32304,6 +31488,25 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/chapel/main) +"pOl" = ( +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 4; + name = "Port to Filter" + }, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 8; + name = "Air to Ports" + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/tech, +/area/engine/atmos) "pOn" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -32324,21 +31527,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"pOA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "pPs" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/yellow, @@ -32355,34 +31543,37 @@ }, /turf/open/floor/iron, /area/maintenance/department/security/brig) -"pPR" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "2-4" +"pPP" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Brig"; + req_access_txt = "63" + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigfrontdoor"; + name = "Front Security Blast Door" + }, +/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ + alpha = 180; + color = "#DE3A3A" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/brig) +"pPZ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/r_wall/rust, +/area/asteroid/paradise) "pQk" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) -"pQS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 9 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) -"pRe" = ( -/obj/structure/fence{ - dir = 8 - }, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "pRW" = ( /obj/structure/chair/office{ dir = 4 @@ -32403,8 +31594,18 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/carpet/red, /area/security/detectives_office) +"pRZ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/maintenance/department/crew_quarters/bar) "pSj" = ( /obj/machinery/camera/autoname/directional/east{ network = list("ss13","rd") @@ -32423,6 +31624,15 @@ }, /turf/open/floor/iron, /area/science/lab) +"pSK" = ( +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/structure/sink{ + dir = 1; + pixel_y = 20 + }, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron, +/area/hydroponics) "pSN" = ( /obj/effect/turf_decal/siding/blue{ alpha = 100; @@ -32433,11 +31643,9 @@ "pSY" = ( /turf/open/floor/plating, /area/maintenance/department/chapel) -"pTs" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) +"pTq" = ( +/turf/open/floor/glass/reinforced, +/area/hallway/primary/central) "pTv" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, @@ -32482,13 +31690,6 @@ }, /turf/open/floor/iron, /area/medical/surgery) -"pTU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "pTV" = ( /obj/structure/lattice/catwalk/over, /obj/structure/railing/corner{ @@ -32594,26 +31795,14 @@ }, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) -"pVj" = ( +"pVx" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/east{ - pixel_x = 24 - }, +/obj/structure/flora/rock/pile, /obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/iron, -/area/maintenance/department/engine) -"pVC" = ( -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 + icon_state = "4-8" }, -/turf/open/floor/iron/white, -/area/medical/surgery) +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "pVY" = ( /turf/closed/wall, /area/engine/engineering) @@ -32732,33 +31921,13 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) -"pXA" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) -"pXK" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4; - piping_layer = 1 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) "pXQ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/engine) "pYd" = ( @@ -32816,9 +31985,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "qaU" = ( /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) @@ -32866,11 +32033,12 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) -"qbu" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/rock/pile, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/science/misc_lab) +"qbr" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/closed/mineral/random/air, +/area/engine/atmos) "qbN" = ( /turf/open/floor/plating/beach/coastline_t{ dir = 9 @@ -32887,13 +32055,26 @@ dir = 4 }, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "qcr" = ( /obj/structure/sign/warning/explosives, /turf/closed/wall/mineral/titanium/survival, /area/asteroid/paradise/surface) +"qcv" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/frame/computer{ + anchored = 1; + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/hallway/primary/fore) "qcy" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/structure/cable/yellow{ @@ -32914,13 +32095,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/tech, /area/engine/atmos) -"qdf" = ( -/obj/machinery/power/smes, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) "qdG" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/RnD_secure, @@ -32933,6 +32107,15 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/storage/tech) +"qdN" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/dark, +/area/bridge) "qdO" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -32952,47 +32135,41 @@ }, /obj/effect/landmark/start/assistant, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"qdZ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) +/area/hallway/primary/aft) "qeb" = ( /obj/effect/spawner/structure/window, /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) -"qey" = ( +"qen" = ( +/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ - icon_state = "0-8" + icon_state = "1-2" }, -/turf/closed/wall/r_wall, -/area/crew_quarters/heads/cmo) +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig"; + req_access_txt = "63" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + alpha = 180; + dir = 1 + }, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/security/brig) "qeO" = ( /obj/structure/flora/rock/pile, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"qeW" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "qfj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -33023,19 +32200,23 @@ /obj/machinery/flasher/portable, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"qge" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +"qfZ" = ( +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) +"qga" = ( +/obj/effect/turf_decal/tile/black/opposingcorners{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/railing{ - dir = 4 +/obj/machinery/photocopier, +/obj/effect/turf_decal/bot, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 }, -/obj/machinery/light/floor, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/hor) "qgj" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ywflowers, @@ -33052,9 +32233,7 @@ dir = 8 }, /turf/open/floor/grass/no_border, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "qgB" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ @@ -33083,28 +32262,12 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) -"qhg" = ( -/obj/structure/table, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/clothing/neck/stethoscope{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/reagent_containers/medspray/sterilizine{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/structure/disposalpipe/segment{ +"qhp" = ( +/obj/structure/fence/corner{ dir = 8 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "qhy" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -33122,6 +32285,20 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"qhz" = ( +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/spawner/structure/window/reinforced/prison, +/obj/machinery/door/poddoor/preopen{ + id = "Prisongate"; + name = "Prison Blast Door" + }, +/turf/open/floor/plating, +/area/security/prison) "qhA" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -33136,20 +32313,6 @@ "qhT" = ( /turf/closed/wall/r_wall, /area/maintenance/department/security/brig) -"qiD" = ( -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 40 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white, -/area/medical/surgery) "qiO" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -33175,7 +32338,12 @@ icon_state = "4-8" }, /turf/open/floor/carpet/purple, -/area/vacant_room/office) +/area/library/abandoned) +"qjh" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "qji" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/bot{ @@ -33183,18 +32351,64 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) +"qjm" = ( +/obj/machinery/power/solar{ + id = "portsolar"; + name = "Port Solar Array" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/iron/solarpanel, +/area/asteroid/paradise/surface) "qjq" = ( /obj/structure/flora/grass/jungle/b, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"qjr" = ( -/obj/structure/window/reinforced/survival_pod{ +"qju" = ( +/obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 }, -/obj/structure/frame, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) +/obj/machinery/light, +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","rd") + }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/hor) +"qjB" = ( +/obj/structure/table/reinforced, +/obj/machinery/button/door{ + id = "bridgewindows"; + name = "Bridge View Blast doors"; + pixel_x = -6; + pixel_y = -2; + req_access_txt = "19" + }, +/obj/machinery/button/door{ + id = "bridgedoors"; + name = "Bridge Access Blast door"; + pixel_x = -6; + pixel_y = 8 + }, +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ + alpha = 180 + }, +/obj/machinery/light, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/structure/cable/yellow, +/obj/item/camera{ + pixel_x = 2; + pixel_y = 6 + }, +/turf/open/floor/iron/dark, +/area/bridge) "qjF" = ( /obj/structure/railing{ dir = 8 @@ -33205,30 +32419,13 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "qjI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{ - dir = 1; - piping_layer = 4 + dir = 1 }, /turf/open/floor/engine/plasma, /area/engine/atmos) -"qjP" = ( -/obj/machinery/requests_console{ - department = "Cargo Bay"; - departmentType = 2; - pixel_y = 29 - }, -/obj/machinery/computer/cargo, -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/dark, -/area/quartermaster/storage) "qjR" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -33241,15 +32438,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "atmos Junction"; - sortType = 6 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/structure/disposalpipe/sorting/mail/destination/atmospherics, /turf/open/floor/iron, /area/security/prison) "qka" = ( @@ -33260,20 +32453,6 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) -"qki" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 8 - }, -/obj/machinery/door/airlock/public/glass/incinerator{ - frequency = null; - req_access_txt = "11"; - req_one_access = null - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "qkM" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -33283,14 +32462,6 @@ }, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) -"qlb" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cmoshutter"; - name = "CMO Office Shutters" - }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/medical/medbay/central) "qlg" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -33316,13 +32487,12 @@ /obj/structure/fans/tiny, /turf/open/floor/iron/techmaint/planetary, /area/science/mixing) -"qlO" = ( -/obj/item/seeds/flower/harebell, -/obj/machinery/light/small, -/obj/effect/turf_decal/delivery, -/obj/machinery/hydroponics, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) +"qmb" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore) "qmd" = ( /obj/structure/railing{ dir = 4 @@ -33336,15 +32506,7 @@ /turf/open/floor/iron/dark/corner{ dir = 4 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"qms" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) +/area/hallway/primary/central) "qmz" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -33362,17 +32524,58 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"qnI" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "qnO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "qnY" = ( /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"qoc" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark/corner{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/open/floor/iron/dark, +/area/engineering/hallway) +"qor" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "qow" = ( /obj/structure/stairs, /turf/open/floor/pod/dark, @@ -33413,30 +32616,16 @@ /obj/machinery/holopad, /obj/effect/turf_decal/box, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "qpS" = ( /turf/closed/mineral/random/air, /area/maintenance/disposal) -"qrb" = ( -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science Requests Console"; - pixel_x = -32; - pixel_y = -33; - receive_ore_updates = 1 - }, -/obj/machinery/airalarm/directional/west, -/obj/machinery/monkey_recycler, -/obj/machinery/camera/directional/west{ - c_tag = "Xenobiology Lab"; - name = "Xeno camera"; - network = list("ss13","rd","xeno") +"qrH" = ( +/obj/machinery/door/airlock/external/glass{ + autoclose = 0.1 }, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "qrO" = ( /obj/machinery/conveyor{ dir = 4; @@ -33447,29 +32636,18 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"qsx" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, +"qse" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 + icon_state = "1-2" }, -/turf/open/floor/pod/dark, -/area/maintenance/department/crew_quarters/dorms) -"qsz" = ( -/obj/structure/railing{ - dir = 4 +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 8 }, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/tech, +/area/engine/engineering) "qsE" = ( /obj/structure/sign/directions/science{ dir = 4; @@ -33485,16 +32663,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/chapel) -"qte" = ( -/obj/machinery/rnd/production/techfab/department/service, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/iron, -/area/hallway/secondary/service) "qti" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -33512,14 +32680,6 @@ "qtI" = ( /turf/open/openspace, /area/bridge) -"qtY" = ( -/obj/effect/turf_decal/siding/dark/end{ - dir = 8 - }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "quq" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -33528,6 +32688,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) "qur" = ( @@ -33542,25 +32705,48 @@ }, /turf/open/floor/carpet/green, /area/chapel/main) +"quz" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table, +/obj/item/stack/sheet/rglass{ + amount = 30; + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/stack/sheet/plasteel/fifty, +/obj/item/circuitboard/machine/shuttle/engine/plasma{ + pixel_y = 3 + }, +/obj/item/circuitboard/machine/shuttle/engine/plasma{ + pixel_x = -6 + }, +/obj/item/shuttle_creator{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/circuitboard/machine/exploration_equipment_vendor{ + pixel_y = 5 + }, +/obj/item/circuitboard/machine/shuttle/heater, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "quA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/iron, /area/teleporter) -"quQ" = ( -/obj/machinery/door/poddoor/shutters{ - id = "atmosshutters"; - name = "Atmos storage" - }, -/obj/effect/turf_decal/loading_area{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark, -/area/engine/atmos) +"quK" = ( +/obj/effect/turf_decal/siding/white, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/recharge_station, +/obj/structure/railing, +/turf/open/floor/iron, +/area/science/robotics) "qvu" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner{ @@ -33580,9 +32766,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "qvD" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -33598,13 +32782,6 @@ /obj/structure/lattice, /turf/open/openspace, /area/science/lab) -"qwe" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "qwi" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, @@ -33615,6 +32792,12 @@ /obj/structure/chair/office, /turf/open/floor/iron/dark, /area/engine/atmos) +"qwr" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 6 + }, +/turf/open/floor/glass/reinforced, +/area/medical/medbay/central) "qwA" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -33659,9 +32842,7 @@ /obj/structure/lattice/catwalk/over, /obj/structure/chair/foldable, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "qxp" = ( /obj/structure/closet/secure_closet/warden{ anchored = 1 @@ -33676,13 +32857,14 @@ pixel_x = -1; pixel_y = -5 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/warden) "qxA" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/bot_assembly/floorbot, /turf/open/floor/plating/asteroid/basalt/planetary, -/area/science/misc_lab) +/area/asteroid/paradise) "qxE" = ( /obj/structure/stairs, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -33691,6 +32873,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/pod/dark, /area/science/mixing) "qxQ" = ( @@ -33698,6 +32883,19 @@ /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) +"qyj" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + id = "qm_warehouse"; + name = "warehouse Shutters" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/sepia, +/area/quartermaster/warehouse) "qyw" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4{ @@ -33726,6 +32924,13 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) +"qyK" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "qza" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -33737,6 +32942,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/pod/dark, /area/quartermaster/qm) "qzj" = ( @@ -33747,9 +32955,7 @@ dir = 5 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "qzt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -33766,6 +32972,19 @@ }, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) +"qzR" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "qAn" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -33778,13 +32997,12 @@ /obj/machinery/door/airlock/wood, /turf/open/floor/wood, /area/asteroid/paradise/surface) -"qBi" = ( -/obj/machinery/door/poddoor/incinerator_toxmix{ - id = "EmergancyescapeShutter"; - name = "Emergancy escape Shutters" +"qAL" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ + dir = 5 }, -/turf/open/floor/plating, -/area/science/mixing/chamber) +/turf/closed/wall, +/area/engine/supermatter) "qBw" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -33795,9 +33013,50 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/engine/engineering) +"qBC" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/bar) "qCg" = ( /turf/open/floor/plating/beach/deep_water, /area/asteroid/paradise/surface/water) +"qCl" = ( +/obj/structure/rack, +/obj/item/circuitboard/machine/telecomms/bus, +/obj/item/circuitboard/machine/telecomms/broadcaster, +/turf/open/floor/iron/dark, +/area/engine/atmos) +"qCn" = ( +/obj/structure/lattice/catwalk/over, +/obj/item/wirecutters{ + pixel_x = -6; + pixel_y = -12 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/hallway/primary/central) +"qCO" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "cmoshutter"; + name = "CMO Office Shutters" + }, +/turf/open/floor/plating, +/area/crew_quarters/heads/cmo) "qDp" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -33809,6 +33068,20 @@ /obj/effect/turf_decal/bot, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) +"qDH" = ( +/obj/structure/table, +/obj/structure/bedsheetbin, +/obj/effect/turf_decal/siding/white{ + alpha = 100 + }, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/white, +/area/crew_quarters/fitness/recreation) "qDJ" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -33826,9 +33099,7 @@ }, /obj/structure/lattice, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "qEd" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -33836,23 +33107,6 @@ /obj/machinery/telecomms/processor/preset_four, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) -"qEQ" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 1; - pixel_x = 32; - pixel_y = 3 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "qEU" = ( /obj/machinery/light{ dir = 8 @@ -33870,19 +33124,40 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"qFs" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/machinery/computer/med_data/laptop{ + dir = 4; + pixel_x = 2; + pixel_y = 2 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/cmo) "qFF" = ( /turf/open/floor/wood, /area/crew_quarters/heads/captain) "qGg" = ( /turf/closed/wall, /area/maintenance/department/engine/atmos) +"qGy" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/maintenance/department/engine) "qGC" = ( /turf/open/floor/iron/dark/side{ dir = 6 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "qGH" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -33920,6 +33195,23 @@ "qHP" = ( /turf/closed/wall, /area/security/execution/education) +"qHS" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_y = 25 + }, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_y = 21 + }, +/obj/effect/turf_decal/siding/wood, +/obj/item/food/spaghetti/beefnoodle{ + pixel_x = -1; + pixel_y = 2 + }, +/obj/effect/turf_decal/siding/white, +/obj/structure/railing, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "qHY" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -33940,12 +33232,19 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, /turf/open/floor/wood/broken, -/area/vacant_room/office) -"qId" = ( -/obj/structure/ladder, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/pod/dark, -/area/maintenance/department/science/central) +/area/library/abandoned) +"qIE" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/tech, +/area/engine/atmos) +"qIN" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating/beach/sand, +/area/asteroid/paradise/surface) "qIX" = ( /obj/docking_port/stationary{ dwidth = 3; @@ -33985,23 +33284,6 @@ "qJS" = ( /turf/closed/wall/r_wall, /area/crew_quarters/cafeteria) -"qJT" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/general/hidden/layer4, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - name = "Connector Port (Air Supply)" - }, -/obj/machinery/atmospherics/pipe/simple/general/hidden/layer2{ - dir = 6 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) "qKI" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/bot{ @@ -34030,6 +33312,24 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/science/central) +"qLm" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) +"qLF" = ( +/obj/structure/fence/corner{ + dir = 8 + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "qMA" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -34067,9 +33367,7 @@ dir = 9 }, /turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "qNf" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -34087,9 +33385,21 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/obj/structure/disposalpipe/junction/flip, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/brig) +"qNm" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "qNq" = ( /obj/machinery/computer/cargo/request{ dir = 1 @@ -34103,9 +33413,17 @@ /obj/structure/chair/foldable, /obj/effect/landmark/start/chief_engineer, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) +"qNU" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/effect/landmark/start/chief_medical_officer, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "qOg" = ( /obj/machinery/suit_storage_unit/atmos, /obj/effect/turf_decal/stripes/line, @@ -34113,6 +33431,24 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/engine/engineering) +"qOj" = ( +/obj/structure/bed, +/obj/item/bedsheet/purple{ + name = "Holy bedsheet" + }, +/obj/machinery/newscaster{ + pixel_y = 34 + }, +/obj/machinery/camera/autoname/directional/north, +/obj/item/storage/secure/safe{ + pixel_x = -27; + pixel_y = 1 + }, +/obj/item/storage/book/bible{ + pixel_x = 1 + }, +/turf/open/floor/wood, +/area/chapel/office) "qOn" = ( /obj/structure/table/wood, /obj/item/soap/nanotrasen, @@ -34127,6 +33463,14 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/rust, /area/science/test_area) +"qOB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/rnd/production/circuit_imprinter, +/obj/structure/window/plasma/reinforced, +/turf/open/floor/iron, +/area/engine/engineering) "qON" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -34137,35 +33481,42 @@ }, /turf/open/floor/iron, /area/security/brig) +"qPe" = ( +/turf/closed/wall/r_wall/rust, +/area/asteroid/paradise) "qPg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) +"qPx" = ( +/obj/machinery/door/poddoor/shutters{ + id = "atmosshutters"; + name = "Atmos Storage" + }, +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/engine/atmos) +"qPC" = ( +/obj/machinery/door/poddoor/preopen{ + id = "testlab"; + name = "test Chamber Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/explab) "qPX" = ( /obj/machinery/light{ dir = 8 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"qQk" = ( -/obj/item/storage/secure/safe{ - pixel_x = 37; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/camera/directional/north, -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 29 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "qQo" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, @@ -34183,6 +33534,19 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/sorting) +"qQx" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","security") + }, +/obj/item/kirbyplants/random, +/obj/structure/sink/kitchen{ + pixel_y = 22 + }, +/turf/open/floor/iron, +/area/security/brig) "qQD" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -34191,18 +33555,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/engineering) -"qQU" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow, -/obj/machinery/sleeper{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) "qQW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/multiz/layer4{ @@ -34224,10 +33576,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "qRs" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/barricade/wooden, @@ -34236,9 +33587,7 @@ "qRu" = ( /obj/structure/lattice, /turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "qRN" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -34287,16 +33636,17 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) -"qTn" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner{ +"qST" = ( +/obj/item/trash/popcorn, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/medical/surgery) "qTU" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/structure/table/wood, @@ -34348,6 +33698,17 @@ /obj/structure/railing, /turf/open/floor/iron, /area/bridge) +"qUn" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" + }, +/turf/open/floor/plating, +/area/security/warden) "qUr" = ( /obj/effect/turf_decal/stripes/line, /obj/item/kirbyplants/random, @@ -34357,24 +33718,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/engine/atmos) -"qUt" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/radio/intercom{ - pixel_y = 20 - }, -/turf/open/floor/iron, -/area/medical/surgery) "qUy" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/structure/disposalpipe/segment{ @@ -34387,10 +33730,6 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/iron, /area/maintenance/department/science/central) -"qUD" = ( -/obj/structure/flora/ash/tall_shroom, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "qUJ" = ( /obj/machinery/clonepod/prefilled, /obj/effect/turf_decal/bot, @@ -34421,6 +33760,18 @@ /obj/structure/rack, /turf/open/floor/plating, /area/maintenance/department/eva) +"qVo" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "qVs" = ( /obj/structure/sign/warning/nosmoking/circle, /turf/closed/wall/r_wall/rust, @@ -34441,29 +33792,6 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/hor) -"qWg" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/command, -/obj/effect/turf_decal/delivery, -/obj/item/radio/intercom{ - pixel_y = 29 - }, -/obj/machinery/power/apc/auto_name/directional/east{ - pixel_x = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/camera/motion/directional/east{ - c_tag = "Technical Storage"; - name = "motion-sensitive Technical Storage"; - network = list("ss13","engine") - }, -/turf/open/floor/iron/techmaint/planetary, -/area/storage/tech) "qWJ" = ( /obj/machinery/door/window/southleft{ dir = 4; @@ -34481,26 +33809,35 @@ }, /obj/machinery/light/floor, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "qWX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/wood, -/area/vacant_room/office) -"qXl" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/area/library/abandoned) +"qXb" = ( +/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ + alpha = 180; + color = "#DE3A3A" }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/camera/directional/north{ - network = list("ss13","public") +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","security") }, /turf/open/floor/iron, -/area/maintenance/department/crew_quarters/dorms) +/area/security/brig) "qXt" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -34574,17 +33911,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/medical/morgue) -"qYc" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark/corner, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "qYC" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -34592,22 +33918,6 @@ /obj/machinery/digital_clock/directional/south, /turf/open/floor/iron, /area/security/brig) -"qYP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/turf/open/floor/plating, -/area/quartermaster/warehouse) "qYU" = ( /obj/machinery/computer/bounty{ dir = 1 @@ -34618,17 +33928,15 @@ /obj/structure/flora/tree/jungle, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"qZw" = ( -/obj/machinery/power/solar_control, -/obj/structure/cable/yellow{ - icon_state = "4-8" +"qZk" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "0-2" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "qZA" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/turf_decal/bot, @@ -34666,7 +33974,7 @@ "rab" = ( /obj/structure/girder, /turf/open/floor/plating, -/area/vacant_room/office) +/area/library/abandoned) "ran" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/cigarettes/cigpack_carp{ @@ -34683,8 +33991,24 @@ /obj/machinery/light{ dir = 4 }, +/obj/item/storage/firstaid/toxin{ + pixel_x = 1; + pixel_y = 3 + }, /turf/open/floor/iron/dark, /area/science/mixing) +"rat" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) "raX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/layer_manifold/visible{ @@ -34721,16 +34045,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"rca" = ( -/obj/structure/lattice/catwalk/over, -/obj/effect/turf_decal/trimline/yellow, -/obj/structure/cable/yellow{ - icon_state = "8-32" - }, -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/plating, -/area/maintenance/department/science/central) "rck" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/structure/disposalpipe/segment{ @@ -34738,13 +34052,27 @@ }, /turf/open/floor/iron, /area/security/brig) -"rcr" = ( -/obj/structure/sign/departments/minsky/supply/hydroponics{ - pixel_x = -33 +"rcA" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/turf_decal/tile/dark_green, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ + dir = 6 + }, +/turf/open/floor/iron/tech, +/area/engine/atmos) "rcE" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/modular_computer/console/preset/engineering{ @@ -34774,6 +34102,30 @@ }, /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) +"rcR" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/sepia, +/area/quartermaster/storage) +"rcY" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/status_display/evac{ + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/security/brig) +"rdf" = ( +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/space_heater, +/turf/open/floor/iron, +/area/maintenance/department/medical/central) "rdw" = ( /obj/structure/grille/broken, /turf/open/floor/iron, @@ -34789,6 +34141,19 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/medical/morgue) +"rem" = ( +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/bot, +/obj/item/radio/intercom{ + dir = 1; + pixel_x = 1; + pixel_y = 23 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","medbay") + }, +/turf/open/floor/iron, +/area/medical/genetics/cloning) "reS" = ( /obj/structure/railing/corner, /obj/effect/decal/cleanable/dirt/dust, @@ -34821,6 +34186,41 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) +"rfc" = ( +/obj/structure/window/reinforced/spawner/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/box/white, +/obj/machinery/atmospherics/pipe/simple/general/visible, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) +"rff" = ( +/obj/structure/railing/corner, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/airlock/atmos/glass{ + req_access_txt = "11" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/atmos) "rfn" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -34841,25 +34241,24 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/security/brig) -"rfL" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 +"rfC" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/machinery/computer/security, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/iron, -/area/bridge) -"rfT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) +/turf/open/floor/iron, +/area/maintenance/department/crew_quarters/bar) "rgj" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -34899,31 +34298,10 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) -"rgP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/table, -/obj/item/assembly/igniter{ - pixel_x = 12; - pixel_y = -6 - }, -/obj/item/assembly/igniter{ - pixel_x = 15; - pixel_y = 6 - }, -/obj/item/storage/firstaid/regular{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/iron, -/area/storage/primary) +"rhg" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/dark/side, +/area/hallway/primary/aft) "rhp" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/reagent_dispensers/watertank, @@ -34960,15 +34338,12 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/fitness/recreation) -"riG" = ( -/obj/structure/railing, -/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +"riF" = ( /obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/science/lab) +/obj/item/kirbyplants/random, +/obj/structure/railing, +/turf/open/floor/iron, +/area/science/robotics) "riT" = ( /obj/machinery/button/door{ id = "meetingshutter"; @@ -34995,16 +34370,6 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"rjf" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/department/crew_quarters/bar) -"rjx" = ( -/obj/structure/fence, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "rjD" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -35023,9 +34388,7 @@ pixel_y = -32 }, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "rjX" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -35068,6 +34431,14 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating/airless, /area/science/mixing) +"rky" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/iron/tech, +/area/engine/engineering) "rkK" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -35075,6 +34446,16 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/iron, /area/medical/medbay/central) +"rkL" = ( +/obj/machinery/rnd/production/techfab/department/service, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "rkR" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 5 @@ -35109,17 +34490,11 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/pod/dark, /area/maintenance/department/engine) -"rlo" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "rlr" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -35181,6 +34556,9 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/science/mixing) "rlP" = ( @@ -35196,6 +34574,16 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/ai_monitored/security/armory) +"rmk" = ( +/obj/structure/cable/yellow{ + icon_state = "1-16" + }, +/obj/effect/turf_decal/trimline/yellow, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/pod/dark, +/area/maintenance/department/medical/morgue) "rmX" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/conveyor/inverted{ @@ -35213,6 +34601,23 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/dark, /area/science/mixing) +"rnO" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor/preopen{ + id = "Engidesk"; + name = "engineering Security Door" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"rnR" = ( +/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/airalarm/directional/north, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/wood, +/area/crew_quarters/theatre/backstage) "roc" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -35228,6 +34633,11 @@ }, /turf/open/floor/iron/dark, /area/security/nuke_storage) +"roh" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron/tech, +/area/engine/engineering) "roj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -35240,13 +34650,25 @@ dir = 1 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "roN" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"rpn" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "rpu" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -35301,6 +34723,9 @@ pixel_x = 7; pixel_y = 2 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/quartermaster/sorting) "rpH" = ( @@ -35309,15 +34734,9 @@ }, /turf/open/openspace, /area/hydroponics) -"rpV" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) +"rpX" = ( +/turf/closed/wall/r_wall/rust, +/area/quartermaster/storage) "rqj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/ausbushes/sparsegrass, @@ -35332,30 +34751,12 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface/grass) -"rqt" = ( -/obj/machinery/door/window/northleft{ - dir = 2 - }, -/turf/open/floor/iron/dark/side, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +"rqy" = ( +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "rqF" = ( /turf/closed/wall/r_wall, /area/tcommsat/server) -"rqV" = ( -/obj/item/clothing/suit/costume/ianshirt, -/obj/item/bedsheet/ian, -/obj/structure/closet/secure_closet{ - req_access_txt = "57" - }, -/obj/item/wrench{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/clothing/suit/hooded/ian_costume, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/hop) "rrg" = ( /turf/closed/wall, /area/quartermaster/warehouse) @@ -35369,24 +34770,6 @@ /obj/effect/spawner/room/fivexthree, /turf/open/floor/plating, /area/maintenance/department/science/central) -"rrt" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, -/turf/open/floor/iron, -/area/engine/engineering) "rru" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -35403,6 +34786,9 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) "rrC" = ( @@ -35425,18 +34811,7 @@ }, /obj/structure/lattice, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"rsf" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/digital_clock/directional/east, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/fore) "rsH" = ( /obj/effect/turf_decal/numbers{ dir = 1 @@ -35487,9 +34862,7 @@ dir = 8 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "rtT" = ( /obj/structure/sink{ dir = 4; @@ -35505,9 +34878,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/freezer, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "rtX" = ( /obj/machinery/door/airlock/public/glass{ name = "Primary Tool Storage"; @@ -35532,6 +34903,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/storage/primary) +"rub" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) "ruE" = ( /obj/effect/turf_decal/siding/dark{ dir = 10 @@ -35541,9 +34920,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "ruO" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 6 @@ -35569,27 +34946,27 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"rvl" = ( +"rvk" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/maintenance/department/science/central) -"rvq" = ( -/obj/structure/railing/corner{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/turf_decal/siding/dark/corner{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/effect/turf_decal/siding/dark{ - dir = 1 +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 }, -/turf/open/floor/iron/dark/side{ - dir = 9 +/obj/structure/cable/yellow{ + icon_state = "0-8" }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/turf/open/floor/iron, +/area/maintenance/department/chapel) +"rvl" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/maintenance/department/science/central) "rvJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -35640,27 +35017,18 @@ "rxi" = ( /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface) -"rxA" = ( -/obj/structure/table, -/obj/item/shovel/spade, -/obj/item/reagent_containers/glass/bottle/nutrient/rh{ - pixel_x = 5 - }, -/obj/item/reagent_containers/glass/bottle/nutrient/ez{ - pixel_x = -5 +"rxt" = ( +/obj/effect/spawner/lootdrop/glowstick/lit, +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/obj/item/reagent_containers/syringe, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) +/turf/open/floor/plating, +/area/maintenance/department/engine) "rxI" = ( /obj/structure/railing, /obj/structure/lattice, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "rxQ" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -35679,16 +35047,6 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) -"ryA" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/machinery/vending/wardrobe/jani_wardrobe, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted, -/obj/structure/cable/yellow, -/turf/open/floor/iron, -/area/janitor) "rzg" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -35703,6 +35061,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/engine/engineering) +"rzw" = ( +/obj/structure/lattice/catwalk/over, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/hallway/primary/central) "rzI" = ( /obj/structure/lattice/catwalk/over, /obj/structure/railing/corner{ @@ -35719,9 +35087,7 @@ /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "rzP" = ( /obj/item/kirbyplants/random, /obj/item/radio/intercom{ @@ -35732,9 +35098,7 @@ /turf/open/floor/iron/dark/side{ dir = 10 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "rzV" = ( /obj/structure/flora/rock/pile, /obj/effect/decal/cleanable/dirt, @@ -35774,13 +35138,13 @@ }, /turf/open/floor/iron, /area/medical/surgery) -"rAu" = ( -/obj/structure/fence{ - dir = 8 +"rAA" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 1 }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) +/turf/open/openspace, +/area/engineering/hallway) "rAS" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, @@ -35816,33 +35180,48 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"rBT" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","rd") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/science/mixing) "rBY" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) -"rCk" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/camera/directional/north{ - network = list("ss13","cargo") +"rCo" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/spawner/randomvend/cola, +/obj/machinery/airalarm/directional/west, +/obj/structure/sign/map/echo{ + pixel_y = 32 }, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/quartermaster/storage) -"rDl" = ( -/obj/structure/chair/office/light{ - dir = 4 +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) +"rCA" = ( +/obj/structure/window/reinforced/survival_pod{ + dir = 1 }, -/obj/effect/landmark/start/chemist, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/frame, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) +"rDh" = ( +/obj/machinery/computer/card, +/obj/item/radio/intercom{ + dir = 1; + pixel_x = 1; + pixel_y = 23 }, -/turf/open/floor/iron/white, -/area/medical/apothecary) +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/hop) "rDD" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -35883,9 +35262,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/numbers, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "rEh" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -35907,6 +35284,13 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"rEs" = ( +/obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "rEz" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small{ @@ -35961,43 +35345,20 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "rFo" = ( /obj/structure/flora/rock/pile/largejungle{ pixel_x = -2; pixel_y = -27 }, /turf/open/floor/grass/no_border, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "rFF" = ( /turf/closed/wall, /area/ai_monitored/turret_protected/aisat/maint) "rGh" = ( /turf/closed/indestructible/rock/bedrock, /area/space) -"rGk" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/camera/directional/north{ - network = list("ss13","rd") - }, -/obj/machinery/firealarm/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/iron/white/side, -/area/science/research) "rGl" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -36022,9 +35383,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "rHi" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -36037,28 +35396,13 @@ }, /turf/open/floor/prison/dark, /area/security/prison) -"rHO" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/numbers/two_nine{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/iron, -/area/maintenance/department/chapel) "rHQ" = ( /obj/effect/spawner/room/fivexthree, /turf/open/floor/plating, /area/maintenance/department/bridge) "rId" = ( /turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "rIj" = ( /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, @@ -36084,6 +35428,29 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"rIy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" + }, +/turf/open/floor/plating, +/area/security/brig) +"rIP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/window/plasma/reinforced{ + dir = 1 + }, +/obj/machinery/atmospherics/components/trinary/mixer/airmix/layer2/flipped{ + dir = 8 + }, +/turf/open/floor/iron, +/area/engine/atmos) "rIZ" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/table/reinforced, @@ -36155,9 +35522,18 @@ pixel_x = -27 }, /turf/open/floor/pod/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"rLn" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "rLt" = ( /obj/machinery/computer/crew{ dir = 8 @@ -36202,13 +35578,19 @@ pixel_x = -9; pixel_y = 12 }, +/obj/item/paper_bin{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/pen{ + pixel_x = 6; + pixel_y = 4 + }, /turf/open/floor/carpet/green, /area/chapel/main) "rLR" = ( /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "rMf" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -36230,9 +35612,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "rMK" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -36268,12 +35648,24 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) +"rNY" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window/northleft{ + dir = 8; + name = "Kitchen Delivery"; + req_one_access_txt = "28;25;35" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "rOv" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium/survival, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "rOI" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/fence/post{ @@ -36287,24 +35679,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/engineering) -"rPF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Medbay Maintenance"; - req_access_txt = "5" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/stripes/closeup, -/turf/open/floor/iron/dark, -/area/maintenance/department/medical/central) "rPI" = ( /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, @@ -36312,6 +35686,23 @@ "rPT" = ( /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"rQf" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/bar) "rQE" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -36349,11 +35740,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"rRm" = ( -/obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "rRx" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -36385,7 +35771,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/structure/disposalpipe/trunk/multiz{ +/obj/structure/disposalpipe/multiz{ dir = 8 }, /turf/open/floor/iron, @@ -36399,6 +35785,19 @@ "rSr" = ( /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) +"rSs" = ( +/obj/structure/window/plasma/reinforced{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/rad_collector/anchored, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "rSE" = ( /obj/structure/closet/secure_closet/hydroponics{ req_access = null; @@ -36412,6 +35811,15 @@ /obj/item/reagent_containers/glass/bucket, /turf/open/floor/iron/grid/steel, /area/hydroponics) +"rSI" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/computer/shuttle_flight/custom_shuttle/exploration, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "rSK" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -36423,24 +35831,44 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/prison) -"rTr" = ( -/obj/structure/chair/fancy/comfy{ - color = "#596479" +"rTM" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 }, -/obj/effect/turf_decal/siding/wideplating/dark{ +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark/corner{ dir = 1 }, -/obj/effect/landmark/start/captain, -/obj/machinery/light{ +/obj/effect/turf_decal/trimline/yellow/corner{ dir = 1 }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/carpet/blue, -/area/bridge/meeting_room) +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway) "rUl" = ( /obj/machinery/space_heater, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) +"rUD" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "rUJ" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -36455,6 +35883,21 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/science/test_area) +"rUW" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/item/kirbyplants/random, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/digital_clock/directional/east, +/turf/open/floor/iron, +/area/bridge) "rVx" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -36475,7 +35918,7 @@ pixel_x = -33; pixel_y = -36 }, -/obj/structure/disposalpipe/trunk/multiz/down{ +/obj/structure/disposalpipe/multiz/down{ dir = 4 }, /obj/structure/rack, @@ -36488,6 +35931,16 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) +"rWk" = ( +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/machinery/vending/wardrobe/jani_wardrobe, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/obj/structure/cable/yellow, +/turf/open/floor/iron, +/area/janitor) "rWp" = ( /obj/effect/spawner/room/fivexfour, /turf/open/floor/plating, @@ -36500,6 +35953,17 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/pod/dark, /area/quartermaster/qm) +"rXh" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/door/poddoor/preopen{ + id = "Engidesk"; + name = "engineering Security Door" + }, +/turf/open/floor/plating, +/area/engine/engineering) "rXp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -36565,6 +36029,16 @@ }, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"rYf" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/evac, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/hallway/primary/fore) "rYh" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -36620,29 +36094,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engine/engineering) -"rZs" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/door/airlock/command{ - name = "Chief Medical Officer's Office"; - req_access_txt = "40" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "rZv" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -36654,19 +36105,25 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "rZy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/engine) "rZM" = ( /turf/open/floor/plating, /area/maintenance/department/science/central) +"rZW" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small, +/turf/open/floor/plating, +/area/maintenance/department/chapel) "sap" = ( /obj/docking_port/stationary{ dir = 8; @@ -36725,15 +36182,6 @@ }, /turf/open/floor/iron/dark, /area/gateway) -"saH" = ( -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/door/poddoor/preopen{ - id = "meetingshutter"; - name = "Council Blast Doors" - }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron/dark, -/area/bridge/meeting_room) "saM" = ( /turf/closed/wall, /area/maintenance/department/science/xenobiology) @@ -36751,9 +36199,7 @@ dir = 1 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "sbg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36775,7 +36221,7 @@ /obj/structure/barricade/wooden/crude, /obj/effect/spawner/structure/window, /turf/open/floor/plating, -/area/vacant_room/office) +/area/library/abandoned) "sbS" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /obj/structure/cable/yellow{ @@ -36786,6 +36232,16 @@ }, /turf/open/floor/iron, /area/security/brig) +"scq" = ( +/obj/machinery/holopad{ + pixel_x = 16; + pixel_y = 16 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "scw" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -36809,6 +36265,9 @@ /obj/effect/turf_decal/numbers/two_nine{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/science/mixing) "scX" = ( @@ -36831,6 +36290,14 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) +"sds" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/telecomms/hub/preset, +/turf/open/floor/circuit/green/telecomms/mainframe, +/area/tcommsat/server) "sdD" = ( /turf/closed/wall/r_wall/rust, /area/science/test_area) @@ -36839,6 +36306,7 @@ name = "Maintenance Hatch"; req_one_access_txt = "12;7;29" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/engine) "see" = ( @@ -36847,9 +36315,7 @@ dir = 1 }, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "sel" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -36895,38 +36361,18 @@ }, /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) -"seY" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/area/engineering/hallway) +"seE" = ( +/obj/machinery/light/small{ + dir = 1 }, +/turf/open/openspace, +/area/maintenance/department/chapel) +"sfc" = ( +/obj/structure/ladder, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/item/stack/sheet/rglass{ - amount = 30; - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/stack/sheet/plasteel/fifty, -/obj/item/circuitboard/machine/shuttle/engine/plasma{ - pixel_y = 3 - }, -/obj/item/circuitboard/machine/shuttle/engine/plasma{ - pixel_x = -6 - }, -/obj/item/shuttle_creator{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/circuitboard/machine/exploration_equipment_vendor{ - pixel_y = 5 - }, -/obj/item/circuitboard/machine/shuttle/heater, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) +/turf/open/floor/pod/dark, +/area/maintenance/department/science/central) "sff" = ( /obj/structure/rack, /obj/item/crowbar/red, @@ -36949,6 +36395,12 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/security/execution/education) +"sfs" = ( +/obj/machinery/power/tracker, +/obj/structure/cable, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "sfC" = ( /obj/machinery/door/airlock/highsecurity{ name = "AI Chamber"; @@ -36974,12 +36426,13 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/corner, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"sfR" = ( -/turf/closed/wall/r_wall/rust, -/area/maintenance/department/cargo) +/area/hallway/primary/central) +"sfW" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft) "sgv" = ( /obj/effect/turf_decal/siding/white{ alpha = 100; @@ -36987,14 +36440,6 @@ }, /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness/recreation) -"sho" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/department/chapel) "shD" = ( /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, @@ -37019,9 +36464,7 @@ network = list("ss13","public") }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "siH" = ( /obj/machinery/conveyor{ dir = 4; @@ -37049,6 +36492,14 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/sorting) +"siI" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "hopshutter"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/crew_quarters/heads/hop) "siO" = ( /obj/machinery/door/airlock/public/glass{ name = "Chapel" @@ -37071,6 +36522,16 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) +"siR" = ( +/obj/effect/decal/cleanable/generic, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "sjC" = ( /obj/item/book/granter/spell/smoke/lesser{ pixel_x = -4; @@ -37089,32 +36550,12 @@ pixel_x = 33; pixel_y = -1 }, +/obj/item/organ/heart{ + pixel_x = -5; + pixel_y = -1 + }, /turf/open/floor/wood, /area/chapel/office) -"sjD" = ( -/obj/structure/table/reinforced, -/obj/item/pipe_dispenser, -/obj/item/lightreplacer{ - pixel_x = 2; - pixel_y = 13 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 25 - }, -/obj/structure/window/plasma/reinforced, -/turf/open/floor/iron, -/area/engine/engineering) -"sjJ" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/under/suit/tan, -/obj/item/reagent_containers/food/drinks/bottle/champagne{ - layer = 5; - pixel_x = 6; - pixel_y = 10 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/purple, -/area/crew_quarters/dorms) "sjV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -37139,9 +36580,7 @@ /area/crew_quarters/dorms) "skf" = ( /turf/closed/wall, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "skF" = ( /obj/machinery/newscaster{ pixel_y = -31 @@ -37149,6 +36588,19 @@ /obj/structure/dresser, /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) +"skT" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/manifold/green/visible/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "sld" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -37188,13 +36640,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"slT" = ( -/obj/machinery/vending/cigarette, -/turf/open/floor/iron, -/area/medical/surgery) +/area/hallway/primary/aft) "slY" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -37218,6 +36664,32 @@ /obj/item/instrument/violin, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"smm" = ( +/obj/machinery/requests_console{ + department = "AI"; + departmentType = 5; + name = "AI RC"; + pixel_x = 30; + pixel_y = -30 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/effect/turf_decal/box, +/obj/machinery/flasher{ + id = "AI"; + name = "Meatbag Pacifier"; + pixel_x = 24; + pixel_y = 24 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) "smw" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -37235,9 +36707,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "smU" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; @@ -37248,42 +36718,42 @@ }, /turf/open/floor/iron/dark, /area/chapel/office) -"sna" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) "snu" = ( /turf/closed/wall, /area/crew_quarters/cryopods) +"snB" = ( +/obj/structure/table, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/clothing/neck/stethoscope{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/reagent_containers/medspray/sterilizine{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "snW" = ( /obj/structure/girder, /turf/open/floor/plating, /area/maintenance/department/cargo) -"sol" = ( -/obj/machinery/power/solar{ - id = "portsolar"; - name = "Port Solar Array" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/iron/solarpanel, -/area/asteroid/paradise/surface) "som" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "soL" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -37302,6 +36772,18 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) +"soZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "spj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -37341,22 +36823,7 @@ /obj/machinery/door/airlock/public/glass, /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron/techmaint/planetary, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"sqh" = ( -/obj/machinery/light/small/broken/directional/west, -/obj/structure/frame, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) -"sqm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/sand/plating, -/obj/structure/grille, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) +/area/hallway/primary/fore) "sru" = ( /obj/structure/chair/wood/normal{ dir = 8 @@ -37390,42 +36857,32 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/department/bridge) +"ssj" = ( +/turf/closed/indestructible/rock/snow, +/area/space) "ssr" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/paicard, /turf/open/floor/iron, /area/maintenance/department/medical/central) -"ssu" = ( -/obj/effect/turf_decal/box/white, -/obj/machinery/rnd/server, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 9 - }, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "ssw" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/tech, /area/engine/atmos) -"ssy" = ( -/obj/structure/safe, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c500, -/obj/item/stack/spacecash/c500, -/obj/item/ammo_box/a357, -/obj/item/gun/ballistic/automatic/pistol/deagle, -/obj/item/gun/ballistic/revolver/russian, -/obj/structure/sign/warning/securearea{ - pixel_y = -32 +"ssG" = ( +/obj/machinery/requests_console{ + department = "Cargo Bay"; + departmentType = 2; + pixel_y = 29 }, -/turf/open/floor/circuit/green{ - luminosity = 2 +/obj/machinery/computer/cargo, +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/area/security/nuke_storage) +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/quartermaster/storage) "ssT" = ( /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, @@ -37434,23 +36891,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/quartermaster/storage) -"stR" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/fancy/plastic, -/turf/open/floor/iron, -/area/maintenance/department/chapel) -"stZ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chemistry_shutters"; - name = "chemistry shutters" - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/medical/apothecary) "sua" = ( /obj/structure/chair/office{ dir = 8 @@ -37478,19 +36918,10 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"suJ" = ( -/obj/machinery/firealarm/directional/north, -/obj/machinery/camera/directional/north{ - network = list("ss13","medbay") - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/iron, -/area/medical/surgery) +"suz" = ( +/obj/effect/landmark/loneops, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface/grass) "suO" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -37503,9 +36934,16 @@ }, /turf/open/lava/smooth, /area/asteroid/paradise) +"svD" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/digital_clock/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/central) "swh" = ( /obj/machinery/smartfridge/food, -/turf/closed/wall, +/turf/open/floor/iron/cafeteria_red, /area/crew_quarters/kitchen) "swj" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -37531,73 +36969,26 @@ "swD" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/iron, -/area/maintenance/department/science/xenobiology) -"swK" = ( -/obj/structure/railing, -/turf/open/floor/glass/reinforced, -/area/crew_quarters/heads/cmo) -"swO" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/security/glass{ - id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/machinery/door/poddoor/preopen{ - id = "brigfrontdoor"; - name = "Front Security Blast door" - }, -/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ - alpha = 180; - color = "#DE3A3A" - }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 6 }, /turf/open/floor/iron, -/area/security/brig) +/area/maintenance/department/science/xenobiology) "swS" = ( /turf/open/floor/iron/dark, /area/quartermaster/qm) -"swT" = ( -/obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/spawner/structure/window/reinforced/prison, -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison blast door" - }, -/turf/open/floor/plating, -/area/security/prison) "swU" = ( /obj/structure/railing{ dir = 5 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "sxu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) -"sxA" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "sxD" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -37642,19 +37033,31 @@ }, /turf/open/floor/iron, /area/storage/primary) -"szu" = ( -/mob/living/simple_animal/pet/dog/corgi/Ian{ - density = 0; - dir = 1; - pixel_y = 4 +"szj" = ( +/obj/structure/railing, +/obj/structure/closet/bombcloset, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/obj/item/toy/plush/ian, -/obj/structure/bed/dogbed/ian, -/obj/item/storage/secure/safe{ - pixel_x = 38 +/turf/open/floor/iron/dark, +/area/science/mixing) +"szl" = ( +/obj/structure/fence{ + dir = 8 }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/hop) +/obj/structure/sign/warning/securearea, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) +"szJ" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "sAm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -37665,6 +37068,17 @@ }, /turf/open/floor/engine/o2, /area/engine/atmos) +"sAY" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central) "sAZ" = ( /obj/effect/turf_decal/box/corners{ dir = 1 @@ -37698,16 +37112,6 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/iron, /area/maintenance/department/eva) -"sBO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/iron/dark, -/area/engine/engineering) "sBX" = ( /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/asteroid/planetary, @@ -37724,6 +37128,15 @@ /obj/structure/sign/departments/minsky/engineering/engineering, /turf/closed/wall/r_wall, /area/engine/engineering) +"sCH" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/flora/rock/pile, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "sDa" = ( /turf/closed/wall, /area/maintenance/disposal) @@ -37861,18 +37274,17 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"sGP" = ( -/obj/structure/disposalpipe/segment{ +"sGT" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/sign/painting/library{ - pixel_x = 1; - pixel_y = -32 +/turf/open/floor/iron/dark/side{ + dir = 8 }, -/turf/open/floor/iron, -/area/medical/surgery) +/area/hallway/primary/central) "sGX" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/sepia, @@ -37881,7 +37293,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/wood/broken, -/area/vacant_room/office) +/area/library/abandoned) "sHr" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -37895,15 +37307,6 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"sHD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/glowstick/lit, -/turf/open/floor/plating, -/area/maintenance/department/chapel) -"sHG" = ( -/obj/machinery/light/small/broken/directional/east, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "sHI" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -37918,6 +37321,17 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) +"sHV" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/hydroponics, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) +"sHY" = ( +/obj/structure/fence{ + dir = 8 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "sIv" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -37946,6 +37360,7 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/warden) "sJC" = ( @@ -37957,9 +37372,7 @@ dir = 4 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "sKk" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -37994,37 +37407,81 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"sLe" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) "sLz" = ( /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"sLU" = ( -/obj/structure/window/reinforced{ +"sLI" = ( +/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ + alpha = 180; + color = "#DE3A3A" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/landmark/start/security_officer, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron, +/area/security/brig) +"sMd" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/fore) +"sMl" = ( /obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ - alpha = 180 +/obj/machinery/door/window/brigdoor{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Head of Personnel's Paperwork Door"; + req_access_txt = "57" }, -/obj/machinery/camera/autoname{ - c_tag = "Corporate Meeting Room"; - dir = 10 +/obj/machinery/door/window/northleft{ + dir = 8; + name = "Paperwork Window" }, -/obj/item/aicard{ - pixel_x = 6 +/obj/item/pen{ + pixel_x = 6; + pixel_y = 1 }, -/obj/item/storage/secure/briefcase{ - pixel_x = -2 +/obj/item/pen{ + pixel_x = 10; + pixel_y = 1 }, -/obj/item/storage/lockbox/loyalty, -/turf/open/floor/iron/dark, -/area/bridge) +/obj/item/pen{ + pixel_x = 8; + pixel_y = -3 + }, +/obj/item/paper{ + pixel_x = -6 + }, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell/speed_demon, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "hopshutter"; + name = "Privacy Shutters" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron, +/area/crew_quarters/heads/hop) "sMC" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ @@ -38037,13 +37494,8 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "sMF" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -38129,15 +37581,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"sNy" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/department/chapel) +/area/hallway/primary/aft) "sNC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -38151,51 +37595,37 @@ }, /turf/open/floor/pod/dark, /area/maintenance/department/engine/atmos) -"sOB" = ( -/obj/structure/railing{ - dir = 10 - }, -/turf/open/floor/glass/reinforced, -/area/crew_quarters/heads/cmo) "sPu" = ( /obj/structure/railing{ dir = 8 }, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) +"sPC" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "sPE" = ( /obj/machinery/light, /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/engine/atmos) -"sPK" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"sQq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +"sPJ" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) +"sQT" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/bridge) "sQU" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/atmos_control/tank/nitrogen_tank{ @@ -38204,6 +37634,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/tech, /area/engine/atmos) +"sRu" = ( +/obj/effect/turf_decal/siding/dark/end{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore) "sRD" = ( /turf/closed/wall/r_wall, /area/security/prison) @@ -38245,6 +37681,21 @@ "sSJ" = ( /turf/closed/wall, /area/chapel/main) +"sSV" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Medbay Maintenance"; + req_one_access_txt = "5" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "Isolation Shutters" + }, +/obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/maintenance/department/crew_quarters/bar) "sTa" = ( /obj/effect/turf_decal/siding/wood, /obj/item/hatchet, @@ -38283,9 +37734,18 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/freezer, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"sTV" = ( +/obj/effect/turf_decal/box/white, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + external_pressure_bound = 120; + name = "server vent" + }, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "sUf" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/line{ @@ -38295,16 +37755,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"sUh" = ( -/obj/machinery/computer/card/minor/hos, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/camera/directional/north{ - network = list("ss13","security") - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/hos) "sUW" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -38354,7 +37804,7 @@ /area/quartermaster/storage) "sVZ" = ( /turf/open/floor/wood/broken, -/area/vacant_room/office) +/area/library/abandoned) "sWd" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -38371,18 +37821,18 @@ dir = 1 }, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "sWe" = ( /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) "sWl" = ( -/obj/structure/filingcabinet/chestdrawer, -/mob/living/simple_animal/parrot/Poly, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 9 }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) "sWu" = ( @@ -38440,13 +37890,6 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"sXm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "sXB" = ( /turf/closed/wall/r_wall, /area/engine/engineering) @@ -38485,9 +37928,7 @@ }, /obj/effect/turf_decal/numbers/two_nine, /turf/open/floor/iron/sepia, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "sYf" = ( /obj/machinery/computer/cryopod{ pixel_y = -27 @@ -38580,22 +38021,16 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"tai" = ( -/obj/structure/lattice/catwalk/over, -/obj/item/wirecutters{ - pixel_x = -6; - pixel_y = -12 - }, -/obj/structure/railing{ - dir = 4 +"tak" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 }, -/obj/structure/railing{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "0-8" }, -/turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/turf/open/floor/iron, +/area/maintenance/department/engine) "tay" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -38634,14 +38069,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) -"taT" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/medical/surgery) "tbm" = ( /obj/machinery/light{ dir = 8 @@ -38676,8 +38103,34 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/wood, /area/chapel/office) +"tcB" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Bridge"; + req_access_txt = "19" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/poddoor/preopen{ + id = "bridgedoors"; + name = "Bridge Access Blast Door" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/bridge/meeting_room) "tcM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -38691,21 +38144,6 @@ /obj/effect/turf_decal/evac/evac_big, /turf/open/floor/iron, /area/maintenance/department/science/central) -"tcS" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "tdh" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -38720,9 +38158,7 @@ }, /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "tdN" = ( /obj/structure/chair/office/light{ dir = 8 @@ -38736,28 +38172,13 @@ dir = 8 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "tef" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/bridge) -"tel" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) -"teo" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 5 - }, -/turf/open/floor/glass/reinforced, -/area/medical/medbay/central) "teA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -38802,6 +38223,11 @@ }, /turf/open/floor/prison/dark, /area/security/prison) +"teT" = ( +/obj/machinery/light/small/broken/directional/west, +/obj/structure/frame, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "teU" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/beacon{ @@ -38809,24 +38235,17 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) +"teV" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "tfd" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/medical/central) -"tfg" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/prison, -/area/security/prison) "tfh" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/line{ @@ -38864,8 +38283,7 @@ }, /obj/machinery/atmospherics/components/unary/tank/air{ dir = 1; - initialize_directions = 1; - piping_layer = 2 + initialize_directions = 1 }, /obj/machinery/firealarm/directional/east, /turf/open/floor/engine, @@ -38899,12 +38317,6 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"tgt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/sand/plating, -/obj/structure/chair/fancy/plastic, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "tgH" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -38940,6 +38352,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) "thu" = ( @@ -38998,6 +38413,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/grid/steel, /area/science/mixing) "tiy" = ( @@ -39014,15 +38432,13 @@ pixel_y = 4 }, /turf/open/floor/carpet/royalblack, -/area/vacant_room/office) +/area/library/abandoned) "tiF" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "tiS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -39054,9 +38470,7 @@ /turf/open/floor/iron/dark/side{ dir = 1 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "tjz" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ alpha = 180; @@ -39067,6 +38481,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/security/brig) "tko" = ( @@ -39088,15 +38503,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) -"tks" = ( -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/structure/sink{ - dir = 1; - pixel_y = 20 - }, -/obj/machinery/camera/directional/north, -/turf/open/floor/iron, -/area/hydroponics) "tkv" = ( /obj/structure/window/reinforced{ dir = 4 @@ -39173,10 +38579,11 @@ /obj/structure/railing{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "tlw" = ( /obj/structure/stairs, /turf/open/floor/pod/dark, @@ -39220,9 +38627,15 @@ dir = 8 }, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) +"tmd" = ( +/obj/effect/turf_decal/box/white, +/obj/machinery/rnd/server, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "tmh" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -39288,6 +38701,22 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) +"tna" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark/corner, +/turf/open/floor/iron/dark, +/area/engineering/hallway) "tnA" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/structure/window/reinforced{ @@ -39338,23 +38767,43 @@ }, /turf/open/floor/pod/dark, /area/engine/engineering) +"toq" = ( +/obj/machinery/door/window/northleft{ + dir = 2 + }, +/turf/open/floor/iron/dark/side, +/area/hallway/primary/fore) "tov" = ( /turf/open/floor/wood, /area/crew_quarters/cafeteria) "tox" = ( -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 4 }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cmoshutter"; - name = "CMO Office Shutters" +/obj/structure/table, +/obj/item/clothing/mask/gas{ + pixel_x = -4; + pixel_y = 10 }, -/turf/open/floor/plating, -/area/crew_quarters/heads/cmo) +/obj/item/analyzer{ + pixel_x = 1 + }, +/obj/item/crowbar/red{ + pixel_x = -2; + pixel_y = 11 + }, +/obj/item/tank/internals/plasma{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "toz" = ( /turf/closed/wall/rust, /area/science/test_area) @@ -39405,28 +38854,12 @@ /obj/machinery/space_heater, /turf/open/floor/iron, /area/maintenance/department/science/central) -"tqj" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/rock/pile, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "tqq" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{ dir = 1 }, /turf/open/floor/engine/airless, /area/engine/atmos) -"tqs" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) "tqL" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -39441,19 +38874,9 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"trc" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) "trd" = ( /turf/closed/wall/mineral/titanium/survival, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "trB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 8 @@ -39463,89 +38886,6 @@ }, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"trC" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/folder/red, -/obj/item/restraints/handcuffs, -/obj/item/stack/cable_coil, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/item/storage/backpack/duffelbag/sec/surgery{ - pixel_y = 5 - }, -/obj/item/melee/baseball_bat{ - desc = "A staple of security force interrogations."; - icon_state = "baseball_bat_metal"; - name = "kneecapper" - }, -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow, -/turf/open/floor/iron/dark, -/area/security/execution/education) -"trI" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/evac/evac_big{ - dir = 1 - }, -/turf/open/floor/iron, -/area/maintenance/department/science/xenobiology) -"tsf" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/item/paper/pamphlet/centcom/visitor_info{ - default_raw_text = " XCC-P5831 Visitor Information
          \ntGreetings, visitor, to XCC-P5831! As you may know, this outpost was once \ntused as Nanotrasen's CENTRAL COMMAND STATION, organizing and coordinating company \ntprojects across the vastness of space.
          \ntSince the completion of the much more efficient CC-A5831 on March 8, 2553, XCC-P5831 no longer \ntacts as NT's base of operations but still plays a very important role its corporate affairs; \ntserving as a supply and repair depot, as well as being host to its most important legal proceedings\nt and the thrilling pay-per-view broadcasts of PLASTEEL CHEF and THUNDERDOME LIVE.
          \ntWe hope you enjoy your stay!"; - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/paper/pamphlet/centcom/visitor_info{ - default_raw_text = " XCC-P5831 Visitor Information
          \ntGreetings, visitor, to XCC-P5831! As you may know, this outpost was once \ntused as Nanotrasen's CENTRAL COMMAND STATION, organizing and coordinating company \ntprojects across the vastness of space.
          \ntSince the completion of the much more efficient CC-A5831 on March 8, 2553, XCC-P5831 no longer \ntacts as NT's base of operations but still plays a very important role its corporate affairs; \ntserving as a supply and repair depot, as well as being host to its most important legal proceedings\nt and the thrilling pay-per-view broadcasts of PLASTEEL CHEF and THUNDERDOME LIVE.
          \ntWe hope you enjoy your stay!"; - pixel_x = 1; - pixel_y = 4 - }, -/obj/item/paper/pamphlet/centcom/visitor_info{ - default_raw_text = " XCC-P5831 Visitor Information
          \ntGreetings, visitor, to XCC-P5831! As you may know, this outpost was once \ntused as Nanotrasen's CENTRAL COMMAND STATION, organizing and coordinating company \ntprojects across the vastness of space.
          \ntSince the completion of the much more efficient CC-A5831 on March 8, 2553, XCC-P5831 no longer \ntacts as NT's base of operations but still plays a very important role its corporate affairs; \ntserving as a supply and repair depot, as well as being host to its most important legal proceedings\nt and the thrilling pay-per-view broadcasts of PLASTEEL CHEF and THUNDERDOME LIVE.
          \ntWe hope you enjoy your stay!"; - pixel_x = 7; - pixel_y = 2 - }, -/obj/machinery/camera/autoname{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"tsp" = ( -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/spawner/structure/window/reinforced/prison, -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison blast door" - }, -/turf/open/floor/plating, -/area/security/prison) "tss" = ( /obj/effect/turf_decal/trimline/yellow, /obj/structure/cable/yellow{ @@ -39590,19 +38930,6 @@ }, /turf/open/floor/pod/dark, /area/maintenance/department/science/central) -"ttf" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/fans/tiny{ - density = 1; - icon = 'icons/effects/effects.dmi'; - icon_state = "m_shield"; - layer = 5; - max_integrity = 1e+007 - }, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/quartermaster/storage) "tth" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -39628,17 +38955,12 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) -"ttw" = ( -/turf/closed/wall/r_wall, -/area/quartermaster/storage) "ttC" = ( /obj/structure/railing, /obj/structure/lattice, /obj/machinery/firealarm/directional/west, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "ttD" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -39654,33 +38976,9 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/central) -"ttG" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "ttY" = ( /turf/closed/wall, /area/medical/medbay/central) -"tuo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/iron, -/area/maintenance/department/eva) "tuw" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/fancy/sofa/old/left{ @@ -39705,7 +39003,7 @@ /area/hydroponics) "tuT" = ( /obj/machinery/air_sensor/atmos/air_tank, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer2, +/obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/open/floor/engine/air, /area/engine/atmos) "tuV" = ( @@ -39713,12 +39011,16 @@ /obj/machinery/atmospherics/pipe/simple/green/hidden, /turf/open/floor/engine/plasma, /area/engine/atmos) -"tvj" = ( -/obj/structure/fence/cut/medium{ - dir = 8 +"tvi" = ( +/obj/structure/railing{ + dir = 4 }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) +/obj/structure/closet/emcloset, +/obj/structure/sign/map/echo{ + pixel_y = 32 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore) "tvm" = ( /obj/item/beacon{ pixel_y = 3 @@ -39735,34 +39037,6 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"twd" = ( -/obj/structure/flora/rock/pile, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/science/misc_lab) -"twg" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/sign/warning/nosmoking{ - pixel_x = -32 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) -"two" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "tww" = ( /obj/machinery/light{ dir = 8 @@ -39808,25 +39082,17 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) -"txF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/siding/wood{ - dir = 6; - layer = 2 +"txM" = ( +/obj/structure/disposalpipe/segment{ + dir = 2 }, -/turf/open/floor/carpet/green, -/area/vacant_room/office) +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/hallway/primary/fore) "txR" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "tyc" = ( /obj/structure/fence/corner{ dir = 9 @@ -39840,29 +39106,6 @@ "tyz" = ( /turf/open/floor/engine, /area/science/explab) -"tyF" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/structure/table/glass, -/obj/item/folder/blue, -/obj/item/flashlight/pen, -/obj/item/clothing/neck/stethoscope, -/obj/item/computer_hardware/hard_drive/role/medical{ - pixel_x = 3 - }, -/obj/item/computer_hardware/hard_drive/role/medical{ - pixel_x = -3 - }, -/obj/item/computer_hardware/hard_drive/role/chemistry{ - pixel_y = 6 - }, -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "tyI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -39892,12 +39135,35 @@ "tAg" = ( /turf/open/floor/plating, /area/maintenance/department/security/brig) +"tAo" = ( +/obj/effect/turf_decal/siding/yellow, +/obj/effect/turf_decal/trimline/yellow/warning, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway) "tAt" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 }, /turf/open/floor/iron/dark, /area/medical/morgue) +"tAx" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Gas to Filter" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "tAy" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -39912,9 +39178,17 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) +"tAE" = ( +/obj/structure/light_construct, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/warning/pods{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/library/abandoned) "tAG" = ( /obj/machinery/door/airlock/hatch{ name = "MiniSat Teleporter"; @@ -39950,9 +39224,7 @@ pixel_y = 28 }, /turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "tAT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ @@ -39994,10 +39266,11 @@ pixel_x = 5; pixel_y = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "tCf" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -40008,6 +39281,9 @@ }, /turf/open/floor/iron/tech, /area/science/mixing) +"tCi" = ( +/turf/open/openspace, +/area/asteroid/paradise/surface) "tCj" = ( /obj/structure/chair/office/light{ dir = 1 @@ -40025,38 +39301,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/bridge) -"tCy" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/iron/white/side, -/area/science/research) -"tCQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/medical/apothecary) "tDp" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -40072,9 +39316,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/airlock/public/glass, /turf/open/floor/iron/techmaint/planetary, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "tDA" = ( /obj/item/radio/intercom{ pixel_y = 28 @@ -40082,7 +39324,7 @@ /obj/structure/table/wood, /obj/item/kirbyplants/random, /turf/open/floor/plating, -/area/vacant_room/office) +/area/library/abandoned) "tDF" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -40098,19 +39340,53 @@ }, /turf/open/floor/iron/grid/steel, /area/hydroponics) -"tDZ" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 +"tEa" = ( +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 }, -/obj/structure/railing{ - dir = 8 +/obj/machinery/chem_dispenser/drinks, +/obj/structure/table, +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/iron/dark/side{ - dir = 10 +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron/dark, +/area/crew_quarters/kitchen) +"tEc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table, +/obj/item/assembly/igniter{ + pixel_x = 12; + pixel_y = -6 + }, +/obj/item/assembly/igniter{ + pixel_x = 15; + pixel_y = 6 + }, +/obj/item/storage/firstaid/regular{ + pixel_x = -3; + pixel_y = 5 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron, +/area/storage/primary) +"tEe" = ( +/obj/machinery/door/poddoor/incinerator_toxmix{ + id = "EmergancyescapeShutter"; + name = "Emergancy Escape Shutters" + }, +/turf/open/floor/plating, +/area/maintenance/department/science/central) "tEl" = ( /obj/machinery/door/airlock/science{ name = "Toxins Lab"; @@ -40126,6 +39402,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/science/mixing) "tEI" = ( @@ -40138,7 +39417,7 @@ /obj/item/flashlight, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/broken, -/area/vacant_room/office) +/area/library/abandoned) "tFb" = ( /obj/machinery/defibrillator_mount{ pixel_y = -24 @@ -40154,23 +39433,34 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) +"tFt" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "tFF" = ( /obj/structure/sign/departments/minsky/research/dorms, /turf/closed/wall, /area/crew_quarters/dorms) -"tFM" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +"tFL" = ( +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/camera/directional/north{ - network = list("ss13","security") +/obj/structure/disposalpipe/segment{ + dir = 2 }, -/obj/item/kirbyplants/random, -/obj/structure/sink/kitchen{ - pixel_y = 22 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron, -/area/security/brig) +/turf/open/floor/iron/grid/steel, +/area/bridge) "tFV" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -40214,9 +39504,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "tHj" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/hydroponics/constructable, @@ -40285,21 +39573,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"tIw" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/camera/directional/north{ - network = list("aiupload") - }, -/obj/machinery/firealarm/directional/north, -/turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "tID" = ( /obj/structure/cable{ icon_state = "2-4" @@ -40336,17 +39609,6 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"tIU" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "tJa" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ dir = 4 @@ -40396,9 +39658,7 @@ /turf/open/floor/iron/dark/side{ dir = 9 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "tJw" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/condiment/saltshaker{ @@ -40414,6 +39674,20 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"tJy" = ( +/obj/machinery/shuttle/engine/plasma{ + dir = 1 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) +"tJE" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 4 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "tJV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -40436,15 +39710,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) -"tKv" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "tKR" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/stripes/line{ @@ -40453,28 +39718,17 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/teleporter) -"tLm" = ( +"tKX" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - alpha = 180; - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron/dark, -/area/security/brig) +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "tLR" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/neutral{ @@ -40501,14 +39755,19 @@ /obj/machinery/telecomms/server/presets/engineering, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"tMK" = ( -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/mineral/plastitanium, -/area/asteroid/paradise/surface) "tNh" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) +"tNi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/holohoop{ + dir = 8 + }, +/turf/open/floor/prison/dark, +/area/security/prison) "tNm" = ( /obj/structure/closet/secure_closet/medical2, /obj/effect/turf_decal/bot, @@ -40553,7 +39812,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/vacant_room/office) +/area/library/abandoned) "tNX" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -40569,10 +39828,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/medical/central) -"tOu" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/r_wall/rust, -/area/asteroid/paradise) "tOv" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -40582,16 +39837,12 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "tOw" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "tOz" = ( /obj/item/paper_bin{ pixel_x = 4; @@ -40600,7 +39851,37 @@ /obj/structure/table/wood, /obj/machinery/airalarm/directional/north, /turf/open/floor/wood, -/area/vacant_room/office) +/area/library/abandoned) +"tOC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig"; + req_access_txt = "63" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + alpha = 180 + }, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/security/brig) +"tOI" = ( +/obj/structure/railing{ + dir = 10 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "tOO" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 1 @@ -40626,20 +39907,6 @@ /obj/item/holosign_creator, /turf/open/floor/iron, /area/janitor) -"tOU" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/chem_dispenser{ - layer = 2.7 - }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron, -/area/medical/apothecary) "tPg" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -40654,14 +39921,21 @@ dir = 4 }, /turf/open/floor/plating, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "tPn" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/white, /area/science/xenobiology) +"tPs" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner, +/area/hallway/primary/fore) "tPw" = ( /obj/machinery/status_display/evac{ pixel_y = 32 @@ -40718,22 +39992,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/carpet/orange, /area/crew_quarters/dorms) -"tPD" = ( -/obj/structure/flora/grass/jungle/b, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/grassybush, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "Engidesk"; - name = "engineering security door" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/grass/no_border, -/area/crew_quarters/heads/chief) "tPV" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Foyer"; @@ -40751,9 +40009,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "tQX" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -40783,6 +40039,9 @@ /turf/open/floor/iron/dark, /area/security/brig) "tRy" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 8 + }, /turf/open/floor/iron/tech, /area/engine/atmos) "tRC" = ( @@ -40875,10 +40134,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/office) -"tSC" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "tSN" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -40923,9 +40178,7 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "tTh" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ alpha = 180 @@ -40953,6 +40206,17 @@ }, /turf/open/floor/iron/dark, /area/security/warden) +"tTl" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 12; + pixel_y = 3 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "tTt" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -40961,20 +40225,18 @@ /obj/structure/table, /obj/item/glove_box{ pixel_x = -6; - pixel_y = 17 + pixel_y = 10 }, /obj/item/storage/box/bodybags{ pixel_x = 5; pixel_y = 3 }, +/obj/item/clothing/mask/surgical{ + pixel_x = 3; + pixel_y = -8 + }, /turf/open/floor/iron/dark, /area/security/detectives_office) -"tTE" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/plating, -/area/maintenance/department/chapel) "tUh" = ( /obj/structure/cable{ icon_state = "2-8" @@ -40990,9 +40252,17 @@ }, /obj/structure/lattice, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) +"tUq" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/obj/structure/railing{ + dir = 6 + }, +/obj/structure/closet/emcloset, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "tUs" = ( /obj/structure/railing/corner{ dir = 8 @@ -41017,15 +40287,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/central) -"tUx" = ( -/obj/item/radio/intercom{ - pixel_x = 1; - pixel_y = -30 - }, -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/tech, -/area/engine/engineering) "tUA" = ( /obj/item/radio/intercom{ pixel_y = -35 @@ -41058,7 +40319,7 @@ /area/asteroid/paradise/surface/grass) "tUR" = ( /turf/open/floor/plating, -/area/vacant_room/office) +/area/library/abandoned) "tUV" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -41087,7 +40348,6 @@ /area/engine/engineering) "tVy" = ( /obj/machinery/power/apc{ - areastring = "/area/vacant_room/office"; dir = 1; name = "Vacant Office APC"; pixel_y = 24 @@ -41100,48 +40360,7 @@ icon_state = "0-4" }, /turf/open/floor/wood, -/area/vacant_room/office) -"tVz" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/paper/monitorkey{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/folder/yellow, -/obj/item/toy/figure/ce{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/item/stamp/chief_engineer{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 5 - }, -/obj/machinery/camera/autoname/directional/east{ - network = list("ss13","engine") - }, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Engineer's Desk"; - departmentType = 4; - name = "Chief Engineer RC"; - pixel_x = 32; - pixel_y = 31 - }, -/obj/machinery/power/apc/auto_name/directional/east{ - pixel_x = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/chief) +/area/library/abandoned) "tVK" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -41205,9 +40424,7 @@ dir = 4 }, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "tXn" = ( /obj/effect/turf_decal/sand/plating, /obj/item/beacon{ @@ -41218,18 +40435,11 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) -"tXw" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +"tYb" = ( +/obj/machinery/biogenerator, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "tYc" = ( /obj/structure/sign/departments/restroom{ pixel_y = 32 @@ -41290,6 +40500,14 @@ /obj/machinery/light, /turf/open/floor/noslip/standard, /area/quartermaster/storage) +"uag" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "uaU" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -41300,6 +40518,10 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) +"ubr" = ( +/obj/item/sbeacondrop/exploration, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "ubG" = ( /obj/machinery/conveyor{ dir = 1; @@ -41317,7 +40539,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment{ - dir = 1 + dir = 9 }, /turf/open/floor/catwalk_floor/iron_dark, /area/crew_quarters/heads/hop) @@ -41329,6 +40551,23 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/theatre/backstage) +"ucM" = ( +/obj/machinery/firealarm/directional/north, +/obj/structure/lattice/catwalk/over, +/turf/open/openspace, +/area/maintenance/department/security/brig) +"ucV" = ( +/mob/living/simple_animal/chicken/turkey{ + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0); + desc = "A veteran of Nanotrasen's Animal Experimentation Program that attempted to replicate the organic space suit that some hostile entities are known to have exhibited, Tom now serves Nanotrasen as the mascot of the Exploration Crew."; + health = 200; + maxHealth = 200; + melee_damage = 5; + minbodytemp = 2.7; + name = "Tom" + }, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "udq" = ( /obj/structure/flora/junglebush/b, /obj/structure/window/reinforced{ @@ -41339,25 +40578,6 @@ }, /turf/open/floor/grass/no_border, /area/medical/storage) -"udr" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/light, -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/science/mixing) "udt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -41365,24 +40585,31 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"uet" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/evac{ - dir = 1 +"udE" = ( +/obj/machinery/ai_slipper{ + uses = 10 }, /turf/open/floor/iron, -/area/maintenance/department/engine) +/area/hallway/primary/aft) +"uex" = ( +/obj/structure/table, +/obj/item/glove_box{ + pixel_x = 8 + }, +/obj/item/reagent_containers/dropper{ + pixel_x = -2; + pixel_y = -4 + }, +/obj/item/storage/firstaid/advanced{ + pixel_x = -3; + pixel_y = 9 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "ueO" = ( /obj/machinery/smartfridge/chemistry/preloaded, -/turf/closed/wall, +/turf/open/floor/iron/white, /area/medical/apothecary) -"ueT" = ( -/obj/machinery/door/poddoor/shutters{ - id = "exploration" - }, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "ueV" = ( /turf/closed/wall, /area/quartermaster/qm) @@ -41406,6 +40633,10 @@ }, /turf/open/floor/carpet/green, /area/chapel/main) +"ufI" = ( +/obj/structure/railing, +/turf/open/floor/glass/reinforced, +/area/crew_quarters/heads/cmo) "ufL" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/closed/wall, @@ -41495,10 +40726,6 @@ "uik" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/trinary/filter/atmos/o2{ - dir = 8; - piping_layer = 4 - }, /obj/machinery/atmospherics/pipe/simple/yellow/visible/layer2{ dir = 5 }, @@ -41508,8 +40735,18 @@ /obj/structure/window/plasma/reinforced{ dir = 1 }, +/obj/machinery/atmospherics/components/trinary/filter/atmos/o2/layer4{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/atmos) +"uim" = ( +/obj/machinery/power/smes, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "uio" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -41557,27 +40794,6 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) -"ujn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/closet/secure_closet/medical3, -/obj/effect/spawner/lootdrop/techstorage/medical, -/obj/item/folder/white{ - pixel_x = -1; - pixel_y = -4 - }, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/obj/machinery/camera/directional/north{ - network = list("ss13","medbay","public") - }, -/turf/open/floor/iron, -/area/medical/storage) "ujM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -41590,9 +40806,6 @@ dir = 1 }, /obj/effect/landmark/start/cargo_technician, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -41602,6 +40815,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/dormitories{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "ujX" = ( @@ -41611,6 +40827,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/engine) "uke" = ( @@ -41621,25 +40840,11 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/crew_quarters/heads/chief) -"ukz" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = 4; - pixel_y = 9 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "Chefwindow"; - name = "Chef window" - }, -/obj/item/toy/figure/chef{ - pixel_x = -4; - pixel_y = -1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/kitchen) "ukS" = ( /obj/effect/turf_decal/siding/dark{ dir = 6 @@ -41651,46 +40856,75 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "ukZ" = ( /mob/living/simple_animal/kalo, /obj/effect/landmark/start/janitor, /turf/open/floor/iron, /area/janitor) -"uld" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 4 +"ulg" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) +/obj/structure/table/glass, +/obj/item/folder/blue, +/obj/item/flashlight/pen, +/obj/item/clothing/neck/stethoscope, +/obj/item/computer_hardware/hard_drive/role/medical{ + pixel_x = 3 + }, +/obj/item/computer_hardware/hard_drive/role/medical{ + pixel_x = -3 + }, +/obj/item/computer_hardware/hard_drive/role/chemistry{ + pixel_y = 6 + }, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "uli" = ( /turf/closed/wall/r_wall/rust, /area/engine/atmos) -"ulo" = ( -/obj/machinery/light{ - dir = 4 +"ulu" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/northleft{ + dir = 2; + name = "Engi Desk"; + req_one_access_txt = "32;19" }, -/obj/machinery/power/apc/auto_name/directional/east{ - pixel_x = 24 +/obj/item/paper_bin{ + pixel_x = 7; + pixel_y = 2 }, -/obj/structure/chair/office/light{ - dir = 1; +/obj/item/pen{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/structure/desk_bell{ + pixel_x = -6; pixel_y = 3 }, -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/machinery/door/poddoor/preopen{ + id = "Engidesk"; + name = "engineering Security Door" }, -/obj/effect/landmark/start/scientist, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) -"ulq" = ( -/obj/machinery/ai_slipper{ - uses = 10 +/obj/structure/disposalpipe/segment{ + dir = 2 }, -/turf/open/floor/iron, -/area/science/mixing) +/turf/open/floor/iron/dark, +/area/engine/engineering) +"ulX" = ( +/obj/structure/closet/firecloset/full, +/obj/effect/turf_decal/tile/red{ + alpha = 180; + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/hallway/primary/central) "uma" = ( /obj/structure/railing{ dir = 8 @@ -41701,30 +40935,7 @@ /turf/open/floor/iron/dark/side{ dir = 9 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"umB" = ( -/obj/effect/decal/cleanable/generic, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"unh" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/grass/no_border, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/central) "unj" = ( /obj/structure/closet/secure_closet/medical3, /obj/item/stack/sheet/iron/fifty{ @@ -41751,11 +40962,26 @@ }, /turf/open/floor/iron, /area/medical/storage) +"unk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow, +/obj/machinery/door/poddoor/preopen{ + id = "Engidesk"; + name = "engineering Security Door" + }, +/turf/open/floor/plating, +/area/storage/tech) "unp" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) "unt" = ( @@ -41777,9 +41003,7 @@ pixel_y = 10 }, /turf/closed/wall, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "unO" = ( /obj/structure/railing{ dir = 1 @@ -41821,6 +41045,19 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"uox" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + alpha = 180; + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "upo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/autoname/directional/west{ @@ -41829,7 +41066,7 @@ /obj/structure/table/wood, /obj/machinery/computer/libraryconsole/bookmanagement, /turf/open/floor/carpet/royalblack, -/area/vacant_room/office) +/area/library/abandoned) "upy" = ( /obj/machinery/door/airlock/engineering{ name = "Telecomms Storage"; @@ -41842,19 +41079,23 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"upA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "upK" = ( /obj/structure/window/reinforced{ dir = 8 }, /turf/open/floor/engine, /area/science/xenobiology) +"upN" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "brigfrontdoor"; + name = "Front Security Blast Door" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/security/brig) "upP" = ( /obj/effect/spawner/structure/window, /obj/structure/curtain/directional{ @@ -41979,9 +41220,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "utc" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -41997,7 +41236,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment{ - dir = 10 + dir = 6 }, /turf/open/floor/iron/white, /area/science/lab) @@ -42029,6 +41268,16 @@ /obj/effect/landmark/start/head_of_personnel, /turf/open/floor/wood, /area/crew_quarters/heads/hop) +"uuq" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) +"uux" = ( +/obj/structure/frame/machine, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/asteroid/paradise) "uuD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -42055,6 +41304,28 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, /area/science/explab) +"uvj" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/security/glass{ + id_tag = "brigentrance"; + name = "Brig"; + req_access_txt = "63" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" + }, +/turf/open/floor/iron/dark, +/area/security/brig) "uvZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -42124,20 +41395,16 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) +"uxe" = ( +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/central) "uxt" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) -"uxv" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/dark, -/area/bridge) "uxB" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -42155,9 +41422,7 @@ /turf/open/floor/iron/dark/side{ dir = 1 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "uxQ" = ( /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, @@ -42181,9 +41446,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "uyF" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -42193,13 +41456,25 @@ }, /turf/open/floor/iron, /area/maintenance/department/eva) -"uyP" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/curtain/directional{ - dir = 1 +"uzH" = ( +/obj/machinery/power/solar{ + id = "portsolar"; + name = "Port Solar Array" }, -/turf/open/floor/plating, -/area/crew_quarters/theatre/backstage) +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/iron/solarpanel, +/area/asteroid/paradise/surface) +"uzP" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Chemistry Lab"; + req_access_txt = "33" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/apothecary) "uAb" = ( /obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 4; @@ -42235,25 +41510,7 @@ dir = 4 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"uAS" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/fore) "uBk" = ( /obj/machinery/holopad, /obj/structure/railing/corner{ @@ -42273,6 +41530,16 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"uBH" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/engine/engineering) "uCw" = ( /obj/effect/spawner/structure/window/depleteduranium, /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -42299,11 +41566,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/carpet/green, /area/chapel/main) "uDA" = ( /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface/sand) +"uDE" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "uDM" = ( /obj/structure/sign/departments/minsky/research/xenobiology, /turf/closed/wall/r_wall, @@ -42372,9 +41646,7 @@ network = list("ss13","security") }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "uEY" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -42393,9 +41665,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) "uFe" = ( -/obj/machinery/atmospherics/components/binary/valve/layer2{ - dir = 1 - }, +/obj/machinery/atmospherics/components/binary/valve, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) "uFv" = ( @@ -42481,29 +41751,16 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"uJm" = ( -/obj/structure/table/wood/fancy/blue, -/obj/item/radio/intercom{ - pixel_x = -28 - }, -/obj/item/storage/secure/briefcase{ - pixel_x = -1; - pixel_y = 6 - }, -/obj/machinery/camera/autoname{ - c_tag = "Corporate Meeting Room"; - dir = 5 +"uJs" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/item/book/manual/wiki/sopservice, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/hop) -"uJN" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/camera/autoname/directional/west, +/obj/machinery/digital_clock/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 8 }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) +/area/hallway/primary/aft) "uJX" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -42542,6 +41799,16 @@ /obj/item/stock_parts/subspace/crystal, /turf/open/floor/iron/dark, /area/engine/atmos) +"uKN" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/iron, +/area/maintenance/department/security/brig) "uLf" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -42596,33 +41863,16 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/maintenance/department/cargo) -"uMh" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"uMJ" = ( -/obj/machinery/computer/xenoartifact_console, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ +"uMn" = ( +/obj/effect/turf_decal/siding/blue{ dir = 10 }, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","rd") - }, /obj/machinery/light{ - dir = 1 + light_color = "#7AC3FF" }, -/turf/open/floor/iron, -/area/science/explab) +/obj/machinery/digital_clock/directional/south, +/turf/open/floor/glass/reinforced, +/area/medical/medbay/central) "uNe" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -42630,9 +41880,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "uNk" = ( /obj/machinery/computer/security/qm{ dir = 4 @@ -42641,9 +41889,7 @@ dir = 10 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "uNl" = ( /obj/structure/barricade/wooden/crude, /obj/machinery/door/airlock/maintenance_hatch{ @@ -42652,9 +41898,20 @@ }, /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"uNx" = ( +/obj/structure/table/reinforced, +/obj/item/pipe_dispenser, +/obj/item/lightreplacer{ + pixel_x = 2; + pixel_y = 13 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 25 + }, +/obj/structure/window/plasma/reinforced, +/turf/open/floor/iron, +/area/engine/engineering) "uNJ" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, @@ -42683,17 +41940,16 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) -"uOa" = ( -/turf/open/floor/glass/reinforced/plasma, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) -"uOf" = ( -/obj/effect/landmark/observer_start, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +"uNZ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "uOs" = ( /obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ dir = 4 @@ -42714,7 +41970,7 @@ "uOJ" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, -/area/science/misc_lab) +/area/asteroid/paradise) "uOZ" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/stripes/line{ @@ -42770,20 +42026,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"uQq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/hydroponics/constructable, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/item/paper/guides/jobs/hydroponics{ - default_raw_text = "

          Hey there,

          Sorry about the cramped space! � I know it's a bit tight in here.

          But just so you know, I found a few more hydroponic trays stashed behind botany in maintenance. Feel free to grab them if you need!

          Take care!

          "; - pixel_x = 6 - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "uQu" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -42791,12 +42033,26 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) +"uQE" = ( +/obj/machinery/light{ + dir = 1; + light_color = "#7AC3FF" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "uQF" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, /obj/item/kirbyplants/random, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -42816,6 +42072,15 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"uQO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/grass/no_border, +/area/hallway/primary/aft) "uRn" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/fence/cut{ @@ -42824,13 +42089,22 @@ /obj/structure/sign/warning/explosives/alt, /turf/open/floor/plating/dirt/jungle/wasteland, /area/asteroid/paradise/surface) -"uRt" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" +"uRu" = ( +/obj/structure/chair/fancy/sofa/old/left{ + dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/department/medical/morgue) +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/turf_decal/siding/white, +/obj/structure/railing, +/obj/item/radio/intercom{ + dir = 1; + pixel_x = 29; + pixel_y = -3 + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "uRz" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/cable/yellow{ @@ -42913,6 +42187,24 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/teleporter) +"uTf" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/autoname/directional/west, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_x = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "uTt" = ( /obj/machinery/camera/autoname/directional/south{ network = list("ss13","medbay","public") @@ -42955,21 +42247,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/engine/engineering) -"uTY" = ( -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/obj/item/kirbyplants/random, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/digital_clock/directional/east, -/turf/open/floor/iron, -/area/bridge) "uUf" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -42995,25 +42272,6 @@ }, /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness/recreation) -"uUH" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/plating, -/area/maintenance/department/medical/morgue) "uUK" = ( /obj/effect/turf_decal/stripes/end{ dir = 1 @@ -43029,20 +42287,6 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/qm) -"uVq" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) "uVr" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -43050,20 +42294,6 @@ "uVy" = ( /turf/closed/wall, /area/hallway/secondary/service) -"uVE" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/rnd/production/protolathe/department/science, -/turf/open/floor/iron, -/area/science/lab) "uVJ" = ( /obj/structure/table/wood, /obj/machinery/door/poddoor/shutters{ @@ -43071,9 +42301,7 @@ name = "Vacant Commissary Shutters #3" }, /turf/open/floor/plating, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "uWg" = ( /obj/machinery/light, /obj/structure/stairs{ @@ -43084,15 +42312,22 @@ }, /turf/open/floor/pod/dark, /area/science/lab) -"uWn" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +"uWm" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/dark_green/half/contrasted, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "uWx" = ( /obj/structure/chair/office{ dir = 4 @@ -43103,11 +42338,28 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white/corner, /area/science/research) +"uWK" = ( +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced/prison, +/obj/machinery/door/poddoor/preopen{ + id = "Prisongate"; + name = "Prison Blast Door" + }, +/turf/open/floor/plating, +/area/security/prison) "uWW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/engine) "uWZ" = ( @@ -43131,16 +42383,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) -"uXk" = ( -/obj/machinery/computer/security/mining, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/iron, -/area/bridge) "uXm" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -43168,6 +42410,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/wood, /area/chapel/office) "uXI" = ( @@ -43178,6 +42423,13 @@ /obj/item/paicard, /turf/open/floor/iron, /area/crew_quarters/dorms) +"uXS" = ( +/obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/crew_quarters/fitness/recreation) "uYb" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/structure/window/reinforced{ @@ -43187,9 +42439,7 @@ dir = 4 }, /turf/open/floor/grass/no_border, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "uYr" = ( /turf/open/floor/plating/beach/coastline_t{ dir = 6 @@ -43202,6 +42452,15 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) +"uYF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/item/plant_analyzer{ + pixel_x = 2; + pixel_y = -8 + }, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "uYV" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/medical, @@ -43263,24 +42522,6 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) -"vat" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/bridge) -"vaT" = ( -/obj/structure/table, -/obj/item/clothing/suit/apron/overalls, -/obj/item/cultivator, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "vba" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/cable/yellow{ @@ -43297,6 +42538,19 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/bridge) +"vbX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/medical/medbay/central) "vci" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/engineering_hacking, @@ -43342,32 +42596,6 @@ name = "mainframe floor" }, /area/tcommsat/server) -"vcM" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"vcX" = ( -/obj/effect/turf_decal/siding/dark/corner{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "vcY" = ( /obj/structure/ladder, /turf/open/floor/pod/dark, @@ -43383,15 +42611,11 @@ /turf/open/floor/iron/dark/corner{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "vdf" = ( /obj/structure/flora/tree/jungle/small, /turf/open/floor/grass/no_border, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "vdv" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -43418,9 +42642,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "vet" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -43431,6 +42653,13 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/department/eva) +"vfs" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/closet/firecloset/full, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore) "vft" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -43464,9 +42693,7 @@ }, /obj/machinery/space_heater, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "vgc" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -43486,6 +42713,18 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/pod/dark, /area/engine/engineering) +"vgl" = ( +/obj/structure/table/wood/fancy/blue, +/obj/item/radio/intercom{ + pixel_x = -28 + }, +/obj/item/storage/secure/briefcase{ + pixel_x = -1; + pixel_y = 6 + }, +/obj/item/book/manual/wiki/sopservice, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/hop) "vgv" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate, @@ -43508,10 +42747,23 @@ "vgG" = ( /turf/closed/wall, /area/engine/atmos) +"vgL" = ( +/obj/machinery/computer/card/minor/hos, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","security") + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/hos) "vgR" = ( /obj/structure/flora/ash/stem_shroom, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"vhn" = ( +/turf/open/floor/glass/reinforced, +/area/asteroid/paradise/surface) "vht" = ( /obj/structure/stairs{ dir = 4 @@ -43568,20 +42820,6 @@ "vhU" = ( /turf/closed/wall/rust, /area/crew_quarters/fitness/recreation) -"vhX" = ( -/obj/structure/table, -/obj/item/seeds/flower/lily{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/seeds/flower/geranium, -/obj/effect/decal/cleanable/dirt, -/obj/item/food/grown/wheat, -/obj/item/food/grown/corn, -/obj/item/food/grown/apple, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/maintenance/department/medical/morgue) "vih" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -43614,10 +42852,6 @@ }, /turf/open/floor/prison/dark, /area/security/prison) -"vjo" = ( -/obj/machinery/camera/directional/north, -/turf/open/openspace, -/area/crew_quarters/kitchen) "vjB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -43686,18 +42920,13 @@ "vmg" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"vmm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/map/echo{ - pixel_x = -32 +/area/hallway/primary/central) +"vmt" = ( +/obj/structure/railing/corner{ + dir = 1 }, -/turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/turf/open/openspace, +/area/medical/medbay/central) "vmu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -43782,6 +43011,15 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, /area/tcommsat/computer) +"vnD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","engine") + }, +/turf/open/floor/engine/n2o, +/area/engine/atmos) "vnV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/ladder, @@ -43791,31 +43029,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/cargo) -"vog" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/machinery/computer/med_data/laptop{ - dir = 4; - pixel_x = 2; - pixel_y = 2 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/cmo) "voA" = ( /obj/structure/lattice, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "voC" = ( /obj/structure/railing{ dir = 4 @@ -43853,12 +43070,12 @@ /turf/closed/wall/r_wall, /area/engine/engineering) "vpE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/sorting/unsorted/flip{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "vpI" = ( @@ -43901,6 +43118,37 @@ }, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) +"vqa" = ( +/obj/machinery/door/airlock/medical{ + name = "Surgery Theatre"; + req_access_txt = "45" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/medical/surgery) +"vqg" = ( +/obj/machinery/computer/security/wooden_tv{ + desc = "Welcome to KOZU 5... your number one source for weather, news, and entertainment. And now, the weather forecast for tomorrow..."; + name = "Budget TV"; + network = list("public"); + pixel_x = 2; + pixel_y = 8 + }, +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/asteroid/paradise/surface) +"vql" = ( +/obj/machinery/door/poddoor/shutters{ + id = "exploration" + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "vqp" = ( /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 @@ -43957,35 +43205,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/prison/dark, /area/security/prison) -"vsG" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/landmark/start/quartermaster, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"vsM" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/donkpockets{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/machinery/door/firedoor, -/obj/structure/desk_bell{ - pixel_x = -6; - pixel_y = 9 - }, -/obj/item/food/mint, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "Chefwindow"; - name = "Chef window" - }, -/turf/open/floor/iron/white, -/area/crew_quarters/kitchen) "vsU" = ( /obj/structure/railing, /turf/open/openspace, @@ -44062,15 +43281,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate/solarpanel_small, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"vuq" = ( -/obj/machinery/atmospherics/components/unary/plasma_refiner{ - dir = 8 - }, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) +/area/hallway/primary/fore) "vuE" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 5 @@ -44089,96 +43300,59 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/engine/atmos) -"vuZ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"vvg" = ( -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface/sand) -"vvo" = ( -/obj/structure/table, -/obj/item/stock_parts/subspace/treatment, -/obj/item/stock_parts/subspace/treatment, -/obj/item/stock_parts/subspace/treatment, -/obj/item/stock_parts/subspace/treatment, -/obj/machinery/light/small{ - dir = 1 +"vuK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/obj/item/book/manual/wiki/tcomms{ - pixel_x = 17; - pixel_y = 4 +/obj/machinery/flasher{ + id = "AI"; + name = "Meatbag Pacifier"; + pixel_x = -33; + pixel_y = 1 }, -/obj/item/radio/intercom{ - pixel_y = 28 +/obj/item/kirbyplants/random, +/obj/machinery/camera/autoname/directional/south{ + network = list("aiupload") }, -/turf/open/floor/iron/dark, -/area/engine/atmos) +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) "vvr" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/dark/side{ dir = 10 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"vvA" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"vvC" = ( -/obj/structure/reagent_dispensers/watertank/high, -/turf/open/floor/plating, -/area/maintenance/department/medical/morgue) -"vwd" = ( -/turf/closed/wall/r_wall, -/area/crew_quarters/heads/hos) -"vwk" = ( +/area/hallway/primary/aft) +"vvz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/machinery/ai_slipper{ + uses = 10 }, -/obj/machinery/turnstile{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery/red, -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison blast door" - }, -/obj/structure/fans/tiny, -/turf/open/floor/iron/dark, -/area/security/prison) +/turf/open/floor/iron/tech, +/area/science/mixing) +"vvC" = ( +/obj/structure/reagent_dispensers/watertank/high, +/turf/open/floor/plating, +/area/maintenance/department/medical/morgue) +"vvO" = ( +/obj/effect/turf_decal/box/white, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) +"vwd" = ( +/turf/closed/wall/r_wall, +/area/crew_quarters/heads/hos) "vwq" = ( /obj/structure/dresser, /obj/item/flashlight/lamp/green{ @@ -44191,30 +43365,12 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) -"vwV" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "hopshutter"; - name = "privacy shutters" - }, -/turf/open/floor/plating, -/area/crew_quarters/heads/hop) "vxs" = ( /obj/structure/disposalpipe/segment{ dir = 10 }, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"vyh" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) +/area/hallway/primary/aft) "vyl" = ( /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/grid/steel, @@ -44237,6 +43393,18 @@ /obj/effect/turf_decal/trimline/dark_red/filled/warning, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) +"vyt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/airalarm/directional/north, +/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/blackbox_recorder, +/turf/open/floor/circuit/telecomms/mainframe{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, +/area/tcommsat/computer) "vyx" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light{ @@ -44251,20 +43419,16 @@ luminosity = 2 }, /area/ai_monitored/turret_protected/ai) -"vyZ" = ( -/obj/effect/landmark/start/quartermaster, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/ai_slipper{ - uses = 10 +"vyN" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/wrench{ + pixel_x = -4; + pixel_y = 7 }, -/turf/open/floor/carpet/orange, -/area/quartermaster/qm) +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "vzo" = ( /obj/structure/railing{ dir = 1 @@ -44291,25 +43455,33 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) -"vBh" = ( -/obj/machinery/power/tracker, -/obj/structure/cable, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) -"vBm" = ( -/obj/machinery/door/airlock{ - name = "Service Hall"; - req_one_access_txt = "22;25;26;28;35;37;38;46" +"vAe" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible/layer2, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 }, +/turf/open/floor/iron/dark, +/area/engine/atmos) +"vAW" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/closeup{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/plating, -/area/hallway/secondary/service) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "vBt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -44328,6 +43500,12 @@ /obj/effect/turf_decal/delivery/red, /turf/open/floor/iron/dark, /area/security/prison) +"vBQ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "vDt" = ( /obj/structure/flora/rock/pile, /obj/effect/decal/cleanable/dirt, @@ -44342,6 +43520,19 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) +"vDx" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "Engidesk"; + name = "engineering Security Door" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/grass/no_border, +/area/crew_quarters/heads/chief) "vDJ" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, @@ -44364,15 +43555,19 @@ dir = 6 }, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "vEn" = ( /obj/effect/turf_decal/loading_area{ dir = 8 }, /turf/open/floor/iron, /area/science/mixing) +"vEB" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/maintenance/department/crew_quarters/bar) "vEI" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -44383,7 +43578,7 @@ network = list("ss13","public") }, /turf/open/floor/plating, -/area/vacant_room/office) +/area/library/abandoned) "vES" = ( /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 @@ -44401,6 +43596,9 @@ "vFg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/numbers/two_nine, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/maintenance/department/engine) "vFx" = ( @@ -44418,21 +43616,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, +/obj/structure/disposalpipe/sorting/mail/destination/chemistry/flip, /turf/open/floor/iron, /area/medical/apothecary) -"vFz" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) "vFR" = ( /obj/structure/sign/warning/nosmoking/circle, /turf/closed/wall/r_wall, @@ -44455,53 +43641,27 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/iron/sepia, -/area/quartermaster/storage) -"vGc" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 + dir = 9 }, -/obj/effect/turf_decal/siding/white{ +/turf/open/floor/iron/sepia, +/area/quartermaster/storage) +"vGb" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) -"vGd" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 - }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) +"vGW" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"vGz" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ - dir = 10 - }, -/turf/closed/wall, -/area/engine/supermatter) -"vHd" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/item/stock_parts/micro_laser/ultra, -/obj/item/stock_parts/micro_laser/ultra, -/obj/item/stock_parts/matter_bin/super, -/obj/item/stock_parts/matter_bin/super, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - initialize_directions = 4 +/turf/open/floor/iron/dark/side{ + dir = 8 }, -/turf/open/floor/iron/tech, -/area/engine/engineering) +/area/hallway/primary/central) "vHe" = ( /obj/effect/turf_decal/loading_area{ dir = 1; @@ -44512,6 +43672,26 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"vHg" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/components/binary/pump/on/layer4{ + dir = 8; + name = "Waste to Filter" + }, +/obj/machinery/atmospherics/components/binary/pump/on/layer2{ + dir = 4; + name = "Air to Distro"; + target_pressure = 500 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold4w/general/visible, +/turf/open/floor/iron/tech, +/area/engine/atmos) "vHu" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/directional{ @@ -44531,6 +43711,13 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/department/cargo) +"vIb" = ( +/obj/effect/spawner/structure/window, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/chapel/main) "vIE" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -44544,6 +43731,18 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) +"vIJ" = ( +/obj/structure/chair/fancy/bench/corporate{ + dir = 1 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway) "vJn" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -44589,11 +43788,17 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/structure/disposalpipe/trunk/multiz{ +/obj/structure/disposalpipe/multiz{ dir = 4 }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) +"vKd" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/department/chapel) "vKD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -44602,21 +43807,12 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) -"vKW" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) "vLx" = ( /obj/structure/sign/painting/library{ pixel_y = 1 }, /turf/closed/wall, -/area/vacant_room/office) +/area/library/abandoned) "vLy" = ( /obj/effect/decal/cleanable/dirt, /turf/open/openspace, @@ -44662,12 +43858,38 @@ /obj/structure/railing/corner, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"vME" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/item/radio/intercom{ + pixel_y = -27 + }, +/turf/open/floor/iron, +/area/medical/surgery) "vMK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain/private) +"vNm" = ( +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8; + pixel_x = 4 + }, +/obj/item/storage/firstaid/brute{ + pixel_y = 5 + }, +/obj/structure/closet/boxinggloves, +/turf/open/floor/iron/white, +/area/crew_quarters/fitness/recreation) "vNE" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44683,6 +43905,34 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) +"vNW" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/tech, +/area/engine/engineering) +"vOc" = ( +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 9 + }, +/turf/open/floor/carpet/blue, +/area/bridge/meeting_room) +"vOX" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue{ + alpha = 180; + dir = 4 + }, +/turf/open/floor/iron/dark/side, +/area/hallway/primary/central) "vPr" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box{ @@ -44716,13 +43966,20 @@ /obj/structure/railing, /obj/structure/lattice, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "vPG" = ( /obj/effect/spawner/structure/window, /turf/open/openspace, /area/quartermaster/qm) +"vPM" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft) "vPP" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /obj/structure/disposalpipe/segment{ @@ -44738,15 +43995,26 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) +"vQt" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/general/hidden/layer4, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/mapping_helpers/simple_pipes/general/visible, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/central) "vQL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "vQN" = ( /turf/open/openspace, /area/medical/medbay/central) @@ -44758,15 +44026,7 @@ /turf/open/floor/iron/dark/side{ dir = 9 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"vRk" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible{ - dir = 1 - }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) +/area/hallway/primary/aft) "vRv" = ( /obj/structure/table/reinforced, /obj/item/paper/guides/recycler, @@ -44811,9 +44071,7 @@ "vRY" = ( /obj/structure/railing/corner, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "vSg" = ( /obj/structure/closet/secure_closet/genpop{ anchored = 0 @@ -44867,27 +44125,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/medical/morgue) -"vTn" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"vTs" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "vTw" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -44897,19 +44134,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"vTH" = ( -/obj/machinery/modular_fabricator/exosuit_fab{ - dir = 1; - output_direction = 1 - }, -/obj/machinery/ecto_sniffer{ - layer = 4; - pixel_x = 2; - pixel_y = 7 - }, -/obj/structure/railing, -/turf/open/floor/iron, -/area/science/robotics) "vTN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -44918,9 +44142,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "vUl" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -44965,11 +44187,23 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"vVw" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/grass/no_border, +/area/hallway/primary/aft) "vVE" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) +"vVQ" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft) "vVS" = ( /obj/structure/table/reinforced, /obj/item/storage/box{ @@ -45052,6 +44286,41 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) +"vWQ" = ( +/obj/item/storage/secure/safe{ + pixel_x = 37; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/camera/autoname/directional/north, +/obj/item/radio/intercom{ + dir = 1; + pixel_y = 29 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore) +"vXe" = ( +/obj/machinery/light/small, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/storage/box/lights/mixed{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "vXg" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -45074,9 +44343,11 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) +"vXM" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface/grass) "vYe" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -45086,9 +44357,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "vYl" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -45103,17 +44372,14 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) -"vYy" = ( +"vYo" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/evac, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/turf/open/floor/plating, +/area/maintenance/department/chapel) "vZe" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/fence/post{ @@ -45152,16 +44418,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/medical/morgue) -"way" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/iron, -/area/maintenance/department/science/central) "waB" = ( /obj/item/trash/can/food, /turf/open/floor/plating/beach/water, @@ -45180,9 +44436,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/freezer, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "wbp" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/sparsegrass, @@ -45224,24 +44478,21 @@ name = "mainframe floor" }, /area/tcommsat/server) -"wbZ" = ( -/obj/structure/musician/piano{ - icon_state = "piano" - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 +"wco" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 +/obj/machinery/newscaster{ + pixel_y = 34 }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/machinery/camera/autoname/directional/north{ + c_tag = "Corporate Meeting Room" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/chair/fancy/comfy{ + color = "#596479" }, -/turf/open/floor/wood, -/area/crew_quarters/cafeteria) +/turf/open/floor/carpet/blue, +/area/bridge/meeting_room) "wcq" = ( /obj/structure/table/wood, /obj/machinery/computer/med_data/laptop{ @@ -45261,28 +44512,12 @@ /obj/item/radio/intercom{ pixel_y = -34 }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin, /turf/open/floor/iron/white, /area/medical/apothecary) -"wcZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - alpha = 180 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/poddoor/preopen{ - id = "brigentrance"; - name = "Brig Blast door" - }, -/turf/open/floor/iron/dark, -/area/security/brig) "wdj" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/computer/card/minor/ce{ @@ -45339,42 +44574,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"wef" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"wex" = ( -/obj/structure/lattice/catwalk/over, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "wey" = ( /obj/structure/closet/cardboard, /obj/effect/spawner/lootdrop/maintenance/two, @@ -45399,6 +44598,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/closeup, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/security/detectives_office) "weN" = ( @@ -45418,7 +44618,30 @@ icon_state = "4-8" }, /turf/open/floor/carpet/purple, -/area/vacant_room/office) +/area/library/abandoned) +"wfz" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/techstorage/command, +/obj/effect/turf_decal/delivery, +/obj/item/radio/intercom{ + pixel_y = 29 + }, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/camera/motion/directional/east{ + c_tag = "Technical Storage"; + name = "motion-sensitive Technical Storage"; + network = list("ss13","engine") + }, +/turf/open/floor/iron/techmaint/planetary, +/area/storage/tech) "wfB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -45428,21 +44651,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/tech, /area/engine/atmos) -"wfD" = ( -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ - alpha = 180 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/computer/communications{ - dir = 4 - }, -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/bridge) "wfF" = ( /obj/machinery/conveyor_switch/oneway{ dir = 8; @@ -45459,6 +44667,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/maintenance/disposal) +"wfO" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/evac{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/maintenance/department/engine) "wgg" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -45484,23 +44702,6 @@ /obj/structure/lattice/catwalk/over, /turf/open/openspace, /area/maintenance/department/bridge) -"wgA" = ( -/obj/machinery/camera/autoname/directional/south{ - network = list("ss13","engine") - }, -/obj/item/radio/intercom{ - pixel_x = 33; - pixel_y = -2 - }, -/obj/machinery/light_switch{ - pixel_x = 23 - }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Gas to Chamber" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/engine/supermatter) "wgL" = ( /obj/item/radio/intercom{ dir = 1; @@ -45536,17 +44737,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) -"whz" = ( -/obj/item/storage/pod{ - pixel_x = 5; - pixel_y = 32 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -30 - }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/iron, -/area/medical/surgery) "whD" = ( /obj/structure/destructible/cult/tome, /obj/item/book/codex_gigas, @@ -45554,7 +44744,7 @@ dir = 4 }, /turf/open/floor/carpet/royalblack, -/area/vacant_room/office) +/area/library/abandoned) "whG" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -45582,18 +44772,12 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/quartermaster/warehouse) -"whU" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/evac, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +"wih" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/maintenance/department/science/xenobiology) "wiC" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/blue/half{ @@ -45652,6 +44836,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/quartermaster/storage) "wiQ" = ( @@ -45675,59 +44862,46 @@ }, /turf/open/openspace, /area/engine/atmos) -"wjA" = ( -/obj/structure/girder, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) -"wjR" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) -"wjY" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/white, -/area/science/explab) -"wkb" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/security/glass{ - id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/machinery/door/poddoor/preopen{ - id = "brigfrontdoor"; - name = "Front Security Blast door" +"wjq" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ - alpha = 180; - color = "#DE3A3A" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/medical/medbay/central) +"wjs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/chair/fancy/plastic{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/iron, -/area/security/brig) +/area/maintenance/department/chapel) +"wjY" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/white, +/area/science/explab) "wki" = ( /obj/machinery/firealarm/directional/west{ - dir = 8; pixel_x = 27 }, /obj/machinery/bookbinder, /turf/open/floor/carpet/royalblack, -/area/vacant_room/office) +/area/library/abandoned) "wkI" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/open/floor/plating, /area/maintenance/department/cargo) +"wkT" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "wlj" = ( /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 @@ -45745,6 +44919,12 @@ /obj/structure/ladder, /turf/open/floor/pod/dark, /area/maintenance/department/science/central) +"wlT" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "wlW" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/donkpockets{ @@ -45758,9 +44938,7 @@ }, /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "wlY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -45777,29 +44955,22 @@ /obj/item/storage/backpack/satchel/flat/treasure, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface/sand) -"wmC" = ( -/obj/item/trash/popcorn, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/medical/surgery) "wnT" = ( /turf/open/floor/dock/drydock, /area/quartermaster/storage) -"wov" = ( +"wnX" = ( +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "0-4" }, -/obj/machinery/ai_slipper{ - uses = 10 +/obj/structure/toilet{ + dir = 4; + pixel_y = 2 }, -/turf/open/floor/iron/showroomfloor, -/area/crew_quarters/fitness/recreation) +/turf/open/floor/prison/dark, +/area/security/prison/shielded) "woI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil/slippery, @@ -45813,17 +44984,11 @@ dir = 8 }, /turf/open/floor/carpet/purple, -/area/vacant_room/office) +/area/library/abandoned) "woV" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/engine) -"wpX" = ( -/obj/structure/fence/corner{ - dir = 1 - }, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "wqd" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -45852,16 +45017,7 @@ /turf/open/floor/iron/dark/corner{ dir = 4 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"wqB" = ( -/obj/structure/fence/corner{ - dir = 8 - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) +/area/hallway/primary/central) "wqF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -45887,9 +45043,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "wrb" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ alpha = 180; @@ -45898,9 +45052,7 @@ /turf/open/floor/iron/dark/corner{ dir = 1 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "wrf" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -45916,11 +45068,22 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/disposalpipe/sorting/mail/destination/detective_office{ + dir = 4 }, /turf/open/floor/iron, /area/security/brig) +"wrs" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/grille/broken, +/turf/open/floor/plating, +/area/maintenance/department/chapel) "wru" = ( /obj/effect/spawner/room/fivexfour, /turf/open/floor/plating, @@ -45936,6 +45099,10 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/sorting) +"wsk" = ( +/obj/effect/turf_decal/evac, +/turf/open/floor/iron, +/area/hallway/primary/aft) "wsA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -45948,17 +45115,24 @@ }, /turf/closed/wall, /area/science/test_area) +"wsS" = ( +/obj/item/clothing/suit/costume/ianshirt, +/obj/item/bedsheet/ian, +/obj/structure/closet/secure_closet{ + req_access_txt = "57" + }, +/obj/item/wrench{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/clothing/suit/hooded/ian_costume, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/hop) "wtc" = ( /obj/machinery/space_heater, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) -"wte" = ( -/obj/structure/fence{ - dir = 8 - }, -/obj/structure/sign/warning/securearea, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface) "wtw" = ( /obj/effect/turf_decal/caution/stand_clear{ dir = 1; @@ -45971,6 +45145,28 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"wtR" = ( +/obj/structure/table/reinforced, +/obj/item/toy/figure/qm{ + pixel_x = 7; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/item/melee/classic_baton/police/deputy{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","cargo") + }, +/turf/open/floor/iron/dark, +/area/quartermaster/qm) "wur" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/caution/stand_clear{ @@ -45994,9 +45190,14 @@ /turf/open/floor/iron/dark/side{ dir = 6 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) +"wvr" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "wvu" = ( /obj/structure/bed{ dir = 8 @@ -46017,9 +45218,19 @@ /area/maintenance/department/engine) "wwE" = ( /turf/closed/wall/r_wall, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"wwW" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/light/small, +/obj/effect/turf_decal/siding/white{ + alpha = 100; + dir = 6 + }, +/turf/open/floor/iron, +/area/medical/medbay/central) "wxa" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -46062,9 +45273,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "wxq" = ( /obj/machinery/requests_console{ department = "Cargo Bay"; @@ -46087,17 +45296,21 @@ /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) "wxQ" = ( -/obj/effect/turf_decal/siding/wood, -/obj/effect/spawner/randomvend/cola, -/obj/machinery/airalarm/directional/west, -/obj/structure/sign/map/echo{ - pixel_y = 32 +/obj/machinery/vending/cigarette, +/turf/open/floor/iron, +/area/medical/surgery) +"wxT" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" }, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) +/turf/open/floor/plating, +/area/security/brig) "wyg" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/structure/disposalpipe/junction{ +/obj/structure/disposalpipe/sorting/mail/destination/library{ dir = 1 }, /turf/open/floor/iron/white/side{ @@ -46105,57 +45318,16 @@ }, /area/science/research) "wyo" = ( -/turf/open/floor/glass/reinforced, -/area/asteroid/paradise/surface) +/turf/closed/wall/r_wall/rust, +/area/maintenance/department/cargo) "wys" = ( /turf/closed/wall, /area/crew_quarters/kitchen/coldroom) -"wyu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - name = "HOP"; - sortType = 15 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/numbers{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "wyw" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"wyz" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 9; - piping_layer = 1 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "wyJ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -46166,9 +45338,7 @@ /turf/open/floor/iron/dark/side{ dir = 9 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "wyV" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -46198,7 +45368,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sorting/mail/destination/toxins{ + dir = 1 + }, /turf/open/floor/iron/white/side{ dir = 6 }, @@ -46256,10 +45428,6 @@ }, /turf/open/floor/iron/dark, /area/security/execution/education) -"wAx" = ( -/obj/structure/flora/rock, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "wAN" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /obj/effect/turf_decal/siding/white/corner{ @@ -46283,19 +45451,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/engine) -"wCc" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/camera/directional/north{ - network = list("ss13","cargo") - }, -/turf/open/floor/plating, -/area/quartermaster/warehouse) -"wCh" = ( -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "wCp" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -46306,18 +45461,14 @@ }, /turf/open/floor/iron, /area/security/prison) -"wCG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/power/apc/auto_name/directional/east{ - pixel_x = 24 - }, -/obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - icon_state = "1-2" +"wCR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 9 }, -/turf/open/floor/plating, -/area/maintenance/department/science/central) +/turf/open/floor/iron/tech, +/area/engine/engineering) "wDb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -46348,15 +45499,10 @@ /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron/tech, /area/engine/atmos) -"wDD" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) +"wDy" = ( +/obj/structure/railing/corner, +/turf/open/floor/iron/dark/corner, +/area/hallway/primary/central) "wDK" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46452,6 +45598,19 @@ /obj/machinery/vending/wardrobe/engi_wardrobe, /turf/open/floor/iron, /area/engine/engineering) +"wEY" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/structure/closet/secure_closet/captains, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/reagent_containers/food/drinks/flask/gold{ + pixel_x = 3; + pixel_y = 8 + }, +/obj/item/pinpointer/nuke{ + pixel_y = 5 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/captain/private) "wFm" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -46467,6 +45626,18 @@ }, /turf/open/floor/iron/grid/steel, /area/bridge) +"wFz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 8; + name = "External Gas to Loop" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/dark, +/area/engine/engineering) "wFL" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/multiz/layer4{ @@ -46491,9 +45662,7 @@ /turf/open/floor/iron/dark/corner{ dir = 1 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "wGp" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt/dust, @@ -46528,6 +45697,16 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) +"wGY" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "wHe" = ( /obj/structure/window/reinforced{ dir = 1 @@ -46545,25 +45724,6 @@ }, /turf/open/floor/iron/dark, /area/maintenance/disposal) -"wHv" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4; - piping_layer = 1 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) "wHw" = ( /obj/structure/stairs{ dir = 8 @@ -46604,6 +45764,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) "wIp" = ( @@ -46617,20 +45780,6 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/storage/tech) -"wIO" = ( -/obj/structure/chair/fancy/bench/corporate{ - dir = 1 - }, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "wIQ" = ( /obj/structure/flora/ausbushes/leafybush, /obj/structure/flora/ausbushes/fullgrass, @@ -46641,9 +45790,7 @@ dir = 4 }, /turf/open/floor/grass/no_border, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "wIV" = ( /obj/structure/chair{ dir = 1 @@ -46685,13 +45832,17 @@ "wKO" = ( /turf/closed/wall/r_wall, /area/science/test_area) -"wLa" = ( -/obj/structure/fence{ +"wKQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/structure/sign/warning/electricshock, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/medical/apothecary) "wLe" = ( /turf/open/floor/engine/light, /area/holodeck/small) @@ -46701,6 +45852,13 @@ }, /turf/open/openspace, /area/quartermaster/qm) +"wLG" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "wLQ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -46713,9 +45871,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "wLS" = ( /obj/structure/railing/corner{ dir = 4 @@ -46768,21 +45924,6 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/storage/tech) -"wMW" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Medbay Maintenance"; - req_one_access_txt = "5" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, -/obj/effect/turf_decal/stripes/closeup, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/maintenance/department/crew_quarters/bar) "wMY" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -46820,10 +45961,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/vacant_room/office) +/area/library/abandoned) "wNL" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plating, /area/maintenance/department/engine) "wNN" = ( @@ -46849,9 +45993,15 @@ }, /obj/structure/lattice, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) +"wOh" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/photocopier, +/turf/open/floor/iron/dark, +/area/bridge/meeting_room) "wOF" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46863,7 +46013,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/disposalpipe/trunk/multiz/down{ +/obj/structure/disposalpipe/multiz/down{ dir = 2 }, /turf/open/floor/iron/white/side, @@ -46908,9 +46058,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/two, /obj/structure/cable/yellow{ @@ -46923,9 +46070,7 @@ dir = 4 }, /turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "wQy" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/plating/asteroid/planetary, @@ -46941,28 +46086,20 @@ /obj/effect/spawner/lootdrop/glowstick/lit, /turf/open/floor/plating, /area/maintenance/department/science/central) -"wQK" = ( -/obj/machinery/space_heater, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/maintenance/department/science/xenobiology) "wQW" = ( /obj/machinery/smartfridge{ name = "Bulk storage" }, -/turf/closed/wall, +/turf/open/floor/iron/grid/steel, /area/hydroponics) "wQY" = ( /obj/structure/sign/departments/minsky/supply/cargo, /turf/closed/wall, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) +"wRv" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/turf/open/floor/iron/tech, +/area/engine/engineering) "wRO" = ( /obj/machinery/announcement_system, /obj/effect/turf_decal/stripes/line{ @@ -46977,16 +46114,12 @@ dir = 9 }, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "wSx" = ( /obj/structure/lattice, /obj/structure/railing/corner, /turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "wSz" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -47051,21 +46184,56 @@ dir = 4 }, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"wUl" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/box, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/area/hallway/primary/central) +"wUj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/rnd/production/techfab/department/cargo, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "0-8" }, -/turf/open/floor/iron/white, -/area/medical/apothecary) -"wUU" = ( -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface/sand) +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/quartermaster/storage) +"wVn" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "garbage" + }, +/obj/item/trash/tray{ + pixel_x = 11 + }, +/obj/item/trash/semki{ + pixel_x = 12; + pixel_y = 4 + }, +/obj/item/trash/can/food/peaches/maint{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/trash/candle{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/trash/can{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","security") + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/maintenance/disposal) "wVx" = ( /obj/structure/sign/departments/minsky/supply/janitorial{ pixel_y = 32 @@ -47138,19 +46306,6 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/science/central) -"wWL" = ( -/obj/effect/turf_decal/siding/dark/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/corner, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/yellow/corner, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "wXo" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; @@ -47170,12 +46325,9 @@ /obj/machinery/power/emitter, /turf/open/floor/iron, /area/engine/engineering) -"wYG" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/catwalk_floor/iron_dark, +"wXX" = ( +/obj/machinery/light/small/broken/directional/east, +/turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface) "wYL" = ( /obj/effect/turf_decal/stripes/line{ @@ -47191,6 +46343,15 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"wYN" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/fireaxecabinet/directional/south, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/bridge) "wYU" = ( /obj/effect/landmark/start/cyborg, /obj/structure/cable{ @@ -47216,14 +46377,32 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) +"wZt" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) +"wZC" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/carpet/green, +/area/library/abandoned) "wZD" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/sign/poster/official/no_erp{ @@ -47262,6 +46441,14 @@ /obj/item/clothing/under/rank/prisoner, /turf/open/floor/iron, /area/security/prison) +"xap" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "xaA" = ( /obj/effect/turf_decal/box, /obj/machinery/ai_slipper{ @@ -47283,16 +46470,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"xbj" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/obj/item/wrench{ - pixel_x = -4; - pixel_y = 7 - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "xbu" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/delivery, @@ -47334,40 +46511,12 @@ pixel_y = -27 }, /turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "xbL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, /turf/open/floor/plating, /area/security/warden) -"xck" = ( -/obj/structure/closet/secure_closet/detective, -/obj/item/storage/box/evidence{ - pixel_y = 5 - }, -/obj/item/flashlight/seclite, -/obj/item/restraints/handcuffs, -/obj/item/taperecorder, -/obj/machinery/requests_console{ - department = "Detective's office"; - name = "Detective RC"; - pixel_y = 30 - }, -/obj/item/camera/detective, -/obj/machinery/computer/security/telescreen{ - dir = 8; - name = "Station Monitor"; - network = list("ss13"); - pixel_x = 24 - }, -/obj/machinery/camera/directional/north{ - network = list("ss13","security") - }, -/obj/item/holosign_creator/security, -/turf/open/floor/wood, -/area/security/detectives_office) "xcp" = ( /obj/machinery/atmospherics/components/binary/pump/layer2{ dir = 8; @@ -47382,17 +46531,6 @@ }, /turf/open/floor/iron/tech, /area/engine/atmos) -"xct" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/grille/broken, -/turf/open/floor/plating, -/area/maintenance/department/chapel) "xcv" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -47414,6 +46552,31 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/kitchen) +"xdi" = ( +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "medbay" + }, +/obj/machinery/door/airlock/medical/glass{ + emergency = 1; + id_tag = "MedbayFoyer"; + name = "Medbay"; + req_one_access_txt = "5" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "xdp" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -47426,6 +46589,32 @@ }, /turf/open/floor/iron, /area/security/brig) +"xdC" = ( +/obj/structure/closet/secure_closet/detective, +/obj/item/storage/box/evidence{ + pixel_y = 5 + }, +/obj/item/flashlight/seclite, +/obj/item/restraints/handcuffs, +/obj/item/taperecorder, +/obj/machinery/requests_console{ + department = "Detective's office"; + name = "Detective RC"; + pixel_y = 30 + }, +/obj/item/camera/detective, +/obj/machinery/computer/security/telescreen{ + dir = 8; + name = "Station Monitor"; + network = list("ss13"); + pixel_x = 24 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","security") + }, +/obj/item/holosign_creator/security, +/turf/open/floor/wood, +/area/security/detectives_office) "xdD" = ( /obj/structure/window/reinforced{ dir = 4 @@ -47454,17 +46643,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/medical/central) -"xdR" = ( -/obj/effect/turf_decal/siding/wideplating/terracotta{ - dir = 8 +"xeW" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ + dir = 1 }, -/obj/structure/no_effect_signpost{ - name = "Echo station"; - pixel_x = -4; - pixel_y = 3 +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "xfd" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -47480,6 +46669,23 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"xfu" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, +/obj/structure/chair/office/light{ + dir = 1; + pixel_y = 3 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron/grid/steel, +/area/science/xenobiology) "xfA" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -47487,6 +46693,13 @@ /obj/machinery/telecomms/server/presets/service, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) +"xfB" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 4 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "xfI" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -47502,7 +46715,7 @@ /obj/structure/flora/rock/pile, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/basalt/planetary, -/area/science/misc_lab) +/area/asteroid/paradise) "xfN" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/multiz/layer4{ @@ -47516,27 +46729,11 @@ "xfO" = ( /obj/structure/chair/stool/directional/west, /obj/effect/landmark/start/medical_doctor, -/obj/structure/disposalpipe/trunk/multiz/down{ +/obj/structure/disposalpipe/multiz/down{ dir = 8 }, /turf/open/floor/iron, /area/medical/medbay/central) -"xge" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/medical/medbay/central) -"xgv" = ( -/turf/closed/mineral/random/air, -/area/science/misc_lab) "xgH" = ( /turf/closed/wall, /area/medical/storage) @@ -47553,6 +46750,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) +"xhx" = ( +/obj/structure/railing{ + dir = 10 + }, +/turf/open/floor/glass/reinforced, +/area/crew_quarters/heads/cmo) "xhE" = ( /obj/structure/reflector/box{ anchored = 1; @@ -47563,6 +46766,13 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"xhS" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/maintenance/department/chapel) "xiu" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 1 @@ -47587,19 +46797,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/crew_quarters/cafeteria) -"xiD" = ( -/obj/structure/railing, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "xiF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -47622,7 +46819,6 @@ }, /obj/effect/turf_decal/bot, /obj/structure/railing/corner, -/obj/structure/railing/corner, /obj/machinery/firealarm/directional/south, /obj/structure/filingcabinet/filingcabinet{ pixel_x = -7 @@ -47630,7 +46826,6 @@ /obj/structure/filingcabinet/filingcabinet{ pixel_x = 7 }, -/obj/structure/railing/corner, /turf/open/floor/iron/dark, /area/science/robotics) "xiY" = ( @@ -47686,9 +46881,7 @@ /turf/open/floor/iron/dark/side{ dir = 5 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "xko" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -47737,19 +46930,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/tech, /area/engine/atmos) -"xlw" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - pixel_y = -24 - }, -/obj/structure/cable/yellow, -/obj/structure/filingcabinet{ - pixel_x = -8 - }, -/obj/structure/filingcabinet/security{ - pixel_x = 8 - }, -/turf/open/floor/wood, -/area/security/detectives_office) "xlB" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -47758,9 +46938,7 @@ icon_state = "1-2" }, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/area/hallway/primary/aft) "xmm" = ( /obj/structure/railing{ dir = 5 @@ -47842,7 +47020,7 @@ }, /turf/open/floor/plating/rust, /area/science/test_area) -"xoi" = ( +"xos" = ( /obj/effect/spawner/structure/window/depleteduranium, /turf/open/floor/plating, /area/asteroid/paradise) @@ -47894,9 +47072,7 @@ /turf/open/floor/iron/dark/side{ dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "xpJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -47939,16 +47115,6 @@ /obj/structure/closet/cardboard, /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) -"xqi" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/holohoop{ - dir = 8; - layer = 3 - }, -/turf/open/floor/prison/dark, -/area/security/prison) "xqj" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -47961,9 +47127,7 @@ dir = 4 }, /turf/open/floor/grass/no_border, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +/area/hallway/primary/fore) "xql" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ @@ -48023,6 +47187,38 @@ /obj/effect/landmark/start/captain, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) +"xsu" = ( +/obj/structure/flora/rock/pile, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) +"xsw" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "xsH" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -48037,32 +47233,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/maintenance/department/medical/morgue) -"xsS" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"xsU" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 9 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/cmo) "xtb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -48081,9 +47251,7 @@ /turf/open/floor/plating, /area/maintenance/department/bridge) "xtQ" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 }, @@ -48097,9 +47265,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/security/brig) "xuC" = ( @@ -48120,6 +47286,15 @@ }, /turf/open/floor/iron/grid/steel, /area/janitor) +"xuK" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow, +/obj/machinery/door/poddoor/preopen{ + id = "brigentrance"; + name = "Brig Blast Door" + }, +/turf/open/floor/plating, +/area/security/warden) "xuY" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/structure/chair/office/light{ @@ -48134,17 +47309,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/lab) -"xvc" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "xvi" = ( /obj/machinery/light/small{ dir = 4 @@ -48186,6 +47350,18 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/qm) +"xvI" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "xvQ" = ( /obj/effect/turf_decal/trimline/dark/warning{ dir = 4 @@ -48201,9 +47377,7 @@ pixel_y = -3 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "xwe" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/effect/decal/cleanable/dirt, @@ -48227,12 +47401,6 @@ /obj/machinery/light, /turf/open/floor/iron/dark, /area/teleporter) -"xwt" = ( -/obj/structure/fence/corner{ - dir = 8 - }, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "xwB" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -48291,39 +47459,22 @@ dir = 1 }, /area/asteroid/paradise/surface) -"xwR" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/manifold/green/visible/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"xwU" = ( -/turf/open/floor/glass/reinforced, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "xxa" = ( /obj/effect/turf_decal/siding/wideplating/terracotta{ dir = 1 }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"xxV" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/dark_blue{ - alpha = 180 +"xxn" = ( +/obj/structure/girder, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) +"xxo" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "xyh" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 10 @@ -48340,10 +47491,21 @@ }, /turf/open/floor/carpet/orange, /area/quartermaster/qm) -"xyG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ - piping_layer = 2 +"xyn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/holohoop{ + dir = 4 }, +/turf/open/floor/prison/dark, +/area/security/prison) +"xyG" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output, /turf/open/floor/engine/air, /area/engine/atmos) "xyS" = ( @@ -48356,33 +47518,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) -"xyV" = ( -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ - alpha = 180 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/obj/effect/turf_decal/evac, -/turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "xzm" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -48392,14 +47527,49 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) -"xzJ" = ( -/obj/structure/fence{ - dir = 8 +"xzz" = ( +/obj/structure/railing/corner{ + dir = 4 }, -/obj/structure/sign/warning/electricshock, -/obj/effect/turf_decal/sand/plating, +/obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) +"xzL" = ( +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ + alpha = 180 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/computer/communications{ + dir = 4 + }, +/obj/machinery/status_display/evac{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/bridge) +"xzU" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/white/side, +/area/science/research) "xzV" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -48419,14 +47589,13 @@ }, /obj/machinery/door/airlock/public/glass, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"xAa" = ( -/obj/structure/fence/cut/large{ +/area/hallway/primary/aft) +"xAe" = ( +/obj/structure/fence{ dir = 8 }, -/turf/open/floor/plating/dirt/planetary, +/obj/structure/sign/warning/securearea, +/turf/open/floor/plating/grass, /area/asteroid/paradise/surface) "xAi" = ( /obj/structure/chair/office/light{ @@ -48439,6 +47608,11 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/iron/white/side, /area/science/lab) +"xAx" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "xAy" = ( /obj/structure/table, /obj/item/airlock_painter{ @@ -48457,21 +47631,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"xAU" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/obj/machinery/light/small, -/obj/effect/turf_decal/siding/white{ - alpha = 100; - dir = 6 - }, -/turf/open/floor/iron, -/area/medical/medbay/central) +/area/hallway/primary/fore) "xBc" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -48492,15 +47652,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/security/brig) -"xBv" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/computer/shuttle_flight/custom_shuttle/exploration, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "xBP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -48518,6 +47669,19 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) +"xCt" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "xCw" = ( /obj/machinery/computer/security/hos, /obj/item/toy/plush/carpplushie{ @@ -48547,16 +47711,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/security/brig) -"xCK" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) "xCQ" = ( /obj/structure/railing{ dir = 1 @@ -48598,6 +47752,14 @@ /obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/open/floor/engine/airless, /area/engine/atmos) +"xDT" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "xDX" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -48621,7 +47783,7 @@ icon_state = "2-8" }, /turf/open/floor/wood, -/area/vacant_room/office) +/area/library/abandoned) "xEu" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/machinery/computer/atmos_control/tank/oxygen_tank{ @@ -48634,11 +47796,33 @@ /obj/machinery/vending/boozeomat, /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) +"xFu" = ( +/obj/machinery/space_heater, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/maintenance/department/science/xenobiology) "xFx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/emcloset/anchored, /turf/open/floor/iron, /area/maintenance/department/bridge) +"xFB" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/hallway/primary/central) "xGl" = ( /obj/effect/turf_decal/siding/white{ alpha = 100 @@ -48663,8 +47847,8 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/structure/disposalpipe/junction/flip{ - dir = 2 +/obj/structure/disposalpipe/segment{ + dir = 6 }, /turf/open/floor/catwalk_floor/iron_dark, /area/crew_quarters/heads/hop) @@ -48686,10 +47870,23 @@ }, /turf/open/floor/iron/tech, /area/engine/engineering) -"xGU" = ( -/obj/structure/flora/junglebush/large, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) +"xGH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/engineering_hacking{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_construction{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/window/plasma/reinforced, +/turf/open/floor/iron, +/area/engine/engineering) "xHy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -48726,27 +47923,13 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"xIr" = ( -/obj/structure/table/glass, -/obj/machinery/reagentgrinder{ - pixel_x = -5; - pixel_y = 19 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/west{ - pixel_x = -24 - }, +"xIF" = ( +/obj/machinery/atmospherics/components/unary/cryo_cell, /obj/structure/cable/yellow{ - icon_state = "0-2" + icon_state = "4-8" }, -/turf/open/floor/iron, -/area/medical/apothecary) +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/central) "xIO" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -48786,6 +47969,9 @@ dir = 8 }, /obj/machinery/firealarm/directional/north, +/obj/structure/disposalpipe/multiz/down{ + dir = 8 + }, /turf/open/floor/iron/white/corner{ dir = 8 }, @@ -48808,9 +47994,7 @@ "xJN" = ( /obj/structure/railing/corner, /turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/area/engineering/hallway) "xJR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -48891,6 +48075,10 @@ }, /turf/open/floor/iron/dark, /area/medical/morgue) +"xLl" = ( +/obj/structure/flora/junglebush/large, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/asteroid/paradise) "xLT" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -48932,9 +48120,27 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) +"xMi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/maintenance/department/chapel) "xMl" = ( /turf/open/floor/iron, /area/maintenance/department/medical/central) +"xMy" = ( +/obj/machinery/modular_fabricator/exosuit_fab{ + dir = 1; + output_direction = 1 + }, +/obj/machinery/ecto_sniffer{ + pixel_x = 2; + pixel_y = 7 + }, +/obj/structure/railing, +/turf/open/floor/iron, +/area/science/robotics) "xMB" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -48943,6 +48149,20 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/security/brig) +"xMI" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_y = -33 + }, +/obj/machinery/light, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "xMP" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, @@ -48964,6 +48184,19 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) +"xNf" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/evac{ + dir = 4 + }, +/turf/open/floor/iron, +/area/maintenance/department/science/xenobiology) "xNh" = ( /obj/structure/lattice/catwalk/over, /obj/structure/table, @@ -48989,39 +48222,12 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) -"xOo" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/asteroid/paradise/surface) "xPb" = ( /obj/effect/turf_decal/siding/wideplating/terracotta/corner{ dir = 8 }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface/grass) -"xPe" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"xPV" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/dark/side, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"xQe" = ( -/obj/machinery/computer/card, -/obj/item/radio/intercom{ - dir = 1; - pixel_x = 1; - pixel_y = 23 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/hop) "xQu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -49056,21 +48262,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/wood, /area/chapel/office) -"xRg" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/catwalk_floor/iron_dark, -/area/asteroid/paradise/surface) "xRl" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 25 @@ -49110,26 +48306,6 @@ }, /turf/open/floor/iron/white, /area/science/lab) -"xRv" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = -6; - pixel_y = 14 - }, -/obj/item/bikehorn/rubberducky{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/storage/photo_album{ - pixel_x = 3; - pixel_y = -1 - }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain/private) "xRJ" = ( /obj/machinery/door/poddoor/shutters/radiation/preopen{ id = "engsm"; @@ -49147,6 +48323,17 @@ /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/plating, /area/engine/supermatter) +"xRU" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/bridge) "xSk" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/effect/decal/cleanable/dirt, @@ -49173,15 +48360,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/prison) -"xTb" = ( -/obj/item/beacon{ - pixel_y = 3 - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/turf/open/floor/wood, -/area/crew_quarters/cafeteria) "xTu" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -49280,11 +48458,14 @@ /area/asteroid/paradise) "xUB" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ - piping_layer = 2 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output/layer2, /turf/open/floor/engine/o2, /area/engine/atmos) +"xUH" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/tech, +/area/science/mixing) "xVa" = ( /obj/machinery/gateway{ dir = 9 @@ -49294,20 +48475,17 @@ }, /turf/open/floor/iron/dark, /area/gateway) +"xVc" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 9 + }, +/obj/machinery/meter, +/turf/closed/wall/r_wall, +/area/engine/supermatter) "xVj" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"xVu" = ( -/obj/effect/turf_decal/trimline/yellow, -/obj/structure/lattice/catwalk/over, -/obj/structure/cable/yellow{ - icon_state = "2-16" - }, -/turf/open/floor/plating, -/area/maintenance/department/chapel) +/area/hallway/primary/aft) "xVE" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, @@ -49339,6 +48517,21 @@ }, /turf/open/floor/plating, /area/storage/primary) +"xVI" = ( +/turf/closed/wall/r_wall, +/area/maintenance/department/cargo) +"xVY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/department/science/central) "xWe" = ( /obj/structure/lattice, /turf/open/openspace, @@ -49354,9 +48547,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "xWo" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -49366,23 +48557,6 @@ }, /turf/open/floor/wood/broken, /area/crew_quarters/cafeteria) -"xWK" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/frame/computer{ - anchored = 1; - dir = 8 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "xXi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -49391,9 +48565,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/hallway/primary/central) "xXk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -49404,15 +48576,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"xXl" = ( -/obj/structure/rack, -/obj/item/stack/cable_coil/white, -/obj/item/circuitboard/machine/rtg/advanced{ - pixel_x = -1; - pixel_y = -3 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) "xXE" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -49420,27 +48583,32 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 4 + }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) -"xXH" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/fans/tiny{ - density = 1; - icon = 'icons/effects/effects.dmi'; - icon_state = "m_shield"; - layer = 5; - max_integrity = 1e+007 +/area/engineering/hallway) +"xYp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/quartermaster/storage) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) "xYT" = ( /turf/closed/wall/r_wall, /area/medical/patients_rooms) @@ -49455,6 +48623,58 @@ /obj/effect/spawner/lootdrop/gambling, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) +"xZq" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/grenades{ + pixel_x = 4; + pixel_y = 19 + }, +/obj/item/storage/box/beakers{ + pixel_x = -6; + pixel_y = 24 + }, +/obj/item/grenade/chem_grenade{ + pixel_x = 12; + pixel_y = 11 + }, +/obj/item/grenade/chem_grenade{ + pixel_x = 10; + pixel_y = 7 + }, +/obj/item/grenade/chem_grenade{ + pixel_x = 11; + pixel_y = 2 + }, +/obj/item/assembly/igniter{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/item/assembly/igniter{ + pixel_y = 5 + }, +/obj/item/assembly/timer{ + pixel_y = 2 + }, +/obj/item/assembly/timer, +/obj/item/screwdriver{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron, +/area/medical/apothecary) "xZu" = ( /obj/structure/railing{ dir = 8 @@ -49477,17 +48697,6 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) -"yak" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8; - initialize_directions = 8 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "yaq" = ( /turf/closed/wall/rust, /area/science/server) @@ -49565,18 +48774,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer5{ + dir = 9 + }, /turf/open/floor/iron/tech, /area/engine/atmos) -"ycD" = ( -/obj/structure/fans/tiny{ - density = 1; - icon = 'icons/effects/effects.dmi'; - icon_state = "m_shield"; - layer = 5; - max_integrity = 1e+007 - }, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/quartermaster/storage) "ycF" = ( /obj/machinery/door/airlock/public/glass{ name = "Cryogenic Lounge" @@ -49600,6 +48802,34 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) +"ycV" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/hallway/primary/aft) +"yda" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/disposalpipe/sorting/mail/destination/ce_office/flip, +/turf/open/floor/iron/dark, +/area/engineering/hallway) "ydE" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/sand/plating, @@ -49648,13 +48878,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"yeM" = ( -/obj/structure/flora/rock/pile, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/titanium, -/area/asteroid/paradise/surface) "yeS" = ( /obj/structure/stairs{ dir = 8 @@ -49672,47 +48895,36 @@ }, /turf/open/floor/iron, /area/maintenance/department/security/brig) -"yfd" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - piping_layer = 4 - }, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","medbay") +"yfl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 }, -/obj/machinery/light/small{ +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/vending/wallmed{ - pixel_x = -32 - }, -/obj/machinery/power/apc/auto_name/directional/north{ - pixel_y = 24 - }, /obj/structure/cable/yellow{ - icon_state = "0-4" + icon_state = "4-8" }, -/turf/open/floor/iron/grid/steel, -/area/medical/medbay/central) +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Gas to Chamber" + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) +"yfw" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/iron, +/area/maintenance/department/chapel) "yfP" = ( /obj/structure/sink/kitchen{ pixel_y = 22 }, /turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) -"yfQ" = ( -/obj/machinery/power/solar{ - id = "portsolar"; - name = "Port Solar Array" - }, -/obj/structure/cable, -/turf/open/floor/iron/solarpanel, -/area/asteroid/paradise/surface) +/area/hallway/primary/aft) "yfW" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/decal/cleanable/dirt/dust, @@ -49730,19 +48942,7 @@ /turf/open/floor/iron/dark/side{ dir = 5 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"ygK" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -28 - }, -/obj/machinery/ore_silo, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/dark, -/area/security/nuke_storage) +/area/hallway/primary/central) "ygN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -49753,6 +48953,21 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"yhe" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/clothing/glasses/meson/engine, +/obj/item/stack/sheet/mineral/copper{ + amount = 5; + pixel_x = -7; + pixel_y = 3 + }, +/obj/item/storage/belt/utility/full/engi, +/obj/structure/window/plasma/reinforced, +/turf/open/floor/iron, +/area/engine/engineering) "yib" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -49781,30 +48996,38 @@ /obj/effect/decal/cleanable/food/egg_smudge, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) -"yjV" = ( +"yjK" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light{ + dir = 1 + }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) +/area/hallway/primary/fore) "yjX" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plating, /area/engine/supermatter) -"ykL" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +"ykK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/effect/turf_decal/numbers{ + dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/effect/turf_decal/tile/neutral, +/obj/structure/disposalpipe/sorting/mail/destination/hos_office/flip{ + dir = 8 }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/hallway/primary/fore) "ykM" = ( /obj/machinery/camera/motion/directional/south{ c_tag = "MiniSat Exterior 2"; @@ -55148,12 +54371,12 @@ vqI mLS mLS mLS -kne -ycD -xXH -kne -ttf -ycD +jAX +hbZ +cbg +jAX +jjw +hbZ mLS mLS mLS @@ -57222,7 +56445,7 @@ oJl uli qVs tHO -gyC +gWk nIy tHO vFR @@ -57461,7 +56684,7 @@ sFV cbm cbm dMS -rCk +cqi qJK dRp jUw @@ -57727,7 +56950,7 @@ hig wuy ovX iGq -wCc +fBx kYy afy rXp @@ -57983,7 +57206,7 @@ ocL nii nii nii -gDX +goq xpJ kcv oTt @@ -58240,7 +57463,7 @@ vjB hBy vba vba -jwL +qyj whN iVv kCM @@ -58497,21 +57720,21 @@ baM ssX qJo ssX -oHX +mqv gvg fBW mcO oiK hZi fAb -drz +vgG sEH xkV wfB cHg tJa pYm -drz +vgG drz tHO vqI @@ -58993,7 +58216,7 @@ iaR vhU iaR iaR -aJD +ggB vnY wzb cbm @@ -59012,21 +58235,21 @@ mOp wnT dcZ rrg -qYP +lOl mcO kCM -jDe +iDc uli -mgL +lrW bKc -eur +rIP cnW qdc tIa wDm oJt mCk -oIY +vnD uli vqI vqI @@ -59275,14 +58498,14 @@ vXr vXr tHO drz -drz +vgG igh nzj raX -ePf +qIE hfq fUi -drz +vgG drz tHO vqI @@ -59528,14 +58751,14 @@ maU lEu mht ehf -sfR +wyo jOo uli fWy qMR tFX hZv -eYC +pOl rVx aDD eyD @@ -59785,14 +59008,14 @@ wnT ptc rhv gCM -nWb +xVI jOo uli xyG tuT cEi qyw -mrp +vAe jhG bov tnQ @@ -60004,7 +59227,7 @@ rPT rPT jra uVy -qte +rkL waJ rYY wDW @@ -60013,7 +59236,7 @@ pYd kUF azS iaR -jrB +vNm ibj ibj hYk @@ -60042,14 +59265,14 @@ dcZ lEu bnh qQW -nWb +xVI jOo tHO uli tHO -iZg +ldz gOe -nZZ +vHg grS dao oga @@ -60269,7 +59492,7 @@ oEv jtr vhT dzD -kTN +oiT riv jap aIa @@ -60299,14 +59522,14 @@ dcZ lEu bod vHR -sfR -epb +wyo +qbr jOo jRB vgG vZP xQu -ajX +aCq dXj ssw llI @@ -60519,7 +59742,7 @@ rPT rPT uVy eZJ -oRp +oNR cAy wDf wys @@ -60529,7 +59752,7 @@ wys wys iaR iaR -cmy +dcz itk pLv aiR @@ -60543,7 +59766,7 @@ sWT kxi sWT lEY -lhd +kOI tyg tyg hRb @@ -60556,14 +59779,14 @@ wnT lEu dMS lEu -aZV +rpX jOo giS bJq lho yiO xQu -pXK +nrf tRy ssw iiY @@ -60571,7 +59794,7 @@ lAn nXA mmp nXA -eZZ +uux xqU vgR vqI @@ -60775,19 +59998,19 @@ eXB tqL eXB uVy -vBm +gFS wys wys wys wys -dVA +bBK aPU kEf wys fYS xIX eyM -wov +lYL jlf iaR vhU @@ -60802,7 +60025,7 @@ dSI sWT hlL ezA -lgq +ptZ vHe alg kIo @@ -60813,14 +60036,14 @@ jAN iOA pUm rmX -ttw +kzn jOo jOo jOo vgG xUc lly -bVo +rcA ycz hAX bxD @@ -61034,7 +60257,7 @@ xaM eXB jES wys -bEQ +ksb bWw eHY eop @@ -61077,7 +60300,7 @@ eJz eJz eJz gHW -aEB +rff gHW dzW ihL @@ -61090,15 +60313,15 @@ dzW ihL ihL fhM -lCB -lCB -lCB -lCB -lCB -lCB +qPe +qPe +qPe +qPe +qPe +qPe oJl -lCB -lCB +qPe +qPe jsp vqI vqI @@ -61328,13 +60551,13 @@ oZa tVY qrO eJz -ygK +oMj rlu tww vci eJz fqM -nQB +aSs fVf dzW kMN @@ -61350,12 +60573,12 @@ mTL gNG fUV ozj -qUD +dDR oJl sLz lFQ mVg -lCB +qPe jsp jsp vqI @@ -61552,13 +60775,13 @@ vht ozM eUf mbl -lvL +rNY wys wys wys -mpz -oOz -cgI +qDH +odK +uXS fsr noh oNp @@ -61591,7 +60814,7 @@ jxW lsu eJz qUr -hLa +ltK cQe nAD fAi @@ -61608,11 +60831,11 @@ cFP xqU xwe uKf -sqm +jLo eTK aST xqU -lCB +qPe jsp jsp vqI @@ -61847,8 +61070,8 @@ dEU cBs hBl eJz -mEL -lYg +kdV +cpt pfU teA cxL @@ -61866,7 +61089,7 @@ cEu trB dwq oJl -wAx +jMd jmP sLz oJl @@ -62102,10 +61325,10 @@ eJz qlj tHB bAQ -ssy +ioD eJz kvM -wHv +xYp qwZ nAD xsc @@ -62118,13 +61341,13 @@ aLz ihL kEO fhM -lCB -tOu -qki -xoi +qPe +pPZ +biE +xos oJl -lCB -lCB +qPe +qPe oJl oJl jsp @@ -62342,31 +61565,31 @@ fEV gee kBA fMX -qjP +ssG dlh rru viT bdN wHD -lqc +wUj cfv xoc gWp jPg -hgS +rcR pjs eJz -kDx +odp pIl ptb roc eJz gHW -jkI +bAs gHW pyW bRk -cAK +biR pUZ ihL xgK @@ -62375,7 +61598,7 @@ dbV uBt cEk mVg -xGU +xLl xTD mIF sXg @@ -62619,7 +61842,7 @@ eJz eJz eJz qOg -azL +hRU yaU kbq dzW @@ -62876,13 +62099,13 @@ qdG vLP xTu eOD -azL +hRU jFC pVY uUK uRJ ecq -bgo +fFe sXB gqv gqv @@ -63120,7 +62343,7 @@ ejR smS vcv iQa -vyZ +aKM jXE aog mev @@ -63130,10 +62353,10 @@ kPS wML amy pWS -iNo +unk rzg -kzr -wyz +evw +gka oNv wON jsW @@ -63143,8 +62366,8 @@ aaU qEU qRN qBw -pQS -oer +eAU +nHb biV sXB blO @@ -63366,11 +62589,11 @@ xGl tEI wht qbW -sjJ +eIh lQi wvu fMX -jiz +nHZ ovP qaK lxu @@ -63385,24 +62608,24 @@ feI tNX cii vLP -qWg +wfz oeh vLP vgi -dLq -rfT +bkZ +ndI udt hAp wdX -oHn -oHn -vHd -fYP -bmi +oWj +oWj +mNF +tJE +xfB uAD bcS gPs -mHA +roh lCS hJN wFM @@ -63646,21 +62869,21 @@ vLP vLP vLP top -rrt -eUG +lYh +bQM eCn aIx fMC -xwR -jUL -kaW -qeW -two +skT +jvX +nYP +eAO +soZ oxg hsv tVm -iPj -iQr +vNW +oeH ndX viX xqU @@ -63858,7 +63081,7 @@ vqI vqI vqI eXB -qsx +gAV qhA scw cJf @@ -63883,15 +63106,15 @@ qMM dqm ndg rzP -hgw +coO aQK slF hCL -iIS -cZG -ekb +nME +uuq +oLX tJv -gWg +uJs gMn sNq tdv @@ -63904,19 +63127,19 @@ tlH pVY pVY vVo -pOA +kTW wWC -tKv -mNS -hZM +jOE +tox +dJY dXI -glt +awm doY ezZ dXI uAb wzE -nIe +vXe lCS eGc mmJ @@ -64139,13 +63362,13 @@ wLe wLe lyG iEJ -flm -qge -gZM -jkt -nfQ -pTU -mZC +iFN +eiZ +rub +dcB +njI +mic +fMV wyJ aRh dfZ @@ -64155,25 +63378,25 @@ som kJA vvr vxs -nQV +ulu sua bHK -oju +azl rZf oFu -pOA +kTW wWC -ijV -vGz -nhl +xMI +nCH +hSz ifQ -bUC -nFx +ixC +mhE cdq xiB lSc uTP -jIs +rky sXB cFP rzV @@ -64392,19 +63615,19 @@ xQN wLe wLe wLe -hhH +wLe wLe lCP niw -oeL -gdO +uQO +lby vdf fhR -mFz +cqv rLR -aOt -knl -xPV +wsk +vPM +rhg pqi pqi bUT @@ -64412,25 +63635,25 @@ fqg qdV vTN wrb -ekN +rXh jxc nrc -bJS +qOB wEX pHp -pOA +kTW wWC -nnQ +uNZ yjX -ogE -aeQ +mMj +xVc hBg hBg hBg baq tfH -npY -kwz +wRv +hVn sXB cEk gNq @@ -64641,7 +63864,7 @@ weN kOu sDH bUA -dYY +tFt jst llb pqE @@ -64653,40 +63876,40 @@ wLe wLe wLe niw -nYi +dul rFo gWa eWh -nFm -jEa -oTq -sQq -xPV +vVQ +udE +hpE +cCc +rhg pqi pqi iPP yfP -aEx +rat fZl tlK qbd -mEl +rUD sMX ldp -lsV +eAu wDK -xvc +cgu vuh -lAM +tAx pCa -ctk +szJ kZz ghT amX dbm xiB lSc -ipT +kTX gPs mAp sLz @@ -64895,7 +64118,7 @@ rPT tqL sUW hhu -kAQ +bcJ qti qti wLS @@ -64910,15 +64133,15 @@ wLe wLe dqm niw -unh -nHh +bcb +vVw gWa vQZ -kMZ +mSK rLR -aOt -oPa -xPV +wsk +sfW +rhg pqi pqi unI @@ -64926,25 +64149,25 @@ gkG vQL xVj pjF -gHq +rnO hBY cSZ -gEl +xGH rMf pHp -pOA +kTW wWC -vGd -pIB -wgA -grx +cPi +mQH +azs +gYf vmu vmu vmu baq fzZ -npY -tUx +wRv +pKG lCS vqI hTd @@ -65153,7 +64376,7 @@ eXB eaA hhu hhu -ecH +pBq vlw hSk tov @@ -65167,7 +64390,7 @@ wLe wLe lyG iEJ -gQY +awd qWU sPu jhV @@ -65183,21 +64406,21 @@ rLR exs wuS gzS -gCg +pcL uWx kaw -aAj +yhe fFu pHp -pOA +kTW wWC -oQF -pGF -kXp +aUQ +gNy +qAL ocx -nKs -dZF -blt +rSs +bce +dDB xiB lSc uTP @@ -65429,9 +64652,9 @@ lEl cUr mLL jET -izi -gzS -hog +ycV +dWt +gJk cen oIi oIi @@ -65443,16 +64666,16 @@ dPx sCr wNN sui -sjD +uNx rIZ pHp -cmT +uWm wWC -kQJ -fap -eEl +gWY +mlY +wFz dXI -hST +cQs xRJ gFg dXI @@ -65703,18 +64926,18 @@ pVY pVY dta kXQ -kHt +aRG dHA -tcS +axi gYA -oYL -wef -cdn +nIu +lVH +xsw taA -fWn -sBO -kIV -lDA +nuA +pyn +yfl +wCR gPs mAp rET @@ -65949,7 +65172,7 @@ saP tjd aBu tUW -qrb +isM pfN saP kuW @@ -65962,13 +65185,13 @@ aLe pkS tts tRY -jTE -gdb -kKL -lvc -ecx -dzb -yak +lrQ +uBH +qse +oQq +gAu +dsu +lrC ooF xGG bTY @@ -66206,21 +65429,21 @@ qXK gBj dKK iZu -bYp +lFj sFh qXK evW -nvz +wfO lEQ cvu hos khm ajT fQW -hag +lIF hNJ hNJ -qms +foo bfI bfI bfI @@ -66428,7 +65651,7 @@ vqI vqI eXB pDi -qXl +pDv nXj fzp aVf @@ -66454,7 +65677,7 @@ mDY mSM uZh gfq -rgP +tEc tzP hLF kAr @@ -66713,7 +65936,7 @@ tPA dhO syu tzP -tCy +xzU nol aJU jVL @@ -66971,7 +66194,7 @@ tzP jKL jKL oLQ -bot +lpq gMQ upK hht @@ -66982,7 +66205,7 @@ wHO upK evW kde -oRo +rxt nKW sXB hqu @@ -67218,7 +66441,7 @@ ofT qjd lTB sVZ -gAp +tAE loD lxZ tzP @@ -67227,14 +66450,14 @@ nVq msu mhI heR -rGk +gOB iti eZt mNH hJA uIW -ulo -fSJ +xfu +aYk mZk mNH kuW @@ -67479,7 +66702,7 @@ gkU cVj lfq heR -lxl +byi uWI fKa wyg @@ -67730,11 +66953,11 @@ hAS loD aPE lBL -gkv +wZC bDV mDA loD -jso +xNf tzP ptP jZr @@ -67747,9 +66970,9 @@ hNR vnh wgL gkj -hpW -aoV -dgd +sTV +bNF +enI aEM inn hzQ @@ -68004,9 +67227,9 @@ jkp hyN qmz amO -lhR +rEs aSf -niR +bwk aEM woV hzQ @@ -68244,8 +67467,8 @@ pzQ loD tOz bSm -txF -bjB +gHa +dOQ eIe loD dBm @@ -68260,10 +67483,10 @@ rrn yaq aet aAh -rlo -lfV -rRm -ssu +rfc +meI +vvO +tmd aEM hzQ hzQ @@ -68505,7 +67728,7 @@ loD loD loD loD -lPj +lwz sWe pzQ saM @@ -68762,7 +67985,7 @@ saM nCa saM kJM -trI +hMy vet kyK saM @@ -68773,19 +67996,19 @@ tzP jKL tzP ppQ -hzQ -eqW -hzQ -inn -inn -woV -eqW -uet +kBk +hFQ +eWn +eft +eft +kGF +qGy +gHK hCs hzQ btw rEz -pVj +tak oRo woV lyU @@ -69019,19 +68242,19 @@ saM nnl lIL dUi -lQr +gRi mPj qZI ghc wZm -eoh -gnR +gQd +kgo fjp xmA orX rll vFg -woV +lMI wwk euN wBT @@ -69280,14 +68503,14 @@ iUZ saM saM saM -wQK +xFu xvi -sWe -lAu -bvF +ito +csf +wih sdK -kHe -eqW +hcH +qGy wNL orX ggs @@ -69300,10 +68523,10 @@ mni ggs ggs ggs -xgv -xgv -xgv -xgv +vqI +vqI +vqI +vqI vqI vqI vqI @@ -69547,20 +68770,20 @@ orX aBX orX orX -xgv -xgv +vqI +vqI iDI -qbu +mEO kLj jzW qxA ebd -xgv -xgv -xgv -xgv -xgv -xgv +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -69804,20 +69027,20 @@ hzQ hzQ nTR ggs -xgv -xgv -izj +vqI +vqI +hiB oMe hbL dLt fpO nnv -izj -xgv -xgv -xgv -xgv -xgv +hiB +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -70061,20 +69284,20 @@ hzQ hzQ hzQ orX -xgv -xgv -mWC +vqI +vqI +sLz kGr poV -xgv +vqI uOJ iDI -izj -xgv -xgv -xgv -xgv -xgv +hiB +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -70318,20 +69541,20 @@ hzQ hzQ hzQ ggs -xgv -xgv -xgv -mWC -xgv -xgv -mWC -myx -mWC -izj -xgv -xgv -xgv -xgv +vqI +vqI +vqI +sLz +vqI +vqI +sLz +pmx +sLz +hiB +vqI +vqI +vqI +vqI vqI vqI vqI @@ -70575,20 +69798,20 @@ orX orX orX orX -xgv -xgv -xgv -xgv +vqI +vqI +vqI +vqI xfL -mWC -xgv +sLz +vqI opj -xgv -xgv -xgv -xgv -xgv -xgv +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -70829,22 +70052,22 @@ vqI vqI vqI vqI -xgv -xgv -xgv -xgv -xgv -xgv -aoq -mWC -aoq -aoq -twd -xgv -xgv -xgv -xgv -xgv +vqI +vqI +vqI +vqI +vqI +vqI +mdK +sLz +mdK +mdK +xqU +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -70878,7 +70101,7 @@ mKz lZV rNv ccE -jkD +aTh bXA vqI vqI @@ -71086,21 +70309,255 @@ vqI vqI vqI vqI -xgv -xgv -xgv -xgv -xgv -xgv -xgv -mWC -xgv -xgv -xgv -xgv -xgv -xgv -xgv +vqI +vqI +vqI +vqI +vqI +vqI +vqI +sLz +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +bfz +blO +pdu +xSk +rNv +nve +luk +sLz +ycy +sLz +bXA +svv +vqI +vqI +cEk +sLz +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +jsp +jsp +jsp +jsp +jsp +"} +(84,1,1) = {" +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +jsp +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +saM +lUm +lUm +lUm +lUm +lUm +saM +vqI +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -71125,240 +70582,6 @@ vqI vqI vqI vqI -bfz -blO -pdu -xSk -rNv -nve -luk -sLz -ycy -sLz -bXA -svv -vqI -vqI -cEk -sLz -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -jsp -jsp -jsp -jsp -jsp -"} -(84,1,1) = {" -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -jsp -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -saM -lUm -lUm -lUm -lUm -lUm -saM -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -xgv -xgv -xgv -xgv -xgv -xgv -xgv -xgv -xgv -xgv -xgv -xgv -xgv -xgv -xgv -vqI vqI vqI vqI @@ -71600,20 +70823,20 @@ vqI vqI vqI vqI -xgv -xgv -xgv -xgv -xgv -xgv -xgv -xgv -xgv -xgv vqI -xgv -xgv -xgv +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -71861,15 +71084,15 @@ vqI vqI vqI vqI -xgv -xgv -xgv -xgv -xgv vqI vqI vqI -xgv +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -72119,7 +71342,7 @@ vqI vqI vqI vqI -xgv +vqI vqI vqI vqI @@ -121176,11 +120399,11 @@ vqI vqI vqI kQw -naX -pXA +pmo +jtl luF -twg -nub +osB +kFU kQw vqI vqI @@ -121433,11 +120656,11 @@ vqI vqI vqI kQw -vaT +nxR luF luF -pXA -qlO +jtl +jKY kQw vqI vqI @@ -121690,11 +120913,11 @@ vqI vqI vqI kQw -egS +tYb luF luF luF -rxA +bpx kQw vqI vqI @@ -121947,11 +121170,11 @@ vqI vqI vqI kQw -vhX -pXA +jai +jtl luF luF -dbT +mny kQw vqI vqI @@ -122204,11 +121427,11 @@ vqI vqI vqI kQw -iyC -pXA +sHV +jtl luF luF -iyC +sHV kQw vqI vqI @@ -122461,11 +121684,11 @@ vqI vqI vqI kQw -pei +eCL luF luF luF -iyC +sHV kQw vqI vqI @@ -122718,11 +121941,11 @@ vqI vqI vqI kQw -iyL +nqv luF luF luF -iyC +sHV kQw vqI vqI @@ -122975,11 +122198,11 @@ vqI vqI vqI kQw -kxR -pXA +psv +jtl luF luF -kSY +lti kQw kQw kQw @@ -123232,11 +122455,11 @@ vqI vqI vqI kQw -naX -pXA +pmo +jtl luF -pXA -jDz +jtl +aRd kQw fnQ fnQ @@ -123489,11 +122712,11 @@ kQw kQw kQw kQw -bnO -jZf -pXA -pXA -nub +kjU +icJ +jtl +jtl +kFU sHr fnQ fnQ @@ -123503,7 +122726,7 @@ fnQ fnQ fnQ hqw -nww +pqZ jZp mcM tUA @@ -123748,7 +122971,7 @@ rPI kQw kQw kQw -uRt +lEp kQw kQw kQw @@ -124004,19 +123227,19 @@ fnQ fnQ sHr luF -giQ -aVH -rcr +nWp +uYF +lZj lGc xsQ xsQ sHr xsQ kQw -uUH +ewn cDx vry -mQR +mvN usH vTg vDJ @@ -124045,7 +123268,7 @@ qhc tNh iwI tHO -aZa +qCl ame uKw tHO @@ -124262,8 +123485,8 @@ fnQ kQw uhy gsF -uWn -kzK +nnQ +lEo eWL qdO eWL @@ -124271,7 +123494,7 @@ eWL tGT tGT kND -mVt +rmk vcY hqw pjN @@ -124302,7 +123525,7 @@ iwI iwI iwI tHO -vvo +efR cno cFN tHO @@ -124539,9 +123762,9 @@ baa cIB cIB sRD -tsp +aDq sRD -tsp +aDq sRD sRD sRD @@ -124793,7 +124016,7 @@ kWe lbA vIE xYT -bIO +wnX bgS wEb uNJ @@ -125045,8 +124268,8 @@ dXb jKK kKx lTW -kdJ -ohx +ogP +pti vyl pvV bup @@ -125302,10 +124525,10 @@ bkn nyZ lUo hjp -fRu -lKm -lyZ -iwF +hsG +aRk +xeW +pqu xYT hph bgS @@ -125316,7 +124539,7 @@ sYf sRD sRD sRD -iAM +emw xwF rSK nst @@ -125559,10 +124782,10 @@ fUc aBy mxW lTW -kdJ +ogP ozT ozT -qhg +snB xYT xYT bgS @@ -125570,10 +124793,10 @@ qSp bKY tpw kdn -ghV +xyn xiu sRD -hRD +mpS eEe lob sRD @@ -125590,7 +124813,7 @@ oCE cMn qGN tmX -quQ +qPx aLc jDC uPQ @@ -125807,30 +125030,30 @@ pTO eNz orD anu -cmD -exl -kPl -gyO +rQf +ahD +pRZ +cyP xgH -ujn +jZv unj aHq mtn -ill +uQE cbP -abN -ohx +hJD +pti epj xYT bGO aBO fiC -tfg +asV vjc rHl biP sRD -dsF +fTr vUl kqQ sRD @@ -126067,19 +125290,19 @@ bDD bYj bDD bDD -rjf +ngW xgH xgH udq tob tnA -aaz -uld -oyg -ohx +fLu +vGb +gpr +pti uTt xYT -ned +eUd ezz sYY lAt @@ -126320,23 +125543,23 @@ cOp cOp ogJ tay -lQd +uTf jGY myl bDD -jqp +vEB coF ttY vkb vkb gDc -azd +wlT gHV brZ -ohx +pti tFb xYT -pfq +lJZ tih aNk rjD @@ -126581,16 +125804,16 @@ wAN aKH iYE bDD -drs +qBC ttY ttY vkb vkb wYL -fMk +bDq gHV -wjR -axZ +aAu +tKX ubl xYT teS @@ -126598,7 +125821,7 @@ paK lsE tPg aCN -xqi +tNi mNy sRD xab @@ -126608,7 +125831,7 @@ gth qHP gJG gmt -trC +hmU sls wPi iKw @@ -126838,36 +126061,36 @@ rGq wMY rSE bDD -fWF +luf ttY -yfd -qJT -jLG -xPe -fMk -cxj -gND -ykL -qQU +cCH +vQt +kMH +nGU +bDq +tTl +uex +nbG +kkW xYT sRD -orR -fuJ -cOO -swT -mJk +uWK +qhz +bGq +aUd +nVt sRD sRD -gmo -vwk -aov +dMX +obH +bGh sRD qHP fpu uRz sff sls -lBD +efm eOP jVt vgG @@ -127095,16 +126318,16 @@ tNz pbw wQW bDD -rjf +ngW ttY -kAS +xIF hyo iIO -pcu -hvh +mIl +uMn jME jME -tCQ +wKQ jME jME eUh @@ -127114,7 +126337,7 @@ rId rId rId qRu -lXf +rIy tSo hLT fCj @@ -127341,7 +126564,7 @@ dGh liG eyu clO -vjo +cGQ unO yjb aeN @@ -127352,16 +126575,16 @@ ofU ifR thO bDD -fjc -wMW -qdZ +mEn +sSV +hhk hrF cIY -lbv -fcl +jIb +mEw nKL -xIr -mFB +gqF +xZq eVT dqV tiF @@ -127371,13 +126594,13 @@ nIZ wPp wPp huR -lXf +rIy qMI kpO fZy -wcZ +tOC iYo -ozt +qXb hse hdJ hdJ @@ -127386,7 +126609,7 @@ tIJ mEU xtb vpJ -brs +vyt dQg wRO rVy @@ -127611,14 +126834,14 @@ kxc bDD suO ttY -mBp +bIZ uxt qxQ -teo -hUj -htB -ptj -hns +mUU +qwr +uzP +jJF +dRN vFx dAh qMT @@ -127629,10 +126852,10 @@ fZm vXz uNk vqE -dwr +hjQ wrf cxE -tLm +qen tjz rfn vSN @@ -127643,7 +126866,7 @@ oEl dYJ aVS gDY -dJL +cED tID bge iED @@ -127651,7 +126874,7 @@ caJ caJ hIa aiE -oOM +sds rqF vqI vqI @@ -127858,7 +127081,7 @@ mxy xdb qiO llQ -umB +siR nOu bDD ejD @@ -127872,10 +127095,10 @@ jLp ntA ttY nJX -cRw +xdi jME -apg -wUl +mCz +arF wcC jME rId @@ -127886,8 +127109,8 @@ vsW xvB wxq vqE -tFM -bMW +qQx +sLI eSh oEl bvY @@ -128111,7 +127334,7 @@ eyu bvO esW afw -epO +tEa pdw tVK llQ @@ -128119,7 +127342,7 @@ aWb acj thc nRX -uQq +mCp aDn iIl bDD @@ -128129,17 +127352,17 @@ iTe dFk bqp tSb -ncK -bMe -mtO -rDl +scq +jFT +nAN +nFY nSF jME fdi oln vPG ueV -mRY +wtR swS gwg vqE @@ -128371,25 +127594,25 @@ afw laf gcq swh -ukz -vsM -cEM +ljK +kOl +bZb bDD -tks +pSK nye oOA tDT bDD vVE ttY -byq +emr tND kQc jxa mIN ueO leg -tOU +gWy tWL jME rId @@ -128420,7 +127643,7 @@ eMV afq xvQ eMV -jKl +qoc skf skf skf @@ -128643,10 +127866,10 @@ jLp jLp ttY obC -elK +jGO oEZ -nkb -stZ +kOd +dkC jME wZF rId @@ -128657,7 +127880,7 @@ bPo vHu ueV vqE -jrl +fnL qao iTA oEl @@ -128882,7 +128105,7 @@ eyu wdv eyu hhu -wxQ +rCo tov pUp jNl @@ -128903,11 +128126,11 @@ xWj wxm wxm gDp -tXw +vGW gDp -xiD +ked rId -tIU +hPN xpy fOY xpy @@ -128918,11 +128141,11 @@ aoM pHI aoM oEl -xck +xdC lii -xlw +kOh oEl -fVb +gFW wlW lAq tle @@ -129157,29 +128380,29 @@ sfL rFm rFm dme -vcM -vcM -uAS -cPh -vYy -vTn -gAf +eTE +eTE +mQJ +ewP +orv +dqd +cGz vdC -hCo -hCo -vsG -iTy +drY +drY +kSJ +sAY vYe -vuZ -gsi +adM +uox mAj -aoI +ulX cCz oEl -jlR +eqG oEl oEl -avS +coB kAn ifA tle @@ -129392,7 +128615,7 @@ vqI vqI vqI eyu -kAk +rfC vdv gMh hhu @@ -129410,25 +128633,25 @@ pqE psY hAV clc -eWf +lZb qRu rId qRu rId qRu lpc -qYc -lkw -lkw -fBA -lkw -lkw -cHd -gYQ -lgS -ttG -huH -oeG +lig +mrg +mrg +oWy +mrg +mrg +kYp +wDy +nUN +qNm +jYk +jER wqX wLQ dCq @@ -129437,7 +128660,7 @@ tAy nYq tPV lnH -kWQ +yda xXE hyx mAS @@ -129674,14 +128897,14 @@ qRu rId rId qRu -vvA -xwU -xwU -xwU -xwU -xwU -aQF -hmF +aWi +pTq +pTq +pTq +pTq +pTq +cYu +tUq qRu rId qRu @@ -129702,11 +128925,11 @@ fWA rxI qNE iYB -wWL +gYk jnE jnE -aVl -bPL +rTM +mHk kBd voA ifA @@ -129917,7 +129140,7 @@ npn ijN jeN gTv -cjG +jLd gyy gyy gyy @@ -129931,13 +129154,13 @@ qRu rId rId qRu -vvA -xwU -xwU -xwU -xwU -xwU -aJI +aWi +pTq +pTq +pTq +pTq +pTq +koe rId qRu rId @@ -129949,7 +129172,7 @@ fGM czv ddQ ddQ -oOS +aep hsN sWl cLN @@ -129957,13 +129180,13 @@ ujl wdj kBd iUt -uOa +bEO iYB hYe -uOa -uOa -uOa -oEI +bEO +bEO +bEO +jHa kBd voA ifA @@ -130167,46 +129390,46 @@ bSM mll mll hhu -jHF +mvx hVF lfw -xTb +gpt mzC wzi qgB -jrE +qHS gyy gyy gyy gak bzr -dQy -wex -wex -wex -wex -tai -wex -wex -sPK -xwU -xwU -uOf -xwU -xwU -aJI +cCy +rzw +rzw +rzw +rzw +qCn +rzw +rzw +hML +pTq +pTq +ggL +pTq +pTq +koe rId qRu rId rId rId -cRE +dlf kZN qpi bjl ddQ ddQ -mAk +vDx hsN mtK nDD @@ -130214,14 +129437,14 @@ tUN rcE kBd iUt -uOa +bEO iYB -moC -uOa -uOa -uOa -wIO -eIb +tAo +bEO +bEO +bEO +vIJ +rAA tOw voA gqb @@ -130431,7 +129654,7 @@ jeo oLK xIO olO -kax +uRu gyy gyy gyy @@ -130445,13 +129668,13 @@ qRu rId rId qRu -vvA -xwU -xwU -xwU -xwU -xwU -aJI +aWi +pTq +pTq +pTq +pTq +pTq +koe rId qRu rId @@ -130463,21 +129686,21 @@ knv czv ddQ ddQ -tPD +bcs hsN -tVz +aeM vJG aoH oru kBd iUt -uOa +bEO iYB hYe -uOa -uOa -uOa -hwq +bEO +bEO +bEO +jky kBd voA ifA @@ -130702,14 +129925,14 @@ qRu rId rId qRu -vvA -xwU -xwU -xwU -xwU -xwU -rvq -hIY +aWi +pTq +pTq +pTq +pTq +pTq +omw +hhn qRu rId qRu @@ -130719,7 +129942,7 @@ wFP ndP psr qjF -pgp +mFz flo flo cvA @@ -130730,11 +129953,11 @@ aAy rxI qxa iYB -mfh +lPI gwZ gwZ -eFY -kfK +tna +fss kBd voA ifA @@ -130952,22 +130175,22 @@ pqE psY wTn psr -ftK +tOI qRu rId qRu rId qRu oXd -aeV -add -add -eNE -add -add -vcX -iUO -tDZ +cBp +hlB +hlB +sGT +hlB +hlB +fcg +aNW +lhm uyA uma dOv @@ -131189,7 +130412,7 @@ vqI vqI vqI tYd -cbl +fWw fvg xko ukZ @@ -131215,11 +130438,11 @@ tHd tHd tHd tHd -xsS +xFB vmg iQq vmg -aaX +qor ndP ndP ndP @@ -131227,9 +130450,9 @@ ndP ndP cZZ vmg -xxV +bPd gXk -iOD +vOX lOf ajB ajB @@ -131450,13 +130673,13 @@ mJs lQZ boc xuC -ryA +rWk tYd pBJ ftU goW mIx -jtQ +qVo pag dtZ jtQ @@ -131474,21 +130697,21 @@ tTb tTb tTb tTb -hYz +uxe oMd xXi ygB aIl jcz -rsf +svD atE iBU bnn eyQ -kbW +tcB itO ajB -haE +kNp aqw nEW thd @@ -131712,7 +130935,7 @@ gEP gEP pTv gEP -wbZ +kjt nkk aNK cbI @@ -131722,12 +130945,12 @@ sSJ sSJ sSJ siO -pNI +vIb pNI pNI sSJ cea -gaf +aPZ iSf iSf hKp @@ -131741,7 +130964,7 @@ gMG gMG dLS kfl -saH +nsH oLi cDz ajB @@ -132004,8 +131227,8 @@ iwM ajB lPe btR -mZW -bAc +vAW +jcn ajB ajB tRH @@ -132018,7 +131241,7 @@ hTq hTN utb utb -onw +lXD skf skf skf @@ -132221,14 +131444,14 @@ vqI vqI vqI gEP -ijF +gBe uwN sIv kJL foz wMn bZH -fPV +fVl kmN fRt xIT @@ -132239,14 +131462,14 @@ cIr uCY ufG qur -pMI +htu baE -uVE +lXT iFd -nFX +oFr dky ylg -gQK +hLx rDX gMG wHw @@ -132478,7 +131701,7 @@ vqI vqI vqI gEP -kXu +rnR fbS qVb xoR @@ -132500,7 +131723,7 @@ fSh baE kti xAi -riG +eZv uWg ylg lPV @@ -132508,7 +131731,7 @@ gFM gMG wHw hHO -eAb +qju gMG uZl kfl @@ -132523,7 +131746,7 @@ fgm ikw ccn sSw -asf +djP vNE rRx mQo @@ -132757,7 +131980,7 @@ baE baE klE hvK -cgQ +hpJ aGd ylg lji @@ -132769,7 +131992,7 @@ iyb wOV qAn kfl -piY +vOc qzt jTj iEP @@ -132996,7 +132219,7 @@ fJW drA oNe xnU -uyP +akq ehJ ehJ fnC @@ -133010,7 +132233,7 @@ tmO uXy tmO tmO -hqd +mjX uyf iHj geJ @@ -133022,18 +132245,18 @@ bIe bZe nYl aOF -cpM +qga gMG nwu kfl -jwU +wco rpu hBA mFI nzZ liQ mSE -xRv +oVD vRT imc iSr @@ -133254,17 +132477,17 @@ lqn hoO jqN gEP -fNB +seE ehJ iQd rER -hTi +rvk eKX eKX smU eKX tmO -jMw +bBJ orA tmO pWQ @@ -133283,7 +132506,7 @@ gMG gMG pcP kfl -rTr +ikL alW hLr cFp @@ -133512,12 +132735,12 @@ gEP gEP gEP fZR -aTm -sNy -jSR -xct +xhS +bOv +vKd +wrs eKX -dfH +qOj yik btG tbS @@ -133549,8 +132772,8 @@ bga mSE dwk eUm -gbz -mHK +wEY +fMH mSE cwz seu @@ -133769,10 +132992,10 @@ fZR hLc nxt fZR -stR -xVu -rHO -eWv +cjI +eQz +fDJ +nlO eKX czE sjC @@ -133798,8 +133021,8 @@ tpM evR kfl riT -bpL -bic +wOh +dNe jZG xtQ hyc @@ -134024,12 +133247,12 @@ pSY pSY fZR bpM -ewJ +eqb sCm -lHB +xMi qsH -sho -aLo +vYo +nhW eKX eKX eKX @@ -134283,13 +133506,13 @@ pSY pSY pSY sCm -iGw +wjs pSY -tTE +oLq mBS lKU -jDq -ebh +hYl +buj wxb tyI ncw @@ -134299,7 +133522,7 @@ wxb tcM pMZ aAV -uMJ +fwI dSU vtT rAS @@ -134538,7 +133761,7 @@ xrC pSY pSY pSY -eNV +rZW fZR qsH pSY @@ -134558,7 +133781,7 @@ isW aAV abU wjY -lhu +jWv aPc xJo aWm @@ -134799,7 +134022,7 @@ pSY uwE qsH qsH -sHD +jss qsH pSY pSY @@ -134813,13 +134036,13 @@ tss uWZ rZM aAV -nom -gmi -nom +qPC +lIK +qPC aAV plG tEl -plG +cJx hgB aqu uEs @@ -135058,7 +134281,7 @@ hPz fZR fZR fZR -jAB +yfw qsH oZe sld @@ -135325,9 +134548,9 @@ qLe olN olN olN -pyQ +tEe nFR -dou +mMm bOR uuH aAV @@ -135839,16 +135062,16 @@ rZM rZM rZM cae -qBi +iMK aAV nFR aAV aAV aAV hrt -lAS +vvz cEZ -acU +xUH lnY aqu wVx @@ -136618,10 +135841,10 @@ aRY aTx mMZ aJe -lnW +inX mjt aqu -gXz +wVn nbf erT sDa @@ -137130,7 +136353,7 @@ vqI vqI vqI aqu -oBg +kNT lEj qWJ aqu @@ -137387,8 +136610,8 @@ vqI vqI vqI aqu -kHD -ulq +eFi +cci xku ubG uSG @@ -189557,7 +188780,7 @@ xdL tOf xdL pdR -jrL +lCH voC voC voC @@ -189811,11 +189034,11 @@ hif fmH oXe btO -moh +jtW btO tBy -iYn -bzO +caO +hcC shD aiK kVV @@ -190063,11 +189286,11 @@ bJi tOf pdR ouX -eQW +rdf gmU btO oXe -cyT +fOw oXe oXe oXe @@ -190085,7 +189308,7 @@ vqE vqE vqE vqE -byu +uKN kyf gEN gEN @@ -190324,9 +189547,9 @@ tst pMt uhc uhc -okt +jcQ uhc -fMc +fhE tNm lOO uhc @@ -190336,7 +189559,7 @@ tAg qhT aiK aiK -aLD +alM aoM jij jij @@ -190580,10 +189803,10 @@ ttY ttY ttY uhc -whz +dcS jUT hUe -aLU +fzs xjt rAh uhc @@ -190593,7 +189816,7 @@ tAg qhT aiK aiK -aLD +alM aoM jij jij @@ -190837,18 +190060,18 @@ eXz mxY iej uhc -suJ -wmC -iKU -taT -naW -myX +hMW +qST +vqa +eFl +bwC +oHn uhc qhT qhT qhT qhT -pgl +ucM aiK qhT vqE @@ -191089,17 +190312,17 @@ kmg dgE wDb ibc -rPF -nhC +jhz +wjq pLs -xge +vbX pTS -mxu -diV -cle -qiD -pVC -mpq +dWz +btE +nWB +cPv +bRN +vME uhc pub pub @@ -191107,7 +190330,7 @@ pub tbm kSi aiK -nlE +cgP vqE jij jij @@ -191347,16 +190570,16 @@ iyS iyS iyS iyS -pMY +kMD oDR -fLs +dnD uhc -qUt -slT +pfh +wxQ uhc dBS dPK -sGP +oUo uhc pub pub @@ -191592,7 +190815,7 @@ gVA gVA gVA rFF -gEU +gRz hYU dfX jLD @@ -191605,15 +190828,15 @@ pcZ nlH iyS wEt -eDl -xAU +eDU +wwW aSN pEf pEf uhc upP upP -nrK +upP uhc pub pub @@ -191622,7 +190845,7 @@ pub vsU aiK vqE -hoH +bOK jXs fbe dNl @@ -191855,7 +191078,7 @@ hUt rSr gVA iyS -pug +myy kao cAd cqs @@ -191864,7 +191087,7 @@ jfU ijh wiC lhc -jwG +vmt vQN vQN usq @@ -191877,7 +191100,7 @@ pub pub pub vsU -dyQ +gHn vqE pDD bdh @@ -192113,7 +191336,7 @@ rFF bEB iyS iyS -cDT +pDR qXL fNV xTI @@ -192146,7 +191369,7 @@ tla pka nqk fLS -azA +nKC gXb qXE bHH @@ -192398,15 +191621,15 @@ aTZ ozO iXj fLS -byk +nyK qhy lOq -opX +fli fLS qDJ jEu nyO -nOn +rcY vqE vqE vqE @@ -192635,11 +191858,11 @@ mWS tqW iuG vQN -jMW -lNu -qlb -qlb -qlb +oae +oVk +epN +epN +epN qhT qhT qhT @@ -192665,7 +191888,7 @@ lUd jnJ hyQ sWu -glM +nRz dpo dpo dpo @@ -192884,20 +192107,20 @@ gVA gVA gVA kxf -iFx +izI iEq erZ mcZ dWn -ijh +hLy lCL dGt oFa xLY -sxA +nGJ mTS meb -tyF +ulg oFa vwd bxq @@ -193141,7 +192364,7 @@ gVA gVA gVA kxf -oBS +rem yib jWU ebE @@ -193150,13 +192373,13 @@ wxa idj oYY oFa -aLI -lyd -cfJ -hiE -nhz +eBt +qZk +qNU +aKI +bOM oFa -bSX +jFA vft xvx vDw @@ -193165,7 +192388,7 @@ vwd pjU aOI xpM -dDA +bsL rEh oMQ tQX @@ -193176,7 +192399,7 @@ uLg xCy xjn sel -htu +gjv kQZ vqE xXk @@ -193406,12 +192629,12 @@ kxf tpg jnX mFq -rZs -vGc -fGm -xsU -vog -eQh +iev +gcn +qnI +mxH +qFs +gvc oFa hMj ooN @@ -193431,13 +192654,13 @@ bQs lhn wNk hhm -nqa +eOX jVo ayz hdx hJS pXn -eHH +hEA vqE ljQ eWC @@ -193660,17 +192883,17 @@ eAc eAc kxf kxf -gqC +oNY xfO rkK -tox -nrA -sOB +qCO +iqL +xhx vYl tdN bqm oFa -sUh +vgL iwr gCP wIV @@ -193693,7 +192916,7 @@ nFv gAW sbS hJU -oxf +lCI tmi vqE ktY @@ -193920,9 +193143,9 @@ ctU ipu qTU qwF -qey -nmv -swK +ayp +eGE +ufI gTA hUc rLt @@ -193937,18 +193160,18 @@ eee xtX bSK lLT -dkt +gnr oKL -wQG +miE qxp gwb sIH fUW mRe wQG -ias -jGg -bhX +uvj +cLp +pih vqE vqE vqE @@ -194197,7 +193420,7 @@ jlT dkt axB wQG -cJd +mtH uVd wgi tRD @@ -194436,10 +193659,10 @@ sTd aXF gim gim -grk -grk -grk -grk +dxw +dxw +dxw +dxw oFa ipb ipb @@ -194447,14 +193670,14 @@ ipb ipb ipb vqE -joy -gVN +gJz +dhj iSX -joy -eXG -lDt +gJz +dGg +wxT wQG -lnK +lfc tkD jzn tTh @@ -194711,15 +193934,15 @@ frz frz frz wQG -iis -nMm +qUn +maC dnf dnf -cry -pdo -wkb -aRU -swO +eEY +xuK +iId +upN +pPP vqE fgP fgP @@ -194944,7 +194167,7 @@ jNd rHi soL gim -cpR +gTz lOG cKi ajZ @@ -195194,7 +194417,7 @@ lsj rcQ fdh fdh -dpV +doQ tsU ePt rBf @@ -195207,7 +194430,7 @@ gim xnb gim gim -tIw +edh sJH nYL nYL @@ -195228,12 +194451,12 @@ nYL nYL nYL gUx -uMh +sMd mMc irp -kPR -kXP -whU +ykK +txM +rYf nZB bzj fgP @@ -195457,9 +194680,9 @@ uwJ aEi ceR gMP -aya +vuK aEi -mwP +cNt wbv rvJ awE @@ -195486,15 +194709,15 @@ nYL nYL bpo kBY -qtY -fAC +gvk +dhb cgb -avB +eeI ayl rMs fgP fgP -tuo +esU uyF ljQ ljQ @@ -195708,11 +194931,11 @@ lsj rcQ fdh fdh -dpV +doQ gJg -hpO -aXM -nBm +smm +pcJ +npW lYF nhs sfC @@ -195743,10 +194966,10 @@ nYL nYL nYL kBY -lTh -cNG -oLC -rqt +nTP +mfJ +ihR +toq uYb wIQ xUk @@ -195967,7 +195190,7 @@ fdh fdh aEi aEi -lgQ +auC aEi aYp fHo @@ -195975,7 +195198,7 @@ aZm aEi mik bZl -gpl +kBJ awE pDe eOr @@ -196000,10 +195223,10 @@ nYL nYL vRY kBY -joi -jnM +sRu +tPs llU -qTn +bqR aFR kVj fgP @@ -196222,7 +195445,7 @@ lsj rcQ fdh fdh -dpV +doQ hMm qUZ xwJ @@ -196256,17 +195479,17 @@ nYL nYL nYL gUx -qEQ +plh bbd mpj -wyu -kUg -jVJ +fvB +gIs +gux nZB nZB fgP gLR -myY +bWA ljQ vqI vqI @@ -196514,8 +195737,8 @@ nYL nYL tee wwE -tsf -xWK +cRT +qcv bYh hAU ceg @@ -197021,13 +196244,13 @@ kvk aTW xWg eMh -onx +ltD xWg xWg -wfD +xzL lEt gsV -eIP +qjB xWg tAS got @@ -197271,7 +196494,7 @@ aUN bDz qLd cYK -inv +fck gMG aSX aSX @@ -197280,16 +196503,16 @@ xWg aKw oJf rYh -sLU +oRf apo mim apo -hSg +fnz xWg fCw dJP sMC -xyV +ooQ uSN rsb liA @@ -197534,7 +196757,7 @@ djm aSX gXD xWg -alf +hIr jRL bgn deq @@ -197544,8 +196767,8 @@ wFx aqI xWg srJ -ahk -vwV +sMl +siI pbq voM gNX @@ -197553,7 +196776,7 @@ uOZ quA lbY lbY -kHW +bym oam vqI vqI @@ -197796,16 +197019,16 @@ oJf iGr gwH xdD -pKz -axr +kDB +tFL lDe dur -xQe +rDh aSp aRP -gBO +cBo srJ -vwV +siI srJ okx rYJ @@ -198031,12 +197254,12 @@ ise ise ohi lku -eVJ +grQ ohi -iWs +hpA xiY eni -enN +quK eFS auE cqD @@ -198048,16 +197271,16 @@ fah aSX gXD xWg -uXk +lzc jRL -bGc +qdN fJc eUg -uxv -vat -hbu +naa +xRU +wYN dur -oKf +oOT hOi oLn xKs @@ -198290,10 +197513,10 @@ fyA fyA fyA fyA -pKx +cid wOQ cXy -jxw +riF eFS mxd aKG @@ -198310,16 +197533,16 @@ uXm mks gXq aNF -nJy -iAz +mNC +pyH uuD -aqx +jwN vgF ucC xGw uEY ifB -caT +ijj srJ vqI vqI @@ -198574,7 +197797,7 @@ dur kyY eYp myN -ppX +igM uup qNq srJ @@ -198809,7 +198032,7 @@ oEs nhY agT aiA -vTH +xMy aKG aKG aSX @@ -198819,7 +198042,7 @@ aSX aSX wWF xWg -rfL +hAC anP aIR aTg @@ -198831,7 +198054,7 @@ dur qDp uQG rXP -szu +aOX qah qYU srJ @@ -199049,10 +198272,10 @@ rSr xjy cnM rZM -way +fZY iTq jWc -apI +fCz eWS jWc jWc @@ -199124,7 +198347,7 @@ iwl rNv cEk sLz -grQ +mVg xUr sLz vqI @@ -199306,9 +198529,9 @@ rFF bEB rFF rFF -rca +nQs czD -qId +sfc olN olN qLe @@ -199336,18 +198559,18 @@ xWg aVs cmX atd -aRO -dkR +eoG +sQT atd aIF -uTY +rUW oNu uhU lVQ srJ vwq ade -uJm +vgl srJ vqI vqI @@ -199588,7 +198811,7 @@ sWP sWP sSk jVe -eAO +guH xWg xWg xWg @@ -199604,7 +198827,7 @@ vbQ srJ mMl avP -rqV +wsS srJ vqI vqI @@ -199835,7 +199058,7 @@ sld wSN tte aPc -cJm +cHc fJp fJp aPc @@ -200089,7 +199312,7 @@ olN pZC tUu vtn -wCG +xVY tWu aPc fJp @@ -200611,7 +199834,7 @@ fJp fJp emp aJP -lSA +szj hjU hjU obo @@ -200871,8 +200094,8 @@ vEn ugv gis gHx -udr -aqu +ftk +mNQ iwq rZM giC @@ -201124,7 +200347,7 @@ fJp fJp fJp aAV -bUa +rBT itG dCL alV @@ -201895,7 +201118,7 @@ rZM rZM rZM aqu -eVs +elD wVI rnG aeG @@ -250760,7 +249983,7 @@ lWr lyK uDA uDA -mgu +suz yli yli yli @@ -250993,7 +250216,7 @@ uDA uDA uDA uDA -ljz +ghg yli yli yli @@ -252001,7 +251224,7 @@ yli yli yli yli -mgu +suz yli yli yli @@ -253039,7 +252262,7 @@ qCg qCg xwM yli -kyp +kEj kxS kxS qCg @@ -253273,7 +252496,7 @@ dTC sTa nVI vMa -kdO +pjV kWT yli yli @@ -253782,7 +253005,7 @@ yli yli yli lAN -jyb +vqg nPW lAN nVI @@ -254610,7 +253833,7 @@ qCg kxS kxS kxS -kyp +kEj yli yli sNi @@ -254813,7 +254036,7 @@ xPb ffv gJR gJR -xdR +hzX qoI yli yli @@ -255935,7 +255158,7 @@ yli yli yli yli -mgu +suz yli yli yli @@ -256651,10 +255874,10 @@ rxi rxi rxi rxi -xOo -lzi -ueT -kLl +eXk +phm +vql +rqy rxi rxi kxS @@ -256906,18 +256129,18 @@ kxS kxS rxi rxi -kNb -mUP -sqh -nNY +qfZ +hMI +teT +sPC rxi -wjA +xxn rxi kxS rxi rxi -seY -ove +quz +nub rxi kxS kxS @@ -257161,19 +256384,19 @@ kxS kxS kxS rxi -coy -wjA -gIa -xOo -tMK +dCZ +xxn +nhp +eXk +lgM rxi -eKt -qwe +hJl +aer rxi -qjr -cwc +rCA +tJy rxi -xBv +rSI ggb rxi rxi @@ -257418,20 +256641,20 @@ kxS kxS kxS rxi -coy -nQC -prd -oqm -ial -ial -ial -kFv -vRk -lRf +dCZ +cpc +qyK +dCA +iiZ +iiZ +iiZ +xAx +nVj +ppr rxi rxi -upA -khr +kXc +ubr rxi rxi kxS @@ -257675,19 +256898,19 @@ kxS kxS kxS rxi -coy -bty -ofC -ial -ial -otu +dCZ +nuy +teV +iiZ +iiZ +ucV rxi -axk -vuq -kNb +lFh +mPN +qfZ rxi rxi -nIC +lwi ggb rxi rxi @@ -257932,20 +257155,20 @@ kxS kxS rxi rxi -coy -xOo +dCZ +eXk rxi rxi -sHG -mon -yeM -gIa -mon -jqW +wXX +exd +fYa +nhp +exd +law rxi rxi -gnb -hJJ +fgK +lHk rxi rxi kxS @@ -258190,13 +257413,13 @@ kxS rxi rxi rxi -wjA -xOo +xxn +eXk rxi -fuO -dlw -xOo -xOo +hVU +qrH +eXk +eXk rxi rxi kxS @@ -258426,7 +257649,7 @@ dvc dvc dvc dvc -mgu +suz dvc dvc dvc @@ -258977,9 +258200,9 @@ kxS kxS kxS yli -oPp +uDE wVV -lWF +iMz evM wVV wVV @@ -259235,12 +258458,12 @@ kxS kxS yli wVV -tSC +lXC wVV -tSC +lXC yli -tSC -jRA +lXC +kLz wVV yli yli @@ -259491,12 +258714,12 @@ kxS kxS kxS wVV -lWF +iMz bIK wVV -pTs -lWF -tSC +qjh +iMz +lXC wVV evM wVV @@ -259752,11 +258975,11 @@ bIK cnJ kqB wVV -oPp +uDE evM -lWF -pTs -tSC +iMz +qjh +lXC wVV wVV yli @@ -260010,12 +259233,12 @@ aqa qQo kqB aqa -wCh +pxu wVV wVV wVV -lWF -tSC +iMz +lXC wVV yli yli @@ -260268,9 +259491,9 @@ kqB nnR cnJ wVV -tSC -fzx -oPp +lXC +vXM +uDE wVV wVV wVV @@ -260310,7 +259533,7 @@ uDA uDA uDA uDA -fKS +ekI erN mZd bMS @@ -260516,7 +259739,7 @@ nYL sip qPX nAF -vmm +cnD tDr aqa hYp @@ -260525,12 +259748,12 @@ aqa bHi bNd bNd -vTs -kkJ -qsz -mab -kuu -tel +xap +bvt +pGy +wvr +xDT +xzz yli yli yli @@ -260746,16 +259969,16 @@ kxS kxS kxS kxS -wyo -wyo -wyo -wyo -wyo -wyo -wyo -wyo -wyo -wyo +vhn +vhn +vhn +vhn +vhn +vhn +vhn +vhn +vhn +vhn kxS kxS kxS @@ -260787,7 +260010,7 @@ gRg sUf ahQ tFV -hHp +biD yli yli yli @@ -260805,7 +260028,7 @@ yli yli yli yli -aeP +dap yli yli yli @@ -261025,9 +260248,9 @@ nrQ eKj eMx mpI -egg -krW -krW +vfs +irl +irl exJ iIy hsh @@ -261044,7 +260267,7 @@ uXr uXr uXr hfW -hHp +biD yli yli yli @@ -261282,14 +260505,14 @@ gfK wbl hib gHf -exY -exY -exY +kNr +kNr +kNr esO rEg jUk ote -bRn +aoD uwc lDZ kqB @@ -261539,14 +260762,14 @@ sTM rtT dfi nrQ -lzp -lhv -lhv +tvi +qmb +qmb hpx jKs csX pnk -fnx +aWs nBs qKQ ggb @@ -261558,7 +260781,7 @@ uXr uXr uXr cXz -hHp +biD yli yli yli @@ -261774,14 +260997,14 @@ kxS kxS kxS kxS -wyo -wyo -wyo -wyo -wyo -wyo -wyo -wyo +vhn +vhn +vhn +vhn +vhn +vhn +vhn +vhn kxS kxS dvc @@ -261803,7 +261026,7 @@ nYL aRR qnO sqb -yjV +eTr bqg bIK aqa @@ -262060,18 +261283,18 @@ nYL bLn rzL tDr -gRw +sCH kqB bIK tae ngJ rqj hxu -nCU -ktV -jpr +wGY +hnH +dCe hxu -jpr +dCe mbE yli yli @@ -262317,7 +261540,7 @@ rOv uNl trd nrQ -tqs +oSR kqB bqg hfK @@ -262325,10 +261548,10 @@ hYp ayH cnJ bIK -lWF -tSC +iMz +lXC wVV -oPp +uDE wVV yli yli @@ -262574,17 +261797,17 @@ aXp hsh txR trd -lsm +odA kqB ggb cnJ wzL bIK wVV -fzx -tSC +vXM +lXC wVV -lWF +iMz evM wVV yli @@ -262831,18 +262054,18 @@ rGM csX cDv nrQ -sLe +wZt bIK nId aqa qJs -tSC -jRA -pTs -tSC +lXC +kLz +qjh +lXC yli -lWF -lWF +iMz +iMz yli yli kxS @@ -263083,24 +262306,24 @@ dvc dvc nrQ nrQ -qQk +vWQ pbk pbk fxY kAX -eFW +yjK bqg bqg tnT -xwt -lWK -rjx -rjx -rjx -rjx -bpp -rjx -rjx +qhp +lID +cXB +cXB +cXB +cXB +ety +cXB +cXB cPg kxS kxS @@ -263345,11 +262568,11 @@ uVJ uVJ nrQ trd -tqj +pVx hfK ggb -wUU -nQI +mhD +xAe lnM ayH bIK @@ -263357,8 +262580,8 @@ bIK sBX bIK sBX -mMf -wte +nMt +szl kxS kxS uDA @@ -263602,20 +262825,20 @@ xNL xNL apP erO -bYf +oVc hyg cnJ -vvg -lEc -sol -elM -iad -mTe -sol -vKW -eXD -mMf -hgC +dgZ +iSJ +qjm +qLm +ohY +wkT +qjm +dpQ +kVn +nMt +sHY kxS kxS uDA @@ -263859,20 +263082,20 @@ apP jsm apP bIK -yjV +eTr hfK bIK -mPv +hyP pdW -sol -xRg -iad +qjm +qzR +ohY kqB -sol -bkP -yfQ -crm -xAa +qjm +rpn +iHo +hpg +mVX kxS lHW gpg @@ -264116,20 +263339,20 @@ apP apP dav cnJ -rpV +gjm hyg -wUU -rAu +mhD +fkN wQy -sol -xRg -iad +qjm +qzR +ohY bIK -sol -xRg -yfQ -crm -hgC +qjm +qzR +iHo +hpg +sHY ckI bgs csW @@ -264373,20 +263596,20 @@ alL uDA nnR bqg -sXm +akL hyg -wqB -fuQ +qLF +lab bIK -sol -auy -iad +qjm +kqF +ohY kqB -bGP -auy -yfQ -crm -hgC +uzH +kqF +iHo +hpg +sHY sNi ckI bgs @@ -264402,9 +263625,9 @@ bgs dvc dvc dvc -dGX -dGX -dGX +tCi +tCi +tCi dvc dvc dvc @@ -264630,20 +263853,20 @@ cOC apP cnJ kqB -rpV +gjm wzL -rAu +fkN sBX bIK -sol -auy -iad +qjm +kqF +ohY bIK -sol -auy -yfQ -mMf -hgC +qjm +kqF +iHo +nMt +sHY kxS sNi bMS @@ -264660,9 +263883,9 @@ dvc dvc dvc dvc -dGX -dGX -dGX +tCi +tCi +tCi dvc dvc dvc @@ -264674,7 +263897,7 @@ kxS kxS kxS kxS -kyp +kEj kxS kxS kxS @@ -264887,20 +264110,20 @@ rYt rYt uDA kqB -ili +llk bIK -lEc -tgt +iSJ +bid uXr -sol -xRg -iad +qjm +qzR +ohY bIK -sol -auy -yfQ -mMf -hgC +qjm +kqF +iHo +nMt +sHY kxS sNi sNi @@ -264917,9 +264140,9 @@ sNi sNi dvc dvc -dGX -dGX -dGX +tCi +tCi +tCi dvc dvc dvc @@ -265144,20 +264367,20 @@ apP apP wGC aqa -wDD +mNh cnJ -rAu -evc +fkN +gbq kqB -sol -auy -iad +qjm +kqF +ohY bIK -sol -bkP -yfQ +qjm +rpn +iHo bIK -hgC +sHY kxS sNi sNi @@ -265176,8 +264399,8 @@ sNi dvc dvc dvc -dGX -dGX +tCi +tCi dvc dvc dvc @@ -265401,20 +264624,20 @@ qMK fCM bIK wGC -bYf +oVc lnM -xzJ +efu uXr -hoX +cwu uXr -uJN +oZk hfK ggb pAy -uJN +oZk bIK sBX -hgC +sHY kxS kxS sNi @@ -265658,20 +264881,20 @@ gpg uDA uDA bIK -lwo -ikz -bPr -ocv -pPR -ihG -jIW -bjJ -iXD -vyh -lal -vBh -mMf -hgC +sPJ +qIN +bPK +hyR +kad +wLG +nFK +xxo +kXY +elZ +xvI +sfs +nMt +sHY kxS kxS sNi @@ -265917,18 +265140,18 @@ cnJ wGC bIK dyt -wLa -eZG -wYG +gnE +vBQ +gVM uXr -trc +uag lnM kqB bIK -wYG +gVM bIK -mMf -hgC +nMt +sHY kxS kxS sNi @@ -266174,18 +265397,18 @@ uDA wGC gNr uDA -rAu -qZw -vFz -sol -epm -iad +fkN +hja +oVg +qjm +xCt +ohY bIK -sol -mYe -yfQ -crm -hgC +qjm +oQj +iHo +hpg +sHY kxS sNi sNi @@ -266431,18 +265654,18 @@ apP bIK rzJ kqB -pRe -qdf -xCK -sol -epm -iad +jLj +uim +hey +qjm +xCt +ohY bIK -sol -uVq -yfQ -mMf -tvj +qjm +eBH +iHo +nMt +kTK kxS kxS sNi @@ -266688,18 +265911,18 @@ apP uDA hyg wGC -rAu -xbj +fkN +vyN uXr -sol -uVq -iad +qjm +eBH +ohY kqB -bGP -epm -yfQ -mMf -hgC +uzH +xCt +iHo +nMt +sHY kxS kxS kxS @@ -266945,18 +266168,18 @@ fkk aQv hfK bqg -rAu -xXl +fkN +lTj pAy -sol -uVq -iad +qjm +eBH +ohY bIK -sol -epm -yfQ -mMf -hgC +qjm +xCt +iHo +nMt +sHY kxS kxS kxS @@ -267203,17 +266426,17 @@ xbg kqB duJ pdW -lDM +iGt wQy -sol -adk -iad +qjm +bOd +ohY bIK -sol -epm -yfQ -mMf -hgC +qjm +xCt +iHo +nMt +sHY kxS kxS kxS @@ -267230,7 +266453,7 @@ sNi sNi sNi sNi -hkG +gkT sNi sNi sNi @@ -267405,7 +266628,7 @@ sNi yet xwM uDA -kyp +kEj dvc dvc dvc @@ -267460,17 +266683,17 @@ nPk ooY hyg cnJ -nIF +epX bIK -sol -sna -iad +qjm +lGn +ohY bIK -sol -eWs -yfQ +qjm +xsu +iHo bIK -hgC +sHY kxS kxS kxS @@ -267717,17 +266940,17 @@ kqB dNK bqg sGy -oRT +clm cnJ wQy sBX bIK bIK -sol -aAe -yfQ +qjm +rLn +iHo kqB -lEc +iSJ kxS kxS kxS @@ -267975,16 +267198,16 @@ ggb xIQ yli pdW -rjx -rjx -bpp -wpX +cXB +cXB +ety +loV bIK cnJ aqa bIK cnJ -nQI +xAe yli kxS kxS @@ -268236,12 +267459,12 @@ yli yli yli pdW -rjx -exf -rjx -rjx -rjx -oDI +cXB +eTo +cXB +cXB +cXB +mVr yli kxS kxS @@ -268259,7 +267482,7 @@ sNi kxS kxS kxS -pBL +aeH lWr eoS jmY @@ -269488,7 +268711,7 @@ sNi sNi yli yli -mgu +suz kxS kxS kxS @@ -271297,7 +270520,7 @@ kxS kxS kxS kxS -kyp +kEj kxS kxS kxS @@ -272549,7 +271772,7 @@ gpg uDA yli yli -mgu +suz yli yli yli @@ -273917,7 +273140,7 @@ yli yli yli yli -mgu +suz yli yli yli @@ -300709,13 +299932,13 @@ rGh rGh rGh rGh -how -how -how -how -how -how -how +ssj +ssj +ssj +ssj +ssj +ssj +ssj rGh rGh rGh @@ -300966,13 +300189,13 @@ rGh rGh rGh rGh -how -how -how -how -how -how -how +ssj +ssj +ssj +ssj +ssj +ssj +ssj rGh rGh rGh @@ -301226,10 +300449,10 @@ rGh rGh rGh rGh -how -how -how -how +ssj +ssj +ssj +ssj rGh rGh rGh @@ -301482,11 +300705,11 @@ rGh rGh rGh rGh -how -how -how -how -how +ssj +ssj +ssj +ssj +ssj rGh rGh rGh @@ -301738,12 +300961,12 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh -how -how +ssj +ssj rGh rGh rGh @@ -301994,13 +301217,13 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh -how -how +ssj +ssj rGh rGh rGh @@ -302250,14 +301473,14 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh -how -how +ssj +ssj rGh rGh rGh @@ -302506,9 +301729,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -302762,9 +301985,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -303018,9 +302241,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -303274,9 +302497,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -303530,9 +302753,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -303786,9 +303009,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -304042,9 +303265,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -304298,9 +303521,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -304554,9 +303777,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -304810,9 +304033,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -305066,9 +304289,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -305322,9 +304545,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -305578,9 +304801,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -305834,9 +305057,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -306090,9 +305313,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -306346,9 +305569,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -306602,9 +305825,9 @@ rGh rGh rGh rGh -how -how -how +ssj +ssj +ssj rGh rGh rGh @@ -306859,8 +306082,8 @@ rGh rGh rGh rGh -how -how +ssj +ssj rGh rGh rGh diff --git a/_maps/map_files/EchoStation/job_changes.dm b/_maps/map_files/EchoStation/job_changes.dm index 26c6fb6445dfd..758ea7a14a2fd 100644 --- a/_maps/map_files/EchoStation/job_changes.dm +++ b/_maps/map_files/EchoStation/job_changes.dm @@ -36,4 +36,11 @@ MAP_REMOVE_JOB(virologist) spawn_positions = 1 total_positions = 1 +//TODO: Convert this into a mapping config please +/datum/controller/subsystem/mapping/Initialize() + . = ..() + MAP_JOB_CHECK + GLOB.disabled_tagger_locations += "Virology" + GLOB.disabled_tagger_locations += "Law Office" + #undef JOB_MODIFICATION_MAP_NAME diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm index 8c43bdb0c18f2..0de0b73ac4ee4 100644 --- a/_maps/map_files/FlandStation/FlandStation.dmm +++ b/_maps/map_files/FlandStation/FlandStation.dmm @@ -92,9 +92,7 @@ /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/spawner/lootdrop/minor/twentyfive_percent_cyborg_mask, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/fore) "abA" = ( /obj/structure/sink{ @@ -240,7 +238,7 @@ /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Fore Primary Hallway - Security shuttle view"; name = "hallway camera" }, @@ -283,7 +281,7 @@ /obj/machinery/airalarm/directional/west{ pixel_x = -22 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Chapel - Port"; name = "chapel camera" }, @@ -323,7 +321,7 @@ /area/storage/tech) "aeb" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/iron, /area/hydroponics) "aep" = ( /obj/structure/lattice, @@ -410,7 +408,7 @@ /obj/structure/rack, /obj/item/aicard, /obj/item/storage/secure/briefcase, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Bridge - Port Central"; name = "command camera" }, @@ -756,7 +754,7 @@ /turf/open/floor/plating, /area/maintenance/port/central) "akh" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Science - Break Room"; name = "science camera"; network = list("ss13","rd") @@ -934,7 +932,7 @@ /obj/effect/turf_decal/guideline/guideline_mid/purple, /obj/effect/turf_decal/guideline/guideline_out/yellow, /obj/effect/turf_decal/guideline/guideline_in/blue, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Central Primary Hallway - Central Starboard"; name = "hallway camera" }, @@ -1252,6 +1250,9 @@ dir = 8 }, /obj/machinery/firealarm/directional/west, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/vault, /area/engine/engine_room) "ask" = ( @@ -1535,11 +1536,11 @@ /area/hallway/primary/central) "avb" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/machinery/light/small/directional/west, /turf/open/floor/plating{ broken = 1 }, @@ -1666,9 +1667,7 @@ /obj/item/shard{ icon_state = "medium" }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/asteroid/nearstation) "awC" = ( /obj/machinery/power/solar{ @@ -1817,7 +1816,7 @@ /turf/open/floor/carpet/green, /area/security/detectives_office) "aze" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Medbay - Cloning Lab"; name = "medbay camera"; network = list("ss13","medbay") @@ -1870,7 +1869,7 @@ "azF" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced/prison, @@ -1916,11 +1915,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/camera{ - c_tag = "Shuttle construction area - Aft"; - dir = 9; - name = "hallway camera" - }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/sepia, /area/science/shuttle) "aAl" = ( @@ -1943,11 +1938,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Shuttle construction area - Tool storage"; - dir = 9; - name = "hallway camera" - }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/science/shuttle) "aAu" = ( @@ -2166,6 +2157,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 5 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "aDk" = ( @@ -2313,7 +2307,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ id = "hosprivacy"; - name = "HoS Privacy Blast door" + name = "HoS Privacy Blast Door" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -2353,7 +2347,7 @@ "aFL" = ( /obj/structure/cable/yellow, /obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Science - Robotics Lab"; name = "science camera"; network = list("ss13","rd") @@ -2541,7 +2535,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id = "brigsidedoor"; - name = "Front Security Blast door" + name = "Front Security Blast Door" }, /obj/structure/window/reinforced{ dir = 8 @@ -2712,7 +2706,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ id = "hosprivacy"; - name = "HoS Privacy Blast door" + name = "HoS Privacy Blast Door" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -2907,7 +2901,7 @@ base_state = "left"; dir = 1; icon_state = "left"; - name = "Armour storage"; + name = "Armour Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -3460,6 +3454,9 @@ dir = 1 }, /obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "aPd" = ( @@ -4038,7 +4035,7 @@ "aUY" = ( /obj/machinery/door/poddoor/preopen{ id = "medpriv1"; - name = "privacy door" + name = "privacy Door" }, /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/shutters/preopen{ @@ -4373,7 +4370,7 @@ "aYi" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Medbay - Chief Medical Officer's Office"; name = "medbay camera"; network = list("ss13","medbay") @@ -4409,7 +4406,7 @@ /turf/closed/mineral/random/labormineral, /area/ai_monitored/turret_protected/ai) "aYA" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Medbay - Fore"; name = "medbay camera"; network = list("ss13","medbay") @@ -4767,6 +4764,9 @@ }, /obj/structure/bed/dogbed/runtime, /mob/living/simple_animal/pet/cat/Runtime, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/heads/cmo) "bep" = ( @@ -4794,15 +4794,6 @@ }, /turf/open/floor/iron/dark, /area/storage/tech) -"bez" = ( -/obj/machinery/camera{ - c_tag = "Xenobiology - Cell 6"; - dir = 9; - name = "xenobiology camera"; - network = list("ss13","xeno","rd") - }, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) "beF" = ( /obj/item/kirbyplants/random, /turf/open/floor/wood, @@ -5397,7 +5388,7 @@ /turf/open/floor/iron/ridged/steel, /area/science/xenobiology) "bmD" = ( -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Science - Experimentation Lab"; name = "science camera"; network = list("ss13","rd") @@ -5610,7 +5601,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay break room maintenance"; + name = "Medbay Break Room Maintenance"; req_access_txt = "5" }, /turf/open/floor/iron/techmaint, @@ -5712,8 +5703,7 @@ /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/effect/loot_jobscale/medical/first_aid_kit, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/iron/dark, /area/medical/storage) @@ -5902,6 +5892,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/chapel/office) +"bug" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/quartermaster/storage) "buo" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -5928,11 +5929,6 @@ /obj/item/flashlight/lamp, /obj/item/clothing/neck/stethoscope, /obj/item/flashlight/pen, -/obj/machinery/camera/directional/south{ - c_tag = "Medbay - Chief Medical Officer's Quarters"; - name = "medbay camera"; - network = list("ss13","medbay") - }, /obj/machinery/light_switch{ pixel_x = -24 }, @@ -6050,9 +6046,7 @@ "bvF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/central) "bvG" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ @@ -6087,7 +6081,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Cargo - Quartermaster's Office"; name = "cargo camera" }, @@ -6234,7 +6228,7 @@ /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/machinery/door/poddoor/preopen{ id = "BrigForeWindows"; - name = "Fore Security Blast door" + name = "Fore Security Blast Door" }, /obj/machinery/door/airlock/security/glass{ id_tag = "ForeOuterBrig"; @@ -6430,11 +6424,7 @@ /obj/effect/turf_decal/pool{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Recreation - Aft"; - dir = 6; - name = "recreation camera" - }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/noslip/standard, /area/crew_quarters/fitness/recreation) "bCW" = ( @@ -6554,6 +6544,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/science/mixing/chamber) "bEq" = ( @@ -6577,11 +6570,6 @@ /obj/item/screwdriver{ pixel_y = 6 }, -/obj/machinery/camera/directional/south{ - c_tag = "Medbay - Storage"; - name = "medbay camera"; - network = list("ss13","medbay") - }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/machinery/airalarm/directional/north{ pixel_y = 22 @@ -6600,7 +6588,10 @@ /area/engine/atmos) "bFp" = ( /obj/machinery/smartfridge/organ, -/turf/closed/wall/r_wall, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, /area/medical/surgery) "bFI" = ( /obj/machinery/door/airlock{ @@ -6678,6 +6669,9 @@ real_name = "Betsy" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/grass, /area/hydroponics/garden) "bHe" = ( @@ -6942,7 +6936,7 @@ /turf/open/floor/iron/techmaint, /area/science/shuttle) "bMi" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Arrivals - Station Entrance"; name = "hallway camera" }, @@ -6991,7 +6985,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/door/window/southright{ dir = 1; - name = "Armour storage"; + name = "Armour Storage"; req_one_access_txt = "1;4" }, /obj/structure/window/reinforced{ @@ -7105,9 +7099,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -7207,7 +7198,7 @@ /area/ai_monitored/turret_protected/ai_upload) "bPg" = ( /obj/machinery/door/airlock/security/glass{ - name = "Transfer cell"; + name = "Transfer Cell"; req_one_access_txt = "1;4" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -7466,7 +7457,7 @@ pixel_x = 30 }, /obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Hydroponics - Starboard"; name = "service camera" }, @@ -7708,6 +7699,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/dark, /area/hallway/primary/central) "bUR" = ( @@ -7747,6 +7741,11 @@ /obj/machinery/airalarm/directional/west{ pixel_x = -22 }, +/obj/machinery/camera/autoname/directional/south{ + c_tag = "Medbay - Cloning Lab"; + name = "medbay camera"; + network = list("ss13","medbay") + }, /turf/open/floor/iron/grid/steel, /area/medical/medbay/lobby) "bVk" = ( @@ -7880,6 +7879,7 @@ dir = 4 }, /obj/machinery/firealarm/directional/east, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/quartermaster/storage) "bXF" = ( @@ -7972,7 +7972,7 @@ pixel_y = -24; req_access_txt = "32;47;48" }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Auxiliary Base Construction" }, /turf/open/floor/iron/sepia, @@ -8000,7 +8000,7 @@ "bZS" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/siding/thinplating_new/dark, @@ -8089,14 +8089,10 @@ name = "Engineering RC"; pixel_y = -30 }, -/obj/machinery/camera{ - c_tag = "Engineering - Foyer"; - dir = 5; - name = "engineering camera" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/sepia, /area/engine/break_room) "cca" = ( @@ -8431,7 +8427,7 @@ pixel_x = 7; pixel_y = 3 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Engieneering- Engine Access"; name = "engineering camera"; network = list("ss13","engine") @@ -8652,14 +8648,10 @@ "cjS" = ( /obj/effect/turf_decal/delivery, /obj/machinery/disposal/bin, -/obj/machinery/camera{ - c_tag = "Atmospherics - Canister Storage"; - dir = 9; - name = "atmospherics camera" - }, /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/engine/atmos) "ckd" = ( @@ -9054,7 +9046,6 @@ }, /obj/machinery/button/door{ id = "quarantineshutters"; - layer = 4; name = "Quarantine Lockdown"; pixel_x = 24; pixel_y = 24; @@ -9309,14 +9300,8 @@ }, /obj/item/stack/medical/gauze, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/camera{ - c_tag = "Medbay - Side Storage"; - dir = 5; - name = "medbay camera"; - network = list("ss13","medbay") - }, /obj/structure/disposalpipe/segment{ - dir = 1 + dir = 6 }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) @@ -9332,6 +9317,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/quartermaster/storage) "ctC" = ( @@ -9467,7 +9453,7 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "cargo maintenance"; + name = "cargo Maintenance"; req_one_access_txt = "31;48;47" }, /obj/effect/turf_decal/stripes/closeup{ @@ -9550,7 +9536,7 @@ }, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/structure/disposalpipe/segment{ - dir = 5 + dir = 4 }, /turf/open/floor/iron, /area/medical/break_room) @@ -9628,6 +9614,17 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/quartermaster/storage) +"cxk" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/quartermaster/storage) "cxn" = ( /obj/machinery/vending/clothing, /obj/machinery/light, @@ -9793,18 +9790,15 @@ /turf/open/floor/engine/air/light, /area/engine/atmos) "czJ" = ( -/obj/machinery/camera{ - c_tag = "Supermatter Engine - Aft"; - dir = 5; - name = "engineering camera"; - network = list("ss13","engine") - }, /obj/item/radio/intercom{ pixel_y = -28 }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","engine") + }, /turf/open/floor/vault, /area/engine/engine_room) "czO" = ( @@ -10298,7 +10292,6 @@ "cIr" = ( /obj/structure/table/wood, /obj/item/paper_bin{ - layer = 2.9; pixel_x = -2; pixel_y = 4 }, @@ -10327,6 +10320,7 @@ /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "cIz" = ( @@ -10491,7 +10485,7 @@ /area/engine/atmos) "cKn" = ( /obj/machinery/smartfridge, -/turf/closed/wall/r_wall, +/turf/open/floor/iron/grid/steel, /area/medical/virology) "cKA" = ( /obj/vehicle/ridden/wheelchair{ @@ -10572,7 +10566,7 @@ }, /obj/item/storage/box/syringes, /obj/machinery/door/window/southright{ - name = "Miscellaneous medical Supplies"; + name = "Miscellaneous Medical Supplies"; req_access_txt = "5" }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, @@ -10626,7 +10620,7 @@ "cLT" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -10784,6 +10778,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "cOs" = ( @@ -10970,7 +10967,7 @@ pixel_x = -26 }, /obj/item/kirbyplants/random, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Research Division - Nanite Lab"; name = "science camera"; network = list("ss13","rd") @@ -11003,6 +11000,9 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/grid/steel, /area/hallway/primary/central) "cRc" = ( @@ -11217,6 +11217,9 @@ /obj/effect/turf_decal/trimline/red/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/dark, /area/hallway/primary/central) "cSA" = ( @@ -11416,6 +11419,9 @@ /obj/machinery/status_display/evac{ pixel_y = 32 }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","medbay") + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "cUI" = ( @@ -11429,7 +11435,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -11554,7 +11560,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -11563,7 +11569,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/plating, /area/medical/virology) @@ -11653,7 +11659,7 @@ pixel_y = -32 }, /obj/machinery/light/small, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Engineering - Power Tools"; name = "engineering camera" }, @@ -11827,11 +11833,6 @@ /obj/machinery/airalarm/directional/east{ pixel_x = 22 }, -/obj/machinery/camera{ - c_tag = "Cargo - Delivery Office"; - dir = 6; - name = "cargo camera" - }, /obj/structure/disposalpipe/sorting/wrap{ dir = 2 }, @@ -11842,6 +11843,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/camera/autoname/directional/east{ + c_tag = "Cargo - Office"; + name = "cargo camera" + }, /turf/open/floor/iron, /area/quartermaster/sorting) "daw" = ( @@ -12258,7 +12263,7 @@ /area/bridge/meeting_room/council) "dfv" = ( /obj/structure/sign/poster/contraband/hacking_guide{ - desc = "This poster details the internal workings of the common Nanotrasen airlock. Despite it appears out of date, this poster was placed by an alleged Nanotransen official due to some lack of hacking skill to open a door around here."; + desc = "This poster details the internal workings of the common Nanotrasen airlock. Despite it appears out of date, this poster was placed by an alleged Nanotrasen official due to some lack of hacking skill to open a door around here."; pixel_x = -32 }, /obj/structure/barricade/wooden, @@ -12545,14 +12550,10 @@ /turf/open/floor/iron/techmaint, /area/security/prison) "dko" = ( -/obj/machinery/camera{ - c_tag = "Library Evac Pod"; - dir = 6; - name = "library camera" - }, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/hallway/primary/aft) "dku" = ( @@ -12719,7 +12720,7 @@ "dme" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Supermatter Engine - Fore"; name = "engineering camera"; network = list("ss13","engine") @@ -12943,7 +12944,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "rndlabint"; - name = "Internal research shutters" + name = "Internal Research Shutters" }, /turf/open/floor/plating, /area/science/lab) @@ -13189,7 +13190,7 @@ /turf/open/floor/iron/sepia, /area/engine/break_room) "dtF" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Chapel Crematorium"; name = "Chapel camera" }, @@ -13424,19 +13425,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/vault, /area/engine/engine_room) "dwC" = ( -/obj/machinery/camera{ - c_tag = "Central Primary Hallway - Engineering Department Antichamber"; - dir = 5; - name = "hallway camera" - }, /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/trimline/yellow/line{ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/hallway/primary/central) "dwQ" = ( @@ -13565,7 +13565,7 @@ /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/public/glass{ - name = "Escape pod" + name = "Escape Pod" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -13603,7 +13603,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -13623,7 +13623,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron/techmaint, /area/medical/virology) @@ -13650,11 +13650,14 @@ /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/dropper, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Xenobiology - Research Area"; name = "xenobiology camera"; network = list("ss13","xeno","rd") }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "dBt" = ( @@ -13705,6 +13708,12 @@ broken = 1 }, /area/maintenance/aft) +"dCw" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/security/main) "dCJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -13857,12 +13866,12 @@ /turf/open/floor/iron/techmaint, /area/maintenance/port/fore) "dFG" = ( -/obj/effect/turf_decal/trimline/blue/warning{ - dir = 1 +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/obj/effect/turf_decal/trimline/blue/filled/warning, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/turf/open/floor/iron/dark, +/area/security/brig) "dFH" = ( /obj/effect/landmark/start/chaplain, /obj/structure/chair/wood/wings, @@ -14006,7 +14015,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -14135,7 +14144,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -14208,7 +14217,6 @@ /obj/structure/curtain, /obj/machinery/shower{ dir = 8; - layer = 4; name = "emergency shower"; pixel_x = -6 }, @@ -14227,7 +14235,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -14418,11 +14426,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Bridge - Dock - Docking Area"; - dir = 6; - name = "command camera" - }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, @@ -14772,22 +14776,11 @@ /turf/open/floor/iron/techmaint, /area/security/execution/education) "dOV" = ( -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 5 }, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) -"dOX" = ( -/obj/machinery/camera{ - c_tag = "Arrivals - Aft Arm - Far"; - dir = 10; - name = "hallway camera" - }, -/turf/open/floor/iron/dark, -/area/hallway/secondary/entry) "dOZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -14944,6 +14937,13 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) +"dRl" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/medical/break_room) "dRs" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -14971,7 +14971,7 @@ /obj/item/disk/nuclear/fake/obvious, /obj/machinery/door/window/westleft{ dir = 2; - name = "Museum Showcase door"; + name = "Museum Showcase Door"; req_access_txt = "37" }, /turf/open/floor/iron/dark, @@ -15082,7 +15082,7 @@ /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/stack/cable_coil/white, /obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Engineering - Fore"; name = "engineering camera" }, @@ -15484,7 +15484,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Dormitories - Central"; name = "dormitories camera" }, @@ -15535,7 +15535,7 @@ "eaP" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced, @@ -15982,7 +15982,7 @@ /obj/item/clothing/head/collectable/HoP{ name = "novelty HoP hat" }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Bridge - Corporate Showroom"; name = "command camera" }, @@ -16004,9 +16004,6 @@ /obj/item/computer_hardware/hard_drive/role/medical{ pixel_x = -3 }, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -16448,6 +16445,9 @@ /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 4 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/iron/sepia, /area/maintenance/department/engine) "enJ" = ( @@ -16585,6 +16585,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/dark, /area/security/brig) "eqe" = ( @@ -16613,11 +16616,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/camera{ - c_tag = "Chapel - Aft"; - dir = 5; - name = "chapel camera" - }, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, @@ -16628,6 +16626,7 @@ dir = 1 }, /obj/machinery/light/small, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/chapel/main) "ere" = ( @@ -16644,6 +16643,9 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/dark/side, /area/quartermaster/sorting) "ero" = ( @@ -16873,7 +16875,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -16951,7 +16953,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -17119,7 +17121,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "heads_meeting"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/plating, /area/bridge/meeting_room/council) @@ -17154,9 +17156,6 @@ "ezG" = ( /obj/effect/landmark/start/librarian, /obj/structure/chair/office, -/obj/structure/chair/office{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/library) "ezI" = ( @@ -17446,7 +17445,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -17471,7 +17470,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /turf/open/floor/iron/grid/steel, /area/bridge) @@ -17503,7 +17502,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -17849,17 +17848,13 @@ /obj/structure/sign/poster/official/do_not_question{ pixel_y = 32 }, -/obj/machinery/camera{ - c_tag = "Arrivals Customs"; - dir = 9; - name = "customs camera" - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/security/checkpoint/customs) "eIl" = ( @@ -17886,7 +17881,7 @@ }, /obj/machinery/door/window/westright{ dir = 2; - name = "Museum Showcase door"; + name = "Museum Showcase Door"; req_access_txt = "37" }, /turf/open/floor/iron/dark, @@ -17916,7 +17911,7 @@ /area/science/xenobiology) "eIN" = ( /obj/machinery/door/airlock/maintenance{ - name = "Conference room maintenance"; + name = "Conference Room Maintenance"; req_access_txt = "19" }, /obj/effect/turf_decal/stripes/closeup{ @@ -17924,7 +17919,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /turf/open/floor/iron/techmaint, /area/bridge/meeting_room/council) @@ -18082,17 +18077,10 @@ /obj/item/paper_bin, /obj/item/pen, /obj/structure/table, -/obj/machinery/camera/directional/south{ - c_tag = "Central Primary Hallway - Port Aft Central"; - name = "hallway camera" - }, /obj/structure/sign/departments/minsky/research/research{ pixel_x = -32; pixel_y = -32 }, -/obj/machinery/light{ - dir = 8 - }, /turf/open/floor/iron/dark/side{ dir = 10 }, @@ -18208,11 +18196,6 @@ /turf/open/floor/carpet/royalblue, /area/bridge/meeting_room/council) "eKW" = ( -/obj/machinery/camera{ - c_tag = "Escape Shuttle Hallway - Fore"; - dir = 5; - name = "hallway camera" - }, /obj/effect/landmark/start/assistant, /obj/structure/chair{ dir = 1 @@ -18305,7 +18288,6 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "eMd" = ( -/obj/machinery/light, /obj/effect/turf_decal/trimline/brown/filled/line, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) @@ -18410,7 +18392,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -18817,11 +18799,22 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/library) +"eRJ" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/effect/turf_decal/trimline/red/line{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/iron/dark, +/area/security/brig) "eRO" = ( /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -18965,9 +18958,7 @@ /turf/open/floor/iron/dark, /area/security/prison/shielded) "eTf" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Xenobiology - Cell 5"; - name = "xenobiology camera"; +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","xeno","rd") }, /turf/open/floor/iron/grid/steel, @@ -18986,17 +18977,13 @@ /turf/open/floor/iron/grid/steel, /area/bridge) "eTn" = ( -/obj/machinery/camera{ - c_tag = "Arrivals - Fore Arm"; - dir = 9; - name = "hallway camera" - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/machinery/newscaster{ pixel_y = 31 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/hallway/secondary/entry) "eTo" = ( @@ -19437,7 +19424,7 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/toy/figure/borg, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "AI - Teleporter - Port"; name = "ai camera"; network = list("minisat"); @@ -19564,7 +19551,7 @@ /turf/open/floor/plating, /area/security/checkpoint/medical) "eYX" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Science - Research Director's Office"; name = "science camera"; network = list("ss13","rd") @@ -19839,11 +19826,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/camera{ - c_tag = "Garden - Starboard"; - dir = 9; - name = "garden camera" - }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -19876,12 +19859,8 @@ /obj/machinery/airalarm/directional/east{ pixel_x = 22 }, -/obj/machinery/camera{ - c_tag = "Escape Shuttle Hallway - Aft"; - dir = 6; - name = "hallway camera" - }, /obj/structure/disposalpipe/segment, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/hallway/primary/aft) "fdE" = ( @@ -20246,7 +20225,7 @@ /obj/item/restraints/handcuffs{ pixel_y = 3 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Bridge - Port"; name = "command camera" }, @@ -20381,6 +20360,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron/dark/side, /area/hallway/primary/fore) "fkQ" = ( @@ -20423,12 +20405,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "AI - Teleporter - Starboard"; - dir = 5; - name = "ai camera"; - network = list("minisat"); - start_active = 1 +/obj/machinery/camera/autoname/directional/south{ + network = list("minisat") }, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/ai_upload_foyer) @@ -20477,7 +20455,7 @@ base_state = "left"; dir = 1; icon_state = "left"; - name = "Disabler storage"; + name = "Disabler Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -20649,7 +20627,7 @@ /turf/open/floor/iron/grid/steel, /area/hallway/secondary/exit/departure_lounge) "foB" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Security - Departures Fore" }, /obj/structure/chair/fancy/bench/left{ @@ -20903,9 +20881,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/camera{ - c_tag = "Security Post - Medbay"; - dir = 5 +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","medbay") }, /turf/open/floor/iron, /area/security/checkpoint/medical) @@ -20926,6 +20903,15 @@ }, /turf/open/floor/iron, /area/security/checkpoint/medical) +"fsj" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/security/brig) "fsx" = ( /obj/effect/turf_decal/trimline/blue/warning{ dir = 1 @@ -21044,7 +21030,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /turf/open/floor/iron/techmaint, /area/bridge/meeting_room/council) @@ -21223,11 +21209,7 @@ pixel_x = -28; pixel_y = 1 }, -/obj/machinery/camera{ - c_tag = "Bridge - Council Chamber"; - dir = 10; - name = "command camera" - }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/wood, /area/bridge/meeting_room/council) "fuW" = ( @@ -21410,7 +21392,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - name = "cargo maintenance"; + name = "cargo Maintenance"; req_one_access_txt = "31;48" }, /obj/effect/turf_decal/stripes/closeup{ @@ -21524,6 +21506,9 @@ /area/medical/genetics) "fza" = ( /obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/dark/side, /area/quartermaster/sorting) "fzc" = ( @@ -21638,7 +21623,7 @@ /area/hallway/primary/fore) "fAw" = ( /obj/effect/landmark/start/lawyer, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Courtroom - Center" }, /obj/machinery/light{ @@ -21718,14 +21703,20 @@ /turf/open/floor/iron, /area/security/checkpoint/escape) "fBC" = ( -/obj/machinery/camera{ - c_tag = "Xenobiology - Cell 4"; - dir = 9; - name = "xenobiology camera"; - network = list("ss13","xeno","rd") +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/main) "fBJ" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -21805,6 +21796,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/plating, /area/security/brig) "fCY" = ( @@ -21814,7 +21808,7 @@ }, /area/ai_monitored/turret_protected/ai) "fDc" = ( -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "AI Chamber - Fore"; name = "motion-sensitive ai camera"; network = list("aichamber") @@ -21974,7 +21968,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Science - Research Director's Quarters"; name = "science camera"; network = list("ss13","rd") @@ -22268,7 +22262,7 @@ /obj/item/stock_parts/micro_laser/high, /obj/item/stock_parts/micro_laser/high, /obj/item/stock_parts/micro_laser/high, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Technology Storage"; name = "engineering camera" }, @@ -22315,13 +22309,7 @@ /obj/machinery/airalarm/directional/west{ pixel_x = -22 }, -/obj/machinery/camera{ - c_tag = "AI - Antechamber"; - dir = 10; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/bridge) "fIN" = ( @@ -22479,9 +22467,7 @@ "fKo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/department/medical) "fKP" = ( /obj/structure/cable/yellow{ @@ -22518,7 +22504,7 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor{ id = "hosprivacy"; - name = "HoS Privacy Blast door" + name = "HoS Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -22561,11 +22547,7 @@ name = "Bridge RC"; pixel_x = 30 }, -/obj/machinery/camera{ - c_tag = "Bridge - Command Chair"; - dir = 6; - name = "command camera" - }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/grid/steel, /area/bridge) "fLF" = ( @@ -22652,9 +22634,7 @@ "fLR" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/spawner/lootdrop/trap/reusable, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/central) "fMh" = ( /obj/item/storage/secure/safe{ @@ -22736,6 +22716,9 @@ /obj/effect/turf_decal/trimline/red/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron, /area/security/main) "fNm" = ( @@ -22802,14 +22785,10 @@ "fOg" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, -/obj/machinery/camera{ - c_tag = "Fore Primary Hallway - Auxiliary Security Entrance"; - dir = 9; - name = "hallway camera" - }, /obj/structure/disposalpipe/trunk{ dir = 2 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/hallway/primary/fore) "fOi" = ( @@ -22862,7 +22841,6 @@ dir = 8 }, /obj/structure/bed/roller, -/obj/structure/bed/roller, /obj/machinery/iv_drip, /turf/open/floor/iron/white, /area/security/main) @@ -23262,7 +23240,6 @@ base_state = "rightsecure"; dir = 8; icon_state = "rightsecure"; - layer = 4.1; name = "Secondary AI Core Access"; obj_integrity = 300; req_access_txt = "16" @@ -23763,11 +23740,6 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Atmospherics - Canister Storage"; - dir = 9; - name = "atmospherics camera" - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -24064,13 +24036,13 @@ }, /obj/machinery/door/poddoor{ id = "hosprivacy"; - name = "HoS Privacy Blast door" + name = "HoS Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/hos) "geA" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Supermatter Engine - Laser room"; name = "engineering camera"; network = list("ss13","engine") @@ -24109,7 +24081,7 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Secure Creature Pen shield holder"; + name = "Secure Creature Pen Shield Holder"; obj_integrity = 300 }, /obj/structure/window/reinforced{ @@ -24316,15 +24288,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/central) -"ghK" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar) "ghQ" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -24364,9 +24327,7 @@ pixel_x = -5; pixel_y = 3 }, -/obj/item/multitool{ - layer = 4 - }, +/obj/item/multitool, /turf/open/floor/iron/dark/side, /area/engine/atmos) "gip" = ( @@ -24391,13 +24352,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/machinery/camera{ - c_tag = "AI - Foyer"; - dir = 10; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 }, @@ -24407,6 +24361,11 @@ /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ dir = 4 }, +/obj/machinery/camera/motion/directional/west{ + c_tag = "AI Chamber - Port"; + name = "motion-sensitive ai camera"; + network = list("aichamber") + }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "git" = ( @@ -25478,6 +25437,10 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/fore) +"gwS" = ( +/obj/machinery/smartfridge/chemistry/preloaded, +/turf/open/floor/iron/white, +/area/medical/apothecary) "gwV" = ( /turf/closed/wall, /area/science/server) @@ -25649,7 +25612,7 @@ base_state = "leftsecure"; dir = 4; icon_state = "leftsecure"; - name = "Secure Creature Pen shield holder"; + name = "Secure Creature Pen Shield Holder"; obj_integrity = 300; req_access_txt = "47" }, @@ -25730,7 +25693,7 @@ pixel_y = 23; dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Atmospherics - Turbines"; name = "atmospherics camera" }, @@ -25782,11 +25745,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/camera{ - c_tag = "Bridge - Fore"; - dir = 5; - name = "command camera" - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/grid/steel, /area/bridge) "gAu" = ( @@ -25880,7 +25839,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/external/glass{ - name = "Labour Shuttle airlock"; + name = "Labour Shuttle Airlock"; req_access_txt = "63" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -26170,7 +26129,7 @@ /turf/open/floor/iron/checker, /area/quartermaster/storage) "gEP" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Medbay - Genetics Desk"; name = "medbay camera"; network = list("ss13","medbay") @@ -26697,7 +26656,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 @@ -26754,9 +26713,8 @@ /obj/machinery/atmospherics/components/trinary/mixer{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Science - Toxins Mixing Lab"; - dir = 5; +/obj/machinery/camera/autoname/directional/south{ + c_tag = "Science - Experimentor"; name = "science camera"; network = list("ss13","rd") }, @@ -26938,16 +26896,12 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Atmospherics - Aft"; - dir = 5; - name = "atmospherics camera" - }, /obj/machinery/requests_console{ department = "Atmospherics"; name = "Atmospherics RC"; pixel_y = -30 }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark/side, /area/engine/atmos) "gOY" = ( @@ -27303,11 +27257,7 @@ /area/quartermaster/exploration_prep) "gTR" = ( /obj/item/kirbyplants/random, -/obj/machinery/camera{ - c_tag = "Library - Aft"; - dir = 5; - name = "library camera" - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/library) "gTS" = ( @@ -27371,7 +27321,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "gUV" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Escape Shuttle Hallway - Aft"; name = "hallway camera" }, @@ -27658,11 +27608,6 @@ /turf/open/floor/iron/techmaint, /area/security/checkpoint) "gYZ" = ( -/obj/machinery/camera{ - c_tag = "Escape Shuttle Hallway - Central"; - dir = 5; - name = "hallway camera" - }, /obj/machinery/light/small, /obj/structure/chair{ dir = 1 @@ -27670,6 +27615,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) "gZd" = ( @@ -27833,11 +27779,6 @@ /turf/open/floor/iron/grid/steel, /area/bridge) "hbo" = ( -/obj/machinery/camera/motion{ - c_tag = "E.V.A. Suit Storage"; - dir = 10; - name = "motion-sensitive command camera" - }, /obj/structure/sign/poster/contraband/missing_gloves{ pixel_x = -32 }, @@ -27847,6 +27788,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "hbD" = ( @@ -28088,6 +28030,9 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/science/mixing/chamber) "hfx" = ( @@ -28126,7 +28071,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "hfY" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Vacant Commissary #1" }, /obj/machinery/newscaster{ @@ -28149,7 +28094,7 @@ "hgy" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/siding/thinplating_new/dark, @@ -28355,7 +28300,7 @@ /obj/effect/turf_decal/stripes/end, /obj/effect/turf_decal/stripes/red/end, /obj/machinery/door/airlock/external/glass{ - name = "Labour Shuttle airlock"; + name = "Labour Shuttle Airlock"; req_access_txt = "63" }, /obj/machinery/atmospherics/pipe/layer_manifold, @@ -28483,6 +28428,15 @@ /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /turf/open/floor/iron/techmaint, /area/science/nanite) +"hjL" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/vault, +/area/engine/engine_room) "hjV" = ( /obj/machinery/light, /obj/effect/turf_decal/stripes/line, @@ -28560,6 +28514,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/dark/side, /area/quartermaster/sorting) "hlD" = ( @@ -28679,7 +28636,7 @@ /turf/open/floor/plating, /area/maintenance/port/central) "hmI" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Port Primary Hallway - Center"; name = "hallway camera" }, @@ -28723,7 +28680,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -29063,12 +29020,8 @@ /turf/open/floor/iron/dark, /area/medical/surgery) "htj" = ( -/obj/machinery/camera{ - c_tag = "Fore Primary Hallway - Bow"; - dir = 10; - name = "hallway camera" - }, /obj/structure/disposalpipe/segment, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/hallway/primary/aft) "htv" = ( @@ -29448,7 +29401,7 @@ /area/science/explab) "hzt" = ( /obj/machinery/door/airlock/maintenance{ - name = "cargo maintenance"; + name = "cargo Maintenance"; req_one_access_txt = "31;48" }, /obj/structure/cable/yellow{ @@ -29520,19 +29473,15 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 20 }, -/obj/machinery/camera{ - c_tag = "AI - Maintenance"; - dir = 5; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ dir = 1 }, /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ dir = 4 }, +/obj/machinery/camera/autoname/directional/south{ + network = list("minisat") + }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "hAd" = ( @@ -29665,7 +29614,7 @@ /obj/effect/turf_decal/guideline/guideline_out/blue{ dir = 1 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Starboard Primary Hallway - Port"; name = "hallway camera" }, @@ -29688,7 +29637,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/preopen{ id = "brigsidedoor"; - name = "Front Security Blast door" + name = "Front Security Blast Door" }, /obj/machinery/door/firedoor, /obj/structure/window/reinforced{ @@ -29903,14 +29852,6 @@ }, /turf/open/floor/iron, /area/security/checkpoint/medical) -"hGi" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Xenobiology - Cell 1"; - name = "xenobiology camera"; - network = list("ss13","xeno","rd") - }, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) "hGw" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -30003,8 +29944,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 6; +/obj/machinery/camera/autoname/directional/east{ network = list("ss13","prison") }, /turf/open/floor/iron/dark, @@ -30046,7 +29986,7 @@ /obj/structure/chair/fancy/sofa/old/left{ color = "#742925" }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Medbay - Break Room"; name = "medbay camera"; network = list("ss13","medbay") @@ -30189,12 +30129,12 @@ /turf/open/floor/plating, /area/bridge) "hJJ" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/turf/open/floor/vault, +/area/engine/engine_room) "hJK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 @@ -30485,7 +30425,7 @@ /obj/structure/rack, /obj/effect/turf_decal/bot, /obj/machinery/door/window/southright{ - name = "Weapons storage"; + name = "Weapons Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -30708,7 +30648,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/warning, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Science - Research Division Access"; name = "science camera"; network = list("ss13","rd") @@ -30978,15 +30918,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/camera{ - c_tag = "Supermatter Engine - Port"; - dir = 10; - name = "engineering camera"; - network = list("ss13","engine") - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","engine") + }, /turf/open/floor/vault, /area/engine/engine_room) "hSZ" = ( @@ -31348,7 +31285,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ id = "rndlabint"; - name = "Internal research shutters" + name = "Internal Research Shutters" }, /turf/open/floor/iron/techmaint, /area/science/lab) @@ -31510,7 +31447,7 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Labour Shuttle airlock" + name = "Labour Shuttle Airlock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, @@ -32150,11 +32087,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Port Primary Hallway - Roboticists passageway"; - dir = 5; - name = "hallway camera" - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/hallway/primary/port) "iix" = ( @@ -32303,7 +32236,6 @@ base_state = "rightsecure"; dir = 8; icon_state = "rightsecure"; - layer = 4.1; name = "Secondary AI Core Access"; obj_integrity = 300; req_access_txt = "16" @@ -32564,7 +32496,7 @@ /turf/open/floor/iron/dark, /area/security/execution/transfer) "ioe" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Starboard Primary Hallway - AI antechamber Entrance"; name = "hallway camera" }, @@ -32582,7 +32514,7 @@ /turf/open/floor/prison, /area/security/prison) "ioj" = ( -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Engineering Maintenance - Center"; name = "engineering camera" }, @@ -32848,10 +32780,8 @@ /turf/open/floor/iron/grid, /area/medical/virology) "irr" = ( -/obj/machinery/camera{ - c_tag = "Atmospherics - Air Supply"; - dir = 5; - name = "atmospherics camera" +/obj/machinery/camera/autoname/directional/south{ + c_tag = "Atmospherics - Plasma Cell" }, /turf/open/floor/engine/air/light, /area/engine/atmos) @@ -32915,7 +32845,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -32956,14 +32886,6 @@ dir = 1 }, /area/crew_quarters/dorms) -"isw" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Xenobiology - Cell 3"; - name = "xenobiology camera"; - network = list("ss13","xeno","rd") - }, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) "isz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -33182,6 +33104,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/grass, /area/hydroponics/garden) "iuT" = ( @@ -33204,6 +33129,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron, /area/security/main) "ivb" = ( @@ -33513,6 +33441,16 @@ }, /turf/open/floor/iron/techmaint, /area/security/execution/education) +"iyh" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/security/brig) "iyk" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Distro to Waste" @@ -33533,13 +33471,13 @@ /area/hallway/primary/central) "iyB" = ( /obj/machinery/smartfridge/chemistry/preloaded, -/turf/closed/wall, +/turf/open/floor/iron, /area/medical/apothecary) "iyG" = ( /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -33553,7 +33491,7 @@ /area/maintenance/department/security/brig) "iyP" = ( /obj/machinery/door/airlock/hatch{ - name = "AI maintenance chamber"; + name = "AI Maintenance Chamber"; req_one_access_txt = "32;19" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -33701,7 +33639,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -33869,7 +33807,7 @@ }, /obj/effect/turf_decal/bot, /obj/machinery/cryopod{ - desc = "Suited for Cyborgs and Humanoids, the pod is a safe place for personnel affected by the Space Sleep Disorder to get some rest. If you think that this the easy way out, Nanotransen will address your situation in a later date..."; + desc = "Suited for Cyborgs and Humanoids, the pod is a safe place for personnel affected by the Space Sleep Disorder to get some rest. If you think that this the easy way out, Nanotrasen will address your situation in a later date..."; dir = 4; name = "Jail cryogenic freezer" }, @@ -33903,9 +33841,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/fore) "iEc" = ( /obj/machinery/status_display/ai{ @@ -34048,7 +33984,7 @@ "iFO" = ( /obj/machinery/door/poddoor/preopen{ id = "telelab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor, @@ -34489,7 +34425,7 @@ }, /obj/machinery/door/poddoor{ id = "hosprivacy"; - name = "HoS Privacy Blast door" + name = "HoS Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -34539,6 +34475,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/vault, /area/engine/engine_room) "iLD" = ( @@ -34872,7 +34811,7 @@ /area/science/shuttle) "iPP" = ( /obj/machinery/door/airlock/maintenance{ - name = "e.v.a. maintenance"; + name = "e.v.a. Maintenance"; req_access_txt = "18" }, /obj/machinery/door/firedoor, @@ -35062,7 +35001,7 @@ /turf/open/floor/iron, /area/quartermaster/office) "iSn" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Xenobiology - Fore"; name = "xenobiology camera"; network = list("ss13","xeno","rd") @@ -35153,14 +35092,10 @@ dir = 1 }, /obj/machinery/light, -/obj/machinery/camera{ - c_tag = "Bridge - Head of Personnel's Office"; - dir = 5; - name = "command camera" - }, /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "iTB" = ( @@ -35231,7 +35166,7 @@ /obj/machinery/door/window/southright{ base_state = "left"; icon_state = "left"; - name = "Weapons storage"; + name = "Weapons Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -35354,7 +35289,7 @@ /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "iWh" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Atmospherics - Fore Port"; name = "atmospherics camera" }, @@ -35466,7 +35401,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/junction{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/iron, @@ -35703,24 +35638,12 @@ /turf/open/floor/iron/techmaint, /area/medical/medbay/central) "jbB" = ( +/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/port) +/turf/open/floor/grass, +/area/hydroponics/garden) "jbJ" = ( /obj/machinery/newscaster{ pixel_x = -28; @@ -35850,13 +35773,12 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "jdc" = ( -/obj/machinery/camera{ - c_tag = "Cargo - Mining Office"; - dir = 5; - name = "cargo camera" - }, /obj/effect/turf_decal/trimline/brown/filled/line, /obj/structure/reagent_dispensers/fueltank, +/obj/machinery/camera/autoname/directional/south{ + c_tag = "Cargo - Quartermaster's Office"; + name = "cargo camera" + }, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "jdf" = ( @@ -36041,7 +35963,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ - name = "Gambling den" + name = "Gambling Den" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, @@ -36377,7 +36299,7 @@ dir = 4 }, /obj/machinery/door/window/southright{ - name = "Balistic Weapons storage"; + name = "Balistic Weapons Storage"; req_one_access_txt = "1;4" }, /obj/item/ammo_box/magazine/wt550m9/rubber{ @@ -36457,17 +36379,13 @@ /area/hallway/primary/port) "jkL" = ( /obj/item/kirbyplants/random, -/obj/machinery/camera{ - c_tag = "Library Gameroom"; - dir = 6; - name = "library camera" - }, /obj/effect/turf_decal/siding/wood{ dir = 8 }, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = 32 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/wood, /area/library) "jlz" = ( @@ -36644,7 +36562,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/poddoor/preopen{ id = "BrigAftWindows"; - name = "Aft Security Blast door" + name = "Aft Security Blast Door" }, /obj/machinery/door/airlock/security/glass{ id_tag = "AftOuterBrig"; @@ -36734,7 +36652,7 @@ /obj/machinery/airalarm/directional/east{ pixel_x = 22 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Telecomms - Antechamber"; name = "telecomms camera"; network = list("ss13","tcomms") @@ -36868,7 +36786,7 @@ "jrF" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -37173,6 +37091,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/grass/no_border, /area/security/main) "jxz" = ( @@ -37209,10 +37130,10 @@ "jxF" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/machinery/door/window/southright{ - name = "Sign door"; + name = "Sign Door"; req_one_access = "25" }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Cafeteria antechamber"; name = "service camera" }, @@ -37736,7 +37657,6 @@ /obj/structure/curtain, /obj/machinery/shower{ dir = 8; - layer = 4; name = "emergency shower"; pixel_x = -6 }, @@ -37785,7 +37705,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Primary Restroom"; name = "Restroom camera" }, @@ -37987,6 +37907,11 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, +/obj/machinery/camera/autoname/directional/west{ + c_tag = "Medbay - Surgery"; + name = "medbay camera"; + network = list("ss13","medbay") + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "jIj" = ( @@ -38120,6 +38045,9 @@ dir = 4 }, /obj/effect/spawner/structure/window/plasma/reinforced, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/science/mixing/chamber) "jJI" = ( @@ -38146,7 +38074,7 @@ /turf/open/floor/grass, /area/hydroponics/garden) "jKb" = ( -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Engineering Maintenance - Starboard"; name = "engineering camera" }, @@ -38217,14 +38145,11 @@ pixel_x = -3; pixel_y = 3 }, -/obj/machinery/camera/directional/west{ - c_tag = "Primary Tool Storage"; - name = "engineering camera" - }, /obj/item/radio/intercom{ pixel_x = -28 }, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/storage/primary) "jLa" = ( @@ -38308,6 +38233,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/grass/no_border, /area/security/brig) "jME" = ( @@ -38520,7 +38448,7 @@ dir = 1 }, /obj/machinery/door/airlock/external/glass{ - name = "Labour Shuttle airlock"; + name = "Labour Shuttle Airlock"; req_access_txt = "63" }, /obj/machinery/atmospherics/pipe/layer_manifold, @@ -38543,14 +38471,13 @@ }, /obj/machinery/hydroponics/constructable, /obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","prison") - }, /obj/machinery/light, /obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","prison") + }, /turf/open/floor/iron/techmaint, /area/security/prison) "jPp" = ( @@ -38584,11 +38511,6 @@ /turf/open/floor/plating, /area/maintenance/aft) "jPA" = ( -/obj/machinery/camera{ - c_tag = "Fore Primary Hallway - Central Aft"; - dir = 6; - name = "hallway camera" - }, /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 8 }, @@ -38598,6 +38520,7 @@ /obj/effect/turf_decal/guideline/guideline_out/blue{ dir = 8 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/hallway/primary/aft) "jPK" = ( @@ -38732,17 +38655,13 @@ /obj/effect/turf_decal/guideline/guideline_in_T/red{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Central Primary Hallway - Security Main Entrance"; - dir = 5; - name = "hallway camera" - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /obj/machinery/newscaster{ pixel_y = -29 }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/hallway/primary/central) "jQL" = ( @@ -38810,15 +38729,15 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 8 }, -/obj/machinery/camera/autoname/directional/east{ - network = list("ss13","prison") - }, /obj/machinery/light{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","prison") + }, /turf/open/floor/prison, /area/security/prison) "jRy" = ( @@ -39187,7 +39106,7 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Labour Shuttle airlock" + name = "Labour Shuttle Airlock" }, /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/techmaint, @@ -39320,7 +39239,7 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Labour Shuttle airlock" + name = "Labour Shuttle Airlock" }, /turf/open/floor/iron/techmaint, /area/security/execution/transfer) @@ -39384,7 +39303,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Locker Room - Starboard"; name = "dormitories camera" }, @@ -39447,15 +39366,11 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "jZL" = ( -/obj/machinery/camera{ - c_tag = "Engineering Maintenance - Auxiliary Atmospheric entrance"; - dir = 6; - name = "engineering camera" - }, /obj/effect/turf_decal/stripes/corner, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/maintenance/department/engine) "jZV" = ( @@ -39568,7 +39483,7 @@ /obj/machinery/vending/wallmed{ pixel_x = -24 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Medbay - Surgery"; name = "medbay camera"; network = list("ss13","medbay") @@ -39639,7 +39554,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -39701,6 +39616,9 @@ pixel_x = -24; pixel_y = -24 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/quartermaster/sorting) "kcJ" = ( @@ -40087,7 +40005,7 @@ /obj/effect/turf_decal/stripes/red/end, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/airlock/external{ - name = "Labour Shuttle airlock" + name = "Labour Shuttle Airlock" }, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) @@ -40550,7 +40468,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/poddoor/preopen{ id = "BrigAftWindows"; - name = "Aft Security Blast door" + name = "Aft Security Blast Door" }, /obj/machinery/door/airlock/security/glass{ id_tag = "AftOuterBrig"; @@ -40585,7 +40503,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "BrigForeWindows"; - name = "Fore Security Blast door" + name = "Fore Security Blast Door" }, /turf/open/floor/plating, /area/security/main) @@ -41172,14 +41090,10 @@ /turf/open/floor/grass/no_border, /area/hallway/primary/port) "kvE" = ( -/obj/machinery/camera{ - c_tag = "Arrivals - Aft Arm"; - dir = 9; - name = "hallway camera" - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/hallway/secondary/entry) "kvJ" = ( @@ -41264,6 +41178,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/dark/side, /area/quartermaster/sorting) "kwx" = ( @@ -41977,7 +41894,7 @@ dir = 1 }, /obj/machinery/door/airlock/external/glass{ - name = "Labour Shuttle airlock"; + name = "Labour Shuttle Airlock"; req_access_txt = "63" }, /turf/open/floor/iron/techmaint, @@ -42041,7 +41958,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "mixwindows"; - name = "Toxin Mix Chamber Blast door" + name = "Toxin Mix Chamber Blast Door" }, /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/engine, @@ -42066,7 +41983,7 @@ dir = 4; pixel_x = -26 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Teleporter"; name = "command camera" }, @@ -42327,7 +42244,7 @@ /obj/machinery/status_display/evac{ pixel_y = -32 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Fore Primary Hallway - Starboard"; name = "hallway camera" }, @@ -42341,6 +42258,9 @@ /area/engine/supermatter) "kMK" = ( /mob/living/simple_animal/chicken, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/grass, /area/hydroponics/garden) "kMO" = ( @@ -42494,7 +42414,7 @@ }, /area/quartermaster/office) "kPe" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Engineering - Central"; name = "engineering camera" }, @@ -42595,12 +42515,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "AI - Maintenance - Power Station"; - dir = 9; - name = "ai camera"; - network = list("minisat"); - start_active = 1 +/obj/machinery/camera/autoname/directional/north{ + network = list("minisat") }, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/ai_upload_foyer) @@ -42679,7 +42595,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Garden - Port"; name = "garden camera" }, @@ -42744,7 +42660,7 @@ /obj/machinery/newscaster{ pixel_y = -28 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Cryogenic Lounge"; name = "recreation camera" }, @@ -42809,7 +42725,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Medbay - Chemistry"; name = "medbay camera"; network = list("ss13","medbay") @@ -43143,7 +43059,7 @@ /area/medical/morgue) "kWo" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering locker room"; + name = "Engineering Locker Room"; req_access_txt = "32" }, /obj/structure/cable/yellow{ @@ -43210,7 +43126,7 @@ /turf/open/floor/plating, /area/engine/gravity_generator) "kWN" = ( -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","security") }, /turf/open/floor/plating, @@ -43244,9 +43160,7 @@ /area/bridge) "kXc" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/curtain{ - layer = 4.5 - }, +/obj/structure/curtain, /turf/open/floor/plating, /area/medical/cryo) "kXj" = ( @@ -43271,7 +43185,7 @@ /turf/open/floor/prison, /area/security/prison) "kXo" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Telecomms - Server Room"; name = "telecomms camera"; network = list("ss13","tcomms") @@ -43828,11 +43742,8 @@ "lcG" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/camera/motion/directional/east{ - c_tag = "E.V.A. Storage"; - name = "motion-sensitive command camera" - }, /obj/item/toy/plush/moth/firewatch, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark/side{ dir = 5 }, @@ -43876,13 +43787,10 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 22 }, -/obj/machinery/camera{ - c_tag = "Food Commissary"; - dir = 9 - }, /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/cafeteria, /area/vacant_room/commissary/commissaryFood) "ldq" = ( @@ -43930,7 +43838,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Science - Aft hallway"; name = "science camera"; network = list("ss13","rd") @@ -44036,7 +43944,7 @@ /area/medical/apothecary) "lfr" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Arrivals - Aft Arm - Center"; name = "hallway camera" }, @@ -44058,7 +43966,6 @@ dir = 8 }, /obj/structure/bed/roller, -/obj/structure/bed/roller, /obj/item/radio/intercom{ pixel_x = 28 }, @@ -44466,8 +44373,7 @@ /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/effect/loot_jobscale/medical/medkits, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/iron/dark, /area/medical/storage) @@ -44581,7 +44487,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "lkP" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Service Hallways"; name = "service camera" }, @@ -44653,7 +44559,7 @@ /obj/structure/sign/poster/official/random{ pixel_x = 32 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Dormitories - Fore"; name = "dormitories camera" }, @@ -44962,7 +44868,7 @@ /turf/open/floor/iron, /area/quartermaster/sorting) "lpz" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Port Primary Hallway - Fore"; name = "hallway camera" }, @@ -45024,7 +44930,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /turf/open/floor/iron/techmaint, /area/bridge) @@ -45046,14 +44952,14 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "lqv" = ( -/obj/machinery/camera{ - c_tag = "Science - Toxins Launch Site"; - dir = 9; - name = "science camera" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/machinery/camera/autoname/directional/north{ + c_tag = "Xenobiology - Research Area"; + name = "xenobiology camera"; + network = list("ss13","xeno","rd") + }, /turf/open/floor/iron/grid/steel, /area/science/misc_lab) "lqz" = ( @@ -45465,7 +45371,7 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 22 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Medbay - Aft Port"; name = "medbay camera"; network = list("ss13","medbay") @@ -45590,7 +45496,7 @@ /obj/effect/turf_decal/guideline/guideline_out/blue{ dir = 8 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Port Primary Hallway - Port"; name = "hallway camera" }, @@ -46119,7 +46025,7 @@ /obj/structure/window/reinforced, /obj/machinery/door/window/southright{ dir = 8; - name = "Firing pins storage"; + name = "Firing Pins Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -46172,13 +46078,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail/destination/security/flip{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/central) "lGe" = ( @@ -46200,7 +46106,7 @@ "lGs" = ( /obj/machinery/door/poddoor/preopen{ id = "mixwindows"; - name = "Toxin Mix Chamber Blast door" + name = "Toxin Mix Chamber Blast Door" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -46242,16 +46148,13 @@ /area/science/shuttledock) "lHa" = ( /obj/machinery/light/small, -/obj/machinery/camera{ - c_tag = "Courtroom - Aft"; - dir = 5 - }, /obj/structure/sign/poster/official/obey{ pixel_y = -32 }, /obj/structure/chair/fancy/bench/pew/left{ dir = 4 }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/security/courtroom) "lHb" = ( @@ -46416,17 +46319,13 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/camera{ - c_tag = "Library - Museum"; - dir = 9; - name = "library camera" - }, /obj/structure/sign/painting/library{ pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/wood, /area/library/lounge) "lJJ" = ( @@ -46458,7 +46357,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Library - Entrance"; name = "library camera" }, @@ -46518,7 +46417,7 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Labour Shuttle airlock" + name = "Labour Shuttle Airlock" }, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -46663,11 +46562,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/camera{ - c_tag = "Arrivals Docking area - Fore"; - dir = 6; - name = "hallway camera" - }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/engine{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, @@ -46788,7 +46683,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Technology Storage - Secure"; name = "engineering camera" }, @@ -46831,8 +46726,8 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/junction/flip{ + dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -46843,18 +46738,12 @@ /turf/open/floor/carpet/grimy, /area/hallway/primary/port) "lPB" = ( -/obj/effect/turf_decal/trimline/blue/line, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "Medbay - Fore"; - dir = 9; - name = "medbay camera"; - network = list("ss13","medbay") +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/turf/open/floor/grass, +/area/hydroponics/garden) "lPL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -46929,15 +46818,6 @@ dir = 8 }, /area/ai_monitored/storage/eva) -"lRk" = ( -/obj/machinery/camera{ - c_tag = "Xenobiology - Cell 2"; - dir = 9; - name = "xenobiology camera"; - network = list("ss13","xeno","rd") - }, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) "lRo" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -46998,7 +46878,7 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "lSo" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Starboard Primary Hallway - Starboard"; name = "hallway camera" }, @@ -47450,7 +47330,7 @@ /obj/item/book/manual/wiki/security_space_law, /obj/item/radio, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Security Post - Arrivals" }, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -47497,7 +47377,7 @@ /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/syringe, /obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Security - Medbay" }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -47531,6 +47411,9 @@ "lZw" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/grass, /area/hydroponics/garden) "lZy" = ( @@ -47771,9 +47654,6 @@ /turf/open/floor/iron, /area/engine/atmos) "mcF" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -47934,7 +47814,7 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "mfv" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Science - Toxins Secure Storage"; name = "science camera"; network = list("ss13","rd") @@ -47991,7 +47871,7 @@ /obj/machinery/door/window/southright{ base_state = "left"; icon_state = "left"; - name = "Balistic Weapons storage"; + name = "Balistic Weapons Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -48031,7 +47911,7 @@ "mho" = ( /obj/machinery/door/poddoor/preopen{ id = "mixwindows"; - name = "Toxin Mix Chamber Blast door" + name = "Toxin Mix Chamber Blast Door" }, /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/engine, @@ -48068,8 +47948,7 @@ /obj/machinery/computer/security{ dir = 8 }, -/obj/machinery/camera/autoname{ - dir = 6; +/obj/machinery/camera/autoname/directional/east{ network = list("ss13","security") }, /turf/open/floor/iron/dark, @@ -48198,7 +48077,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -48317,7 +48196,7 @@ id = "medcell"; name = "Medical Cell Locker" }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Security Post - Arrivals" }, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -48493,9 +48372,7 @@ /turf/open/floor/iron/white, /area/science/lobby) "moy" = ( -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/central) "moD" = ( /obj/effect/spawner/structure/window/reinforced, @@ -49729,11 +49606,7 @@ /obj/structure/sign/poster/official/cleanliness{ pixel_x = -32 }, -/obj/machinery/camera{ - c_tag = "Hydroponics - Port"; - dir = 10; - name = "service camera" - }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/hydroponics) "mEH" = ( @@ -49908,7 +49781,7 @@ /turf/open/floor/iron/sepia, /area/engine/engineering) "mGW" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Auxiliary Restroom"; name = "restroom camera" }, @@ -50335,7 +50208,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Xenobiology - Secure Cell"; name = "xenobiology camera"; network = list("ss13","xeno","rd") @@ -50370,7 +50243,7 @@ "mNq" = ( /obj/structure/table, /obj/machinery/door/window/southleft{ - name = "Miscellaneous medical Supplies"; + name = "Miscellaneous Medical Supplies"; req_access_txt = "5" }, /obj/item/reagent_containers/spray/cleaner{ @@ -50392,7 +50265,7 @@ /turf/open/floor/iron/dark, /area/medical/storage) "mNx" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Central Primary Hallway - Central Port"; name = "hallway camera" }, @@ -51037,7 +50910,7 @@ name = "Virology Requests Console"; pixel_x = 30 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Virology - Virology Breakroom"; name = "virology camera"; network = list("ss13","medbay") @@ -51342,6 +51215,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/break_room) "nbC" = ( @@ -51508,7 +51384,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Port Primary Hallway - Mech bay"; name = "hallway camera" }, @@ -51563,7 +51439,7 @@ "neP" = ( /obj/machinery/door/poddoor/preopen{ id = "telelab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, @@ -51793,7 +51669,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Atmospherics - Distro Loop"; name = "atmospherics camera" }, @@ -51972,7 +51848,7 @@ /area/library/lounge) "njt" = ( /obj/machinery/power/tesla_coil, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Engineering - Secure Storage"; name = "engineering camera" }, @@ -51996,6 +51872,9 @@ /obj/structure/lattice/catwalk/over, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/plating, /area/security/main) "nkn" = ( @@ -52681,7 +52560,7 @@ /obj/structure/bed, /obj/item/bedsheet/medical, /obj/machinery/iv_drip, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Medbay - Recovery Room"; name = "medbay camera"; network = list("ss13","medbay") @@ -53196,7 +53075,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Courtroom - Fore" }, /obj/structure/chair/fancy/bench/pew/right{ @@ -53692,9 +53571,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, @@ -53822,7 +53698,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id = "brigsidedoorn"; - name = "Fore Security Blast door" + name = "Fore Security Blast Door" }, /obj/item/book/manual/wiki/security_space_law, /obj/item/restraints/handcuffs, @@ -53999,9 +53875,7 @@ /area/engine/atmos) "nKj" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/curtain{ - layer = 4.5 - }, +/obj/structure/curtain, /turf/open/floor/plating, /area/medical/surgery) "nKl" = ( @@ -54270,7 +54144,7 @@ /turf/open/floor/plating, /area/construction) "nPP" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Unique Commissary" }, /turf/open/floor/plating, @@ -54589,7 +54463,6 @@ "nVA" = ( /obj/machinery/telecomms/processor/preset_exploration, /obj/effect/turf_decal/stripes/closeup, -/obj/machinery/atmospherics/pipe/simple/general/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -54776,7 +54649,7 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /obj/machinery/door/poddoor/preopen{ id = "hosprivacy"; - name = "HoS Privacy Blast door" + name = "HoS Privacy Blast Door" }, /turf/open/floor/plating, /area/crew_quarters/toilet/restrooms) @@ -54880,7 +54753,7 @@ /area/bridge/meeting_room/council) "nZD" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Atmospherics - Engine Passage"; name = "atmospherics camera" }, @@ -54942,6 +54815,9 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/techmaint, /area/quartermaster/storage) "oaw" = ( @@ -55285,13 +55161,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "odz" = ( -/obj/machinery/camera{ - c_tag = "Supermatter Engine - Thermo Electric Generator"; - dir = 5; - name = "engineering camera"; +/obj/machinery/firealarm/directional/south, +/obj/machinery/camera/autoname/directional/south{ network = list("ss13","engine") }, -/obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/engine/engine_room) "odD" = ( @@ -55612,11 +55485,7 @@ /turf/open/floor/iron/techmaint, /area/quartermaster/exploration_prep) "ojt" = ( -/obj/machinery/camera{ - c_tag = "Shuttle construction area - Custom shuttle dock"; - dir = 9; - name = "hallway camera" - }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/catwalk_floor, /area/drydock) "oju" = ( @@ -55765,7 +55634,7 @@ "omg" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /obj/structure/cable/yellow{ @@ -56005,11 +55874,7 @@ /obj/structure/sign/nanotrasen{ pixel_y = 32 }, -/obj/machinery/camera{ - c_tag = "Starboard Primary Hallway - Central"; - dir = 9; - name = "hallway camera" - }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/hallway/primary/starboard) "oon" = ( @@ -56518,12 +56383,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/security/main) "ovA" = ( @@ -56552,7 +56417,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron/grid, /area/medical/virology) @@ -56648,11 +56513,6 @@ /turf/open/floor/iron/dark, /area/quartermaster/storage) "owV" = ( -/obj/machinery/camera{ - c_tag = "Fore Primary Hallway - Central"; - dir = 6; - name = "hallway camera" - }, /obj/effect/turf_decal/guideline/guideline_out_arrow_con/blue{ dir = 9 }, @@ -56662,6 +56522,7 @@ /obj/effect/turf_decal/guideline/guideline_in_arrow_con/red{ dir = 9 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/hallway/primary/fore) "owW" = ( @@ -56737,12 +56598,6 @@ /turf/open/floor/iron/grid, /area/crew_quarters/toilet/auxiliary) "oyt" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/structure/table/optable{ - name = "Robotics Operating Table" - }, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, @@ -56901,20 +56756,17 @@ /obj/item/computer_hardware/hard_drive/role/lawyer{ pixel_x = -5 }, -/obj/machinery/camera{ - c_tag = "Lawyer's Office"; - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/wood, /area/lawoffice) "oBN" = ( /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -57074,7 +56926,7 @@ /obj/structure/sign/poster/official/do_not_question{ pixel_y = -32 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Vacant Office" }, /obj/item/camera_film{ @@ -57087,7 +56939,7 @@ "oDB" = ( /obj/structure/table/wood/fancy/royalblack, /obj/item/flashlight/lamp, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Cargo - Quartermaster's Quarters"; name = "cargo camera" }, @@ -57129,7 +56981,7 @@ /obj/effect/turf_decal/guideline/guideline_mid/darkblue{ dir = 1 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Fore Primary Hallway - Security shuttle"; name = "hallway camera" }, @@ -57190,6 +57042,13 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/bridge) +"oFs" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/medical/medbay/lobby) "oFC" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -57245,7 +57104,7 @@ dir = 4 }, /obj/machinery/door/airlock/highsecurity{ - name = "radiation shelter" + name = "radiation Shelter" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -57258,7 +57117,7 @@ }, /obj/machinery/computer/rdservercontrol, /obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Science - Server Room"; name = "science camera"; network = list("ss13","rd") @@ -57598,7 +57457,7 @@ "oKv" = ( /obj/machinery/computer/objective, /obj/effect/turf_decal/delivery, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Science - Exploration Preparation"; name = "science camera"; network = list("ss13","rd") @@ -58117,7 +57976,7 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance{ - name = "Medbay central maintenance"; + name = "Medbay Central Maintenance"; req_access_txt = "5" }, /turf/open/floor/iron/techmaint, @@ -58522,7 +58381,7 @@ /obj/machinery/door/window/southright{ base_state = "left"; icon_state = "left"; - name = "Sign door"; + name = "Sign Door"; req_one_access = "25" }, /turf/open/floor/grass/no_border, @@ -58559,7 +58418,7 @@ dir = 1 }, /obj/machinery/door/airlock/maintenance{ - name = "science access"; + name = "science Access"; req_access_txt = "47" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -59374,7 +59233,7 @@ /turf/open/floor/iron, /area/vacant_room/commissary/commissary1) "pla" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Science - Research and Development"; name = "science camera"; network = list("ss13","rd") @@ -59672,15 +59531,11 @@ pixel_y = -3 }, /obj/item/clothing/head/helmet{ - layer = 3.00001; pixel_x = -3; pixel_y = 3 }, +/obj/item/clothing/head/helmet, /obj/item/clothing/head/helmet{ - layer = 3.00001 - }, -/obj/item/clothing/head/helmet{ - layer = 3.00001; pixel_x = 3; pixel_y = -3 }, @@ -59690,7 +59545,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/door/window/southright{ dir = 1; - name = "Armour storage"; + name = "Armour Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -60204,7 +60059,7 @@ /obj/effect/turf_decal/stripes/red/end, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/airlock/external/glass{ - name = "Labour Shuttle airlock"; + name = "Labour Shuttle Airlock"; req_access_txt = "63" }, /turf/open/floor/iron/techmaint, @@ -60903,6 +60758,11 @@ /obj/machinery/light_switch{ pixel_y = -24 }, +/obj/machinery/camera/autoname/directional/south{ + c_tag = "Medbay - Storage"; + name = "medbay camera"; + network = list("ss13","medbay") + }, /turf/open/floor/iron/white, /area/medical/storage) "pHy" = ( @@ -60945,10 +60805,7 @@ /area/hallway/primary/port) "pHV" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/camera{ - c_tag = "Courtroom - Backroom"; - dir = 10 - }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/lawoffice) "pHW" = ( @@ -61051,7 +60908,7 @@ "pIV" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/portable_atmospherics/pump, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Atmospherics - Pumps"; name = "atmospherics camera" }, @@ -61090,12 +60947,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Theatre"; - dir = 5; - name = "service camera" - }, /obj/machinery/firealarm/directional/south, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/wood, /area/crew_quarters/theatre) "pJl" = ( @@ -61130,10 +60983,10 @@ /turf/open/floor/catwalk_floor/iron_smooth, /area/maintenance/disposal/incinerator) "pJI" = ( -/obj/machinery/camera{ - c_tag = "Science maintenance - Starboard"; - dir = 9; - name = "science camera" +/obj/machinery/camera/autoname/directional/north{ + c_tag = "Xenobiology - Research Area"; + name = "xenobiology camera"; + network = list("ss13","xeno","rd") }, /turf/open/floor/iron/dark, /area/maintenance/department/science) @@ -61552,7 +61405,7 @@ /obj/machinery/computer/atmos_alert{ dir = 4 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Atmospherics - Desk"; name = "atmospherics camera" }, @@ -61693,7 +61546,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Engineering - Chief Engineer's Quarters"; name = "engineering camera" }, @@ -61703,9 +61556,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/binary/valve/layer2{ - layer = 2.35 - }, +/obj/machinery/atmospherics/components/binary/valve/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/techmaint, /area/maintenance/department/science) @@ -61868,7 +61719,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Arrivals - Fore Arm - Far"; name = "hallway camera" }, @@ -62111,6 +61962,11 @@ /obj/machinery/status_display/evac{ pixel_x = 32 }, +/obj/machinery/camera/autoname/directional/south{ + c_tag = "Medbay - Chief Medical Officer's Quarters"; + name = "medbay camera"; + network = list("ss13","medbay") + }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) "pYZ" = ( @@ -62416,15 +62272,11 @@ "qcu" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, -/obj/machinery/camera{ - c_tag = "Bar Backroom"; - dir = 5; - name = "service camera" - }, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/firealarm/directional/west, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "qcA" = ( @@ -62827,7 +62679,7 @@ /turf/open/floor/plating, /area/ai_monitored/storage/eva) "qhL" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Recreation - port"; name = "recreation camera" }, @@ -63242,7 +63094,7 @@ /area/construction) "qmP" = ( /obj/machinery/vending/sustenance, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Cafeteria" }, /turf/open/floor/iron/cafeteria, @@ -63584,7 +63436,7 @@ /obj/machinery/microwave{ pixel_y = 5 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Kitchen"; name = "service camera" }, @@ -63630,7 +63482,7 @@ /turf/open/floor/carpet, /area/vacant_room/office) "qsh" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Dormitories - Locker Room"; name = "dormitories camera" }, @@ -63762,7 +63614,7 @@ /turf/open/floor/iron/dark, /area/tcommsat/computer) "qtt" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Atmospherics - Mix Cell"; name = "atmospherics camera" }, @@ -63885,10 +63737,7 @@ "quf" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow, -/obj/machinery/camera{ - c_tag = "Telecomms - Server Room"; - dir = 5; - name = "telecomms camera"; +/obj/machinery/camera/autoname/directional/south{ network = list("ss13","tcomms") }, /turf/open/floor/engine{ @@ -63899,7 +63748,7 @@ "quh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Cargo Bay - Starboard"; name = "cargo camera" }, @@ -64081,7 +63930,7 @@ /turf/open/floor/catwalk_floor/iron_smooth, /area/maintenance/disposal/incinerator) "qwL" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Arrivals - Inner corridor"; name = "hallway camera" }, @@ -64185,7 +64034,7 @@ pixel_x = -28; pixel_y = 1 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Escape Shuttle Hallway - Aft Central"; name = "hallway camera" }, @@ -64331,7 +64180,9 @@ /area/storage/art) "qAE" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, /area/crew_quarters/kitchen) "qAN" = ( /obj/structure/table/reinforced, @@ -64394,7 +64245,7 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/maintenance{ desc = "It opens and closes. You have a terrible feeling about this room..."; - name = "Brig closet" + name = "Brig Closet" }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, @@ -64492,6 +64343,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/security/main) "qCb" = ( @@ -64873,10 +64727,7 @@ /area/quartermaster/qm) "qHb" = ( /obj/structure/reagent_dispensers/water_cooler, -/obj/machinery/camera{ - c_tag = "Medbay - Psychologist room"; - dir = 6; - name = "medbay camera"; +/obj/machinery/camera/autoname/directional/east{ network = list("ss13","medbay") }, /turf/open/floor/wood, @@ -65052,7 +64903,7 @@ "qJB" = ( /obj/machinery/door/poddoor/preopen{ id = "BrigForeWindows"; - name = "Fore Security Blast door" + name = "Fore Security Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -65725,7 +65576,7 @@ /obj/item/radio/intercom{ pixel_y = -28 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Science - Experimentor"; name = "science camera"; network = list("ss13","rd") @@ -66036,7 +65887,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/preopen{ id = "testlab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/engine, @@ -66654,6 +66505,9 @@ /obj/structure/lattice/catwalk/over, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/plating, /area/security/brig) "rgl" = ( @@ -66740,7 +66594,7 @@ base_state = "left"; dir = 4; icon_state = "left"; - name = "Implants storage"; + name = "Implants Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -66917,6 +66771,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/dark, /area/hallway/primary/central) "rjG" = ( @@ -67466,9 +67323,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /turf/open/floor/iron, /area/medical/break_room) "rrs" = ( @@ -67601,12 +67455,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Fore Primary Hallway - VIP lounge"; - dir = 9; - name = "hallway camera" - }, /obj/machinery/firealarm/directional/north, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/wood, /area/hallway/primary/aft) "rsJ" = ( @@ -67899,7 +67749,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ id = "rndlabext"; - name = "External research shutters" + name = "External Research Shutters" }, /turf/open/floor/iron/techmaint, /area/science/lab) @@ -67929,9 +67779,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/starboard/aft) "rxd" = ( /turf/closed/wall, @@ -68029,9 +67877,6 @@ /obj/item/storage/toolbox/emergency, /obj/item/crowbar/red, /obj/structure/rack, -/obj/machinery/light/small{ - dir = 8 - }, /obj/effect/turf_decal/bot, /turf/open/floor/iron/techmaint, /area/maintenance/solars/port) @@ -68260,7 +68105,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Science - Toxins Storage Passtrough"; name = "science camera"; network = list("ss13","rd") @@ -68302,7 +68147,7 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "rBC" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Gambling Corner"; name = "service camera" }, @@ -68348,7 +68193,7 @@ "rBT" = ( /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; - name = "biohazard containment door" + name = "biohazard Containment Door" }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/grid/steel, @@ -68460,7 +68305,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /turf/open/floor/plating, /area/security/prison/shielded) @@ -68516,7 +68361,7 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "rEf" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Medbay - Auxiliary Fore Entrance"; name = "medbay camera"; network = list("ss13","medbay") @@ -68571,12 +68416,6 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/camera{ - c_tag = "Medbay - Central Port"; - dir = 6; - name = "medbay camera"; - network = list("ss13","medbay") - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, @@ -68720,6 +68559,14 @@ }, /turf/open/floor/iron/grid/steel, /area/engine/engine_room) +"rGH" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/closeup{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/techmaint, +/area/quartermaster/storage) "rGR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/shieldwallgen, @@ -68770,7 +68617,7 @@ /area/engine/engine_room) "rHf" = ( /obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Science - Toxins Mixing Lab Burn Chamber"; name = "science camera"; network = list("ss13","rd") @@ -69131,7 +68978,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Cargo - Foyer"; name = "cargo camera" }, @@ -69305,7 +69152,7 @@ /obj/machinery/computer/cryopod{ pixel_y = 25 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Medbay - Sleepers"; name = "medbay camera"; network = list("ss13","medbay") @@ -69405,6 +69252,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/plating, /area/security/main) "rOy" = ( @@ -69780,7 +69630,7 @@ }, /obj/item/stack/sheet/plasteel/twenty, /obj/item/wrench, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Engineering - Gravity Generator Foyer"; name = "engineering camera" }, @@ -69794,7 +69644,7 @@ "rRA" = ( /obj/machinery/camera/motion{ c_tag = "AI - Upload"; - dir = 6; + dir = 4; name = "motion-sensitive ai camera"; network = list("aiupload") }, @@ -69880,7 +69730,7 @@ /turf/open/floor/iron/techmaint, /area/maintenance/department/engine) "rSU" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Chapel Office Antechamber"; name = "chapel camera" }, @@ -69939,7 +69789,7 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "rUg" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Central Primary Hallway - Courtroom Entrance"; name = "hallway camera" }, @@ -70132,17 +69982,13 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "rWE" = ( -/obj/machinery/camera{ - c_tag = "Port Primary Hallway - Cargo Office Entrance"; - dir = 9; - name = "hallway camera" - }, /obj/item/radio/intercom{ pixel_y = 24 }, /obj/effect/turf_decal/siding/white{ dir = 1 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/hallway/primary/port) "rWG" = ( @@ -70283,7 +70129,7 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_y = 32 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","security") }, /obj/structure/cable/yellow{ @@ -70396,7 +70242,7 @@ "sao" = ( /obj/machinery/door/poddoor/preopen{ id = "testlab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -70661,6 +70507,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/dark/side, /area/quartermaster/sorting) "sdo" = ( @@ -70756,18 +70605,14 @@ /turf/open/floor/iron, /area/storage/primary) "sfg" = ( -/obj/machinery/camera{ - c_tag = "Port Primary Hallway - Starboard"; - dir = 9; - name = "hallway camera" - }, /obj/machinery/status_display/ai{ pixel_y = 32 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/hallway/primary/port) "sfk" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Atmospherics - Plasma Cell"; name = "atmospherics camera" }, @@ -70805,7 +70650,7 @@ }, /area/maintenance/aft) "sfP" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Medbay - Waiting Room"; name = "medbay camera"; network = list("ss13","medbay") @@ -70926,11 +70771,7 @@ /area/hallway/primary/fore) "shn" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/camera{ - c_tag = "Port Primary Hallway - Starboard"; - dir = 6; - name = "hallway camera" - }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/hallway/primary/central) "shs" = ( @@ -71124,12 +70965,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/white/side{ dir = 8 }, @@ -71168,7 +71009,7 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "ska" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Arrivals - Lounge"; name = "lounge camera" }, @@ -71219,7 +71060,7 @@ "skP" = ( /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; - name = "biohazard containment door" + name = "biohazard Containment Door" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance_hatch{ @@ -71425,6 +71266,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/plating, /area/security/brig) "smL" = ( @@ -71777,14 +71621,10 @@ /turf/open/floor/carpet/grimy, /area/crew_quarters/locker) "ssQ" = ( -/obj/machinery/camera{ - c_tag = "Fore Primary Hallway - Port Bow"; - dir = 5; - name = "hallway camera" - }, /obj/machinery/status_display/ai{ pixel_y = -32 }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/hallway/primary/aft) "ssT" = ( @@ -71980,7 +71820,6 @@ /area/lawoffice) "svn" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, @@ -71988,6 +71827,7 @@ /obj/item/toy/plush/lizard_plushie{ name = "Eats-The-Rubbish" }, +/obj/structure/disposalpipe/sorting/unsorted, /turf/open/floor/iron/dark/side, /area/quartermaster/sorting) "svu" = ( @@ -72264,11 +72104,7 @@ /turf/open/floor/vault, /area/engine/engine_room) "syL" = ( -/obj/machinery/camera{ - c_tag = "Shuttle construction area - Security shuttle dock"; - dir = 6; - name = "hallway camera" - }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/catwalk_floor, /area/drydock/security) "syR" = ( @@ -72371,7 +72207,7 @@ name = "Interrogation Intercom"; pixel_y = 24 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Interrogation room"; network = list("interrogation") }, @@ -72714,7 +72550,7 @@ /obj/item/crowbar, /obj/item/wirecutters, /obj/item/stack/cable_coil/white, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Engineering - Gear Storage"; name = "engineering camera" }, @@ -72742,6 +72578,13 @@ }, /turf/open/floor/iron/techmaint, /area/engine/engine_room) +"sEh" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/grass, +/area/hydroponics/garden) "sEl" = ( /obj/effect/turf_decal/pool/corner{ dir = 8 @@ -72850,7 +72693,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Security Post - Science"; network = list("ss13","rd") }, @@ -72924,7 +72767,7 @@ /area/maintenance/port/central) "sGH" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering locker room"; + name = "Engineering Locker Room"; req_access_txt = "32" }, /obj/machinery/door/firedoor, @@ -72950,7 +72793,7 @@ }, /area/quartermaster/office) "sGY" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Atmospherics - Port"; name = "atmospherics camera" }, @@ -73225,7 +73068,7 @@ }, /obj/machinery/door/poddoor{ id = "hosprivacy"; - name = "HoS Privacy Blast door" + name = "HoS Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -73575,7 +73418,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Science - Central hallway"; name = "science camera"; network = list("ss13","rd") @@ -73586,13 +73429,10 @@ /turf/open/floor/iron/grid/steel, /area/science/research) "sQT" = ( -/obj/machinery/camera{ - c_tag = "Vacant Commissary #2"; - dir = 9 - }, /obj/machinery/newscaster{ pixel_y = 31 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/vacant_room/commissary/commissary2) "sRl" = ( @@ -74026,7 +73866,7 @@ /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 4 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Central Primary Hallway - Bow"; name = "hallway camera" }, @@ -74086,6 +73926,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "sWq" = ( @@ -74329,7 +74172,7 @@ /area/crew_quarters/bar) "sYZ" = ( /obj/machinery/smartfridge/extract/preloaded, -/turf/closed/wall, +/turf/open/floor/iron/grid/steel, /area/science/xenobiology) "sZm" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -74562,6 +74405,9 @@ pixel_x = 1; pixel_y = -24 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "tbP" = ( @@ -74788,7 +74634,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "corporate_privacy"; - name = "showroom shutters" + name = "showroom Shutters" }, /turf/open/floor/plating, /area/bridge/showroom/corporate) @@ -75356,7 +75202,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Science - Experimentor"; name = "science camera"; network = list("ss13","rd") @@ -75847,7 +75693,7 @@ /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/machinery/door/poddoor/preopen{ id = "BrigForeWindows"; - name = "Fore Security Blast door" + name = "Fore Security Blast Door" }, /obj/machinery/door/airlock/security/glass{ id_tag = "ForeOuterBrig"; @@ -75945,7 +75791,6 @@ /obj/structure/curtain, /obj/machinery/shower{ dir = 8; - layer = 4; name = "emergency shower"; pixel_x = -6 }, @@ -76354,7 +76199,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "brigsidedoorn"; - name = "Fore Security Blast door" + name = "Fore Security Blast Door" }, /obj/item/paper_bin, /obj/item/pen, @@ -76799,7 +76644,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Atmospherics - Atmos Storage"; name = "atmospherics camera" }, @@ -77143,7 +76988,7 @@ dir = 1 }, /obj/machinery/door/airlock/external/glass{ - name = "Labour Shuttle airlock"; + name = "Labour Shuttle Airlock"; req_access_txt = "63" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -77211,7 +77056,7 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "tNV" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Medbay - Genetics Lab"; name = "medbay camera"; network = list("ss13","medbay") @@ -77297,7 +77142,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; - name = "biohazard containment door" + name = "biohazard Containment Door" }, /obj/effect/turf_decal/stripes/closeup{ dir = 1 @@ -77370,6 +77215,7 @@ /obj/item/radio/intercom{ pixel_x = 28 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/quartermaster/storage) "tPn" = ( @@ -77502,7 +77348,7 @@ /turf/open/floor/catwalk_floor, /area/security/checkpoint/escape) "tQo" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Bridge - Dock - Aft"; name = "command camera" }, @@ -77510,7 +77356,7 @@ /turf/open/floor/iron/dark, /area/bridge) "tQu" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Port Primary Hallway - Checkpoint"; name = "hallway camera" }, @@ -77813,7 +77659,7 @@ /turf/open/floor/iron/dark, /area/bridge/showroom/corporate) "tUe" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Atmospherics - Nitrous Oxide Cell"; name = "atmospherics camera" }, @@ -78138,7 +77984,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Supermatter Engine - Backup Starboard"; name = "engineering camera"; network = list("ss13","engine") @@ -78161,6 +78007,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "tZn" = ( @@ -78181,12 +78030,12 @@ /turf/open/floor/engine, /area/science/storage) "tZF" = ( -/obj/machinery/camera{ - c_tag = "Science maintenance - Central"; - dir = 9; - name = "science camera" - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/autoname/directional/north{ + c_tag = "Xenobiology - Research Area"; + name = "xenobiology camera"; + network = list("ss13","xeno","rd") + }, /turf/open/floor/iron/dark, /area/maintenance/department/science) "tZK" = ( @@ -78370,6 +78219,18 @@ }, /turf/open/floor/iron/sepia, /area/engine/break_room) +"ucp" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/maintenance/port) "ucx" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -78680,6 +78541,9 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/security/main) "ugP" = ( @@ -78734,6 +78598,9 @@ /area/engine/supermatter) "uhJ" = ( /obj/machinery/biogenerator, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/grass, /area/hydroponics/garden) "uhU" = ( @@ -78869,7 +78736,7 @@ pixel_y = 6 }, /obj/item/pen, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Engineering - Chief Engineer's Office"; name = "engineering camera" }, @@ -78893,6 +78760,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/vault, /area/engine/engine_room) "ujx" = ( @@ -79040,14 +78910,10 @@ /obj/structure/railing/corner{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Central Primary Hallway - Starboard Aft Central"; - dir = 6; - name = "hallway camera" - }, /obj/item/radio/intercom{ pixel_x = 28 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/hallway/primary/central) "ulP" = ( @@ -79139,10 +79005,6 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/machinery/camera{ - c_tag = "Security Post - Engineering"; - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -79159,6 +79021,7 @@ pixel_x = -32; pixel_y = 37 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/security/checkpoint/engineering) "umz" = ( @@ -79242,6 +79105,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, +/obj/machinery/power/apc/auto_name/directional/north{ + areastring = "/area/engine/supermatter" + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "unR" = ( @@ -79507,7 +79376,7 @@ dir = 1 }, /obj/machinery/door/airlock/external/glass{ - name = "Labour Shuttle airlock"; + name = "Labour Shuttle Airlock"; req_access_txt = "63" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -79625,7 +79494,7 @@ /area/crew_quarters/dorms) "uta" = ( /obj/machinery/door/airlock{ - name = "Cyborg Recharging station" + name = "Cyborg Recharging Station" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -79782,7 +79651,7 @@ /turf/open/floor/vault, /area/engine/engine_room) "uuU" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Recreation - Cryo Lounge"; name = "recreation camera" }, @@ -79828,9 +79697,8 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - name = "HOS" +/obj/structure/disposalpipe/sorting/mail/destination/hos_office/flip{ + dir = 8 }, /turf/open/floor/iron, /area/hallway/primary/fore) @@ -79867,9 +79735,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -79973,12 +79838,12 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/security/main) "uwE" = ( @@ -80017,6 +79882,9 @@ /obj/effect/turf_decal/trimline/blue/corner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "uxf" = ( @@ -80939,6 +80807,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/vault, /area/engine/engine_room) "uHW" = ( @@ -81018,12 +80889,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Kitchen Hatch"; - dir = 6; - name = "service camera" - }, /obj/machinery/firealarm/directional/east, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/wood, /area/crew_quarters/bar/atrium) "uJg" = ( @@ -81199,11 +81066,7 @@ /turf/open/floor/iron, /area/engine/atmos) "uLG" = ( -/obj/machinery/camera{ - c_tag = "Port Primary Hallway - Fore"; - dir = 10; - name = "hallway camera" - }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/hallway/primary/port) "uLI" = ( @@ -81289,12 +81152,6 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "uNi" = ( -/obj/machinery/camera{ - c_tag = "Xenobiology - Aft"; - dir = 6; - name = "xenobiology camera"; - network = list("ss13","xeno","rd") - }, /obj/item/radio/intercom{ pixel_x = 28 }, @@ -81307,6 +81164,9 @@ pixel_x = 4; pixel_y = 4 }, +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","xeno","rd") + }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) "uNj" = ( @@ -81459,6 +81319,9 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/hydroponics/garden) "uPe" = ( @@ -81813,12 +81676,12 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "uUa" = ( @@ -81891,7 +81754,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "rndlabext"; - name = "External research shutters" + name = "External Research Shutters" }, /obj/machinery/door/firedoor, /obj/item/paper_bin, @@ -81925,11 +81788,7 @@ /obj/structure/noticeboard{ pixel_y = 26 }, -/obj/machinery/camera{ - c_tag = "Recreation - fore"; - dir = 9; - name = "recreation camera" - }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -81976,7 +81835,7 @@ "uWu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Science - Shuttle dock"; name = "science camera" }, @@ -82187,7 +82046,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "rndlabext"; - name = "External research shutters" + name = "External Research Shutters" }, /turf/open/floor/plating, /area/science/lab) @@ -82216,7 +82075,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Science maintenance - Port"; name = "science camera" }, @@ -82768,9 +82627,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/central) "veG" = ( /obj/structure/cable/yellow{ @@ -83005,10 +82862,8 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "vih" = ( -/obj/machinery/camera{ - c_tag = "Atmospherics - Oxygen Supply"; - dir = 5; - name = "atmospherics camera" +/obj/machinery/camera/autoname/directional/south{ + c_tag = "Atmospherics - Plasma Cell" }, /turf/open/floor/engine/o2/light, /area/engine/atmos) @@ -83211,6 +83066,7 @@ /obj/structure/sign/poster/official/bless_this_spess{ pixel_y = -32 }, +/obj/machinery/light, /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "vjV" = ( @@ -83305,7 +83161,7 @@ }, /obj/item/clothing/suit/armor/laserproof, /obj/machinery/door/window/southright{ - name = "EMP storage"; + name = "EMP Storage"; req_one_access_txt = "1;4" }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -83528,7 +83384,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","security") }, /obj/machinery/power/apc/auto_name/directional/north, @@ -83556,7 +83412,7 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "vod" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Chapel - Starboard"; name = "chapel camera" }, @@ -83691,12 +83547,8 @@ /obj/structure/sign/warning/nosmoking{ pixel_x = -28 }, -/obj/item/stack/sheet/glass/fifty{ - layer = 4 - }, -/obj/item/stack/sheet/glass/fifty{ - layer = 4 - }, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/plasteel/twenty{ pixel_x = -3; pixel_y = 3 @@ -83761,7 +83613,7 @@ /obj/effect/turf_decal/stripes/red/line, /obj/structure/cable, /obj/structure/window/plasma/reinforced, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Supermatter Chamber"; network = list("engine") }, @@ -83941,7 +83793,7 @@ /turf/open/floor/iron, /area/medical/cryo) "vrW" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Xenobiology - Kill Room"; name = "xenobiology camera"; network = list("ss13","xeno","rd") @@ -84101,7 +83953,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "AI Chamber - Antechamber"; name = "ai camera"; network = list("aichamber"); @@ -84116,6 +83968,9 @@ /obj/effect/turf_decal/guideline/guideline_mid/purple, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -84276,7 +84131,7 @@ "vuT" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /obj/structure/cable/yellow{ @@ -84453,6 +84308,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/dark, /area/hallway/primary/central) "vwj" = ( @@ -84902,7 +84760,7 @@ /area/hallway/primary/central) "vAj" = ( /obj/structure/window/reinforced, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Locker Room - Holodeck"; name = "dormitories camera" }, @@ -85331,6 +85189,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/quartermaster/storage) "vGr" = ( @@ -85956,7 +85817,9 @@ }, /obj/effect/turf_decal/trimline/blue/filled/warning, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction{ + dir = 2 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "vNM" = ( @@ -85979,14 +85842,10 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/camera{ - c_tag = "Engineering - Power Monitoring"; - dir = 9; - name = "engineering camera" - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/engine/engine_smes) "vNZ" = ( @@ -86017,9 +85876,8 @@ /obj/effect/turf_decal/trimline/purple/line{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Science - Fore hallway"; - dir = 10; +/obj/machinery/camera/autoname/directional/west{ + c_tag = "Research Division - Nanite Lab"; name = "science camera"; network = list("ss13","rd") }, @@ -86063,11 +85921,7 @@ /turf/open/floor/engine/light, /area/science/explab) "vOz" = ( -/obj/machinery/camera{ - c_tag = "Shuttle construction area - Escape Pod"; - dir = 9; - name = "hallway camera" - }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/sepia, /area/science/shuttle) "vOC" = ( @@ -86164,10 +86018,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/camera{ - c_tag = "Medbay - Back entrance"; - dir = 9; - name = "medbay camera"; +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","medbay") }, /turf/open/floor/iron/white, @@ -86250,6 +86101,7 @@ "vQm" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/turf_decal/delivery, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/engine/atmos) "vQp" = ( @@ -86307,7 +86159,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics_shutters"; - name = "robotics shutters" + name = "robotics Shutters" }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, @@ -86340,7 +86192,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "vRu" = ( -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Atmospherics - Carbon Dioxide Cell"; name = "atmospherics camera" }, @@ -86469,9 +86321,7 @@ "vSv" = ( /obj/effect/turf_decal/stripes/line, /obj/item/target/alien/anchored, -/obj/machinery/camera/preset/toxins{ - dir = 1 - }, +/obj/machinery/camera/preset/toxins, /turf/open/floor/plating/airless, /area/science/test_area) "vSE" = ( @@ -86550,7 +86400,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id = "brigsidedoor"; - name = "Front Security Blast door" + name = "Front Security Blast Door" }, /obj/machinery/door/window/brigdoor/westright{ name = "Warden's Desk"; @@ -86562,6 +86412,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/grid/steel, /area/science/mixing) "vTP" = ( @@ -86761,7 +86614,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/curtain/directional{ dir = 8 @@ -86843,15 +86696,12 @@ "vXO" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, /obj/effect/turf_decal/delivery, -/obj/machinery/camera{ - c_tag = "Telecomms - Storage room"; - dir = 9; - name = "telecomms camera"; - network = list("ss13","tcomms") - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","tcomms") + }, /turf/open/floor/iron/dark, /area/tcommsat/computer) "vXT" = ( @@ -86950,6 +86800,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/iron/grid/steel, /area/science/mixing) "vZJ" = ( @@ -87379,7 +87232,7 @@ /obj/machinery/airalarm/directional/east{ pixel_x = 22 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Central Primary Hallway - Central Fore"; name = "hallway camera" }, @@ -87563,11 +87416,6 @@ /turf/open/floor/vault, /area/engine/engine_room) "whB" = ( -/obj/machinery/camera{ - c_tag = "Arrivals Docking area - Aft"; - dir = 5; - name = "hallway camera" - }, /obj/structure/table/reinforced, /obj/item/nanite_scanner{ pixel_x = 4; @@ -87586,6 +87434,11 @@ dir = 1 }, /obj/machinery/firealarm/directional/south, +/obj/machinery/camera/autoname/directional/south{ + c_tag = "Science - Experimentor"; + name = "science camera"; + network = list("ss13","rd") + }, /turf/open/floor/iron/techmaint, /area/science/nanite) "whE" = ( @@ -88112,11 +87965,7 @@ /turf/closed/wall, /area/chapel/main) "wov" = ( -/obj/machinery/camera{ - c_tag = "Arrivals Docking area - Aft"; - dir = 5; - name = "hallway camera" - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/engine{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, @@ -88177,7 +88026,7 @@ dir = 9 }, /obj/item/kirbyplants/random, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Bridge - Dock - Fore"; name = "command camera" }, @@ -88213,7 +88062,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/button/door{ id = "QMUnloadDoor"; - layer = 4; name = "Unloading Door Toggle"; pixel_x = -24; pixel_y = 6; @@ -88221,7 +88069,6 @@ }, /obj/machinery/button/door{ id = "QMLoadingDoor"; - layer = 4; name = "Loading Door Toggle"; pixel_x = -24; pixel_y = -6; @@ -88297,7 +88144,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hos) "wqP" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Starboard Primary Hallway - Telecomm entrance"; name = "hallway camera" }, @@ -88348,7 +88195,7 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Labour Shuttle airlock" + name = "Labour Shuttle Airlock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, @@ -88399,12 +88246,10 @@ /obj/item/clothing/neck/stethoscope, /obj/item/extrapolator, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = -4; pixel_y = 8 }, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = 2 }, /turf/open/floor/iron/tiled, @@ -88613,7 +88458,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ - name = "Gambling den" + name = "Gambling Den" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/grid/steel, @@ -88634,11 +88479,7 @@ /turf/open/floor/plating, /area/maintenance/port) "wuF" = ( -/obj/machinery/camera{ - c_tag = "Arrivals - Aft Arm - Far Fore"; - dir = 10; - name = "hallway camera" - }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "wuK" = ( @@ -88953,7 +88794,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics_shutters"; - name = "robotics shutters" + name = "robotics Shutters" }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, @@ -89089,7 +88930,7 @@ /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics_shutters"; - name = "robotics shutters" + name = "robotics Shutters" }, /turf/open/floor/plating, /area/science/robotics/lab) @@ -89402,7 +89243,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Atmospherics - Maintenace access"; name = "atmospherics camera" }, @@ -89538,10 +89379,8 @@ }, /area/maintenance/starboard/aft) "wHC" = ( -/obj/machinery/camera{ - c_tag = "Atmospherics - Nitrogen Cell"; - dir = 5; - name = "atmospherics camera" +/obj/machinery/camera/autoname/directional/south{ + c_tag = "Atmospherics - Plasma Cell" }, /turf/open/floor/engine/n2/light, /area/engine/atmos) @@ -89959,19 +89798,10 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) -"wMC" = ( -/obj/machinery/light/small, -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/hallway/secondary/exit/departure_lounge) "wML" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/bot, +/obj/machinery/light/small/directional/east, /turf/open/floor/iron/techmaint, /area/maintenance/solars/port) "wMM" = ( @@ -90091,7 +89921,7 @@ dir = 8 }, /obj/item/paicard, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Bar"; name = "service camera" }, @@ -90225,6 +90055,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/engine, /area/science/mixing/chamber) "wPJ" = ( @@ -90291,7 +90124,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Cargo Bay - Aft"; name = "cargo camera" }, @@ -90393,7 +90226,7 @@ /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/desk_bell{ pixel_x = 8; @@ -90684,7 +90517,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics_shutters"; - name = "robotics shutters" + name = "robotics Shutters" }, /turf/open/floor/plating, /area/science/robotics/lab) @@ -90894,7 +90727,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; - name = "biohazard containment door" + name = "biohazard Containment Door" }, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, @@ -90906,7 +90739,7 @@ "wWH" = ( /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; - name = "biohazard containment door" + name = "biohazard Containment Door" }, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, @@ -91330,12 +91163,8 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "xbh" = ( -/obj/machinery/camera{ - c_tag = "Shuttle construction area - Fore"; - dir = 9; - name = "hallway camera" - }, /obj/machinery/firealarm/directional/north, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/sepia, /area/science/shuttle) "xbl" = ( @@ -91388,9 +91217,6 @@ /turf/open/floor/plating, /area/maintenance/aft) "xbT" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -91569,7 +91395,7 @@ pixel_x = -24 }, /obj/structure/cable/yellow, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Cargo Bay - Starboard"; name = "cargo camera" }, @@ -91614,7 +91440,7 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "xdU" = ( -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Port Primary Hallway - lounge"; name = "hallway camera" }, @@ -91661,7 +91487,7 @@ /area/crew_quarters/theatre/backstage) "xek" = ( /obj/machinery/door/airlock/maintenance/glass{ - name = "Sanitation closet"; + name = "Sanitation Closet"; req_access_txt = "47" }, /obj/machinery/door/firedoor, @@ -91903,7 +91729,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "rndlabext"; - name = "External research shutters" + name = "External Research Shutters" }, /obj/machinery/door/firedoor, /obj/structure/desk_bell{ @@ -91973,12 +91799,8 @@ "xgP" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, -/obj/machinery/camera{ - c_tag = "Locker Room - Fore"; - dir = 9; - name = "dormitories camera" - }, /obj/structure/disposalpipe/trunk, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/crew_quarters/locker) "xgX" = ( @@ -92148,7 +91970,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Chapel - Funeral Parlour"; name = "chapel camera" }, @@ -92194,7 +92016,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Cargo - Office"; name = "cargo camera" }, @@ -92436,15 +92258,12 @@ pixel_y = 30 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/camera{ - c_tag = "Custodial bay"; - dir = 9 - }, /obj/structure/closet/l3closet/janitor, /obj/item/clothing/gloves/maid, /obj/item/clothing/accessory/maidapron, /obj/item/clothing/under/costume/maid, /obj/item/grenade/clusterbuster/cleaner, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark/side{ dir = 5 }, @@ -92503,7 +92322,7 @@ /obj/effect/turf_decal/guideline/guideline_in_arrow_con/blue, /obj/effect/turf_decal/guideline/guideline_mid_arrow_con/purple, /obj/machinery/firealarm/directional/north, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Central Primary Hallway - Port"; name = "hallway camera" }, @@ -92574,7 +92393,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -92609,10 +92428,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "xnv" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/junction, /turf/open/floor/iron/dark/side{ dir = 5 }, @@ -92698,6 +92517,7 @@ dir = 4 }, /obj/machinery/firealarm/directional/east, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/hallway/primary/central) "xoU" = ( @@ -92862,7 +92682,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -93040,7 +92860,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Engineering - Shared Storage"; name = "engineering camera" }, @@ -93224,7 +93044,7 @@ name = "Cargo Checkpoint RC"; pixel_y = 30 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Security Post - Cargo" }, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -93353,7 +93173,7 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 22 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Medbay - Sleepers"; name = "medbay camera"; network = list("ss13","medbay") @@ -93512,9 +93332,7 @@ dir = 4 }, /obj/item/wirecutters, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/maintenance/port/central) "xxD" = ( /obj/effect/turf_decal/delivery, @@ -93682,7 +93500,7 @@ "xzJ" = ( /obj/effect/turf_decal/bot, /obj/structure/ore_box, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Cargo - Mining Dock"; name = "cargo camera" }, @@ -93704,6 +93522,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/engine, /area/science/mixing/chamber) "xzY" = ( @@ -93783,11 +93605,6 @@ pixel_y = 1 }, /obj/effect/turf_decal/tile/blue, -/obj/machinery/camera{ - c_tag = "Library - Port"; - dir = 10; - name = "library camera" - }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "xAA" = ( @@ -93851,11 +93668,6 @@ /turf/open/floor/carpet/red, /area/crew_quarters/bar/atrium) "xBr" = ( -/obj/machinery/camera{ - c_tag = "Central Primary Hallway - Recreation area entrance"; - dir = 6; - name = "hallway camera" - }, /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 8 }, @@ -93865,6 +93677,7 @@ /obj/effect/turf_decal/guideline/guideline_mid/purple{ dir = 4 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/hallway/primary/central) "xBu" = ( @@ -94276,7 +94089,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "BrigForeWindows"; - name = "Fore Security Blast door" + name = "Fore Security Blast Door" }, /turf/open/floor/plating, /area/security/main) @@ -94492,7 +94305,7 @@ dir = 4 }, /obj/machinery/door/airlock/external/glass{ - name = "Labour Shuttle airlock"; + name = "Labour Shuttle Airlock"; req_access_txt = "63" }, /obj/machinery/atmospherics/pipe/layer_manifold{ @@ -94535,11 +94348,7 @@ /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Atmospherics - Center"; - dir = 5; - name = "atmospherics camera" - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark/side, /area/engine/atmos) "xHi" = ( @@ -95071,7 +94880,7 @@ /area/ai_monitored/turret_protected/ai_upload) "xLY" = ( /obj/machinery/door/airlock/maintenance{ - name = "hydroponics maintenance"; + name = "hydroponics Maintenance"; req_access_txt = "35" }, /obj/effect/turf_decal/stripes/closeup, @@ -95174,15 +94983,11 @@ /turf/open/floor/iron, /area/hallway/primary/port) "xMo" = ( -/obj/machinery/camera{ - c_tag = "Locker Room - Aft"; - dir = 10; - name = "dormitories camera" - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, /obj/machinery/firealarm/directional/west, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/crew_quarters/locker) "xMs" = ( @@ -95292,7 +95097,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "Theatre - Backstage"; name = "service camera" }, @@ -95408,15 +95213,10 @@ /turf/open/floor/grass, /area/hallway/secondary/entry) "xOR" = ( -/obj/effect/spawner/structure/window/reinforced/prison, -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison blast door" - }, /obj/structure/cable/yellow{ icon_state = "0-2" }, -/turf/open/floor/plating, +/turf/open/space/basic, /area/security/prison) "xOV" = ( /obj/structure/sign/warning/vacuum/external, @@ -95763,7 +95563,7 @@ "xSF" = ( /obj/effect/spawner/randomvend/snack, /obj/effect/turf_decal/delivery, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Locker Room - Arcade"; name = "dormitories camera" }, @@ -95962,8 +95762,7 @@ dir = 1 }, /obj/machinery/airalarm/directional/south, -/obj/machinery/camera/autoname{ - dir = 5; +/obj/machinery/camera/autoname/directional/south{ network = list("ss13","prison") }, /turf/open/floor/iron/dark, @@ -96058,14 +95857,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Cargo Bay - Starboard"; - dir = 9; - name = "cargo camera" - }, /obj/item/radio/intercom{ pixel_y = 24 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/quartermaster/storage) "xWO" = ( @@ -96333,7 +96128,7 @@ "xZz" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Engineering Maintenance - Engine Entrance"; name = "engineering camera" }, @@ -96558,8 +96353,8 @@ dir = 1 }, /obj/effect/turf_decal/stripes/end, -/obj/machinery/camera/directional/south{ - c_tag = "Science - Mech Bay"; +/obj/machinery/camera/autoname/directional/west{ + c_tag = "Research Division - Nanite Lab"; name = "science camera"; network = list("ss13","rd") }, @@ -96741,7 +96536,7 @@ "yej" = ( /obj/machinery/door/poddoor/shutters{ id = "qm_warehouse"; - name = "warehouse shutters" + name = "warehouse Shutters" }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, @@ -96829,7 +96624,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /obj/machinery/door/airlock/external{ - name = "Labour Shuttle airlock" + name = "Labour Shuttle Airlock" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -97032,16 +96827,12 @@ /turf/open/floor/iron/dark, /area/quartermaster/miningdock) "yiv" = ( -/obj/machinery/camera{ - c_tag = "Library - Port"; - dir = 10; - name = "library camera" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/library) "yix" = ( @@ -97125,6 +96916,9 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/red/corner, +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","medbay") + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "yjd" = ( @@ -97312,11 +97106,7 @@ pixel_x = 24 }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, -/obj/machinery/camera{ - c_tag = "Bridge - Command center"; - dir = 6; - name = "command camera" - }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/bridge) "ykQ" = ( @@ -111709,7 +111499,7 @@ wru uMd uMd vEQ -dOX +wuF vJY loh nbR @@ -113698,7 +113488,7 @@ xmv wks ryr sSy -wMC +gYZ jhy ooz nbg @@ -115758,7 +115548,7 @@ tqu fUf uWJ vUd -fUf +sEh aoI ceB riN @@ -116014,7 +115804,7 @@ mDo bGV lZw iuQ -tqu +lPB uhJ cXA ldc @@ -116525,7 +116315,7 @@ jJY kpO tNe iba -tqu +jbB mbf tNe tNe @@ -117039,7 +116829,7 @@ jKw tkV tkV tkV -tkV +ucp tkV tkV tkV @@ -118595,7 +118385,7 @@ qcR rxd cIs aDk -ghK +ksN pFH syY mRd @@ -123696,7 +123486,7 @@ iwP pIN iwP ghQ -lPB +vJo uuW gXr ceV @@ -124230,7 +124020,7 @@ ygM ygM jUE iNC -jUE +oFs xvj xvj kXc @@ -125577,9 +125367,9 @@ cuI vFU bXE tPh -nwl +rGH ctx -xmR +bug vSe hhD xZI @@ -125836,7 +125626,7 @@ wtF wtF uCS eQT -xmR +cxk vHt xxD xZW @@ -126291,7 +126081,7 @@ iLD xXA kXx vhU -iyB +gwS vbH maD vhU @@ -126849,7 +126639,7 @@ sCI lYH xTG lMS -jbB +cpS tVa wMZ ukC @@ -127314,7 +127104,7 @@ bAU sme cEi enY -hJJ +fVb jWe ngh nDi @@ -127571,7 +127361,7 @@ frR vHr cEi xCy -dFG +pyX gyt qvn pRv @@ -127828,7 +127618,7 @@ sTY eYR cEi tpt -dFG +pyX iyB heB ocm @@ -128856,7 +128646,7 @@ vHr vHr aOt bOi -aOt +dRl vhU vhU vhU @@ -129916,7 +129706,7 @@ xed gpZ kOw oSt -oSt +fsj epZ smK rgi @@ -130173,7 +129963,7 @@ nfL lZt iPt rOQ -qpD +iyh jeQ lYr dKC @@ -130416,7 +130206,7 @@ tBw vUR wBt qsB -scg +bhT uoP tsb tct @@ -130430,8 +130220,8 @@ pNU uSv yek tPF -qqd -osQ +dFG +eRJ pXI aGq vTE @@ -130673,7 +130463,7 @@ vjy keW lhm xcP -xcP +fBC oba xJU pUn @@ -130759,11 +130549,11 @@ ylW xIO qqV siW -hGi +eTf pqX qTc xDt -isw +eTf fIT qTc xDt @@ -130930,7 +130720,7 @@ kKG lgf wdt scg -vcI +dCw wTK giZ lMd @@ -131187,7 +130977,7 @@ wBt wBt wBt cLg -vcI +dCw bjB kXy wPS @@ -131444,7 +131234,7 @@ dNT pSe knc scg -vcI +dCw wTK chH lMd @@ -133329,15 +133119,15 @@ siW mUI vrW siW -lRk +eTf fIT qTc xDt -fBC +eTf pqX qTc xDt -bez +eTf fIT qTc siW @@ -145357,7 +145147,7 @@ uxX uxX uxX uxX -uxX +hJJ uxX eMl xCg @@ -145614,7 +145404,7 @@ ebb wzX wzX wzX -wzX +hjL wzX wUL xCg diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 954dcb3ff1c8c..13fb62cb7b1bd 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1522,6 +1522,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/caution/stand_clear, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/science/xenobiology) "agA" = ( @@ -1694,7 +1695,7 @@ /area/maintenance/port) "ahI" = ( /obj/machinery/door/airlock/maintenance{ - name = "command maintenance"; + name = "command Maintenance"; req_one_access_txt = "19;63" }, /obj/structure/disposalpipe/segment, @@ -2105,9 +2106,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "ajT" = ( /obj/structure/sign/poster/contraband/random, /turf/closed/wall, @@ -2137,7 +2136,7 @@ "akb" = ( /obj/machinery/door/poddoor/preopen{ id = "transittube"; - name = "Transit Tube Blast door" + name = "Transit Tube Blast Door" }, /obj/effect/turf_decal/caution/stand_clear, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -2246,7 +2245,7 @@ /area/solar/port/fore) "akI" = ( /obj/machinery/door/airlock/maintenance/external{ - name = "exploration maintenance access"; + name = "exploration Maintenance Access"; req_one_access_txt = "49" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -2283,7 +2282,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance/external{ - name = "mass driver intersection"; + name = "mass Driver Intersection"; req_access_txt = "12" }, /obj/structure/cable/yellow{ @@ -2323,7 +2322,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /obj/machinery/door/airlock/research/glass{ - name = "exploration shuttle dock"; + name = "exploration Shuttle Dock"; req_one_access_txt = "49" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2339,7 +2338,7 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance/external{ - name = "mass driver intersection"; + name = "mass Driver Intersection"; req_access_txt = "12" }, /obj/structure/cable/yellow{ @@ -2563,7 +2562,7 @@ /area/science/xenobiology) "amh" = ( /obj/machinery/door/airlock/maintenance/external{ - name = "transit intersection"; + name = "transit Intersection"; req_access_txt = "12" }, /obj/structure/sign/warning/vacuum/external{ @@ -2654,7 +2653,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/airlock/public/glass{ - name = "visitation area" + name = "visitation Area" }, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, @@ -2742,7 +2741,7 @@ /area/maintenance/port/fore) "ank" = ( /obj/machinery/door/airlock/maintenance{ - name = "chapel maintenance"; + name = "chapel Maintenance"; req_one_access_txt = "22" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -3788,7 +3787,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "atf" = ( /obj/effect/turf_decal/bot, /obj/machinery/holopad, @@ -4039,7 +4038,7 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "auT" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/frame/machine, @@ -4480,7 +4479,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "awL" = ( /turf/closed/wall/r_wall/rust, /area/engine/break_room) @@ -5163,7 +5162,7 @@ /area/engine/engineering) "azL" = ( /obj/machinery/door/airlock/maintenance{ - name = "mech bay maintenance"; + name = "mech Bay Maintenance"; req_access_txt = "29" }, /obj/structure/disposalpipe/segment, @@ -5575,17 +5574,17 @@ /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "aBV" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "aBW" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "aCa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -5629,7 +5628,7 @@ name = "Atmospherics Blast Door" }, /turf/open/floor/plating, -/area/engine/break_room) +/area/engine/atmos) "aCj" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -5652,7 +5651,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "aCl" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/delivery, @@ -5660,7 +5659,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "aCp" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner{ @@ -5686,7 +5685,7 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "aCw" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -5695,12 +5694,12 @@ /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "aCA" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "aCB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -5805,9 +5804,20 @@ }, /area/science/robotics/mechbay) "aCU" = ( -/obj/structure/sign/plaques/atmos, -/turf/closed/wall/rust, -/area/engine/break_room) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/mixing) "aCV" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, @@ -6465,7 +6475,7 @@ c_tag = "Medbay Lobby"; name = "medical camera"; network = list("ss13","medical"); - dir = 9 + dir = 1 }, /obj/item/kirbyplants{ icon_state = "plant-08" @@ -6801,10 +6811,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "aJb" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -7114,7 +7121,7 @@ "aLC" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "Bridge Blast door" + name = "Bridge Blast Door" }, /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/iron/dark, @@ -7344,6 +7351,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/mixing) "aNp" = ( @@ -7368,6 +7378,9 @@ "aNw" = ( /obj/machinery/door/firedoor/heavy, /obj/effect/turf_decal/caution/stand_clear, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/mixing/chamber) "aNx" = ( @@ -7453,7 +7466,7 @@ /area/security/prison) "aOy" = ( /obj/machinery/door/airlock/maintenance{ - name = "bar maintenance"; + name = "bar Maintenance"; req_access_txt = "25" }, /turf/open/floor/iron/dark, @@ -7713,7 +7726,7 @@ /area/tcommsat/computer) "aRn" = ( /obj/machinery/smartfridge/chemistry/preloaded, -/turf/closed/wall, +/turf/open/floor/iron/dark, /area/medical/chemistry) "aRI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -7732,6 +7745,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/library) "aRM" = ( @@ -7828,7 +7842,7 @@ /area/hallway/primary/fore) "aSQ" = ( /obj/machinery/door/airlock/maintenance{ - name = "backstage maintenance"; + name = "backstage Maintenance"; req_access_txt = "46" }, /obj/structure/disposalpipe/segment{ @@ -7884,7 +7898,7 @@ /area/space/nearstation) "aTf" = ( /obj/machinery/door/airlock/maintenance{ - name = "crematorium maintenance"; + name = "crematorium Maintenance"; req_one_access_txt = "27" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -7904,7 +7918,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "brigfrontdoor"; - name = "Aft Security Blast door" + name = "Aft Security Blast Door" }, /turf/open/floor/iron/dark, /area/security/brig/aft) @@ -8961,7 +8975,7 @@ /area/science/xenobiology) "bbs" = ( /obj/machinery/door/airlock/maintenance/external{ - name = "mass driver intersection"; + name = "mass Driver Intersection"; req_access_txt = "12" }, /obj/structure/cable/yellow{ @@ -9141,6 +9155,9 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/dark, /area/science/mixing/chamber) "bch" = ( @@ -9712,7 +9729,7 @@ /area/maintenance/port) "bgr" = ( /obj/machinery/door/airlock/maintenance{ - name = "research lab maintenance"; + name = "research Lab Maintenance"; req_one_access_txt = "7;29" }, /obj/structure/cable/yellow{ @@ -9763,7 +9780,7 @@ /area/science/xenobiology) "bgF" = ( /obj/machinery/smartfridge/extract/preloaded, -/turf/closed/wall, +/turf/open/floor/iron/dark, /area/science/xenobiology) "bgN" = ( /obj/effect/decal/cleanable/dirt, @@ -9851,7 +9868,7 @@ /area/maintenance/central) "bhd" = ( /obj/machinery/door/airlock/maintenance{ - name = "kitchen maintenance"; + name = "kitchen Maintenance"; req_access_txt = "28" }, /obj/structure/fans/tiny/invisible, @@ -9871,7 +9888,7 @@ /area/maintenance/starboard) "bhh" = ( /obj/machinery/door/airlock/maintenance{ - name = "mining dock maintenance"; + name = "mining Dock Maintenance"; req_access_txt = "48" }, /obj/structure/cable/yellow{ @@ -9980,6 +9997,9 @@ "bhL" = ( /obj/structure/plasticflaps/opaque, /obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/dark, /area/quartermaster/sorting) "bhN" = ( @@ -10123,7 +10143,7 @@ /area/maintenance/central) "biq" = ( /obj/machinery/door/airlock/maintenance{ - name = "cargo maintenance"; + name = "cargo Maintenance"; req_one_access_txt = "31;48" }, /obj/structure/cable/yellow{ @@ -10228,9 +10248,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, +/turf/open/floor/wood, /area/library) "bjq" = ( /obj/structure/cable/yellow{ @@ -10319,9 +10337,7 @@ "bjH" = ( /obj/machinery/vending/assist, /obj/effect/turf_decal/delivery, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -10428,10 +10444,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bki" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -10468,10 +10481,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bky" = ( /mob/living/simple_animal/butterfly, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -10585,7 +10595,7 @@ /area/quartermaster/storage) "blc" = ( /obj/machinery/door/airlock/maintenance{ - name = "kitchen maintenance"; + name = "kitchen Maintenance"; req_access_txt = "28" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -10621,7 +10631,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/button/door{ id = "QMLoaddoor"; - layer = 4; name = "Off Ramp Toggle"; pixel_x = 24; pixel_y = 6; @@ -10629,7 +10638,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor2"; - layer = 4; name = "On Ramp Toggle"; pixel_x = 24; pixel_y = -6; @@ -10845,7 +10853,7 @@ /area/crew_quarters/bar/atrium) "bmA" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/iron/dark, /area/crew_quarters/kitchen) "bmF" = ( /obj/machinery/status_display/evac, @@ -10984,7 +10992,7 @@ /area/quartermaster/sorting) "bnj" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/iron, /area/hydroponics) "bnl" = ( /obj/structure/cable/yellow{ @@ -11559,7 +11567,7 @@ "bpU" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "Bridge Blast door" + name = "Bridge Blast Door" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/caution/stand_clear, @@ -11686,7 +11694,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "bqF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ @@ -11830,9 +11838,6 @@ }, /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/machinery/light{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/medical/medbay/central) "brz" = ( @@ -11915,9 +11920,7 @@ "brV" = ( /obj/machinery/suit_storage_unit/ce, /obj/effect/turf_decal/delivery, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -12902,7 +12905,7 @@ /area/chapel/main) "byi" = ( /obj/machinery/door/airlock/maintenance{ - name = "hydroponics maintenance"; + name = "hydroponics Maintenance"; req_access_txt = "35" }, /turf/open/floor/iron/dark, @@ -12953,7 +12956,7 @@ /obj/machinery/smartfridge{ name = "Sample Storage" }, -/turf/closed/wall/r_wall, +/turf/open/floor/iron/showroomfloor, /area/medical/virology) "byD" = ( /obj/effect/turf_decal/stripes/line{ @@ -13107,7 +13110,6 @@ }, /obj/machinery/door/window/westleft{ dir = 1; - layer = 3.1; name = "Cyborg Upload Console Window"; req_access_txt = "16" }, @@ -13129,7 +13131,6 @@ base_state = "right"; dir = 1; icon_state = "right"; - layer = 3.1; name = "Upload Console Window"; req_access_txt = "16" }, @@ -13874,9 +13875,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/newscaster{ pixel_y = -28 }, @@ -14568,7 +14567,7 @@ }, /obj/machinery/door/poddoor{ id = "freight_port"; - name = "Freight Bay Blast door" + name = "Freight Bay Blast Door" }, /turf/open/floor/plating, /area/quartermaster/warehouse) @@ -14807,7 +14806,7 @@ icon_state = "0-4" }, /turf/open/floor/plating, -/area/engine/break_room) +/area/engine/atmos) "bHt" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -15347,7 +15346,7 @@ /area/crew_quarters/locker) "bKz" = ( /obj/machinery/door/airlock/maintenance{ - name = "command maintenance"; + name = "command Maintenance"; req_one_access_txt = "17;19" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -15480,7 +15479,7 @@ /area/crew_quarters/fitness/recreation) "bLe" = ( /obj/machinery/door/airlock/maintenance{ - name = "cargo maintenance"; + name = "cargo Maintenance"; req_one_access_txt = "31;48" }, /obj/structure/cable/yellow{ @@ -15791,7 +15790,7 @@ /area/hallway/primary/starboard) "bNF" = ( /obj/machinery/door/airlock/maintenance{ - name = "security maintenance"; + name = "security Maintenance"; req_access_txt = "4" }, /turf/open/floor/iron/dark, @@ -15888,9 +15887,6 @@ /area/maintenance/starboard/aft) "bOl" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -15904,6 +15900,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/structure/disposalpipe/junction/flip{ + dir = 2 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "bOo" = ( @@ -15925,6 +15924,9 @@ name = "Mailroom"; req_access_txt = "50" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/quartermaster/sorting) "bOz" = ( @@ -16010,7 +16012,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Disposal Exit"; - name = "disposal exit vent" + name = "disposal Exit Vent" }, /obj/structure/sign/warning/deathsposal{ pixel_x = -32 @@ -16054,10 +16056,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bPO" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "hop"; @@ -16073,10 +16072,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bPQ" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/flora/grass/jungle, @@ -16087,10 +16083,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bPR" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/flora/ausbushes/palebush, @@ -16098,24 +16091,15 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bPT" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/flora/grass/jungle, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bPU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -16147,10 +16131,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bPY" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light{ @@ -16160,10 +16141,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bPZ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -16171,10 +16149,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bQa" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -16215,7 +16190,7 @@ /area/hallway/primary/aft) "bQl" = ( /obj/machinery/door/airlock/maintenance{ - name = "security maintenance"; + name = "security Maintenance"; req_access_txt = "12;63" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -16361,10 +16336,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bRa" = ( /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -16419,10 +16391,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/plating/airless, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bRx" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ @@ -16493,9 +16462,6 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/advanced_airlock_controller{ pixel_y = -24 }, @@ -16505,6 +16471,7 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ dir = 4 }, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "bRU" = ( @@ -16547,10 +16514,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bSe" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -16737,7 +16701,7 @@ "bTb" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "Bridge Blast door" + name = "Bridge Blast Door" }, /obj/effect/turf_decal/caution/stand_clear, /obj/structure/cable/yellow{ @@ -16870,10 +16834,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bTV" = ( /obj/effect/turf_decal/box, /obj/effect/turf_decal/stripes/line{ @@ -16885,10 +16846,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bTZ" = ( /obj/machinery/status_display/evac, /turf/closed/wall, @@ -16905,26 +16863,17 @@ "bUj" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bUn" = ( /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bUo" = ( /obj/structure/sign/warning, /turf/closed/wall, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bUp" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -16944,10 +16893,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bUv" = ( /obj/effect/turf_decal/bot, /obj/machinery/computer/station_alert, @@ -16961,7 +16907,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "bUw" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -16984,10 +16930,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bUB" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -17000,10 +16943,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bUC" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -17015,10 +16955,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bUD" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -17030,10 +16967,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bUE" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/sparsegrass, @@ -17044,10 +16978,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bUF" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -17057,10 +16988,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bUG" = ( /obj/structure/lattice/catwalk, /obj/item/stack/marker_beacon{ @@ -17080,7 +17008,6 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/light/small, /obj/machinery/advanced_airlock_controller{ pixel_y = 24 }, @@ -17090,6 +17017,7 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ dir = 4 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "bUI" = ( @@ -17117,10 +17045,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bUL" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -17138,10 +17063,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bUO" = ( /obj/effect/turf_decal/box/corners{ dir = 8 @@ -17149,10 +17071,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "bUQ" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/sand/plating, @@ -17666,7 +17585,6 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /obj/machinery/advanced_airlock_controller{ pixel_y = 24 @@ -17677,6 +17595,7 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ dir = 4 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "bYD" = ( @@ -17811,6 +17730,12 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/camera/directional/east{ + c_tag = "Xenobiology Computers"; + name = "xenobiology camera"; + network = list("ss13","rd","xeno"); + dir = 8 + }, /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) "bZO" = ( @@ -18204,7 +18129,7 @@ dir = 4 }, /obj/machinery/camera/preset/toxins{ - dir = 8 + dir = 4 }, /turf/open/floor/engine/vacuum, /area/science/test_area) @@ -18502,9 +18427,7 @@ }, /obj/item/bedsheet/brown, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "cdS" = ( /obj/structure/sign/warning/securearea, /obj/item/multitool, @@ -18631,7 +18554,6 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - layer = 4.1; name = "Secondary AI Core Access"; obj_integrity = 300; pixel_x = 4; @@ -18686,7 +18608,6 @@ base_state = "leftsecure"; dir = 8; icon_state = "leftsecure"; - layer = 4.1; name = "Tertiary AI Core Access"; obj_integrity = 300; pixel_x = -3; @@ -18726,9 +18647,7 @@ }, /obj/effect/landmark/prisonspawn, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "cev" = ( /obj/structure/transit_tube/diagonal/topleft, /obj/structure/lattice, @@ -19088,9 +19007,7 @@ }, /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 }, @@ -19314,7 +19231,7 @@ /area/maintenance/aft) "cgD" = ( /obj/machinery/door/airlock/maintenance{ - name = "e.v.a. maintenance"; + name = "e.v.a. Maintenance"; req_access_txt = "18" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -19666,10 +19583,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "cid" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -20339,10 +20253,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "cln" = ( /obj/machinery/camera/directional/west{ c_tag = "Atmospherics Tank - Plasma"; @@ -20653,7 +20564,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "cmQ" = ( /obj/machinery/door/poddoor/preopen{ id = "gravity"; @@ -20697,7 +20608,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "cmY" = ( /obj/machinery/power/smes, /obj/effect/turf_decal/bot, @@ -20741,7 +20652,7 @@ /area/security/prison) "cnk" = ( /obj/machinery/door/airlock/maintenance{ - name = "supermatter maintenance"; + name = "supermatter Maintenance"; req_one_access_txt = "10" }, /obj/structure/cable/yellow{ @@ -20854,7 +20765,7 @@ /area/maintenance/solars/port/aft) "coh" = ( /obj/machinery/door/airlock/maintenance{ - name = "atmospherics maintenance"; + name = "atmospherics Maintenance"; req_access_txt = "24" }, /obj/structure/disposalpipe/segment, @@ -21052,10 +20963,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "cpb" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, @@ -21070,7 +20978,7 @@ }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/engine/break_room) +/area/engine/atmos) "cpx" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment, @@ -21120,6 +21028,9 @@ /obj/machinery/newscaster{ pixel_y = 32 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/freezer, /area/medical/virology) "cpI" = ( @@ -21269,9 +21180,7 @@ /turf/open/floor/iron/dark, /area/maintenance/disposal) "cqw" = ( -/obj/structure/sign/warning/deathsposal{ - layer = 4 - }, +/obj/structure/sign/warning/deathsposal, /turf/closed/wall, /area/science/xenobiology) "cqx" = ( @@ -21297,7 +21206,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "cqN" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ @@ -21489,10 +21398,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "crH" = ( /obj/machinery/mech_bay_recharge_port, /obj/effect/turf_decal/stripes/corner{ @@ -21517,10 +21423,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "crK" = ( /obj/effect/turf_decal/box/corners{ dir = 1 @@ -21528,10 +21431,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "crP" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -21543,7 +21443,7 @@ /obj/item/analyzer, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "crX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -21821,10 +21721,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "ctA" = ( /turf/closed/wall/rust, /area/maintenance/solars/port/fore) @@ -21905,10 +21802,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "ctV" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -21933,10 +21827,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "cua" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -22048,9 +21939,7 @@ pixel_x = 6; pixel_y = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -22069,8 +21958,7 @@ /obj/effect/spawner/randomarcade, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -22100,10 +21988,7 @@ /turf/open/floor/plating/asteroid/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "cuS" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -22408,7 +22293,7 @@ "cvP" = ( /obj/machinery/door/poddoor{ id = "trash"; - name = "disposal bay door" + name = "disposal Bay Door" }, /obj/structure/fans/tiny, /turf/open/floor/iron/dark, @@ -22637,10 +22522,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "cwv" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -23265,6 +23147,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/engine, /area/engine/engineering) "czt" = ( @@ -24247,7 +24132,7 @@ }, /obj/machinery/door/poddoor{ id = "freight_port"; - name = "Freight Bay Blast door" + name = "Freight Bay Blast Door" }, /turf/open/floor/plating, /area/quartermaster/warehouse) @@ -24421,7 +24306,7 @@ }, /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "47"; - name = "science aft maintenance access" + name = "science Aft Maintenance Access" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -24611,7 +24496,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "brigfrontdoor"; - name = "Front Security Blast door" + name = "Front Security Blast Door" }, /turf/open/floor/iron/dark, /area/security/prison) @@ -24947,7 +24832,7 @@ /area/chapel/main) "cHl" = ( /obj/machinery/door/airlock/maintenance{ - name = "chapel maintenance"; + name = "chapel Maintenance"; req_one_access_txt = "22" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -25486,9 +25371,7 @@ /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "cJh" = ( -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4; color = "#439C1E" @@ -26089,6 +25972,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/power/apc/auto_name/directional/north{ + areastring = "/area/engine/supermatter" + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/engine, /area/engine/engineering) "cMr" = ( @@ -26554,7 +26443,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "Bridge Blast door" + name = "Bridge Blast Door" }, /obj/structure/cable/yellow, /obj/structure/cable/yellow{ @@ -26566,7 +26455,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "Bridge Blast door" + name = "Bridge Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -28075,21 +27964,6 @@ burnt = 1 }, /area/maintenance/port/aft) -"djE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/xenobiology) "dkc" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ color = "#439C1E" @@ -28777,6 +28651,7 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) "dxm" = ( @@ -29233,9 +29108,6 @@ pixel_y = 6 }, /obj/structure/table, -/obj/machinery/camera/autoname{ - dir = 10 - }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, @@ -29480,11 +29352,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) -"dIW" = ( -/turf/closed/wall/r_wall, -/area/security/prison{ - name = "Prison Dorms" - }) "dJh" = ( /obj/effect/turf_decal/tile/dark/half{ dir = 1 @@ -29548,7 +29415,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/public/glass{ - name = "visitation area" + name = "visitation Area" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -30181,9 +30048,7 @@ }, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/machinery/space_heater, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/light, /turf/open/floor/iron/dark, /area/security/execution/education) @@ -30222,10 +30087,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "dWK" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -30480,7 +30342,7 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/maintenance{ desc = "It opens and closes. You have a terrible feeling about this room..."; - name = "Brig closet" + name = "Brig Closet" }, /turf/open/floor/iron/dark, /area/security/brig) @@ -30632,7 +30494,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /turf/open/floor/plating, /area/security/prison) @@ -30770,9 +30632,7 @@ }, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/freezer, -/area/security/prison{ - name = "Prison Toilet" - }) +/area/security/prison) "eeb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -31359,9 +31219,7 @@ /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/freezer, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "emQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -31636,9 +31494,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/security/prison) "erN" = ( @@ -32169,11 +32025,6 @@ pixel_x = 24; pixel_y = 24 }, -/obj/machinery/camera/directional/south{ - c_tag = "AI Chamber Core"; - name = "core camera"; - network = list("aicore") - }, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) "eAT" = ( @@ -32284,7 +32135,7 @@ /area/maintenance/starboard) "eDV" = ( /obj/machinery/smartfridge/chemistry/virology/preloaded, -/turf/closed/wall, +/turf/open/floor/iron/showroomfloor, /area/medical/virology) "eEe" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -32624,6 +32475,7 @@ /obj/structure/sign/departments/minsky/medical/virology/virology1{ pixel_x = 30 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "eKm" = ( @@ -32988,6 +32840,9 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/showroomfloor, /area/science/mixing) "eQm" = ( @@ -33359,9 +33214,7 @@ dir = 1 }, /obj/structure/table, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/bridge) @@ -33486,6 +33339,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/iron, /area/hallway/primary/fore) "fas" = ( @@ -33534,9 +33390,7 @@ "fcg" = ( /obj/machinery/suit_storage_unit/atmos, /obj/effect/turf_decal/delivery, -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /obj/machinery/light{ dir = 1 }, @@ -33995,9 +33849,7 @@ pixel_y = 5 }, /obj/item/storage/lockbox/medal, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -34134,7 +33986,7 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance/external{ - name = "construction zone"; + name = "construction Zone"; req_access_txt = "32;47;48;37" }, /turf/open/floor/iron/dark, @@ -34230,9 +34082,7 @@ name = "science camera"; network = list("ss13","rd") }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, /area/science/lab) "flU" = ( @@ -34383,6 +34233,9 @@ color = "#439C1E" }, /obj/machinery/vending/medical, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/freezer, /area/medical/virology) "foR" = ( @@ -34391,9 +34244,7 @@ /obj/item/aiModule/reset, /obj/item/assembly/flash/handheld, /obj/item/assembly/flash/handheld, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -34853,9 +34704,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/effect/turf_decal/tile/yellow, +/obj/structure/disposalpipe/sorting/unsorted/flip{ + dir = 2 + }, /turf/open/floor/iron, /area/hallway/primary/starboard) "fwE" = ( @@ -34922,7 +34775,7 @@ "fya" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /obj/structure/cable/yellow{ @@ -35097,6 +34950,9 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/showroomfloor, /area/science/mixing) "fAx" = ( @@ -35107,9 +34963,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "fAI" = ( -/obj/machinery/chem_dispenser{ - layer = 2.7 - }, +/obj/machinery/chem_dispenser, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/medical/chemistry) @@ -35203,8 +35057,7 @@ /area/maintenance/port/fore) "fCh" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /obj/item/radio/intercom{ freerange = 1; @@ -35352,6 +35205,9 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/showroomfloor, /area/science/mixing) "fFb" = ( @@ -35481,14 +35337,13 @@ /obj/machinery/vending/wallmed/lite{ pixel_y = 26 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/showroomfloor, /area/security/main) "fGT" = ( /obj/machinery/vendor/mining, /obj/effect/turf_decal/bot, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/status_display/supply{ pixel_y = -32 }, @@ -35835,9 +35690,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "fMC" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -36026,10 +35879,8 @@ }, /obj/effect/decal/cleanable/blood/old, /obj/effect/landmark/xeno_spawn, -/obj/machinery/light/small{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, /turf/open/floor/plating{ broken = 1 }, @@ -36168,9 +36019,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/camera/directional/east{ c_tag = "Cargo Ramps"; name = "cargo camera"; @@ -36192,6 +36041,10 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/floor/iron/showroomfloor, /area/science/mixing) "fRS" = ( @@ -36336,8 +36189,7 @@ "fUL" = ( /obj/structure/table, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/light, /obj/machinery/reagentgrinder{ @@ -36458,9 +36310,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/maintenance/port/aft) "fWQ" = ( @@ -36528,15 +36378,11 @@ "fXw" = ( /obj/structure/sign/poster/official/work_for_a_future, /turf/closed/wall/r_wall, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "fXx" = ( /obj/machinery/vending/tool, /obj/effect/turf_decal/bot, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -36555,6 +36401,12 @@ dir = 4; pixel_x = 11 }, +/obj/machinery/camera{ + c_tag = "Recovery Room"; + name = "cloning camera"; + network = list("ss13","medical"); + dir = 4 + }, /turf/open/floor/iron/showroomfloor, /area/medical/genetics/cloning) "fYn" = ( @@ -36671,10 +36523,7 @@ /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "fZO" = ( /obj/machinery/power/apc{ areastring = "/area/science/research"; @@ -36861,7 +36710,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "gcE" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -37189,9 +37038,7 @@ "gjM" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/bombcloset, -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -37347,7 +37194,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /turf/open/floor/plating, /area/security/prison) @@ -37574,7 +37421,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "gqA" = ( /obj/structure/chair/fancy/bench/right{ dir = 8 @@ -37672,7 +37519,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/poddoor/shutters{ id = "explorerstorage"; - name = "Exploration storage shutter" + name = "Exploration Storage Shutter" }, /turf/open/floor/iron, /area/quartermaster/exploration_dock) @@ -37914,7 +37761,6 @@ /area/maintenance/starboard/aft) "gxd" = ( /obj/machinery/power/apc{ - areastring = "/area/hallway/primary/port"; dir = 8; name = "Cryopod Room APC"; pixel_x = -24 @@ -38070,7 +37916,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -38279,9 +38125,7 @@ /obj/structure/table, /obj/item/storage/briefcase, /obj/item/book/manual/wiki/security_space_law, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -38410,7 +38254,7 @@ "gJj" = ( /obj/machinery/door/poddoor/preopen{ id = "transittube"; - name = "Transit Tube Blast door" + name = "Transit Tube Blast Door" }, /obj/effect/turf_decal/caution/stand_clear, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -38544,9 +38388,7 @@ "gLj" = ( /obj/item/kirbyplants/random, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "gLn" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -39090,7 +38932,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "gUs" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -39155,9 +38997,7 @@ pixel_x = -32 }, /turf/open/floor/noslip/white, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "gVy" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -39371,9 +39211,7 @@ "gZW" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -39627,10 +39465,7 @@ }, /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/plating/airless, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "heK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 5 @@ -40259,9 +40094,7 @@ "hpy" = ( /obj/effect/spawner/randomvend/snack, /obj/effect/turf_decal/bot, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -40671,16 +40504,15 @@ /turf/open/floor/iron, /area/hallway/primary/central) "hvl" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/turf_decal/caution, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/showroomfloor, -/area/science/explab) +/area/science/shuttledock) "hwo" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -40947,9 +40779,7 @@ name = "Cell 1" }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "hzJ" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/machinery/door/firedoor, @@ -41040,7 +40870,6 @@ }, /area/ai_monitored/turret_protected/aisat_interior) "hBS" = ( -/obj/machinery/vending/games, /obj/effect/turf_decal/bot_white, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/item/radio/intercom{ @@ -41050,6 +40879,10 @@ pixel_y = 32 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/library) "hBV" = ( @@ -41666,7 +41499,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "hKw" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; @@ -41856,7 +41689,7 @@ "hNj" = ( /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "47"; - name = "science aft maintenance access" + name = "science Aft Maintenance Access" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -42067,6 +41900,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "hSc" = ( @@ -42380,6 +42216,10 @@ }, /turf/open/floor/iron/dark, /area/science/aft) +"hWT" = ( +/obj/machinery/smartfridge/chemistry/preloaded, +/turf/open/floor/iron/showroomfloor, +/area/medical/chemistry) "hWU" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -42442,12 +42282,10 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "hYi" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/effect/turf_decal/siding/wood/end, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/wood{ broken = 1 }, @@ -42479,9 +42317,6 @@ /area/science/research) "hYV" = ( /obj/structure/table, -/obj/machinery/light{ - dir = 8 - }, /obj/item/clipboard, /obj/item/airlock_painter{ pixel_x = -4; @@ -42516,9 +42351,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/security/prison) "hZo" = ( @@ -43077,6 +42910,9 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/showroomfloor, /area/science/research) "ikV" = ( @@ -43244,9 +43080,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 9 - }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, @@ -43517,6 +43350,10 @@ dir = 4; color = "#439C1E" }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/disposaloutlet, /turf/open/floor/iron/freezer, /area/medical/virology) "iuE" = ( @@ -43627,9 +43464,6 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, @@ -43673,7 +43507,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "iyn" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -43701,12 +43535,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron/dark, /area/medical/medbay/lobby) "iyU" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /obj/item/kirbyplants/random, /obj/machinery/camera/directional/north{ @@ -43833,9 +43669,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar) "iAD" = ( -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /obj/machinery/holopad, /obj/effect/turf_decal/bot, /turf/open/floor/wood, @@ -44112,9 +43946,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -44307,7 +44139,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "iGO" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/asteroid/airless, @@ -44399,9 +44231,7 @@ }, /obj/effect/landmark/prisonspawn, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "iIt" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/neutral{ @@ -44498,6 +44328,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/lobby) "iJy" = ( @@ -44584,6 +44417,10 @@ }, /turf/open/floor/iron/freezer, /area/medical/virology) +"iKB" = ( +/obj/machinery/smartfridge, +/turf/open/floor/iron/showroomfloor, +/area/crew_quarters/kitchen) "iKN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -45351,9 +45188,7 @@ /obj/structure/table/wood, /obj/item/clothing/neck/tie/red, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "iXy" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -45481,9 +45316,6 @@ /obj/effect/turf_decal/delivery, /obj/structure/ore_box, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/advanced_airlock_controller{ dir = 8; pixel_x = -24 @@ -45491,6 +45323,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/quartermaster/miningoffice) "jaO" = ( @@ -45813,6 +45646,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron, /area/hallway/primary/fore) "jfz" = ( @@ -46462,7 +46298,6 @@ dir = 8 }, /obj/item/taperecorder{ - layer = 2.9; pixel_y = -15 }, /obj/item/flashlight/lamp{ @@ -46689,9 +46524,7 @@ dir = 1 }, /turf/open/floor/iron/freezer, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "jse" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -47378,9 +47211,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -47940,10 +47770,9 @@ "jKY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ - name = "prison processing"; + name = "prison Processing"; req_access_txt = "2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -48107,11 +47936,6 @@ dir = 4; pixel_x = 11 }, -/obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Computers"; - name = "xenobiology camera"; - network = list("ss13","rd","xeno") - }, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -48284,7 +48108,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/poddoor/shutters{ id = "explorerstorage"; - name = "Exploration storage shutter" + name = "Exploration Storage Shutter" }, /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, @@ -48324,7 +48148,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "jSv" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -48583,7 +48407,7 @@ "jWg" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ @@ -48603,6 +48427,9 @@ /obj/structure/desk_bell{ pixel_x = -8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/medical/virology) "jWl" = ( @@ -49052,7 +48879,7 @@ dir = 4 }, /obj/machinery/camera/autoname{ - dir = 10 + dir = 8 }, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -49080,7 +48907,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "kcV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -49307,11 +49134,9 @@ "kiE" = ( /obj/machinery/door/poddoor/preopen{ id = "transittube"; - name = "Transit Tube Blast door" - }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 + name = "Transit Tube Blast Door" }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/caution/stand_clear, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, @@ -50136,7 +49961,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "kvl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -50471,9 +50296,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/plating, /area/maintenance/port/aft) "kBa" = ( @@ -50592,7 +50415,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "kCW" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -50699,7 +50522,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light/small, /obj/structure/cable{ icon_state = "4-8" }, @@ -50712,6 +50534,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/plating{ broken = 1 }, @@ -50827,7 +50650,7 @@ "kGN" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -51135,10 +50958,6 @@ }, /obj/structure/table/optable, /obj/effect/turf_decal/bot, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13", "security") - }, /obj/item/radio/intercom{ pixel_y = -25 }, @@ -51902,6 +51721,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/yellow, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "lda" = ( @@ -51935,6 +51757,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/wood, /area/library) "ldu" = ( @@ -52137,7 +51962,7 @@ /area/hallway/primary/aft) "lfu" = ( /obj/machinery/door/airlock/maintenance{ - name = "brig maintenance"; + name = "brig Maintenance"; req_one_access_txt = "63" }, /obj/structure/sign/directions/evac{ @@ -52176,7 +52001,7 @@ /obj/effect/turf_decal/caution/stand_clear, /obj/machinery/door/poddoor/preopen{ id = "brigfrontdoor"; - name = "Aft Security Blast door" + name = "Aft Security Blast Door" }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -52238,7 +52063,7 @@ /area/maintenance/starboard/aft) "lgC" = ( /obj/machinery/door/airlock/maintenance{ - name = "bar maintenance"; + name = "bar Maintenance"; req_access_txt = "25" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -52414,7 +52239,6 @@ }, /area/maintenance/port/aft) "lig" = ( -/obj/machinery/light/small, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -52650,7 +52474,7 @@ }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "llX" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -53088,9 +52912,7 @@ /area/hallway/secondary/exit/departure_lounge) "lte" = ( /obj/item/bedsheet/medical, -/obj/structure/curtain{ - layer = 4.5 - }, +/obj/structure/curtain, /obj/structure/bed, /obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ dir = 4 @@ -53524,7 +53346,6 @@ "lAr" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, /obj/machinery/portable_atmospherics/canister/air, /obj/item/wrench, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -53745,9 +53566,7 @@ /area/hallway/primary/port) "lDt" = ( /turf/closed/wall, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "lDu" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -54000,7 +53819,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "lHq" = ( /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) @@ -54175,7 +53994,7 @@ }, /obj/machinery/door/window/brigdoor/eastright{ req_one_access_txt = "1"; - name = "evidence access" + name = "evidence Access" }, /obj/structure/window/reinforced{ dir = 1 @@ -54206,9 +54025,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/corner, -/obj/structure/extinguisher_cabinet{ - pixel_x = -26 - }, /turf/open/floor/iron, /area/security/main) "lLA" = ( @@ -54721,9 +54537,7 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "lUB" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -54752,9 +54566,7 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/sign/warning/vacuum{ pixel_y = -32 }, @@ -55067,9 +54879,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/thermomachine/freezer, /obj/effect/turf_decal/tile/dark/opposingcorners, -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/medical/cryo) "lZN" = ( @@ -55389,9 +55199,7 @@ /area/engine/atmos) "meO" = ( /obj/item/bedsheet/medical, -/obj/structure/curtain{ - layer = 4.5 - }, +/obj/structure/curtain, /obj/structure/bed, /obj/effect/turf_decal/tile/dark_green/anticorner/contrasted, /obj/machinery/airalarm/directional/east, @@ -55499,6 +55307,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron, /area/security/brig/aft) "mgy" = ( @@ -55631,10 +55442,7 @@ /area/crew_quarters/fitness/recreation) "mjb" = ( /turf/closed/mineral/random/labormineral, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "mjt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -55802,7 +55610,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, @@ -55854,9 +55661,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/bar) "mmJ" = ( -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/security/prison) "mmK" = ( @@ -56048,9 +55853,7 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "mqm" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -56273,6 +56076,12 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/machinery/camera{ + c_tag = "Cloning Lab"; + name = "medical camera"; + network = list("ss13","medical"); + dir = 1 + }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "mve" = ( @@ -56647,7 +56456,7 @@ /area/hallway/primary/port) "mCT" = ( /obj/machinery/door/airlock/maintenance{ - name = "genetics maintenance"; + name = "genetics Maintenance"; req_access_txt = "9" }, /obj/structure/disposalpipe/segment{ @@ -57679,7 +57488,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "mUy" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/stripes/corner{ @@ -58397,6 +58206,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/iron, /area/engine/break_room) "nkb" = ( @@ -58444,7 +58256,7 @@ "nkG" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -58652,6 +58464,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/dark, /area/quartermaster/sorting) "noJ" = ( @@ -58773,9 +58588,7 @@ "ntf" = ( /obj/machinery/suit_storage_unit/engine, /obj/effect/turf_decal/delivery, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -59065,7 +58878,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "nyN" = ( /obj/machinery/modular_computer/console/preset/command, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -59206,9 +59019,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "nAC" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/camera/directional/east{ c_tag = "Aft Hallway Transfer Centre Doors"; name = "aft camera" @@ -59295,9 +59106,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1; color = "#439C1E" @@ -59382,6 +59190,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "nDY" = ( @@ -59634,7 +59443,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "nIt" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -59688,9 +59497,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/engine, /area/engine/engineering) "nJh" = ( @@ -59730,11 +59537,6 @@ }, /turf/open/floor/iron/dark, /area/storage/tech) -"nJB" = ( -/turf/closed/wall, -/area/security/prison{ - name = "Prison Dorms" - }) "nJS" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -60034,9 +59836,7 @@ pixel_y = 24; specialfunctions = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/landmark/start/assistant, /obj/item/bedsheet/dorms, /obj/effect/turf_decal/siding/wood{ @@ -60104,9 +59904,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "nPe" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -60213,6 +60011,9 @@ }, /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/landmark/event_spawn, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "nQH" = ( @@ -60223,10 +60024,7 @@ /obj/structure/closet{ name = "Evidence Closet" }, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13", "security") - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/security/brig/aft) "nQJ" = ( @@ -60772,7 +60570,7 @@ }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "nYS" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -60979,6 +60777,9 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) "oaY" = ( @@ -61189,6 +60990,9 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/showroomfloor, /area/science/mixing/chamber) "oev" = ( @@ -61363,11 +61167,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"ogW" = ( -/turf/closed/wall/r_wall, -/area/security/prison{ - name = "Prison Toilet" - }) "ohH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -61654,9 +61453,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/freezer, -/area/security/prison{ - name = "Prison Toilet" - }) +/area/security/prison) "omL" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -61920,10 +61717,6 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/vacant_room/commissary) -"orr" = ( -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/security/prison) "orv" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -62224,15 +62017,16 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/freezer, /area/medical/virology) "ovF" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat/atmos) @@ -62713,9 +62507,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -63003,9 +62794,7 @@ }, /obj/item/bedsheet/dorms, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "oJl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -63428,12 +63217,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Cloning Lab"; - name = "medical camera"; - network = list("ss13","medical"); - dir = 9 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = 24 @@ -63464,7 +63247,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/machinery/door/airlock/virology{ name = "Virology Lab"; @@ -63820,7 +63603,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "oYK" = ( /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/airless, @@ -63871,7 +63654,7 @@ /area/maintenance/port/aft) "oZp" = ( /obj/machinery/camera/autoname{ - dir = 9 + dir = 1 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -64739,6 +64522,9 @@ /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "plS" = ( @@ -64938,9 +64724,7 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/noslip/white, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "poY" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -65573,7 +65357,6 @@ /turf/open/floor/iron/showroomfloor, /area/science/shuttledock) "pyh" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, @@ -65582,6 +65365,9 @@ }, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/stripes/corner, +/obj/structure/disposalpipe/sorting/mail/destination/virology/flip{ + dir = 1 + }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "pyo" = ( @@ -65690,6 +65476,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/showroomfloor, /area/science/mixing) "pzN" = ( @@ -65889,11 +65678,6 @@ }, /turf/open/floor/plating/asteroid/airless, /area/space/nearstation) -"pCT" = ( -/turf/closed/wall/r_wall, -/area/security/prison{ - name = "Prison Garden" - }) "pCU" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -66139,9 +65923,7 @@ /obj/item/kirbyplants{ icon_state = "plant-08" }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, @@ -66194,6 +65976,9 @@ }, /obj/structure/closet/l3closet/virology, /obj/machinery/firealarm/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/freezer, /area/medical/virology) "pIA" = ( @@ -67036,7 +66821,7 @@ /obj/machinery/door/airlock/security{ aiControlDisabled = 1; id_tag = "prisonereducation"; - name = "Prison access"; + name = "Prison Access"; req_access_txt = "2" }, /obj/machinery/door/firedoor, @@ -67056,9 +66841,7 @@ "pYQ" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/firealarm/directional/south, /obj/machinery/camera/directional/east{ c_tag = "Transferring Centre" @@ -67336,7 +67119,7 @@ /area/security/brig/aft) "qcN" = ( /obj/machinery/door/airlock/maintenance{ - name = "hydroponics maintenance"; + name = "hydroponics Maintenance"; req_access_txt = "35" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -67497,9 +67280,7 @@ /turf/open/floor/iron/dark, /area/teleporter) "qgc" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -68783,6 +68564,10 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron, /area/security/brig/aft) "qEy" = ( @@ -68904,9 +68689,7 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "qGE" = ( -/obj/structure/railing{ - layer = 20 - }, +/obj/structure/railing, /obj/structure/flora/junglebush/large, /turf/open/floor/grass, /area/medical/medbay/central) @@ -69116,7 +68899,6 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/checkpoint/medical) "qKk" = ( @@ -69395,9 +69177,7 @@ /obj/machinery/status_display/evac{ pixel_x = 32 }, -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, @@ -69465,7 +69245,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "Space Blast door" + name = "Space Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -69527,7 +69307,7 @@ /area/science/aft) "qSN" = ( /obj/machinery/door/airlock/maintenance/external{ - name = "construction zone"; + name = "construction Zone"; req_access_txt = "32;47;48;37" }, /obj/effect/turf_decal/stripes/line{ @@ -69871,9 +69651,7 @@ "raf" = ( /obj/machinery/computer/message_monitor, /obj/effect/turf_decal/bot, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -70340,7 +70118,6 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "rfR" = ( -/obj/machinery/disposal/bin, /obj/effect/turf_decal/bot_white, /obj/machinery/light{ dir = 4 @@ -70350,13 +70127,11 @@ name = "Bar APC"; pixel_y = -24 }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/structure/cable/yellow, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +/obj/machinery/vending/games, /turf/open/floor/iron/dark, /area/crew_quarters/bar) "rfT" = ( @@ -70441,9 +70216,7 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/cable{ icon_state = "0-8" }, @@ -70605,9 +70378,7 @@ dir = 4 }, /turf/open/floor/iron/freezer, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "rjg" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -70953,7 +70724,7 @@ }, /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "rnH" = ( /obj/structure/table, /obj/machinery/light{ @@ -71411,6 +71182,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/dark, /area/science/mixing) "rvh" = ( @@ -71742,6 +71516,9 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/showroomfloor, /area/science/research) "rCB" = ( @@ -71828,7 +71605,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "Space Blast door" + name = "Space Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -71892,6 +71669,9 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 1 }, +/obj/machinery/camera/autoname{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, /area/science/explab) "rHR" = ( @@ -72025,7 +71805,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/camera/autoname{ - dir = 10 + dir = 8 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -72122,9 +71902,7 @@ }, /obj/item/soap/nanotrasen, /turf/open/floor/noslip/white, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "rLs" = ( /obj/effect/turf_decal/bot_white, /obj/machinery/holopad, @@ -72163,6 +71941,7 @@ /obj/effect/turf_decal/tile/green{ dir = 1 }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/quartermaster/exploration_dock) "rME" = ( @@ -72295,7 +72074,7 @@ /area/science/xenobiology) "rOd" = ( /obj/machinery/door/airlock/security{ - name = "EVA room"; + name = "EVA Room"; req_access_txt = "1" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -72320,9 +72099,7 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/exit/departure_lounge) "rOB" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -72366,6 +72143,11 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/camera{ + c_tag = "Recovery Room"; + name = "geneticscamera"; + network = list("ss13","medical") + }, /turf/open/floor/iron/showroomfloor, /area/medical/genetics) "rPz" = ( @@ -72628,6 +72410,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/yellow, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "rTA" = ( @@ -72692,6 +72477,7 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) "rUM" = ( @@ -72826,7 +72612,7 @@ "rWi" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /obj/structure/cable/yellow{ @@ -73549,9 +73335,7 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/table, /obj/item/stock_parts/cell/high, @@ -73985,6 +73769,7 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/machinery/camera/autoname, /turf/open/floor/iron/showroomfloor, /area/science/shuttledock) "srP" = ( @@ -74002,7 +73787,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "ssj" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, @@ -74580,7 +74365,7 @@ "sBW" = ( /obj/machinery/door/poddoor/preopen{ id = "brigfrontdoor"; - name = "Front Security Blast door" + name = "Front Security Blast Door" }, /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/stripes/line{ @@ -74876,9 +74661,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "sIH" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/light/small{ dir = 4 }, @@ -74893,11 +74676,6 @@ luminosity = 2 }, /area/ai_monitored/turret_protected/ai_upload) -"sIN" = ( -/turf/closed/wall/r_wall/rust, -/area/security/prison{ - name = "Prison Garden" - }) "sIO" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -75008,7 +74786,7 @@ "sJP" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /obj/structure/cable/yellow{ @@ -75086,7 +74864,7 @@ "sLj" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /obj/structure/cable/yellow{ @@ -75096,9 +74874,7 @@ /area/security/prison) "sLo" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -75613,9 +75389,7 @@ /obj/machinery/computer/cargo, /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; @@ -75673,9 +75447,7 @@ /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/light_switch{ pixel_y = 24 }, @@ -75695,7 +75467,7 @@ dir = 4 }, /obj/machinery/cryopod{ - desc = "Suited for Cyborgs and Humanoids, the pod is a safe place for personnel affected by the Space Sleep Disorder to get some rest. If you think that this the easy way out, Nanotransen will address your situation in a later date..."; + desc = "Suited for Cyborgs and Humanoids, the pod is a safe place for personnel affected by the Space Sleep Disorder to get some rest. If you think that this the easy way out, Nanotrasen will address your situation in a later date..."; name = "Jail cryogenic freezer" }, /obj/machinery/computer/cryopod{ @@ -75736,7 +75508,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -75859,12 +75631,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/camera{ - c_tag = "Recovery Room"; - name = "geneticscamera"; - network = list("ss13","medical"); - dir = 5 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -75998,7 +75764,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" @@ -76112,7 +75878,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light/small, /turf/open/floor/iron/dark, /area/medical/morgue) "taJ" = ( @@ -76960,6 +76725,9 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "toY" = ( @@ -77060,9 +76828,7 @@ /turf/open/floor/iron/dark, /area/construction/mining/aux_base) "trv" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/light{ dir = 4 }, @@ -77205,10 +76971,7 @@ /area/maintenance/port) "ttv" = ( /turf/closed/wall, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "ttx" = ( /obj/effect/turf_decal/stripes/corner, /obj/structure/cable/yellow{ @@ -77424,9 +77187,7 @@ /obj/effect/spawner/structure/window, /obj/structure/curtain/directional, /turf/open/floor/plating, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "txO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -77522,9 +77283,7 @@ /area/bridge) "tzy" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, @@ -77572,10 +77331,6 @@ }, /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/machinery/vending/coffee, -/obj/machinery/camera/autoname{ - network = list("ss13", "prison", "security"); - dir = 6 - }, /turf/open/floor/iron, /area/hallway/primary/aft) "tzZ" = ( @@ -77828,6 +77583,12 @@ pixel_x = 9; pixel_y = -7 }, +/obj/machinery/light{ + bulb_colour = "#22bfa2"; + bulb_vacuum_colour = "#22bfa2"; + dir = 4; + nightshift_light_color = "#22bfa2" + }, /turf/open/floor/iron/dark, /area/medical/virology) "tFv" = ( @@ -77878,9 +77639,7 @@ /area/engine/engineering) "tFB" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/camera/directional/east{ c_tag = "Port Hallway Chemistry Desk"; name = "port camera" @@ -78084,7 +77843,7 @@ /area/hallway/primary/aft) "tKG" = ( /obj/machinery/door/airlock/maintenance{ - name = "morgue maintenance"; + name = "morgue Maintenance"; req_access_txt = "5;6;22" }, /obj/structure/disposalpipe/segment, @@ -78557,7 +78316,7 @@ pixel_y = 54 }, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "tVh" = ( /obj/effect/turf_decal/bot, /obj/structure/sign/warning/nosmoking{ @@ -78598,6 +78357,9 @@ }, /obj/structure/table/glass, /obj/item/storage/firstaid/regular, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/medical/medbay/central) "tWa" = ( @@ -78677,12 +78439,6 @@ pixel_y = 6 }, /obj/item/crowbar, -/obj/machinery/camera{ - c_tag = "Recovery Room"; - name = "cloning camera"; - network = list("ss13","medical"); - dir = 6 - }, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/showroomfloor, /area/medical/genetics/cloning) @@ -78752,7 +78508,7 @@ "uag" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /obj/structure/cable/yellow{ @@ -79014,9 +78770,7 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 5 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -79175,9 +78929,7 @@ pixel_y = 24; specialfunctions = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -79429,12 +79181,10 @@ "uli" = ( /obj/structure/table/glass, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = -4; pixel_y = 8 }, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = 2 }, /obj/item/clothing/gloves/color/latex, @@ -79585,9 +79335,7 @@ /obj/item/kirbyplants{ icon_state = "plant-10" }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -79671,9 +79419,7 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "upS" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/engine, /area/science/xenobiology) "uqd" = ( @@ -80103,6 +79849,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/dark, /area/hallway/primary/fore) "uwn" = ( @@ -80363,9 +80112,7 @@ "uAM" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall, -/area/security/prison{ - name = "Prison Garden" - }) +/area/security/prison) "uAQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -80406,7 +80153,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "Space Blast door" + name = "Space Blast Door" }, /obj/structure/cable/yellow, /obj/structure/cable/yellow{ @@ -80560,9 +80307,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -80602,7 +80347,7 @@ }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark, -/area/engine/break_room) +/area/engine/atmos) "uFh" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -80640,9 +80385,7 @@ }, /obj/item/bedsheet/brown, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "uFY" = ( /obj/structure/table/reinforced, /obj/item/storage/crayons, @@ -81134,7 +80877,7 @@ "uOr" = ( /obj/machinery/door/poddoor/preopen{ id = "brigfrontdoor"; - name = "Front Security Blast door" + name = "Front Security Blast Door" }, /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/stripes/line{ @@ -81144,10 +80887,7 @@ /area/security/brig) "uON" = ( /turf/closed/wall/rust, -/area/docking/arrival{ - lighting_colour_bulb = "#ffdbb4"; - lighting_colour_tube = "#ffce99" - }) +/area/docking/arrival) "uOX" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -81623,6 +81363,13 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/port) +"vai" = ( +/obj/effect/spawner/structure/window, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/turf/open/floor/plating, +/area/science/mixing) "vap" = ( /obj/effect/turf_decal/tile/dark_blue/opposingcorners, /obj/structure/chair/fancy/comfy{ @@ -82183,6 +81930,9 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/iron/showroomfloor, /area/science/shuttledock) "viZ" = ( @@ -82436,9 +82186,7 @@ /area/maintenance/starboard) "vmG" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /obj/machinery/space_heater, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -82813,9 +82561,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 2 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) "vtG" = ( @@ -82862,7 +82608,7 @@ }, /obj/machinery/camera{ c_tag = "Recovery Room"; - dir = 10; + dir = 8; name = "medical camera"; network = list("ss13","medical") }, @@ -83296,6 +83042,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) "vAb" = ( @@ -83417,7 +83164,7 @@ "vDC" = ( /obj/machinery/door/poddoor/preopen{ id = "brigfrontdoor"; - name = "Front Security Blast door" + name = "Front Security Blast Door" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -83985,7 +83732,6 @@ /obj/machinery/computer/security/telescreen{ desc = "Used for watching the test chamber."; dir = 8; - layer = 4; name = "Test Chamber Telescreen"; network = list("toxins"); pixel_x = 30 @@ -84424,6 +84170,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "vTf" = ( @@ -84947,19 +84696,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, /area/chapel/main) -"wbq" = ( -/obj/effect/spawner/structure/window/reinforced/prison, -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison blast door" - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/plating, -/area/security/prison{ - name = "Prison Garden" - }) "wbz" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -85013,6 +84749,12 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/science/xenobiology) "wco" = ( @@ -86112,6 +85854,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/machinery/camera/autoname{ + network = list("ss13", "prison", "security") + }, /turf/open/floor/iron, /area/hallway/primary/aft) "wsH" = ( @@ -86368,7 +86113,6 @@ /obj/machinery/computer/security/telescreen{ desc = "Used for watching the test chamber."; dir = 8; - layer = 4; name = "Test Chamber Telescreen"; network = list("toxins"); pixel_x = 30 @@ -86751,7 +86495,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -86761,9 +86505,7 @@ }, /obj/structure/cable/yellow, /turf/open/floor/plating, -/area/security/prison{ - name = "Prison Garden" - }) +/area/security/prison) "wCM" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -86778,9 +86520,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/reagent_dispensers/peppertank{ pixel_y = -30 }, @@ -86914,9 +86654,7 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "wEQ" = ( @@ -87323,7 +87061,7 @@ pixel_x = 8 }, /turf/open/floor/plating, -/area/engine/break_room) +/area/engine/atmos) "wKl" = ( /obj/structure/chair/office/light{ dir = 4 @@ -87484,11 +87222,6 @@ }, /turf/open/floor/iron/freezer, /area/medical/virology) -"wMz" = ( -/turf/closed/wall, -/area/security/prison{ - name = "Prison Toilet" - }) "wMJ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -88146,9 +87879,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -88205,6 +87936,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/iron/dark, /area/medical/medbay/lobby) "wXN" = ( @@ -89413,8 +89148,7 @@ dir = 4 }, /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /obj/machinery/light{ dir = 1 @@ -89429,7 +89163,6 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/checkpoint/medical) "xsl" = ( @@ -89663,8 +89396,7 @@ dir = 8 }, /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /obj/machinery/light{ dir = 1 @@ -89712,8 +89444,7 @@ /obj/machinery/airalarm/directional/south, /obj/structure/table/reinforced, /obj/machinery/camera/autoname{ - network = list("ss13", "prison"); - dir = 5 + network = list("ss13", "prison") }, /turf/open/floor/iron/techmaint, /area/security/prison) @@ -89839,7 +89570,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/engine/break_room) +/area/engine/atmos) "xAu" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/effect/turf_decal/stripes/line{ @@ -89858,7 +89589,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /turf/open/floor/plating/airless{ initial_gas_mix = "o2=14;n2=23;TEMP=300" @@ -89916,9 +89647,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) -"xBC" = ( -/turf/closed/wall, -/area/security/prison) "xBV" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ @@ -89965,13 +89693,11 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, -/area/security/prison{ - name = "Prison Garden" - }) +/area/security/prison) "xCZ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/box/lights/mixed, @@ -90631,7 +90357,6 @@ /obj/machinery/atmospherics/components/binary/valve/digital/on/layer2{ name = "Atmospherics Cutoff Valve" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating{ burnt = 1 }, @@ -90857,6 +90582,9 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/showroomfloor, /area/science/mixing) "xSk" = ( @@ -91248,7 +90976,6 @@ /turf/open/floor/iron, /area/hydroponics) "xXH" = ( -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -91263,6 +90990,9 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/testing_range/flip{ + dir = 2 + }, /turf/open/floor/iron/showroomfloor, /area/science/research) "xXS" = ( @@ -91514,6 +91244,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "ycS" = ( @@ -91965,8 +91698,7 @@ "yjg" = ( /obj/structure/bookcase/manuals, /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /turf/open/floor/wood, /area/security/prison) @@ -91981,8 +91713,7 @@ /area/maintenance/aft) "yju" = ( /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /turf/open/floor/wood, /area/security/prison) @@ -92129,9 +91860,7 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) "yld" = ( -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -92161,9 +91890,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, @@ -92173,6 +91899,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) "yln" = ( @@ -92231,7 +91960,6 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, -/obj/machinery/camera/autoname/directional/west, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -108875,12 +108603,12 @@ awD bKN nQP lNO -pCT -pCT -wbq +aav +aav +gCu wCt xCB -pCT +aav aav aav aav @@ -109132,7 +108860,7 @@ awD aer rfb vGx -sIN +aat qvH qvH qvH @@ -109646,7 +109374,7 @@ cWc ldS fiR hul -pCT +aav qvH qvH qvH @@ -112707,7 +112435,7 @@ aNn aQW sQA dbg -aRn +hWT aQW afe jWg @@ -112988,7 +112716,7 @@ cPW vIy sZf aav -wMz +lDt lDt lDt lDt @@ -113244,7 +112972,7 @@ bKk cPX oYn dCd -ogW +aav edU lDt pou @@ -113501,7 +113229,7 @@ boW cBW cBv kqj -ogW +aav omE hzI jrQ @@ -113509,7 +113237,7 @@ emF rjd lDt yjg -orr +mmJ gUd tEI aat @@ -113758,8 +113486,8 @@ brb cBW cBy fHy -ogW -wMz +aav +lDt lDt lDt lDt @@ -114015,7 +113743,7 @@ bsR bIV csN elv -dIW +aav gLj cer nON @@ -114272,7 +114000,7 @@ buH bLu cBw elv -dIW +aav oIQ iWQ cdQ @@ -114529,11 +114257,11 @@ buY bIV ajd kiL -dIW -nJB -nJB -nJB -nJB +aav +lDt +lDt +lDt +lDt gre eNr lFx @@ -114786,17 +114514,17 @@ bIV bIV ljR gCf -dIW +aav gLj iIj nON fMu qBN gxo -xBC -xBC +lDt +lDt dKa -xBC +lDt aav paw fcN @@ -115050,7 +114778,7 @@ cdQ txv hrY sUX -xBC +lDt dRC nze hNc @@ -115300,8 +115028,8 @@ dFd bLu ouT tHj -dIW -dIW +aav +aav dku dku dku @@ -115566,7 +115294,7 @@ ieY kTD dku ppu -xBC +lDt ppu aav fcZ @@ -123026,12 +122754,12 @@ cgC cik hck jYc -awN -awN -awL -awN -awN -aIg +aFM +aFM +aIG +aFM +aFM +aDk aCw csA aCw @@ -123283,12 +123011,12 @@ vJY bGG bEV dHr -awN +aFM ate aCx aCA awI -aIg +aDk dgD lPi nzY @@ -123537,15 +123265,15 @@ lbt kbr bmc rVH -awN -awN -awL -awN +aFM +aFM +aIG +aFM aCk auS aBQ aCr -aIg +aDk fcg eju hlb @@ -123794,7 +123522,7 @@ rbe oof bmc chg -awN +aFM crV llQ uFf @@ -123802,7 +123530,7 @@ aCl aBV aBW gcA -aCU +bxm ksl lEY ctq @@ -124051,7 +123779,7 @@ bDg bmc bmc chh -awL +aIG nIh tUZ jSl @@ -124059,7 +123787,7 @@ srP xzV kuW gUp -aIg +aDk syb vYq wqR @@ -124573,7 +124301,7 @@ lGT nYP ixr nyk -aIg +aDk ssj rkQ pOc @@ -124822,15 +124550,15 @@ bKV tNj glf gZD -awN -awN +aFM +aFM bHq wKj bqD cmX -awN +aFM cpd -awN +aFM aDj aKw bJP @@ -126843,7 +126571,7 @@ ucI kLS eeK ohZ -bmA +iKB fKZ nPI xQc @@ -129639,7 +129367,7 @@ vzU agz dxi rUd -djE +nJt bZM nJt uZV @@ -131974,7 +131702,7 @@ eeD niq aVJ xGo -dzI +aCU pyS bbN bba @@ -132231,7 +131959,7 @@ aXf aVJ aVJ uff -dzI +aCU hXA tcS bxn @@ -132488,7 +132216,7 @@ vsJ ocg ldu uLL -dzI +aCU hXA kHg baY @@ -133224,7 +132952,7 @@ aaa aaa acm gCl -hvl +swn wRZ lmA whj @@ -134032,7 +133760,7 @@ bby itA oet bcg -beH +vai rve eQi fRL @@ -140705,7 +140433,7 @@ aaa cmU aeU ktS -tnd +hvl viB ktS ktS diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index e9569093ad8cb..f98a7ca81881d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -498,7 +498,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -512,7 +512,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -526,7 +526,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosspace"; - name = "space shutters" + name = "space Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -602,9 +602,7 @@ icon_state = "1-2" }, /obj/structure/table, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/camera/directional/east{ c_tag = "Cargo Bay - Starboard" }, @@ -663,7 +661,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosprivacy"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -705,7 +703,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosprivacy"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -788,7 +786,7 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ id = "hosprivacy"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -814,9 +812,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) "ahi" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/aft) @@ -884,7 +880,7 @@ "aif" = ( /obj/machinery/door/poddoor{ id = "trash"; - name = "disposal bay door" + name = "disposal Bay Door" }, /obj/structure/fans/tiny, /turf/open/floor/plating, @@ -932,7 +928,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosprivacy"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -946,7 +942,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosprivacy"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -960,7 +956,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosprivacy"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -971,7 +967,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hosprivacy"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -1004,7 +1000,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Disposal Exit"; - name = "disposal exit vent" + name = "disposal Exit Vent" }, /turf/open/floor/plating, /area/maintenance/disposal) @@ -1121,6 +1117,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/landmark/event_spawn, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/science) "alc" = ( @@ -1200,8 +1197,7 @@ /obj/machinery/door/window{ base_state = "right"; dir = 4; - icon_state = "right"; - layer = 3 + icon_state = "right" }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -1413,16 +1409,9 @@ /turf/open/floor/plating, /area/maintenance/starboard) "anO" = ( -/obj/machinery/light/small{ - dir = 4 - }, /obj/machinery/door/window{ name = "MiniSat Walkway Access" }, -/obj/machinery/camera/directional/east{ - c_tag = "MiniSat Exterior - Aft Port"; - network = list("minisat") - }, /obj/structure/window/reinforced{ dir = 8 }, @@ -1657,7 +1646,7 @@ /obj/structure/plasticflaps, /obj/machinery/door/window/northright{ dir = 2; - name = "delivery door"; + name = "delivery Door"; req_access_txt = "31" }, /obj/structure/disposalpipe/segment, @@ -1935,9 +1924,12 @@ /turf/open/floor/prison, /area/security/prison) "arM" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/camera/directional/east, +/turf/open/space, +/area/space/nearstation) "arS" = ( /obj/machinery/firealarm{ dir = 8; @@ -2222,7 +2214,7 @@ "aup" = ( /obj/effect/spawner/room/tenxten, /turf/open/floor/plating, -/area/maintenance/port/aft) +/area/maintenance/aft) "auy" = ( /obj/item/stack/sheet/cardboard, /obj/item/flashlight, @@ -2241,18 +2233,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /turf/open/floor/iron, /area/security/prison) "auJ" = ( -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced/tinted/fulltile, +/obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/maintenance/port/fore) "auL" = ( @@ -2299,13 +2287,9 @@ /area/maintenance/department/science/xenobiology) "avd" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "geneticslab"; - name = "Genetics Lab Shutters" - }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -2444,9 +2428,7 @@ /area/maintenance/starboard/fore) "axP" = ( /obj/structure/safe, -/obj/item/storage/secure/briefcase{ - contents = newlist(/obj/item/clothing/suit/armor/vest,/obj/item/gun/ballistic/automatic/pistol,/obj/item/suppressor,/obj/item/melee/classic_baton/police/telescopic,/obj/item/clothing/mask/balaclava,/obj/item/bodybag,/obj/item/soap/nanotrasen) - }, +/obj/item/storage/secure/briefcase/hitman, /obj/item/storage/backpack/duffelbag/syndie/hitman, /obj/item/card/id/silver/reaper, /obj/item/lazarus_injector, @@ -2569,7 +2551,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "detective_shutters"; - name = "detective's office shutters" + name = "detective's office Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -3262,21 +3244,21 @@ /turf/open/floor/iron/dark, /area/science/xenobiology) "aEq" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron, /area/engine/engineering) "aEr" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "aEt" = ( @@ -3521,13 +3503,13 @@ /turf/open/floor/engine, /area/engine/engineering) "aFD" = ( -/obj/structure/cable/white{ - icon_state = "1-4" - }, /obj/effect/turf_decal/stripes/line, /obj/machinery/meter, /obj/machinery/light, /obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/engine, /area/engine/engineering) "aFK" = ( @@ -3928,6 +3910,7 @@ dir = 5; id = "QMLoad2" }, +/obj/machinery/light/directional/north, /turf/open/floor/plating, /area/quartermaster/storage) "aIi" = ( @@ -4124,9 +4107,6 @@ /turf/open/floor/plating, /area/quartermaster/storage) "aJC" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/conveyor{ dir = 1; id = "QMLoad2" @@ -4845,7 +4825,6 @@ "aNE" = ( /obj/machinery/button/door{ id = "QMLoaddoor"; - layer = 4; name = "Loading Doors"; pixel_x = -27; pixel_y = -5; @@ -4853,7 +4832,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor2"; - layer = 4; name = "Loading Doors"; pixel_x = -27; pixel_y = 5; @@ -4946,7 +4924,6 @@ }, /obj/machinery/door/window/westleft{ dir = 2; - layer = 3.1; name = "Cyborg Upload Console Window"; req_access_txt = "16" }, @@ -4971,7 +4948,6 @@ base_state = "right"; dir = 2; icon_state = "right"; - layer = 3.1; name = "Upload Console Window"; req_access_txt = "16" }, @@ -5317,7 +5293,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "lawyer_shutters"; - name = "law office shutters" + name = "law office Shutters" }, /turf/open/floor/plating, /area/lawoffice) @@ -5401,6 +5377,9 @@ /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/engine/engineering) "aQe" = ( @@ -5543,11 +5522,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"aQF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/tinted/fulltile, -/turf/open/floor/plating, -/area/security/courtroom) "aQG" = ( /obj/machinery/vending/cigarette, /turf/open/floor/iron/dark, @@ -5598,7 +5572,7 @@ }, /obj/effect/turf_decal/stripes/red/box, /turf/open/floor/plating, -/area/maintenance/department/science) +/area/science/misc_lab/range) "aRg" = ( /obj/machinery/door/window/westright{ name = "Garden B" @@ -5889,6 +5863,9 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 5 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/engine/engineering) "aSB" = ( @@ -6093,12 +6070,12 @@ /turf/open/floor/iron, /area/hydroponics/garden) "aTK" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron, /area/engine/engineering) "aTM" = ( @@ -6292,8 +6269,7 @@ /area/crew_quarters/theatre) "aVk" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -6373,6 +6349,9 @@ "aVH" = ( /obj/item/storage/firstaid/regular, /obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/quartermaster/storage) "aVR" = ( @@ -6566,6 +6545,9 @@ /area/quartermaster/storage) "aXf" = ( /obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron, /area/quartermaster/storage) "aXg" = ( @@ -6747,7 +6729,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "AI Core shutters"; - name = "AI core shutters" + name = "AI Core Shutters" }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) @@ -7031,7 +7013,6 @@ base_state = "rightsecure"; dir = 4; icon_state = "rightsecure"; - layer = 4.1; name = "Secondary AI Core Access"; obj_integrity = 300; pixel_x = 4; @@ -7064,7 +7045,6 @@ base_state = "leftsecure"; dir = 8; icon_state = "leftsecure"; - layer = 4.1; name = "Tertiary AI Core Access"; obj_integrity = 300; pixel_x = -3; @@ -7147,6 +7127,9 @@ pixel_y = -2 }, /obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron, /area/quartermaster/storage) "bap" = ( @@ -7775,6 +7758,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "beX" = ( @@ -7892,7 +7878,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -7909,7 +7895,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -7926,7 +7912,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -7937,7 +7923,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -7951,7 +7937,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -7962,7 +7948,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -8003,7 +7989,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" }, /turf/open/floor/plating, /area/crew_quarters/heads/chief) @@ -8015,7 +8001,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" }, /turf/open/floor/plating, /area/crew_quarters/heads/chief) @@ -8067,8 +8053,7 @@ /area/ai_monitored/turret_protected/ai) "bgn" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/space, /area/space/nearstation) @@ -8077,8 +8062,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/space, /area/space/nearstation) @@ -8195,7 +8179,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -8215,7 +8199,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -8430,7 +8414,7 @@ /area/ai_monitored/turret_protected/ai) "bit" = ( /obj/machinery/smartfridge/chemistry/virology/preloaded, -/turf/closed/wall, +/turf/open/floor/iron/grid/steel, /area/medical/virology) "biu" = ( /obj/effect/turf_decal/stripes/line{ @@ -8561,7 +8545,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -8769,6 +8753,9 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/plating, /area/quartermaster/sorting) "bkh" = ( @@ -8781,6 +8768,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/white/corner, /area/quartermaster/sorting) "bki" = ( @@ -8789,6 +8779,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/white/corner, /area/quartermaster/sorting) "bkl" = ( @@ -9097,7 +9090,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -9423,7 +9416,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hop"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/hop) @@ -9899,8 +9892,7 @@ /area/ai_monitored/storage/satellite) "bsj" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -10292,9 +10284,7 @@ /obj/effect/spawner/lootdrop/costume, /obj/effect/spawner/lootdrop/costume, /obj/item/clothing/mask/balaclava, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/light/small{ dir = 4 }, @@ -10466,7 +10456,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/security{ - name = "Security-Cargo access"; + name = "Security-Cargo Access"; req_access_txt = "63" }, /obj/effect/turf_decal/stripes/line{ @@ -10622,7 +10612,7 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ id = "hop"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/hop) @@ -10647,7 +10637,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "hop"; - name = "privacy shutters" + name = "Privacy Shutters" }, /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -10988,7 +10978,7 @@ /obj/machinery/smartfridge/drinks{ icon_state = "boozeomat" }, -/turf/closed/wall, +/turf/open/floor/iron, /area/crew_quarters/bar) "bAq" = ( /obj/structure/table/wood/poker, @@ -11112,6 +11102,7 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 4 }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/engine/atmos) "bAR" = ( @@ -11152,8 +11143,7 @@ /area/ai_monitored/turret_protected/ai_upload_foyer) "bBb" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/lattice, /turf/open/space, @@ -11488,10 +11478,10 @@ /turf/open/floor/iron, /area/engine/atmos) "bCu" = ( +/obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 6 + dir = 4 }, -/obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) "bCv" = ( @@ -11725,7 +11715,7 @@ /area/engine/atmos) "bDY" = ( /obj/machinery/atmospherics/pipe/manifold/purple/visible{ - dir = 1 + dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) @@ -11733,9 +11723,6 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ - dir = 9 - }, /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron, /area/engine/atmos) @@ -12471,8 +12458,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/lattice, /turf/open/space, @@ -12517,14 +12503,11 @@ /turf/open/floor/iron, /area/engine/atmos) "bIX" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 8 }, /turf/open/floor/iron, -/area/engine/atmos) +/area/quartermaster/storage) "bIY" = ( /obj/structure/window/reinforced{ dir = 4 @@ -12969,7 +12952,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "corporate_privacy"; - name = "showroom shutters" + name = "showroom Shutters" }, /turf/open/floor/plating, /area/bridge/showroom/corporate) @@ -13245,7 +13228,6 @@ }, /obj/structure/window/reinforced, /obj/structure/showcase/machinery/cloning_pod{ - layer = 4; pixel_x = 2; pixel_y = 5 }, @@ -13266,7 +13248,6 @@ /obj/structure/window/reinforced, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/showcase/machinery/implanter{ - layer = 2.7; pixel_y = 4 }, /turf/open/floor/carpet/blue, @@ -13370,9 +13351,7 @@ /obj/machinery/atmospherics/components/binary/pump{ name = "Port Mix to West Ports" }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/engine/atmos) "bNU" = ( @@ -13527,7 +13506,7 @@ /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/preopen{ id = "kitchenwindow"; - name = "kitchen shutters" + name = "kitchen Shutters" }, /turf/open/floor/plating, /area/crew_quarters/kitchen) @@ -13567,6 +13546,21 @@ /obj/item/stock_parts/subspace/crystal, /turf/open/floor/iron/dark, /area/storage/tcom) +"bPi" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/maintenance/aft) "bPj" = ( /obj/structure/table, /obj/item/stock_parts/subspace/filter, @@ -14249,7 +14243,7 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/shutters/preopen{ id = "corporate_privacy"; - name = "showroom shutters" + name = "showroom Shutters" }, /turf/open/floor/plating, /area/bridge/showroom/corporate) @@ -14296,7 +14290,7 @@ /area/hydroponics) "bSW" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/iron, /area/hydroponics) "bSX" = ( /obj/effect/turf_decal/stripes/line{ @@ -15147,8 +15141,11 @@ /turf/open/floor/iron, /area/science/mixing) "bXE" = ( -/turf/open/floor/plating, -/area/maintenance/port/aft) +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "bXK" = ( /turf/closed/wall, /area/medical/storage) @@ -15406,6 +15403,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -15763,9 +15763,20 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "ccS" = ( -/obj/machinery/light, -/turf/open/floor/iron/dark, -/area/engine/atmos) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/turf/open/floor/iron, +/area/quartermaster/storage) "ccT" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 8 @@ -15781,12 +15792,12 @@ "ccZ" = ( /obj/machinery/door/window/northleft{ dir = 8; - name = "glass door"; + name = "glass Door"; req_access_txt = "24" }, /obj/machinery/door/window/northleft{ dir = 4; - name = "glass door"; + name = "glass Door"; req_access_txt = "24" }, /turf/open/floor/plating, @@ -15906,7 +15917,11 @@ /area/solar/port/aft) "cfY" = ( /obj/machinery/smartfridge/chemistry/preloaded, -/turf/closed/wall, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chemistbot"; + name = "Chemistry Side Shutters" + }, +/turf/open/floor/iron/white, /area/medical/chemistry) "cga" = ( /turf/closed/wall, @@ -15918,7 +15933,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters"; - name = "research shutters" + name = "research Shutters" }, /turf/open/floor/plating, /area/science/lab) @@ -15931,7 +15946,7 @@ "cgh" = ( /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; - name = "biohazard containment door" + name = "biohazard Containment Door" }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -16148,7 +16163,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance" @@ -16196,6 +16211,10 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "Isolation Shutters" + }, /turf/open/floor/iron/white/side, /area/medical/medbay/lobby) "chN" = ( @@ -16825,7 +16844,6 @@ }, /obj/machinery/button/door{ id = "SecJusticeChamber"; - layer = 4; name = "Justice Vent Control"; pixel_x = -36; pixel_y = 26; @@ -16913,8 +16931,7 @@ /turf/open/floor/iron, /area/science/research) "cmO" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/tinted/fulltile, +/obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/science/research) "cmP" = ( @@ -16945,7 +16962,7 @@ name = "The Gobetting Barmaid" }, /turf/open/floor/wood, -/area/maintenance/port/aft) +/area/maintenance/aft) "cnp" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17156,7 +17173,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters_2"; - name = "research shutters" + name = "research Shutters" }, /turf/open/floor/plating, /area/science/lab) @@ -17249,10 +17266,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/research) "cqL" = ( @@ -17376,7 +17391,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "rdprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -17391,8 +17406,9 @@ }, /obj/machinery/door/poddoor/preopen{ id = "rdprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/crew_quarters/heads/hor) "crP" = ( @@ -17402,7 +17418,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "rdprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" }, /turf/open/floor/plating, /area/crew_quarters/heads/hor) @@ -17498,7 +17514,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "rdprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" }, /obj/structure/disposalpipe/segment{ dir = 9 @@ -17508,6 +17524,7 @@ "csZ" = ( /obj/structure/table/reinforced, /obj/machinery/computer/security/telescreen/rd, +/obj/structure/disposalpipe/segment, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "ctb" = ( @@ -17653,6 +17670,7 @@ pixel_y = -5; req_access_txt = "47" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "ctR" = ( @@ -17728,7 +17746,10 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ id = "rdprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/plating, /area/crew_quarters/heads/hor) @@ -17736,6 +17757,10 @@ /obj/machinery/computer/card/minor/rd{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "cuN" = ( @@ -18224,6 +18249,12 @@ dir = 8 }, /obj/effect/turf_decal/trimline/black/filled/warning, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/iron, /area/maintenance/department/science) "czJ" = ( @@ -18277,7 +18308,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/maintenance/department/science) +/area/science/misc_lab/range) "cAQ" = ( /obj/structure/window/reinforced, /obj/item/target, @@ -18384,6 +18415,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "cBt" = ( @@ -18406,12 +18440,14 @@ receive_ore_updates = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "cBv" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 1 + dir = 1 }, /obj/item/kirbyplants/random, /obj/item/radio/intercom{ @@ -18420,7 +18456,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "viroshutters"; - name = "viro shutters" + name = "viro Shutters" }, /turf/open/floor/iron/grid/steel, /area/medical/virology) @@ -18485,7 +18521,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics_shutters"; - name = "robotics shutters" + name = "robotics Shutters" }, /turf/open/floor/plating, /area/science/robotics/mechbay) @@ -18532,7 +18568,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics_shutters"; - name = "robotics shutters" + name = "robotics Shutters" }, /turf/open/floor/plating, /area/science/robotics/lab) @@ -18586,7 +18622,7 @@ dir = 4 }, /obj/machinery/camera/preset/toxins{ - dir = 8 + dir = 4 }, /turf/open/floor/plating/airless{ luminosity = 2 @@ -18748,6 +18784,9 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "cFv" = ( @@ -18782,7 +18821,7 @@ dir = 1 }, /turf/open/floor/iron/techmaint, -/area/maintenance/department/science) +/area/science/misc_lab/range) "cFX" = ( /obj/structure/table, /obj/item/folder/white{ @@ -18965,9 +19004,10 @@ /turf/open/floor/plating, /area/science/robotics/lab) "cJh" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/obj/structure/window/reinforced, +/obj/machinery/camera/directional/north, +/turf/open/space, +/area/space/nearstation) "cJj" = ( /obj/structure/window/reinforced{ dir = 8 @@ -19091,7 +19131,7 @@ base_state = "right"; dir = 1; icon_state = "right"; - name = "gas ports" + name = "gas Ports" }, /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -19224,9 +19264,6 @@ /turf/open/floor/iron, /area/engine/atmos) "cLB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -19236,6 +19273,9 @@ /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) "cLN" = ( @@ -19290,14 +19330,22 @@ /turf/closed/wall, /area/chapel/main) "cMK" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Fore Primary Hallway Cells" +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/machinery/door/airlock/engineering/glass{ + name = "Laser Room"; + req_access_txt = "10" }, -/turf/open/floor/iron, -/area/hallway/primary/fore) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/engine/engineering) "cMO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -19314,9 +19362,7 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "cMU" = ( -/obj/machinery/status_display/evac{ - layer = 4 - }, +/obj/machinery/status_display/evac, /turf/closed/wall, /area/hallway/secondary/exit/departure_lounge) "cMZ" = ( @@ -19629,7 +19675,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_shutters_parlour"; - name = "chapel shutters" + name = "chapel Shutters" }, /turf/open/floor/plating, /area/chapel/main) @@ -19869,7 +19915,7 @@ /turf/open/floor/iron/dark/smooth_large, /area/ai_monitored/security/armory) "cQQ" = ( -/obj/structure/cable/white, +/obj/structure/cable/yellow, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/engine/engineering) @@ -20008,7 +20054,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "chapel_shutters_space"; - name = "chapel shutters" + name = "chapel Shutters" }, /turf/open/floor/plating, /area/chapel/main) @@ -20035,7 +20081,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio3"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -20046,7 +20092,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio6"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -20061,7 +20107,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio3"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -20074,7 +20120,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio6"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) @@ -20110,7 +20156,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio5"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -20139,7 +20185,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio6"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/engine, /area/science/xenobiology) @@ -20187,7 +20233,7 @@ dir = 1 }, /turf/open/floor/iron/techmaint, -/area/maintenance/department/science) +/area/science/misc_lab/range) "cTr" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -20337,28 +20383,14 @@ /turf/open/floor/iron/white/smooth_half, /area/security/brig) "cVw" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "MiniSat Exterior - Starboard Aft"; - network = list("minisat") - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/camera/directional/north{ + c_tag = "Fore Primary Hallway Cells" }, -/turf/open/floor/iron/dark, -/area/aisat) +/turf/open/floor/iron, +/area/hallway/primary/fore) "cVx" = ( /obj/docking_port/stationary{ dir = 8; @@ -20384,6 +20416,9 @@ /area/engine/atmos) "cVC" = ( /mob/living/simple_animal/sloth/citrus, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/quartermaster/storage) "cVD" = ( @@ -20471,7 +20506,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -20614,6 +20649,9 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "das" = ( @@ -20632,7 +20670,7 @@ "daO" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; @@ -20879,31 +20917,31 @@ /turf/open/floor/iron, /area/maintenance/starboard/secondary) "deh" = ( -/obj/structure/cable/white{ +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/engine/engineering) "dei" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "dej" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/machinery/light{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "der" = ( @@ -20929,7 +20967,7 @@ /turf/open/floor/engine, /area/engine/engineering) "deu" = ( -/obj/structure/cable/white{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/corner{ @@ -20941,7 +20979,7 @@ /turf/open/floor/engine, /area/engine/engineering) "dev" = ( -/obj/structure/cable/white{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ @@ -20951,9 +20989,6 @@ /turf/open/floor/engine, /area/engine/engineering) "dew" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/machinery/door/airlock/engineering/glass{ name = "Laser Room"; req_access_txt = "10" @@ -20965,16 +21000,19 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/engine/engineering) "dex" = ( -/obj/structure/cable/white{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/open/floor/plating, /area/engine/engineering) "deA" = ( -/obj/structure/cable/white{ +/obj/structure/cable/yellow{ icon_state = "2-8" }, /turf/open/floor/plating, @@ -21027,7 +21065,7 @@ /turf/open/floor/engine, /area/engine/engineering) "deL" = ( -/obj/structure/cable/white, +/obj/structure/cable/yellow, /obj/machinery/light{ dir = 4 }, @@ -21148,6 +21186,12 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/power/apc/auto_name/directional/east{ + areastring = "/area/engine/supermatter" + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/engine, /area/engine/engineering) "dfj" = ( @@ -21230,15 +21274,15 @@ /turf/open/floor/engine, /area/engine/engineering) "dfC" = ( -/obj/structure/cable/white{ - icon_state = "0-2" - }, /obj/machinery/power/emitter/welded{ dir = 1 }, /obj/machinery/light{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/plating, /area/engine/engineering) "dfG" = ( @@ -21257,7 +21301,7 @@ /turf/open/floor/engine, /area/engine/engineering) "dfO" = ( -/obj/structure/cable/white{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, /turf/open/floor/plating, @@ -21268,20 +21312,20 @@ /turf/open/floor/iron/dark, /area/chapel/main) "dfR" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/binary/pump{ name = "Gas to Cooling Loop" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "dfS" = ( -/obj/structure/cable/white{ +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, /area/engine/engineering) "dfW" = ( @@ -21412,6 +21456,21 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) +"dgV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/maintenance/aft) "dha" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -21512,6 +21571,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/security/prison) "dhy" = ( @@ -21872,6 +21932,16 @@ }, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/item/pen, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "geneticslab"; + name = "Genetics Lab Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/iron, /area/medical/genetics) "dkO" = ( @@ -21879,7 +21949,7 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /turf/open/floor/plating, /area/security/warden) @@ -22257,9 +22327,7 @@ pixel_y = 6 }, /obj/structure/table/wood, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/wood, /area/vacant_room/office) "dqu" = ( @@ -22303,7 +22371,7 @@ "drG" = ( /obj/machinery/door/airlock{ id_tag = "Cell"; - name = "Prison dorms" + name = "Prison Dorms" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -22557,8 +22625,16 @@ /turf/open/floor/iron/stairs, /area/science/xenobiology) "dux" = ( -/turf/closed/wall, -/area/maintenance/port/aft) +/obj/machinery/conveyor{ + dir = 4; + id = "packageSort2" + }, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/turf/open/floor/plating, +/area/quartermaster/sorting) "duS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -22779,6 +22855,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/aft) "dyc" = ( @@ -22907,6 +22984,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/engine/engineering) "dBB" = ( @@ -22942,6 +23022,16 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/aft) +"dCa" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/science/research) "dCk" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -22957,9 +23047,7 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "dCs" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/landmark/start/roboticist, /obj/machinery/light{ dir = 4 @@ -23161,9 +23249,7 @@ /turf/open/floor/wood/big, /area/crew_quarters/bar) "dFo" = ( -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/crew_quarters/fitness/recreation) "dFt" = ( @@ -23607,25 +23693,12 @@ /turf/open/floor/iron/white, /area/science/explab) "dOd" = ( -/obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "MiniSat Exterior - Starboard Fore"; - network = list("minisat") - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 + dir = 1 }, -/turf/open/floor/iron/dark, -/area/aisat) +/obj/machinery/camera/directional/south, +/turf/open/space, +/area/space/nearstation) "dOr" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -23820,6 +23893,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/library) "dSx" = ( @@ -23829,7 +23903,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "viroshutters"; - name = "viro shutters" + name = "viro Shutters" }, /turf/open/floor/plating, /area/medical/virology) @@ -23896,6 +23970,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/library) "dUd" = ( @@ -24250,9 +24325,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/airalarm/directional/south{ - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/engine/break_room) "ecC" = ( @@ -24422,6 +24495,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/wood, /area/library) "efj" = ( @@ -24688,6 +24764,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/research) "emX" = ( @@ -24714,17 +24791,24 @@ /turf/open/floor/iron, /area/maintenance/aft) "eng" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chemistbot"; - name = "Chemistry Side Shutters" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/plating, -/area/medical/chemistry) +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/engine, +/area/engine/engineering) "eob" = ( /obj/machinery/door/airlock/engineering{ name = "Port Quarter Solar Access"; @@ -24779,12 +24863,12 @@ /turf/open/floor/iron/dark, /area/security/main) "epu" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/structure/cable/white{ +/obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, @@ -24874,7 +24958,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/maintenance/department/science) +/area/science/misc_lab/range) "erh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -24904,8 +24988,11 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/iron/dark, -/area/maintenance/department/science) +/area/science/misc_lab/range) "erx" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -24914,6 +25001,10 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "Isolation Shutters" + }, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -24944,6 +25035,19 @@ /area/engine/atmos) "erP" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "geneticslab"; + name = "Genetics Lab Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/genetics) "esa" = ( @@ -25378,7 +25482,7 @@ "eBh" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall, -/area/maintenance/department/science) +/area/science/misc_lab/range) "eBQ" = ( /obj/effect/turf_decal/siding/white/corner{ dir = 1 @@ -25469,9 +25573,6 @@ /area/library) "eDs" = ( /obj/structure/table, -/obj/machinery/camera/directional/south{ - c_tag = "Kitchen" - }, /obj/machinery/reagentgrinder, /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) @@ -25505,9 +25606,7 @@ network = list("ss13","medbay") }, /obj/machinery/vending/wardrobe/medi_wardrobe, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/medical/storage) "eDT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -25936,7 +26035,6 @@ }, /obj/machinery/shower{ dir = 8; - layer = 4; name = "emergency shower"; pixel_y = 6 }, @@ -26240,15 +26338,15 @@ /turf/open/floor/iron, /area/quartermaster/qm) "eUo" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/orange/visible{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "eUr" = ( @@ -26325,6 +26423,9 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "eVE" = ( @@ -26611,15 +26712,12 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/item/kirbyplants/random{ - layer = 3.1 - }, +/obj/item/kirbyplants/random, /obj/machinery/light/small{ dir = 8 }, /obj/structure/railing{ - dir = 6; - layer = 3.2 + dir = 6 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 9 @@ -26644,13 +26742,9 @@ /obj/structure/desk_bell{ pixel_x = -8 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "geneticslab"; - name = "Genetics Lab Shutters" - }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/plating, /area/medical/genetics) @@ -26949,7 +27043,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio1"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) @@ -27052,6 +27146,16 @@ "fla" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chemistry_shutters_2"; + name = "chemistry Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "flb" = ( @@ -27408,6 +27512,10 @@ /area/security/main) "frP" = ( /obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "Isolation Shutters" + }, /turf/open/floor/plating, /area/medical/medbay/lobby) "frW" = ( @@ -27423,7 +27531,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "AI Chamber entrance shutters"; - name = "AI Chamber entrance shutters" + name = "AI Chamber Entrance Shutters" }, /obj/machinery/flasher{ id = "AI"; @@ -27668,9 +27776,7 @@ pixel_x = -3; pixel_y = 5 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, /area/security/courtroom) "fwU" = ( @@ -27966,12 +28072,6 @@ pixel_x = 1; pixel_y = 5 }, -/obj/machinery/button/door{ - id = "hop"; - name = "Privacy Shutters Control"; - pixel_y = 25; - req_access_txt = "28" - }, /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -28094,7 +28194,7 @@ /turf/open/floor/iron/white, /area/science/research) "fDA" = ( -/obj/structure/cable/white, +/obj/structure/cable/yellow, /obj/machinery/power/emitter/welded, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, @@ -28168,6 +28268,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chemistbot"; + name = "Chemistry Side Shutters" + }, /turf/open/floor/iron/white, /area/medical/chemistry) "fEL" = ( @@ -28310,25 +28414,12 @@ /turf/open/floor/engine, /area/maintenance/department/science/xenobiology) "fGk" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/light/small{ +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/camera/directional/west{ - c_tag = "MiniSat Exterior - Fore Starboard"; - network = list("minisat") - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/aisat) +/turf/open/floor/iron, +/area/quartermaster/storage) "fGo" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -28382,7 +28473,7 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; - name = "brig shutters" + name = "brig Shutters" }, /turf/open/floor/plating, /area/security/warden) @@ -28629,14 +28720,14 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron/dark, /area/maintenance/aft) "fMN" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; @@ -28706,9 +28797,6 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "fOq" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -28721,6 +28809,9 @@ /obj/effect/turf_decal/stripes/white/corner{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "fOr" = ( @@ -29141,22 +29232,19 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 24 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "fUp" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ @@ -29201,8 +29289,7 @@ req_access_txt = "39" }, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/structure/curtain, /turf/open/floor/iron/grid/steel, @@ -29350,9 +29437,6 @@ pixel_x = 25; pixel_y = -24 }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -30090,7 +30174,7 @@ "goP" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; @@ -30299,7 +30383,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -30599,9 +30683,6 @@ /turf/open/floor/iron, /area/maintenance/aft) "gBY" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Aft Starboard Solar Maintenance" - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -30643,10 +30724,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","medbay") - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -31497,7 +31574,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -31767,6 +31844,9 @@ pixel_y = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "gXh" = ( @@ -31795,15 +31875,15 @@ /turf/open/floor/iron/dark/smooth_half, /area/security/main) "gXM" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 9 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "gYo" = ( @@ -31881,9 +31961,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "hbv" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/computer/cargo/request{ dir = 1 }, @@ -32209,7 +32287,7 @@ /area/maintenance/aft) "hil" = ( /obj/machinery/smartfridge/organ, -/turf/closed/wall, +/turf/open/floor/iron/white, /area/medical/surgery) "hir" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -32501,6 +32579,9 @@ pixel_y = -2 }, /obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "hmo" = ( @@ -32653,6 +32734,9 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "hpf" = ( @@ -32740,7 +32824,7 @@ "hrd" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /obj/structure/cable/yellow{ @@ -32760,25 +32844,12 @@ /turf/open/floor/iron, /area/maintenance/aft/secondary) "hrl" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/camera/directional/east{ - c_tag = "MiniSat Exterior - Fore Port"; - network = list("minisat") - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 2 }, -/turf/open/floor/iron/dark, -/area/aisat) +/turf/open/floor/plating, +/area/quartermaster/sorting) "hrL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -33000,15 +33071,9 @@ /turf/open/floor/iron/white/corner, /area/hallway/primary/aft) "hwG" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron, -/area/medical/morgue) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/aft) "hwT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33160,6 +33225,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/aft) "hzz" = ( @@ -33310,7 +33378,7 @@ "hDh" = ( /obj/machinery/door/poddoor/preopen{ id = "testlab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/closeup, @@ -33380,7 +33448,7 @@ "hEt" = ( /obj/machinery/door/poddoor/preopen{ id = "kitchenwindow"; - name = "kitchen shutters" + name = "kitchen Shutters" }, /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -33392,9 +33460,7 @@ /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, /obj/item/clothing/neck/stethoscope, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 @@ -33453,7 +33519,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "viroshutters"; - name = "viro shutters" + name = "viro Shutters" }, /turf/open/floor/iron/dark, /area/medical/virology) @@ -33623,7 +33689,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/maintenance/aft) @@ -33699,9 +33765,7 @@ /turf/open/floor/iron, /area/maintenance/starboard/fore) "hIY" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -34010,7 +34074,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio2"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) @@ -34451,9 +34515,7 @@ /obj/structure/table/wood, /obj/item/staff/broom, /obj/item/wrench, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/sign/poster/random{ pixel_y = 32 }, @@ -34558,6 +34620,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "hWc" = ( @@ -34579,9 +34644,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/camera/directional/east{ c_tag = "Chapel - Funeral Parlour" }, @@ -34638,8 +34701,7 @@ /area/engine/storage_shared) "hYo" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -34774,9 +34836,7 @@ /area/crew_quarters/locker) "ibw" = ( /obj/structure/closet/secure_closet/miner, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/quartermaster/miningoffice) @@ -34846,7 +34906,7 @@ /area/maintenance/disposal) "icd" = ( /obj/machinery/door/airlock/research/glass{ - name = "science shuttle dock"; + name = "science Shuttle Dock"; req_one_access_txt = "49" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -35216,6 +35276,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/medical/medbay/aft) "iji" = ( @@ -35410,9 +35471,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) @@ -35895,7 +35954,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio2"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) @@ -36146,7 +36205,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "rdprivacy"; - name = "privacy shutter" + name = "Privacy Shutter" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -36265,7 +36324,7 @@ /area/medical/surgery) "iDl" = ( /obj/machinery/door/airlock/public/glass{ - name = "space-bridge access" + name = "space-bridge Access" }, /obj/machinery/button/door{ id = "supplybridge"; @@ -37286,7 +37345,7 @@ "iWT" = ( /obj/machinery/door/poddoor/preopen{ id = "xenobio3"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -37633,9 +37692,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/command{ name = "Research Director's Office"; req_access_txt = "30" @@ -37656,6 +37712,9 @@ /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) "jgt" = ( @@ -37700,7 +37759,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/medical/genetics) @@ -37774,7 +37833,7 @@ "jiS" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /obj/structure/cable/yellow{ @@ -37820,9 +37879,7 @@ dir = 4 }, /obj/structure/closet/firecloset, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/science/research) @@ -38119,9 +38176,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/aft) "jse" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/plating, /area/crew_quarters/toilet/auxiliary) "jsh" = ( @@ -38294,19 +38349,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark, /area/engine/break_room) -"jvt" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/aisat) "jvC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -38364,9 +38406,6 @@ /turf/closed/wall/mineral/plastitanium, /area/crew_quarters/fitness/recreation) "jxf" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -38377,6 +38416,9 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "jxt" = ( @@ -38726,7 +38768,7 @@ /obj/machinery/meter, /obj/machinery/door/window/westleft{ dir = 1; - name = "gas ports" + name = "gas Ports" }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 @@ -38746,15 +38788,15 @@ /turf/open/floor/iron/white, /area/medical/surgery) "jDs" = ( -/obj/structure/cable/white{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/white{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /turf/open/floor/plating, /area/engine/engineering) "jDB" = ( @@ -38958,8 +39000,7 @@ }, /obj/structure/rack, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/hazardvest, @@ -39092,7 +39133,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, -/area/maintenance/department/science) +/area/science/misc_lab/range) "jMi" = ( /obj/structure/window/reinforced{ dir = 4 @@ -39170,13 +39211,9 @@ /area/crew_quarters/dorms) "jMU" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chemistry_shutters_2"; - name = "chemistry shutters" - }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/plating, /area/medical/chemistry) @@ -39252,6 +39289,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/machinery/camera/directional/west{ + c_tag = "Security - Office - Port" + }, /turf/open/floor/iron/dark/smooth_half{ dir = 1 }, @@ -39479,7 +39519,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio1"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) @@ -39941,8 +39981,7 @@ /area/maintenance/starboard/fore) "kaX" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -40115,7 +40154,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics_shutters"; - name = "robotics shutters" + name = "robotics Shutters" }, /obj/machinery/door/firedoor, /obj/structure/desk_bell{ @@ -40218,6 +40257,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/science) "kfm" = ( @@ -40617,9 +40657,7 @@ /obj/machinery/camera/directional/east{ c_tag = "Auxiliary Tool Storage" }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/light/small{ dir = 4 }, @@ -40758,8 +40796,12 @@ /area/hallway/primary/aft) "kqn" = ( /obj/item/kirbyplants/random, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/iron/techmaint, -/area/maintenance/department/science) +/area/science/misc_lab/range) "kqx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -41001,7 +41043,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters_2"; - name = "research shutters" + name = "research Shutters" }, /obj/machinery/door/firedoor, /turf/open/floor/plating, @@ -41016,6 +41058,9 @@ /area/crew_quarters/fitness/recreation) "kwA" = ( /obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "kwD" = ( @@ -41144,9 +41189,7 @@ /obj/structure/table, /obj/item/paper_bin/construction, /obj/item/airlock_painter, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron, /area/storage/art) "kya" = ( @@ -41877,9 +41920,7 @@ /obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/reagent_containers/food/condiment/enzyme{ - layer = 5 - }, +/obj/item/reagent_containers/food/condiment/enzyme, /obj/item/food/mint, /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) @@ -42478,11 +42519,11 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, -/obj/structure/cable/white{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron, /area/engine/engineering) "kXj" = ( @@ -42548,17 +42589,13 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "kZz" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 4; - pixel_x = -24 +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, -/turf/open/floor/catwalk_floor, -/area/hallway/secondary/exit/departure_lounge) +/obj/structure/lattice, +/obj/machinery/camera/directional/east, +/turf/open/space, +/area/space/nearstation) "kZQ" = ( /obj/structure/table/reinforced, /obj/item/food/grown/carrot{ @@ -42685,9 +42722,6 @@ /obj/effect/turf_decal/tile/red/half{ dir = 1 }, -/obj/machinery/camera/directional/west{ - c_tag = "Security - Office - Port" - }, /obj/machinery/light_switch{ pixel_x = -24; pixel_y = 8 @@ -42700,12 +42734,10 @@ /obj/machinery/atmospherics/components/binary/pump{ name = "Port to Filter" }, -/obj/machinery/light/small{ - dir = 8 - }, /obj/machinery/camera/directional/west{ c_tag = "Atmospherics - Starboard" }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/engine/atmos) "leM" = ( @@ -43097,9 +43129,6 @@ /turf/open/floor/carpet/royalblack, /area/security/main) "llR" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/airalarm/directional/west{ pixel_x = -23 }, @@ -43179,7 +43208,7 @@ pixel_y = 25 }, /turf/open/floor/iron/techmaint, -/area/maintenance/department/science) +/area/science/misc_lab/range) "loB" = ( /obj/structure/chair{ dir = 1 @@ -43292,13 +43321,10 @@ req_access_txt = "5" }, /obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 + dir = 8 }, /obj/effect/loot_jobscale/medical/first_aid_kit, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/medical/storage) "lqg" = ( /obj/structure/flora/ausbushes/grassybush, @@ -43855,22 +43881,15 @@ /area/crew_quarters/locker) "lzs" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/machinery/light/small{ dir = 1 }, -/obj/machinery/camera/directional/north{ - c_tag = "MiniSat Exterior - Aft"; - network = list("minisat") - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, +/obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/aisat) "lzt" = ( @@ -44016,9 +44035,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -44030,7 +44046,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron/dark, /area/maintenance/aft) @@ -44158,13 +44174,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/camera/directional/east{ - c_tag = "MiniSat Exterior - Port Fore"; - network = list("minisat") - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, @@ -44174,9 +44183,6 @@ /turf/open/floor/iron/dark, /area/aisat) "lGp" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -44187,6 +44193,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "lGA" = ( @@ -44373,7 +44382,7 @@ "lJI" = ( /obj/machinery/door/poddoor/preopen{ id = "xenobio4"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -44399,18 +44408,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "lKh" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/item/radio/intercom{ pixel_y = -29 }, @@ -44528,6 +44531,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/ai_upload) +"lLz" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/maintenance/aft) "lLC" = ( /obj/structure/rack, /obj/item/clothing/under/color/blue, @@ -44832,7 +44839,7 @@ }, /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/plating, -/area/maintenance/department/science) +/area/science/misc_lab/range) "lQw" = ( /turf/closed/wall, /area/maintenance/starboard/aft) @@ -45005,8 +45012,7 @@ /area/engine/atmos) "lTw" = ( /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/structure/closet/secure_closet/brig_physician, /obj/effect/turf_decal/tile/red/half{ @@ -45151,9 +45157,7 @@ "lWP" = ( /obj/structure/filingcabinet, /obj/effect/turf_decal/tile/red/anticorner, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark/smooth_corner{ dir = 1 }, @@ -45222,9 +45226,6 @@ pixel_y = -2; receive_ore_updates = 1 }, -/obj/machinery/light{ - dir = 4 - }, /turf/open/floor/iron, /area/medical/chemistry) "lXH" = ( @@ -46107,15 +46108,11 @@ /area/ai_monitored/security/armory) "msa" = ( /obj/structure/window/reinforced, -/obj/machinery/light/small, -/obj/machinery/camera/directional/south{ - c_tag = "MiniSat Exterior - Fore"; - network = list("minisat") - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/aisat) "msp" = ( @@ -46126,6 +46123,10 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "Isolation Shutters" + }, /turf/open/floor/iron/white/side, /area/medical/medbay/lobby) "msz" = ( @@ -46454,9 +46455,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /turf/open/floor/iron/dark/smooth_large, /area/security/brig) "mxV" = ( @@ -46695,6 +46693,16 @@ pixel_x = -2; pixel_y = 6 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chemistry_shutters_2"; + name = "chemistry Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "mBl" = ( @@ -46738,10 +46746,10 @@ /turf/open/floor/iron/dark, /area/engine/break_room) "mBY" = ( -/obj/structure/cable/white{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/engine/engineering) "mCA" = ( @@ -46925,18 +46933,15 @@ /area/medical/genetics/cloning) "mDQ" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 1 + dir = 1 }, /obj/effect/turf_decal/bot, /obj/structure/rack, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = -4; pixel_y = 8 }, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = 2 }, /obj/structure/extinguisher_cabinet{ @@ -46948,7 +46953,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "viroshutters"; - name = "viro shutters" + name = "viro Shutters" }, /turf/open/floor/iron/grid/steel, /area/medical/virology) @@ -47006,6 +47011,19 @@ /area/hallway/primary/central) "mFf" = ( /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chemistry_shutters_2"; + name = "chemistry Shutters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/aft) "mFh" = ( @@ -47019,8 +47037,7 @@ /area/chapel/main) "mFp" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -47049,9 +47066,6 @@ /turf/open/floor/carpet/grimy, /area/security/detectives_office) "mFI" = ( -/obj/structure/cable/white{ - icon_state = "2-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -47068,6 +47082,9 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 5 }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/engine, /area/engine/engineering) "mFN" = ( @@ -47124,8 +47141,7 @@ req_access_txt = "39" }, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/structure/curtain, /turf/open/floor/iron/grid/steel, @@ -47239,9 +47255,7 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -47395,19 +47409,11 @@ /area/quartermaster/qm) "mLT" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/camera/directional/east{ - c_tag = "MiniSat Exterior - Port Aft"; - network = list("minisat") - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, @@ -47570,9 +47576,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, /obj/structure/table, /obj/item/toy/cards/deck{ pixel_x = -1; @@ -47896,10 +47899,6 @@ pixel_x = 4; pixel_y = -3 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chemistry_shutters_2"; - name = "chemistry shutters" - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /obj/structure/desk_bell{ @@ -47908,7 +47907,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron/white, /area/medical/chemistry) @@ -47942,10 +47941,6 @@ id = "chemistbot"; name = "Chemistry Side Shutters" }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/structure/desk_bell{ pixel_x = 5; pixel_y = -1 @@ -48115,6 +48110,12 @@ dir = 6 }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron, /area/maintenance/department/science) "mYh" = ( @@ -48705,10 +48706,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/machinery/door/firedoor, /obj/item/clipboard{ pixel_x = -5; @@ -49142,7 +49139,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters"; - name = "research shutters" + name = "research Shutters" }, /obj/machinery/door/firedoor, /obj/structure/desk_bell{ @@ -49290,9 +49287,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /turf/open/floor/iron, /area/medical/morgue) "nye" = ( @@ -49466,7 +49460,7 @@ /obj/machinery/smartfridge{ name = "Sample Storage" }, -/turf/closed/wall, +/turf/open/floor/iron/grid/steel, /area/medical/virology) "nBe" = ( /obj/machinery/airalarm/directional/north{ @@ -49493,7 +49487,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -49593,6 +49587,9 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/maintenance/department/science) "nDy" = ( @@ -49666,7 +49663,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/plating, /area/security/checkpoint/medical) @@ -50119,9 +50116,7 @@ "nMn" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 @@ -50222,6 +50217,19 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/gateway) +"nOq" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "nOZ" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; @@ -50238,10 +50246,6 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -50255,7 +50259,6 @@ pixel_y = 32 }, /obj/structure/sink{ - layer = 4; pixel_y = 22 }, /turf/open/floor/iron, @@ -50780,7 +50783,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 30 }, -/obj/structure/disposalpipe/segment, /obj/structure/sign/map/right{ desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-right-MS"; @@ -50789,6 +50791,9 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/sorting/unsorted{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/port) "nXr" = ( @@ -50861,9 +50866,7 @@ /turf/open/floor/iron/white, /area/medical/medbay/aft) "nYQ" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/vending/cigarette, /turf/open/floor/iron/dark, /area/bridge) @@ -50921,7 +50924,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio5"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) @@ -51339,8 +51342,7 @@ pixel_y = 25 }, /obj/structure/railing{ - dir = 4; - layer = 3.2 + dir = 4 }, /turf/open/floor/iron/dark, /area/maintenance/department/science/xenobiology) @@ -51416,7 +51418,7 @@ /area/hallway/primary/central) "ojg" = ( /turf/closed/wall, -/area/maintenance/department/science) +/area/science/misc_lab/range) "ojh" = ( /obj/effect/turf_decal/plaque{ icon_state = "L4" @@ -51438,8 +51440,7 @@ pixel_x = -31 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -51471,6 +51472,7 @@ /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/medical/morgue) "ojZ" = ( @@ -51537,7 +51539,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "toxins_blastdoor"; - name = "biohazard containment door" + name = "biohazard Containment Door" }, /turf/open/floor/plating, /area/science/mixing) @@ -51726,9 +51728,6 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "opl" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -51744,6 +51743,9 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 5 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "opm" = ( @@ -51992,15 +51994,15 @@ /turf/open/floor/iron/dark, /area/gateway) "osm" = ( -/obj/structure/cable/white{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/white{ +/obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/plating, /area/engine/engineering) "osp" = ( @@ -52034,7 +52036,7 @@ "osY" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; - name = "bridge blast door" + name = "bridge Blast Door" }, /obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; @@ -52208,9 +52210,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "owo" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/computer/secure_data{ dir = 8 }, @@ -52377,8 +52377,14 @@ dir = 8 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron, -/area/maintenance/department/science) +/area/science/misc_lab/range) "oyI" = ( /obj/machinery/light{ dir = 8 @@ -52786,9 +52792,6 @@ /turf/open/floor/iron, /area/maintenance/port/fore) "oFj" = ( -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -52796,6 +52799,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/carpet/grimy, /area/chapel/office) "oFp" = ( @@ -53184,18 +53190,12 @@ /turf/open/floor/iron/smooth_large, /area/security/brig) "oLr" = ( -/obj/machinery/light/small{ - dir = 1 - }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 + dir = 4 }, -/turf/open/floor/iron/dark, -/area/aisat) +/obj/machinery/camera/directional/west, +/turf/open/space, +/area/space/nearstation) "oLs" = ( /obj/structure/cable{ icon_state = "1-2" @@ -53453,18 +53453,11 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/light/small{ - dir = 8 - }, /obj/machinery/door/window{ base_state = "right"; icon_state = "right"; name = "MiniSat Walkway Access" }, -/obj/machinery/camera/directional/west{ - c_tag = "MiniSat Exterior - Aft Starboard"; - network = list("minisat") - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -53702,6 +53695,10 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/floor/wood, /area/library) "oVG" = ( @@ -53942,14 +53939,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security in red at the top, you see engineering in yellow, science in purple, escape in checkered red-and-white, medbay in green, arrivals in checkered red-and-blue, and then cargo in brown."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark/smooth_corner{ dir = 8 }, @@ -54634,7 +54624,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/plating, /area/maintenance/department/medical/central) @@ -54702,7 +54692,6 @@ /obj/machinery/computer/security/telescreen{ desc = "Used for watching the test chamber."; dir = 8; - layer = 4; name = "Test Chamber Telescreen"; network = list("toxins"); pixel_x = 30 @@ -54711,7 +54700,7 @@ dir = 5 }, /turf/open/floor/iron/dark, -/area/maintenance/department/science) +/area/science/misc_lab/range) "psK" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 1; @@ -54850,9 +54839,7 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "puN" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 }, @@ -54866,9 +54853,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/landmark/start/botanist, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, @@ -55290,6 +55275,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/science) "pEu" = ( @@ -55344,6 +55330,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/visible/layer2{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 6 + }, /turf/open/floor/iron, /area/engine/atmos) "pFB" = ( @@ -55575,8 +55564,7 @@ /area/storage/primary) "pKU" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -55704,7 +55692,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/machinery/door/airlock/maintenance_hatch{ name = "Medbay Maintenance"; @@ -56102,11 +56090,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistry_shutters"; - name = "chemistry shutters" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" + name = "chemistry Shutters" }, /turf/open/floor/plating, /area/medical/chemistry) @@ -56214,8 +56198,8 @@ /area/ai_monitored/turret_protected/ai_upload) "pWx" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/junction{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 5 }, /turf/open/floor/plating, /area/medical/morgue) @@ -56224,6 +56208,9 @@ /obj/effect/turf_decal/siding/wood/end{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/wood, /area/library) "pXg" = ( @@ -56253,7 +56240,7 @@ "pXo" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /obj/structure/cable/yellow{ @@ -56265,8 +56252,8 @@ /turf/open/floor/plating, /area/security/prison) "pXq" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 +/obj/structure/disposalpipe/junction/flip{ + dir = 8 }, /turf/open/floor/iron, /area/engine/break_room) @@ -56407,7 +56394,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -56472,7 +56459,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -56504,9 +56491,6 @@ /turf/open/floor/engine/n2, /area/engine/atmos) "qbq" = ( -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, @@ -56551,7 +56535,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio5"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -56818,6 +56802,9 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "qgs" = ( @@ -56946,15 +56933,15 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/structure/cable/white{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron, /area/engine/engineering) "qjd" = ( @@ -57199,9 +57186,7 @@ /turf/open/floor/iron/dark, /area/hallway/primary/central) "qnw" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/closet/firecloset, /obj/effect/turf_decal/trimline/black/filled/line{ dir = 4 @@ -57245,6 +57230,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/research) "qoH" = ( @@ -57418,9 +57404,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -57432,6 +57415,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "qtR" = ( @@ -57508,9 +57494,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/cable/yellow{ @@ -57535,6 +57518,17 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/security/execution/education) +"qvJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "xeno_blastdoor"; + name = "Secure Lab Shutters" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/science/xenobiology) "qwe" = ( /obj/machinery/door/airlock/security{ aiControlDisabled = 1; @@ -57714,9 +57708,6 @@ /turf/open/floor/plating, /area/maintenance/starboard) "qzv" = ( -/obj/structure/cable/white{ - icon_state = "2-4" - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -57727,6 +57718,9 @@ dir = 4; name = "Cooling Loop bypass" }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/engine, /area/engine/engineering) "qzT" = ( @@ -57771,7 +57765,7 @@ "qAu" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /obj/structure/cable/yellow{ @@ -58147,7 +58141,6 @@ icon_state = "0-4" }, /obj/machinery/shower{ - layer = 4; name = "emergency shower"; pixel_y = 7 }, @@ -58390,8 +58383,9 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8; + sortType = 25 }, /turf/open/floor/iron/white, /area/science/research) @@ -58410,6 +58404,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "qMu" = ( @@ -58481,9 +58478,7 @@ /area/engine/engineering) "qNw" = ( /obj/structure/filingcabinet/employment, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -58567,9 +58562,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/central) @@ -59340,7 +59333,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron/white, /area/maintenance/aft) @@ -59404,7 +59397,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/machinery/door/airlock/maintenance_hatch{ name = "Medbay Maintenance"; @@ -59624,7 +59617,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /turf/open/floor/plating, /area/security/warden) @@ -59694,6 +59687,9 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -29 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "rjI" = ( @@ -59945,6 +59941,16 @@ }, /turf/open/floor/iron, /area/science/robotics/lab) +"rqD" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/science/research) "rqQ" = ( /obj/structure/reflector/box/anchored{ dir = 8 @@ -60390,7 +60396,7 @@ "ryM" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/maintenance/department/science) +/area/science/misc_lab/range) "ryP" = ( /turf/open/floor/iron/dark/smooth_large, /area/security/brig) @@ -61125,9 +61131,6 @@ /turf/open/floor/iron, /area/maintenance/port) "rNv" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -61299,7 +61302,7 @@ "rQn" = ( /obj/machinery/door/poddoor/shutters{ id = "armory"; - name = "armory shutters" + name = "armory Shutters" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -62065,7 +62068,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/department/science) +/area/science/misc_lab/range) "sdd" = ( /obj/machinery/door/airlock/research{ name = "Mech Bay"; @@ -62098,6 +62101,9 @@ pixel_y = -30 }, /obj/machinery/processor, +/obj/machinery/camera/directional/south{ + c_tag = "Kitchen" + }, /turf/open/floor/iron/checker, /area/crew_quarters/kitchen) "sdu" = ( @@ -62314,9 +62320,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/sink{ dir = 4; pixel_x = 11 @@ -62342,8 +62346,7 @@ /area/security/prison) "shs" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -62519,9 +62522,7 @@ /turf/open/floor/iron, /area/science/mixing) "slu" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -62838,6 +62839,13 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space, /area/space/nearstation) +"srf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/maintenance/aft) "srs" = ( /turf/open/floor/prison, /area/security/prison) @@ -63131,7 +63139,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance" @@ -63156,13 +63164,10 @@ /obj/machinery/advanced_airlock_controller{ pixel_x = 27 }, -/obj/machinery/light/small{ - brightness = 3; - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/security/brig) "sxu" = ( @@ -63241,9 +63246,6 @@ /turf/open/floor/iron, /area/medical/patients_rooms) "syp" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -63253,6 +63255,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "syr" = ( @@ -63398,8 +63403,9 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/aft) "sBJ" = ( @@ -63850,9 +63856,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, @@ -63983,9 +63986,7 @@ /turf/open/floor/iron/white, /area/science/research) "sNH" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral, /obj/structure/disposalpipe/segment{ dir = 2 @@ -64042,6 +64043,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/research) "sQb" = ( @@ -64361,15 +64365,15 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/junction/flip{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/destination/dormitories/flip{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "sVr" = ( @@ -65023,7 +65027,11 @@ /area/ai_monitored/security/armory) "tiS" = ( /obj/machinery/smartfridge/chemistry, -/turf/closed/wall/r_wall, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chemistbot"; + name = "Chemistry Side Shutters" + }, +/turf/open/floor/iron/white, /area/medical/chemistry) "tjh" = ( /obj/structure/cable/yellow{ @@ -65084,7 +65092,7 @@ }, /obj/machinery/door/window/brigdoor/security/cell/westleft{ id = "cell"; - name = "Solitary confinement" + name = "Solitary Confinement" }, /turf/open/floor/prison, /area/security/prison) @@ -65136,9 +65144,6 @@ /area/maintenance/starboard/aft) "tkg" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -65151,6 +65156,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/aft) "tkv" = ( @@ -65333,9 +65341,8 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 25 +/obj/structure/disposalpipe/sorting/mail/destination/testing_range/flip{ + dir = 8 }, /turf/open/floor/iron/white, /area/science/research) @@ -65469,10 +65476,8 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "toL" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/research) "toQ" = ( @@ -65623,7 +65628,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -65659,10 +65664,6 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "trE" = ( @@ -65679,7 +65680,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "brigfront"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -65881,7 +65882,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -66085,9 +66086,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "tzA" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/camera/directional/east{ c_tag = "Gateway - Access" }, @@ -66242,7 +66241,7 @@ }, /obj/effect/turf_decal/loading_area, /turf/open/floor/iron/dark, -/area/maintenance/department/science) +/area/science/misc_lab/range) "tDE" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -66285,7 +66284,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; - name = "brig shutters" + name = "brig Shutters" }, /obj/effect/turf_decal/tile/red/half, /turf/open/floor/iron/dark/smooth_half{ @@ -67449,7 +67448,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/maintenance/department/science) +/area/science/misc_lab/range) "tYS" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/stripes/line{ @@ -67498,9 +67497,6 @@ name = "Chapel Office Maintenance"; req_one_access_txt = "22" }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -67508,6 +67504,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/plating, /area/chapel/office) "tZR" = ( @@ -67928,6 +67927,9 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood/corner, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/wood, /area/library) "ugA" = ( @@ -68480,13 +68482,13 @@ /turf/open/floor/iron/techmaint, /area/security/main) "urk" = ( -/obj/structure/cable/white{ - icon_state = "0-2" - }, /obj/machinery/power/emitter/welded{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/plating, /area/engine/engineering) "urp" = ( @@ -68513,9 +68515,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "usz" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/light{ dir = 4 }, @@ -68675,9 +68675,11 @@ /turf/open/floor/iron, /area/engine/break_room) "uuI" = ( -/obj/effect/landmark/blobstart, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/closed/wall, +/area/quartermaster/sorting) "uuZ" = ( /obj/machinery/light{ dir = 1 @@ -68961,10 +68963,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" - }, /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/medical/medbay/lobby) @@ -69074,9 +69072,7 @@ /area/maintenance/starboard) "uBG" = ( /obj/effect/spawner/randomarcade, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 }, @@ -69176,7 +69172,7 @@ "uEf" = ( /obj/machinery/door/poddoor/preopen{ id = "testlab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -69365,6 +69361,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/science) "uIM" = ( @@ -69536,10 +69533,6 @@ pixel_x = -7; pixel_y = 2 }, -/obj/machinery/camera/autoname{ - dir = 9; - network = list("ss13","medbay") - }, /turf/open/floor/iron/dark, /area/medical/morgue) "uKR" = ( @@ -69547,10 +69540,6 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/disposal/bin{ - pixel_x = -2; - pixel_y = -2 - }, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -69558,6 +69547,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/machinery/disposal/bin, /turf/open/floor/iron, /area/science/shuttledock) "uLk" = ( @@ -69796,14 +69786,14 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio4"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) "uPU" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters"; - name = "research shutters" + name = "research Shutters" }, /obj/machinery/door/window/eastright{ dir = 2; @@ -70036,9 +70026,6 @@ "uVF" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/effect/mapping_helpers/dead_body_placer, /turf/open/floor/iron, /area/medical/morgue) @@ -71348,9 +71335,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/effect/mapping_helpers/dead_body_placer, /turf/open/floor/iron, /area/medical/morgue) @@ -71581,9 +71565,7 @@ dir = 1; pixel_y = 32 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -71626,6 +71608,9 @@ /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/explab) "vxo" = ( @@ -71717,9 +71702,6 @@ /turf/open/floor/plating, /area/maintenance/starboard) "vAF" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -71731,6 +71713,9 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "vAG" = ( @@ -71829,8 +71814,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/dark, -/area/maintenance/department/science) +/area/science/misc_lab/range) "vCu" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -71879,8 +71867,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/dark, -/area/maintenance/department/science) +/area/science/misc_lab/range) "vDB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -71921,7 +71915,7 @@ name = "BOMB RANGE" }, /turf/closed/wall, -/area/maintenance/department/science) +/area/science/misc_lab/range) "vEi" = ( /obj/machinery/status_display/evac{ pixel_y = 32 @@ -71949,8 +71943,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -72083,6 +72076,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron, /area/maintenance/department/science) "vHE" = ( @@ -72150,9 +72146,7 @@ /turf/closed/wall, /area/security/main) "vIU" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/tile/blue{ @@ -72883,27 +72877,28 @@ /turf/open/floor/wood, /area/library) "vVl" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line, /obj/machinery/camera/directional/south{ c_tag = "Engineering Supermatter Aft"; network = list("ss13","engine") }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "vVq" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, -/area/maintenance/department/science) +/area/science/misc_lab/range) "vVW" = ( -/obj/structure/rack, /obj/effect/turf_decal/bot{ dir = 1 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, /turf/open/floor/iron/techmaint, -/area/maintenance/department/science) +/area/science/misc_lab/range) "vVX" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -73217,7 +73212,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "xenobio2"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -73276,7 +73271,7 @@ "wer" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /obj/structure/cable/yellow{ @@ -73403,7 +73398,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /turf/open/floor/iron, /area/medical/virology) @@ -73868,7 +73863,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; - name = "biohazard containment door" + name = "biohazard Containment Door" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -74324,7 +74319,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio7"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -74361,9 +74356,6 @@ /turf/open/floor/wood/big, /area/crew_quarters/bar) "wzX" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -74374,6 +74366,9 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "wAq" = ( @@ -74834,6 +74829,18 @@ }, /turf/open/floor/carpet/grimy, /area/security/detectives_office) +"wJr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/sorting/mail/destination/chapel/flip{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/aft) "wJR" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -74947,7 +74954,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/research/glass{ - name = "science shuttle dock"; + name = "science Shuttle Dock"; req_one_access_txt = "49" }, /obj/machinery/door/firedoor, @@ -75015,7 +75022,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "xenobio4"; - name = "containment blast door" + name = "containment Blast Door" }, /turf/open/floor/plating, /area/science/xenobiology) @@ -75308,15 +75315,24 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/science/research) +"wSk" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/white, /area/science/research) "wSv" = ( @@ -75397,9 +75413,7 @@ name = "Service Hall APC"; pixel_y = 24 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/hallway/secondary/service) @@ -75647,7 +75661,7 @@ "wXO" = ( /obj/machinery/door/poddoor/preopen{ id = "xenobio1"; - name = "containment blast door" + name = "containment Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -75738,9 +75752,7 @@ /obj/machinery/camera/directional/north{ c_tag = "Fitness Room - Fore" }, -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /obj/machinery/light{ dir = 1 }, @@ -75895,10 +75907,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/structure/disposalpipe/sorting/mail/destination/library/flip{ + dir = 1 + }, /turf/open/floor/iron, /area/hallway/primary/central) "xdK" = ( @@ -75933,7 +75947,7 @@ /obj/effect/spawner/structure/window/reinforced/prison, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -76135,6 +76149,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/library) "xhI" = ( @@ -76176,8 +76191,7 @@ "xis" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -76230,6 +76244,7 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/camera/directional/north, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "xiI" = ( @@ -76324,7 +76339,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -76489,6 +76504,7 @@ /area/security/brig) "xlZ" = ( /obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/medbay/aft) "xmj" = ( @@ -76928,9 +76944,6 @@ /turf/open/floor/iron/smooth_large, /area/security/brig) "xts" = ( -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -77012,9 +77025,6 @@ }, /area/security/checkpoint/engineering) "xus" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -77026,6 +77036,9 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 10 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engine/engineering) "xut" = ( @@ -77165,9 +77178,7 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron, /area/construction/storage_wing) "xxI" = ( @@ -77901,7 +77912,7 @@ /area/science/lab) "xJw" = ( /obj/machinery/door/airlock/public/glass{ - name = "space-bridge access" + name = "space-bridge Access" }, /obj/machinery/button/door{ id = "supplybridge"; @@ -78102,6 +78113,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron, /area/quartermaster/sorting) "xOP" = ( @@ -78138,9 +78152,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -78150,6 +78161,9 @@ /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) "xPx" = ( @@ -78212,8 +78226,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/grass/jungle/b, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, @@ -78292,8 +78305,7 @@ /area/medical/surgery) "xRy" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 1 + dir = 1 }, /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -78310,7 +78322,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "viroshutters"; - name = "viro shutters" + name = "viro Shutters" }, /turf/open/floor/iron/grid/steel, /area/medical/virology) @@ -78530,7 +78542,6 @@ /obj/machinery/computer/security/telescreen{ desc = "Used for watching the test chamber."; dir = 8; - layer = 4; name = "Test Chamber Telescreen"; network = list("toxins"); pixel_x = 30 @@ -78539,7 +78550,7 @@ dir = 6 }, /turf/open/floor/iron/dark, -/area/maintenance/department/science) +/area/science/misc_lab/range) "xWi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -78737,6 +78748,13 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/secondary/command) +"xZr" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/plating, +/area/library) "xZv" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -78753,9 +78771,6 @@ /turf/open/floor/iron/grid/steel, /area/medical/virology) "xZA" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/structure/table/glass, /obj/item/book/manual/wiki/chemistry{ pixel_x = -4; @@ -78965,6 +78980,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/research) "ydw" = ( @@ -78975,6 +78991,9 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/white, /area/science/xenobiology) "ydx" = ( @@ -79196,6 +79215,12 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/secondary/command) +"ygv" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/carpet/purple, +/area/crew_quarters/heads/hor) "ygH" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/closet/crate/freezer/surplus_limbs, @@ -79315,10 +79340,10 @@ /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "yhS" = ( -/obj/structure/cable/white{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/white{ +/obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -79477,7 +79502,6 @@ dir = 1 }, /obj/structure/sink{ - layer = 4; pixel_y = 22 }, /obj/structure/mirror{ @@ -79611,7 +79635,7 @@ /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /obj/machinery/door/poddoor/shutters/preopen{ id = "viroshutters"; - name = "viro shutters" + name = "viro Shutters" }, /turf/open/floor/iron/white, /area/medical/virology) @@ -94189,18 +94213,18 @@ alC off aob aob -dux -dux -dux -cJh -cJh -cJh -cJh -cJh -cJh -cJh -cJh -cJh +bTs +bTs +bTs +dBO +dBO +dBO +dBO +dBO +dBO +dBO +dBO +dBO aaa aaf btN @@ -94446,18 +94470,18 @@ amZ qtR eST cHo -dux -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE +bTs +avr +avr +avr +avr +avr +avr +avr +avr +avr aup -cJh +dBO aaa aaf btN @@ -94703,18 +94727,18 @@ auF aGn eST cJS -dux -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -cJh +bTs +avr +avr +avr +avr +avr +avr +avr +avr +avr +avr +dBO aaa aaf btN @@ -94960,18 +94984,18 @@ aob jyo cMO aob -dux -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -cJh +bTs +avr +avr +avr +avr +avr +avr +avr +avr +avr +avr +dBO aaa aaa btN @@ -95217,18 +95241,18 @@ dwW wIj eST aob -dux -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -cJh +bTs +avr +avr +avr +avr +avr +avr +avr +avr +avr +avr +dBO bTs dBO dBO @@ -95475,16 +95499,16 @@ nPl eST aob cnl -bXE -bXE -bXE -bXE -arM -bXE -bXE -bXE -bXE -bXE +avr +avr +avr +avr +gyd +avr +avr +avr +avr +avr cnl cQv eyZ @@ -95732,16 +95756,16 @@ gEP rNl aob cnl -bXE -bXE -bXE -bXE -uuI -bXE -bXE -bXE -bXE -bXE +avr +avr +avr +avr +eEV +avr +avr +avr +avr +avr cnl cEE cia @@ -95988,18 +96012,18 @@ alK nTB hFd whe -dux -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -dux +bTs +avr +avr +avr +avr +avr +avr +avr +avr +avr +avr +bTs wLx cia wZm @@ -96245,18 +96269,18 @@ alK sNh iWw xsk -dux -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -dux +bTs +avr +avr +avr +avr +avr +avr +avr +avr +avr +avr +bTs cEE cia wfJ @@ -96479,7 +96503,7 @@ bdg byI bgF dmF -dmF +uuI dmF wDQ kbj @@ -96502,18 +96526,18 @@ alK gEP eST xIW -dux -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -dux +bTs +avr +avr +avr +avr +avr +avr +avr +avr +avr +avr +bTs khw rao phq @@ -96759,18 +96783,18 @@ bRf qOE cMO aob -dux -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -bXE -dux +bTs +avr +avr +avr +avr +avr +avr +avr +avr +avr +avr +bTs hTY cia bUw @@ -97016,18 +97040,18 @@ alK gEP iWw aob -dux -dux -dux -dux -dux +bTs +bTs +bTs +bTs +bTs cnl cnl -dux -dux -dux -dux -dux +bTs +bTs +bTs +bTs +bTs wJR cia iCW @@ -97243,10 +97267,10 @@ aMv aMv cVC aXf -rEK +ccS bao -dmH -bdh +hrl +dux beW xOH hWa @@ -97498,7 +97522,7 @@ aQj aMv aKS dCB -aMv +bIX aMv rEK bap @@ -98012,7 +98036,7 @@ kzE aMv aSS aMv -aQl +fGk aXh fXm bar @@ -98269,7 +98293,7 @@ aQm aJH aST aJH -aJH +bXE aXi ylh bas @@ -100377,23 +100401,23 @@ ovI lby dnJ sYW -pmr +wJr xlZ iiO sBv -gKe -tjJ -avr -avr -avr +srf +lLz +hwG +hwG +hwG dxI -avr -avr -tjJ -avr -avr -avr -iuw +hwG +hwG +lLz +hwG +hwG +hwG +dgV cLa cLa cLa @@ -100907,7 +100931,7 @@ sqB rnD cCe esA -iuw +bPi cLa nBO njU @@ -101631,7 +101655,7 @@ bue mRx aZO qeK -mRx +xZr bue kca qnp @@ -101674,7 +101698,7 @@ nyc uVF nyc vsi -hwG +eLp gSM cCe vfC @@ -101888,7 +101912,7 @@ jjZ xuo xul rSE -rRr +nOq vxy xuo xuo @@ -105761,7 +105785,7 @@ pmN tMi yeg jgw -eng +tyH hcg gvA liG @@ -105965,7 +105989,7 @@ apH gKC apH ybO -sbU +cVw lxh cWk aHx @@ -106222,7 +106246,7 @@ apI ajz asp dkO -cMK +sbU jgH tIr aHy @@ -107344,7 +107368,7 @@ tqG fNG mCA clT -kZz +slv kzn aaa aaa @@ -107517,7 +107541,7 @@ aHD aHD aHD aHD -aQF +aTk eWM aTk aUF @@ -110399,14 +110423,14 @@ cwN wVw csW ctO -ctO +wSk wSh ydv qom -cQd -cwN +dCa +ctO emH -cwN +wSk wVw cwN dDy @@ -110663,7 +110687,7 @@ cxJ grt grt kNm -grt +rqD cCs grt grt @@ -110920,7 +110944,7 @@ cSd cSd oIM fyM -oIM +qvJ cSd cSd lqg @@ -111427,7 +111451,7 @@ obf crP cuN ctR -cuN +ygv cLB tvl cSd @@ -114518,7 +114542,7 @@ thn cSd oIM wlR -oIM +qvJ cRi cRi cRi @@ -115549,7 +115573,7 @@ mjJ tVz ciw tVz -mjJ +ojg eBh oyH ojg @@ -115806,7 +115830,7 @@ ejK xxZ krD ygp -mjJ +ojg vVW vDA cAw @@ -116063,7 +116087,7 @@ fkl eZj lwJ liD -mjJ +ojg cFB vCs vVq @@ -116320,7 +116344,7 @@ ejK pyV eMY mOL -mjJ +ojg kqn erp vVq @@ -116577,7 +116601,7 @@ mjJ wxi eMY lSj -mjJ +ojg cTi eqG jMd @@ -116834,7 +116858,7 @@ jqu pVN dJI uKR -mjJ +ojg lop psw xVY @@ -117091,7 +117115,7 @@ tMl fmT ggj dTK -mjJ +ojg vDV ryM ryM @@ -121654,7 +121678,7 @@ dfi aQd dBA aSA -wzX +eng cXA rAS sHC @@ -122206,7 +122230,7 @@ bXm bIS bZI ggZ -ccS +ccQ bza aaf gJs @@ -123477,7 +123501,7 @@ bCv bEa bFU bHy -bIX +bZK bKE bKE dhh @@ -124002,8 +124026,8 @@ bKG bIZ bKG bMl -bYB bKG +bYB bKG dtD bAR @@ -124213,7 +124237,7 @@ ack ack axY kFB -dew +cMK aCZ axY axY @@ -131432,7 +131456,7 @@ bkP rCU tWv vUC -oLr +bnt dLH njs bKK @@ -131679,7 +131703,7 @@ anT anT anT anT -anT +blx anT anT anT @@ -131936,7 +131960,7 @@ anT aaa aTQ aNw -aNw +oLr aNw aNw aNw @@ -131960,7 +131984,7 @@ anT anT anT anT -anT +blx anT anT anT @@ -132217,7 +132241,7 @@ aNw bJl aNw aNw -aNw +oLr aNw aNw aNw @@ -132448,7 +132472,7 @@ dXp dXp dXp dXp -hrl +xHM aVk aOY aOY @@ -134495,8 +134519,8 @@ aaa aaa aaa aaa -anT -aMq +blx +cJh aYd qTn msa @@ -134541,8 +134565,8 @@ bTm lzs jda cmX -bgn -anT +dOd +blx aaa aaa aaa @@ -136560,7 +136584,7 @@ eKe eKe eKe eKe -fGk +xuR aOX aNw aNw @@ -136578,7 +136602,7 @@ aRy aRy aaa aMq -cVw +kaX eKe eKe eKe @@ -136824,7 +136848,7 @@ eKe eKe eKe eKe -dOd +xuR bgn aaa aaa @@ -136843,7 +136867,7 @@ aOY aOY aOY aNC -aOY +arM aOY aOY aOY @@ -137076,7 +137100,7 @@ anT aaa aNC aOY -aOY +arM aOY aOY aOY @@ -137087,7 +137111,7 @@ aNw aNw aNw aSD -jvt +pKU bsj aNw aNw @@ -137100,7 +137124,7 @@ anT anT anT anT -anT +blx anT anT anT @@ -137333,7 +137357,7 @@ anT anT anT anT -anT +blx anT anT anT @@ -137601,7 +137625,7 @@ aOY aOY aOY aOY -aNC +kZz aOY aOY aOY @@ -137858,7 +137882,7 @@ anT anT anT anT -anT +blx anT anT anT diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 54ccf0595f554..9a660252c5951 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -937,7 +937,7 @@ "gH" = ( /obj/machinery/door/poddoor/preopen{ id = "labor"; - name = "labor camp blast door" + name = "labor Camp Blast Door" }, /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/iron/techmaint, @@ -1824,7 +1824,7 @@ "me" = ( /obj/structure/barricade/wooden/crude, /obj/machinery/door/airlock/research{ - name = "tachyon-doppler array booth"; + name = "tachyon-doppler Array Booth"; req_access_txt = "7" }, /obj/effect/turf_decal/stripes/closeup{ @@ -4445,7 +4445,7 @@ /obj/machinery/door/window/westleft{ base_state = "right"; icon_state = "right"; - name = "Unisex bathroom" + name = "Unisex Bathroom" }, /obj/structure/sign/poster/official/cleanliness{ pixel_y = 32 @@ -5581,7 +5581,7 @@ /area/lavaland/surface/outdoors/explored) "PK" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "mining relay room"; + name = "mining Relay Room"; req_access_txt = "48" }, /obj/structure/cable/yellow{ @@ -6600,7 +6600,7 @@ /area/mine/laborcamp) "WD" = ( /obj/machinery/door/airlock/maintenance{ - name = "Radioisotope containment room"; + name = "Radioisotope Containment Room"; req_access_txt = "48" }, /obj/structure/cable{ diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm index 0860f3be74112..db7f836c18a06 100644 --- a/_maps/map_files/RadStation/RadStation.dmm +++ b/_maps/map_files/RadStation/RadStation.dmm @@ -197,8 +197,7 @@ /area/medical/virology) "abL" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 1 + dir = 1 }, /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -215,7 +214,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -363,7 +362,6 @@ "aeh" = ( /obj/structure/table/wood, /obj/item/toy/figure/curator{ - layer = 4; pixel_x = 4; pixel_y = 4 }, @@ -732,9 +730,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "alT" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/effect/spawner/lootdrop/ruinloot/medical, @@ -873,6 +869,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/science/mixing) "aoM" = ( @@ -899,7 +898,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "hopshutter"; - name = "privacy shutters" + name = "Privacy Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -1113,9 +1112,7 @@ }, /obj/item/key/security, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "asP" = ( /obj/machinery/door/airlock{ name = "Hydroponics"; @@ -1224,8 +1221,7 @@ /area/security/courtroom) "auq" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1303,7 +1299,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/camera/directional/north, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/storage/primary) "auW" = ( @@ -1400,9 +1396,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "axg" = ( /obj/machinery/door/airlock{ id_tag = "Cell"; @@ -1419,9 +1413,7 @@ dir = 1 }, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "axk" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 @@ -1529,6 +1521,12 @@ burnt = 1 }, /area/maintenance/port/central) +"ayA" = ( +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/turf/open/floor/engine/o2, +/area/engine/atmos) "ayF" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -1655,9 +1653,7 @@ }, /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "aAK" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -1795,12 +1791,10 @@ icon_state = "4-8" }, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "aEE" = ( /obj/machinery/smartfridge/chemistry, -/turf/closed/wall, +/turf/open/floor/iron, /area/medical/apothecary) "aEI" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -1907,9 +1901,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/light, /turf/open/floor/holofloor/wood, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "aGA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter, @@ -2198,9 +2190,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/firealarm/directional/north, /turf/open/floor/carpet/green, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "aLQ" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 8 @@ -2375,7 +2365,7 @@ "aON" = ( /obj/machinery/door/poddoor/preopen{ id = "testlab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/closeup{ @@ -2430,7 +2420,7 @@ departmentType = 5; pixel_y = 30 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Security Post - Medbay"; network = list("ss13","medbay") }, @@ -2516,9 +2506,7 @@ icon_state = "1-2" }, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "aRN" = ( /obj/machinery/door/poddoor/shutters{ id = "RDToxStore"; @@ -2611,7 +2599,7 @@ /obj/machinery/door/airlock/security{ aiControlDisabled = 1; id_tag = "prisonereducation"; - name = "Prison access"; + name = "Prison Access"; req_one_access_txt = "3" }, /obj/effect/turf_decal/delivery/red, @@ -2695,9 +2683,6 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -2810,9 +2795,7 @@ /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/freezer, -/area/security/prison{ - name = "Prison Toilet" - }) +/area/security/prison) "aVk" = ( /obj/machinery/light{ light_color = "#7AC3FF" @@ -2949,12 +2932,10 @@ /area/engine/atmos) "aXE" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/vending/snack/orange, /obj/effect/turf_decal/bot, @@ -3027,6 +3008,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/science/misc_lab) "aYW" = ( @@ -3111,9 +3095,7 @@ dir = 10 }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "baX" = ( /obj/structure/safe, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -3141,7 +3123,6 @@ }, /obj/machinery/shower{ dir = 8; - layer = 4; name = "emergency shower"; pixel_y = 6 }, @@ -3154,7 +3135,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow, /obj/structure/cable/yellow{ @@ -3639,9 +3620,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "blC" = ( /obj/item/radio/intercom{ pixel_x = -27 @@ -3689,7 +3668,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/junction/flip{ +/obj/structure/disposalpipe/sorting/mail/destination/law_office/flip{ dir = 1 }, /turf/open/floor/iron, @@ -3797,9 +3776,7 @@ /turf/open/floor/iron/white/side, /area/science/research) "bnW" = ( -/obj/structure/window/reinforced{ - layer = 2 - }, +/obj/structure/window/reinforced, /obj/effect/landmark/start/randommaint/psychiatrist, /obj/structure/chair/office/light{ dir = 1 @@ -3810,6 +3787,9 @@ pixel_x = 32; pixel_y = 1 }, +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","medbay") + }, /turf/open/floor/wood, /area/medical/exam_room) "bod" = ( @@ -3819,6 +3799,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron/tech, /area/engine/engine_room) "boq" = ( @@ -3861,8 +3844,7 @@ pixel_x = -22; pixel_y = 10 }, -/obj/machinery/camera/autoname{ - dir = 10; +/obj/machinery/camera/autoname/directional/west{ network = list("ss13","medbay") }, /turf/open/floor/iron/grid/steel, @@ -4169,9 +4151,6 @@ /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 }, -/obj/structure/disposalpipe/sorting/mail{ - name = "Security" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, @@ -4181,6 +4160,9 @@ /obj/effect/turf_decal/guideline/guideline_edge/red{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "btT" = ( @@ -4190,6 +4172,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/science/mixing) "btZ" = ( @@ -4314,7 +4299,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ id = "AIwindows"; - name = "AI View Blast door" + name = "AI View Blast Door" }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) @@ -4341,6 +4326,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/science/mixing) "bwB" = ( @@ -4437,21 +4425,17 @@ /area/security/prison/shielded) "bzb" = ( /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "bzc" = ( /obj/structure/sign/poster/random{ pixel_x = 2 }, /turf/closed/wall, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "bzm" = ( /obj/machinery/portable_atmospherics/canister/plasma, /obj/effect/turf_decal/delivery, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","rd") }, /turf/open/floor/iron, @@ -4545,7 +4529,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "Engidesk"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -4680,7 +4664,7 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","medbay"); view_range = 10 }, @@ -4786,9 +4770,7 @@ color = "#DE3A3A" }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "bFC" = ( /obj/machinery/light/small{ dir = 4 @@ -4961,6 +4943,12 @@ }, /turf/open/floor/iron, /area/hydroponics) +"bJl" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/dark, +/area/engine/engine_room) "bJv" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -5142,9 +5130,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "bMC" = ( /obj/structure/window/reinforced{ dir = 1 @@ -5289,9 +5275,6 @@ /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -5310,6 +5293,9 @@ /obj/effect/turf_decal/guideline/guideline_tri/yellow{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron, /area/engine/engineering) "bPo" = ( @@ -5317,7 +5303,7 @@ /turf/closed/wall, /area/hydroponics) "bPu" = ( -/obj/machinery/camera/directional/north, +/obj/machinery/camera/autoname/directional/north, /obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -5510,6 +5496,7 @@ /obj/effect/turf_decal/guideline/guideline_tri/yellow{ dir = 8 }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/engine/engineering) "bRH" = ( @@ -5578,9 +5565,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "bSZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -5600,7 +5585,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","engine") }, /obj/effect/turf_decal/stripes/line, @@ -5650,8 +5635,7 @@ "bTR" = ( /obj/item/kirbyplants/random, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/quartermaster/exploration_prep) @@ -5774,9 +5758,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "bXk" = ( /obj/machinery/light{ dir = 1 @@ -5833,9 +5815,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "bXU" = ( /obj/effect/decal/cleanable/robot_debris/old, /turf/open/space/basic, @@ -6093,9 +6073,7 @@ /area/engine/atmospherics_engine) "ccG" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /obj/structure/table/wood, /turf/open/floor/carpet/green, /area/hallway/secondary/exit/departure_lounge) @@ -6199,6 +6177,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/security/brig) "ceW" = ( @@ -6524,9 +6503,7 @@ "ciT" = ( /obj/structure/sign/departments/minsky/security/security, /turf/closed/wall/r_wall, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "cjc" = ( /obj/structure/girder/reinforced, /turf/open/space/basic, @@ -6585,15 +6562,7 @@ /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/siding/white, /turf/open/floor/glass/reinforced, -/area/hallway/primary/central{ - dynamic_lighting = 2; - lighting_brightness_tube = 11; - lighting_colour_bulb = "#DDE6FF"; - lighting_colour_night = "#DDE6FF"; - lighting_colour_tube = "#DDE6FF"; - lighting_overlay_colour = "#DDE6FF"; - power_light = 0 - }) +/area/hallway/primary/central) "ckl" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -6769,9 +6738,7 @@ icon_state = "1-2" }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "cmw" = ( /obj/machinery/power/apc/auto_name/directional/north, /turf/closed/wall/r_wall, @@ -6828,6 +6795,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/bridge) +"cnW" = ( +/obj/machinery/camera/motion/directional/south{ + c_tag = "MiniSat Exterior 3"; + network = list("minisat") + }, +/turf/open/space/basic, +/area/space) "cnX" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/southleft{ @@ -6867,7 +6841,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "MiniSat Core Hallway 5"; network = list("minisat") }, @@ -6985,9 +6959,7 @@ }, /obj/structure/table/wood, /turf/open/floor/carpet/green, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "cpx" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -7057,7 +7029,7 @@ /area/crew_quarters/toilet) "crc" = ( /obj/machinery/door/airlock/security{ - name = "Prison intake"; + name = "Prison Intake"; req_access_txt = "2" }, /obj/machinery/door/firedoor, @@ -7077,9 +7049,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "crh" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -7100,9 +7070,7 @@ /area/janitor) "crB" = ( /turf/closed/wall/r_wall, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "crF" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 28 @@ -7162,7 +7130,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "Engidesk"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -7211,9 +7179,7 @@ pixel_y = 32 }, /turf/open/floor/carpet/green, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "ctt" = ( /turf/closed/wall, /area/quartermaster/office) @@ -7670,9 +7636,7 @@ /area/hallway/primary/central) "cyy" = ( /turf/closed/wall, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "cyG" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 @@ -7806,20 +7770,12 @@ dir = 8 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "cAC" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon, /turf/open/space/basic, /area/space/nearstation) -"cAP" = ( -/obj/machinery/camera/autoname/directional/east{ - network = list("ss13","engine") - }, -/turf/open/floor/engine/plasma, -/area/engine/atmos) "cAT" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4 @@ -7960,9 +7916,7 @@ icon_state = "1-2" }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "cEE" = ( /obj/machinery/light/small{ dir = 4 @@ -7980,6 +7934,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/engine/engine_room) "cFj" = ( @@ -8150,9 +8105,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "cId" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8167,7 +8120,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -8213,7 +8166,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistry_shutters"; - name = "chemistry shutters" + name = "chemistry Shutters" }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -8275,10 +8228,6 @@ /area/engine/atmos) "cJu" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/camera/autoname{ - dir = 6; - network = list("ss13","prison") - }, /obj/machinery/status_display/door_timer{ id = "cell"; name = "Solitary confinement timer"; @@ -8291,10 +8240,11 @@ pixel_y = 32 }, /obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","prison") + }, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "cJD" = ( /obj/machinery/telecomms/bus/preset_three, /obj/effect/turf_decal/stripes/line{ @@ -8308,9 +8258,7 @@ }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "cJN" = ( /obj/structure/sign/painting/library{ pixel_x = -32 @@ -8352,7 +8300,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "brigentrance"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -8361,9 +8309,7 @@ icon_state = "0-8" }, /turf/open/floor/plating, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "cKm" = ( /turf/closed/wall/rust, /area/quartermaster/qm) @@ -8388,7 +8334,7 @@ "cKY" = ( /obj/machinery/door/poddoor/preopen{ id = "Engidesk"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/machinery/door/firedoor, /obj/machinery/door/window/northright{ @@ -8517,15 +8463,7 @@ dir = 10 }, /turf/open/floor/glass/reinforced, -/area/hallway/primary/central{ - dynamic_lighting = 2; - lighting_brightness_tube = 11; - lighting_colour_bulb = "#DDE6FF"; - lighting_colour_night = "#DDE6FF"; - lighting_colour_tube = "#DDE6FF"; - lighting_overlay_colour = "#DDE6FF"; - power_light = 0 - }) +/area/hallway/primary/central) "cME" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/stripes{ @@ -8645,7 +8583,8 @@ /obj/machinery/smartfridge{ name = "Bulk storage" }, -/turf/closed/wall, +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/turf/open/floor/iron, /area/hydroponics) "cOL" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, @@ -8670,12 +8609,10 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/preopen{ id = "brigentrance"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /turf/open/floor/plating, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "cPj" = ( /obj/structure/lattice, /obj/structure/frame, @@ -8787,8 +8724,7 @@ }, /obj/machinery/vending/wardrobe/cargo_wardrobe, /obj/structure/railing{ - dir = 8; - layer = 3.1 + dir = 8 }, /turf/open/floor/iron/dark, /area/quartermaster/office) @@ -9133,6 +9069,9 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "cYn" = ( @@ -9144,9 +9083,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "cYr" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -9244,9 +9181,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/plating, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "daa" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -9280,7 +9215,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Science - Toxins Mixing Lab Burn Chamber"; name = "science camera"; network = list("ss13","rd") @@ -9339,18 +9274,14 @@ alpha = 180; color = "#DE3A3A" }, -/obj/structure/disposalpipe/sorting/mail{ - sortType = 30 - }, +/obj/structure/disposalpipe/sorting/mail/destination/detective_office, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "dbs" = ( /obj/machinery/status_display/evac{ pixel_y = 32 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "MiniSat Upload East"; network = list("minisat","aiupload") }, @@ -9445,7 +9376,6 @@ /obj/machinery/door/window{ base_state = "leftsecure"; icon_state = "leftsecure"; - layer = 4.1; name = "Tertiary AI Core Access"; obj_integrity = 300; req_access_txt = "16" @@ -9495,7 +9425,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "medpriv1"; - name = "privacy door" + name = "privacy Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -9712,7 +9642,7 @@ /obj/structure/sign/warning/securearea{ pixel_y = 30 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","engine") }, /turf/open/floor/iron/dark, @@ -9820,7 +9750,7 @@ }, /obj/machinery/door/window/northleft{ dir = 8; - name = "Kitchen doors"; + name = "Kitchen Doors"; req_one_access_txt = "28;25;35" }, /turf/open/floor/iron/cafeteria, @@ -9861,7 +9791,7 @@ /obj/effect/turf_decal/delivery/red, /obj/machinery/door/poddoor/preopen{ id = "brigentrance"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/machinery/turnstile, /obj/machinery/door/firedoor, @@ -9871,9 +9801,7 @@ }, /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "djl" = ( /turf/closed/wall{ desc = "Try setting a bomb next to it. This may destroy the wall, allowing you access to the room on the other side."; @@ -10020,6 +9948,9 @@ network = list("thunder","court"); pixel_y = -32 }, +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","rd") + }, /turf/open/floor/carpet, /area/quartermaster/exploration_prep) "dli" = ( @@ -10052,7 +9983,7 @@ /obj/machinery/newscaster{ pixel_y = 33 }, -/obj/machinery/camera/directional/north, +/obj/machinery/camera/autoname/directional/north, /obj/effect/turf_decal/bot, /obj/machinery/computer/warrant, /turf/open/floor/carpet/royalblack, @@ -10169,7 +10100,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosroom"; - name = "HoS Room Blast door" + name = "HoS Room Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -10234,9 +10165,7 @@ }, /obj/effect/turf_decal/guideline/guideline_edge/red, /turf/open/floor/iron, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "dqc" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 @@ -10408,6 +10337,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "dsS" = ( @@ -10547,9 +10479,7 @@ dir = 5 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "dvk" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -10570,9 +10500,7 @@ /obj/item/trash/raisins, /obj/item/trash/syndi_cakes, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "dvq" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -10881,9 +10809,6 @@ /obj/item/kirbyplants/random{ pixel_y = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -10942,9 +10867,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "dAD" = ( /obj/machinery/firealarm{ dir = 4; @@ -11013,11 +10936,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/camera/autoname{ - c_tag = "Head of Personnel's Office"; - dir = 6 - }, /obj/machinery/firealarm/directional/east, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/grid/steel, /area/hydroponics) "dBO" = ( @@ -11126,7 +11046,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "MiniSat Upload West"; network = list("minisat","aiupload") }, @@ -11184,9 +11104,7 @@ pixel_y = 6 }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "dDT" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 9 @@ -11454,8 +11372,7 @@ /area/maintenance/port/central) "dHF" = ( /obj/structure/window/reinforced{ - dir = 8; - layer = 1 + dir = 8 }, /turf/open/floor/engine, /area/science/xenobiology) @@ -11602,7 +11519,7 @@ /area/library) "dJN" = ( /obj/structure/bodycontainer/morgue, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","medbay") }, /turf/open/floor/iron/dark, @@ -11687,9 +11604,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "dLc" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -12042,9 +11957,7 @@ }, /obj/effect/turf_decal/bot, /turf/open/floor/holofloor/wood, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "dPr" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /obj/structure/bed/roller, @@ -12091,6 +12004,9 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/engine/engineering) "dQv" = ( @@ -12155,9 +12071,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "dSm" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon, @@ -12256,9 +12170,7 @@ icon_state = "1-4" }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "dUk" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -12407,9 +12319,7 @@ /obj/effect/turf_decal/guideline/guideline_edge/red, /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "dVY" = ( /obj/structure/sign/departments/restroom, /turf/closed/wall, @@ -12519,6 +12429,21 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"dXJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/catwalk_floor, +/area/maintenance/department/engine) "dXS" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -12550,7 +12475,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters{ id = "Chefwindow"; - name = "Chef window" + name = "Chef Window" }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) @@ -12730,7 +12655,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "hopshutter"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) @@ -12803,8 +12728,7 @@ /area/medical/chemistry) "edP" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -13025,6 +12949,7 @@ pixel_x = -32; pixel_y = 3 }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/engine/engine_room) "ehk" = ( @@ -13104,7 +13029,6 @@ pixel_y = 1 }, /obj/machinery/ecto_sniffer{ - layer = 4; pixel_x = 2; pixel_y = 7 }, @@ -13225,8 +13149,7 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/machinery/camera/directional/east{ - c_tag = "Incinerator"; +/obj/machinery/camera/autoname/directional/east{ network = list("ss13","engine") }, /turf/open/floor/iron/dark, @@ -13310,7 +13233,7 @@ /obj/item/bedsheet/purple{ name = "Holy bedsheet" }, -/obj/machinery/camera/directional/north, +/obj/machinery/camera/autoname/directional/north, /obj/machinery/firealarm/directional/east, /turf/open/floor/wood, /area/chapel/office) @@ -13338,9 +13261,7 @@ /area/chapel/office) "emF" = ( /turf/closed/wall/r_wall, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "emI" = ( /obj/item/cigbutt{ pixel_x = -13; @@ -13461,13 +13382,12 @@ req_access_txt = "39" }, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /turf/open/floor/iron/grid/steel, /area/medical/virology) "eoO" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Xenobiology Lab - Pen #2"; network = list("ss13","rd","xeno") }, @@ -13704,7 +13624,6 @@ icon_state = "0-4" }, /obj/item/taperecorder{ - layer = 2.9; pixel_x = -5; pixel_y = 4 }, @@ -13840,7 +13759,7 @@ /area/quartermaster/exploration_prep) "eus" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/iron, /area/crew_quarters/kitchen) "euH" = ( /obj/machinery/light, @@ -13928,7 +13847,7 @@ "evJ" = ( /obj/machinery/door/poddoor/preopen{ id = "testlab"; - name = "test chamber blast door" + name = "test Chamber Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -14360,7 +14279,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/structure/sign/departments/minsky/security/command{ pixel_x = -32 @@ -14506,9 +14425,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "eFL" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -14683,8 +14600,7 @@ /area/maintenance/starboard/aft) "eId" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 3 + dir = 4 }, /obj/machinery/holopad, /turf/open/floor/iron/tech/grid, @@ -14752,7 +14668,6 @@ pixel_y = 8 }, /obj/item/pinpointer/nuke{ - layer = 6; pixel_y = 5 }, /obj/structure/extinguisher_cabinet{ @@ -14816,19 +14731,12 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "eJU" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow, /turf/open/floor/plating, /area/maintenance/department/science) -"eJV" = ( -/turf/closed/wall/r_wall, -/area/security/brig{ - name = "Brig Interrogation" - }) "eKd" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 1 @@ -14981,15 +14889,7 @@ pixel_y = 19 }, /turf/open/floor/glass/reinforced, -/area/hallway/primary/central{ - dynamic_lighting = 2; - lighting_brightness_tube = 11; - lighting_colour_bulb = "#DDE6FF"; - lighting_colour_night = "#DDE6FF"; - lighting_colour_tube = "#DDE6FF"; - lighting_overlay_colour = "#DDE6FF"; - power_light = 0 - }) +/area/hallway/primary/central) "eNe" = ( /obj/structure/table/reinforced, /obj/item/gun/ballistic/shotgun/riot{ @@ -15171,16 +15071,15 @@ /area/maintenance/port/aft) "ePU" = ( /obj/machinery/airalarm/directional/south, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","rd") - }, /obj/structure/rack, /obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, /obj/item/healthanalyzer, +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","rd") + }, /turf/open/floor/iron/white, /area/science/explab) "eQf" = ( @@ -15222,9 +15121,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "eQN" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -15284,9 +15181,7 @@ pixel_x = 32 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "eSu" = ( /obj/structure/table, /obj/item/clipboard{ @@ -15443,16 +15338,14 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "eTq" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -15481,8 +15374,7 @@ /area/maintenance/port/aft) "eTH" = ( /obj/structure/railing{ - dir = 6; - layer = 3.1 + dir = 6 }, /obj/structure/chair/fancy/comfy{ color = "#596479"; @@ -15515,10 +15407,12 @@ "eUx" = ( /obj/structure/closet/bombcloset, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/science/mixing) "eUz" = ( @@ -15890,9 +15784,6 @@ /turf/open/floor/engine, /area/engine/supermatter) "eZJ" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -16186,9 +16077,7 @@ icon_state = "1-2" }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "fdM" = ( /obj/structure/table, /obj/item/radio/intercom{ @@ -16213,10 +16102,19 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/virology) +"fed" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/engine/engine_room) "feg" = ( /obj/structure/railing{ - dir = 10; - layer = 3.1 + dir = 10 }, /obj/structure/chair/fancy/comfy{ buildstackamount = 0; @@ -16266,7 +16164,6 @@ dir = 1 }, /obj/machinery/shower{ - layer = 4; name = "emergency shower"; pixel_y = 12 }, @@ -16302,9 +16199,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/camera/autoname{ - dir = 10 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -16315,6 +16209,7 @@ color = "#267878"; dir = 8 }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/crew_quarters/dorms) "ffm" = ( @@ -16349,7 +16244,7 @@ /turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "fhb" = ( -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","cargo") }, /obj/machinery/conveyor{ @@ -16382,9 +16277,7 @@ pixel_x = 6 }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "fhK" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -16516,7 +16409,7 @@ icon_state = "0-2" }, /obj/machinery/recharge_station, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","rd") }, /obj/effect/landmark/start/cyborg, @@ -16734,9 +16627,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "flg" = ( /turf/closed/wall/rust, /area/quartermaster/warehouse) @@ -16860,8 +16751,7 @@ pixel_y = -3 }, /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /obj/machinery/keycard_auth{ pixel_x = -32; @@ -16908,15 +16798,7 @@ dir = 9 }, /turf/open/floor/glass/reinforced, -/area/hallway/primary/central{ - dynamic_lighting = 2; - lighting_brightness_tube = 11; - lighting_colour_bulb = "#DDE6FF"; - lighting_colour_night = "#DDE6FF"; - lighting_colour_tube = "#DDE6FF"; - lighting_overlay_colour = "#DDE6FF"; - power_light = 0 - }) +/area/hallway/primary/central) "fnD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -16953,7 +16835,7 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","engine") }, /turf/open/floor/iron/tech, @@ -17129,26 +17011,6 @@ /obj/machinery/power/tracker, /turf/open/space/basic, /area/solar/starboard/aft) -"fqL" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/light, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/structure/closet/secure_closet/atmospherics{ - anchored = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "fqN" = ( /obj/item/toy/figure/mime, /turf/open/floor/grass, @@ -17162,9 +17024,7 @@ }, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "frc" = ( /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) @@ -17685,9 +17545,7 @@ /area/medical/office) "fAw" = ( /obj/effect/spawner/structure/window, -/obj/structure/barricade/wooden/crude{ - layer = 4 - }, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/library) "fAH" = ( @@ -18048,9 +17906,6 @@ "fHH" = ( /turf/open/space/basic, /area/solar/port/fore) -"fHK" = ( -/turf/closed/wall/r_wall, -/area/security/brig) "fHP" = ( /obj/effect/turf_decal/tile/blue/half, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -18103,8 +17958,7 @@ dir = 8 }, /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /obj/machinery/door/window{ dir = 1; @@ -18268,9 +18122,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "fLx" = ( /obj/machinery/mech_bay_recharge_port, /obj/machinery/newscaster{ @@ -18313,9 +18165,7 @@ /turf/open/floor/iron/sepia, /area/quartermaster/office) "fLW" = ( -/obj/structure/railing{ - layer = 3.1 - }, +/obj/structure/railing, /obj/structure/chair/fancy/comfy{ color = "#596479"; dir = 1 @@ -18389,7 +18239,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/camera/directional/north, +/obj/machinery/camera/autoname/directional/north, /obj/machinery/power/terminal{ dir = 8 }, @@ -18408,9 +18258,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "fNg" = ( /turf/open/floor/carpet, /area/library) @@ -18432,9 +18280,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "fNs" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -18560,7 +18406,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Teleporter Room" }, /obj/structure/table/wood, @@ -18598,9 +18444,7 @@ pixel_x = -12 }, /turf/open/floor/iron/freezer, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "fPx" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -18629,6 +18473,7 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/engine/engineering) "fQg" = ( @@ -18832,8 +18677,7 @@ /area/quartermaster/storage) "fSM" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/structure/closet/emcloset, /obj/effect/turf_decal/bot, @@ -18940,9 +18784,6 @@ /area/hallway/primary/fore) "fUT" = ( /obj/machinery/firealarm/directional/east, -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/turf_decal/guideline/guideline_edge/blue{ color = "#267878"; @@ -19162,7 +19003,7 @@ /area/hallway/primary/port) "fZk" = ( /obj/machinery/smartfridge/sci, -/turf/closed/wall, +/turf/open/floor/iron, /area/science/robotics) "fZt" = ( /obj/structure/table, @@ -19212,6 +19053,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 5 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/tech, /area/engine/engine_room) "fZM" = ( @@ -19240,7 +19084,7 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 9 }, /turf/open/floor/iron, /area/engine/engineering) @@ -19494,7 +19338,7 @@ /area/maintenance/department/medical/morgue) "gdY" = ( /obj/machinery/door/airlock/public/glass{ - name = "visitation area" + name = "visitation Area" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -19503,11 +19347,8 @@ /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "gee" = ( -/obj/structure/closet/crate/freezer/blood, /obj/item/rollerbed, /obj/item/rollerbed{ pixel_x = 4; @@ -19522,6 +19363,7 @@ pixel_y = 8 }, /obj/item/clothing/mask/muzzle, +/obj/item/reagent_containers/blood/OPlus, /turf/open/floor/iron/white, /area/security/brig/medbay) "geq" = ( @@ -19669,6 +19511,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "gfZ" = ( @@ -19952,10 +19797,14 @@ /turf/open/space/basic, /area/solar/starboard/aft) "gky" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/fullgrass, -/turf/open/floor/grass, -/area/hallway/primary/central) +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/hallway/primary/port) "gkB" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/power/apc/auto_name/directional/east, @@ -19964,10 +19813,16 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"gkI" = ( +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/turf/open/floor/engine/airless, +/area/engine/atmos) "gkK" = ( /obj/machinery/door/poddoor/shutters{ id = "atmosshutters"; - name = "Atmos storage" + name = "Atmos Storage" }, /obj/effect/turf_decal/loading_area{ dir = 8 @@ -20201,9 +20056,7 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/structure/barricade/wooden/crude{ - layer = 4 - }, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/maintenance/department/bridge) "gnE" = ( @@ -20322,9 +20175,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -20404,9 +20254,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "grE" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -20542,7 +20390,7 @@ /area/science/xenobiology) "gtD" = ( /obj/machinery/cryopod{ - desc = "Suited for Cyborgs and Humanoids, the pod is a safe place for personnel affected by the Space Sleep Disorder to get some rest. If you think that this the easy way out, Nanotransen will address your situation in a later date..."; + desc = "Suited for Cyborgs and Humanoids, the pod is a safe place for personnel affected by the Space Sleep Disorder to get some rest. If you think that this the easy way out, Nanotrasen will address your situation in a later date..."; name = "Jail cryogenic freezer" }, /obj/machinery/computer/cryopod{ @@ -20588,9 +20436,7 @@ pixel_y = -24 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "guk" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/small{ @@ -20612,27 +20458,17 @@ /turf/open/floor/iron/dark, /area/security/warden) "guA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 +/obj/machinery/power/apc/auto_name/directional/north{ + areastring = "/area/engine/supermatter" }, -/obj/effect/turf_decal/guideline/guideline_in/brown, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 + icon_state = "0-2" }, -/turf/open/floor/iron, -/area/hallway/primary/port) +/turf/open/floor/iron/dark, +/area/engine/engine_room) "guB" = ( /obj/machinery/firealarm/directional/east, /obj/structure/disposalpipe/segment{ @@ -20803,7 +20639,7 @@ }, /obj/machinery/door/poddoor/shutters{ id = "Chefwindow"; - name = "Chef window" + name = "Chef Window" }, /turf/open/floor/plating, /area/crew_quarters/kitchen) @@ -20857,7 +20693,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters{ id = "qm_warehouse"; - name = "warehouse shutters" + name = "warehouse Shutters" }, /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) @@ -20920,9 +20756,7 @@ icon_state = "1-2" }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "gzJ" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt/dust, @@ -20976,9 +20810,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/table, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "gAU" = ( /obj/machinery/vendor/mining, /obj/machinery/light{ @@ -20991,14 +20823,13 @@ pixel_y = 35 }, /obj/structure/sink{ - layer = 4; pixel_y = 25 }, /turf/open/floor/iron/white, /area/crew_quarters/heads/captain/private) "gBm" = ( /obj/machinery/smartfridge/food, -/turf/closed/wall, +/turf/open/floor/iron/white, /area/crew_quarters/kitchen) "gBo" = ( /obj/structure/disposalpipe/segment{ @@ -21059,6 +20890,9 @@ /obj/structure/closet/bombcloset/white, /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/bot, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/iron, /area/science/explab) "gCz" = ( @@ -21082,9 +20916,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "gCB" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -21117,9 +20949,6 @@ /turf/open/floor/iron, /area/security/checkpoint/science) "gCQ" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -21127,6 +20956,9 @@ /obj/effect/turf_decal/guideline/guideline_edge/yellow{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/engine/engineering) "gCT" = ( @@ -21185,9 +21017,7 @@ icon_state = "0-4" }, /turf/open/floor/plating, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "gEs" = ( /obj/machinery/biogenerator, /obj/effect/turf_decal/stripes/line{ @@ -21195,9 +21025,7 @@ }, /obj/effect/turf_decal/tile/black/fourcorners, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "gEE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21258,10 +21086,10 @@ /obj/effect/turf_decal/guideline/guideline_in/purple{ dir = 1 }, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/guideline/guideline_edge/brown{ dir = 4 }, -/obj/effect/turf_decal/guideline/guideline_edge/brown{ +/obj/structure/disposalpipe/sorting/unsorted{ dir = 4 }, /turf/open/floor/iron, @@ -21289,8 +21117,7 @@ /obj/machinery/newscaster{ pixel_y = 34 }, -/obj/machinery/camera/autoname{ - dir = 9; +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","security","court") }, /turf/open/floor/wood, @@ -21479,9 +21306,7 @@ /area/maintenance/department/medical/morgue) "gIf" = ( /turf/closed/wall/r_wall, -/area/security/prison{ - name = "Prison Toilet" - }) +/area/security/prison) "gIh" = ( /obj/structure/window/reinforced{ dir = 1 @@ -21576,9 +21401,7 @@ /obj/machinery/computer/warrant, /obj/effect/turf_decal/bot, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "gKy" = ( /turf/closed/wall, /area/quartermaster/warehouse) @@ -21600,7 +21423,7 @@ }, /area/medical/medbay/central) "gKA" = ( -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","cargo") }, /obj/machinery/newscaster{ @@ -21660,7 +21483,6 @@ "gLm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/ash/large{ - layer = 4; pixel_x = -3; pixel_y = -8 }, @@ -21673,14 +21495,13 @@ "gLp" = ( /obj/structure/table/wood, /obj/item/kirbyplants/random{ - layer = 3; pixel_y = 18 }, /obj/item/candle/infinite{ pixel_x = 1; pixel_y = 2 }, -/obj/machinery/camera/directional/north, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/carpet/purple, /area/chapel/main) "gLV" = ( @@ -21698,13 +21519,11 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "brigentrance"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "gMc" = ( /obj/structure/rack, /obj/item/lighter, @@ -21922,6 +21741,7 @@ /obj/effect/turf_decal/guideline/guideline_tri/_corner/yellow{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engine/engineering) "gOz" = ( @@ -21936,9 +21756,7 @@ /obj/machinery/holopad, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "gOK" = ( /obj/effect/landmark/xeno_spawn, /obj/effect/decal/cleanable/dirt/dust, @@ -22028,12 +21846,6 @@ /turf/open/floor/iron, /area/science/xenobiology) "gQN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -22120,7 +21932,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "hopshutter"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/plating, /area/crew_quarters/heads/hop) @@ -22311,7 +22123,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "brigentrance"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /turf/open/floor/plating, /area/security/brig) @@ -22383,8 +22195,7 @@ /area/maintenance/department/medical/morgue) "gWq" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 3 + dir = 1 }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) @@ -22404,18 +22215,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) -"gXl" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/landmark/start/exploration, -/obj/machinery/camera/autoname/directional/south{ - network = list("ss13","rd") - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/quartermaster/exploration_prep) "gXC" = ( /obj/structure/chair/office{ dir = 1 @@ -22439,7 +22238,7 @@ /area/crew_quarters/heads/captain) "gXJ" = ( /obj/machinery/smartfridge/chemistry/preloaded, -/turf/closed/wall, +/turf/open/floor/iron, /area/medical/apothecary) "gYa" = ( /obj/machinery/photocopier, @@ -22467,9 +22266,6 @@ /turf/open/floor/plating, /area/medical/chemistry) "gZc" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -22522,12 +22318,10 @@ }, /obj/structure/window/reinforced{ dir = 1; - layer = 2.9; pixel_y = 3 }, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/effect/turf_decal/stripes/box, /obj/structure/window/reinforced, @@ -22564,7 +22358,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosroom"; - name = "HoS Room Blast door" + name = "HoS Room Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -22576,11 +22370,6 @@ /obj/structure/sign/departments/minsky/medical/chemistry/chemical2, /turf/closed/wall, /area/maintenance/starboard/aft) -"hae" = ( -/turf/closed/wall/r_wall, -/area/security/prison{ - name = "Prison Visitation" - }) "hay" = ( /obj/machinery/sleeper{ dir = 4 @@ -22642,13 +22431,11 @@ dir = 1 }, /obj/item/instrument/piano_synth, -/obj/machinery/camera/autoname{ - dir = 10 - }, /obj/machinery/light_switch{ pixel_x = -23; pixel_y = 1 }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/wood, /area/library) "hbH" = ( @@ -22682,7 +22469,6 @@ /turf/open/floor/iron/tech, /area/engine/atmos) "hcm" = ( -/obj/machinery/light/small, /obj/structure/cable{ icon_state = "1-8" }, @@ -22773,7 +22559,7 @@ /turf/open/floor/iron, /area/engine/engine_room) "hdv" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Xenobiology Lab - Pen #3"; network = list("ss13","rd","xeno") }, @@ -22810,11 +22596,6 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "hen" = ( -/obj/machinery/camera/autoname{ - c_tag = "Head of Personnel's Office"; - dir = 6; - pixel_y = 12 - }, /obj/machinery/newscaster{ pixel_x = 28; pixel_y = 2 @@ -22822,6 +22603,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/wood, /area/crew_quarters/theatre) "heA" = ( @@ -22860,9 +22642,7 @@ prison_radio = 1 }, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "hff" = ( /obj/item/kirbyplants/random, /obj/structure/disposalpipe/segment{ @@ -22948,9 +22728,7 @@ "hgl" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "hgw" = ( /obj/effect/turf_decal/tile/blue/half, /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -23033,7 +22811,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Xenobiology Lab - Pen #7"; network = list("ss13","rd","xeno") }, @@ -23191,13 +22969,12 @@ /obj/machinery/stasis{ dir = 1 }, -/obj/machinery/camera/autoname{ - dir = 10; - network = list("ss13","security") - }, /obj/machinery/defibrillator_mount{ pixel_x = -32 }, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","security") + }, /turf/open/floor/iron/white, /area/security/brig/medbay) "hkB" = ( @@ -23228,7 +23005,7 @@ "hkQ" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/effect/spawner/structure/window/reinforced/prison, /obj/structure/cable/yellow{ @@ -23454,7 +23231,7 @@ /turf/open/floor/plating, /area/construction/mining/aux_base) "hpC" = ( -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Engineering - Secure Storage"; name = "engineering camera"; network = list("ss13","engine") @@ -23557,7 +23334,7 @@ /turf/open/floor/iron, /area/maintenance/department/science) "hsI" = ( -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Medbay - Break Room"; name = "medbay camera"; network = list("ss13","medbay") @@ -23586,7 +23363,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ id = "Capoffice"; - name = "Captain blast door" + name = "Captain Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -23646,7 +23423,7 @@ "htY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Science - Toxins Mixing Lab Burn Chamber"; name = "science camera"; network = list("ss13","rd") @@ -23986,7 +23763,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -24074,6 +23851,9 @@ /obj/effect/turf_decal/guideline/guideline_tri/yellow{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "hBA" = ( @@ -24085,9 +23865,7 @@ }, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "hBG" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -24102,9 +23880,7 @@ /area/hallway/primary/central) "hBK" = ( /turf/closed/wall/r_wall, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "hBL" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/airalarm/directional/east, @@ -24152,6 +23928,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) "hBW" = ( @@ -24234,7 +24013,7 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance/external{ - name = "construction zone"; + name = "construction Zone"; req_one_access_txt = "32;47;48;37;29" }, /obj/effect/mapping_helpers/airlock/unres{ @@ -24317,9 +24096,6 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, /obj/machinery/camera/autoname/directional/east, /obj/machinery/light{ dir = 4 @@ -24474,10 +24250,6 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "hIn" = ( -/obj/machinery/camera/autoname{ - dir = 10; - network = list("ss13","prison") - }, /obj/structure/railing{ dir = 1 }, @@ -24486,10 +24258,11 @@ dir = 9 }, /obj/effect/turf_decal/tile/black/fourcorners, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","prison") + }, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "hIs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -24541,7 +24314,7 @@ }, /obj/machinery/door/window/southleft{ dir = 8; - name = "Witness box"; + name = "Witness Box"; req_one_access_txt = "63;42;38" }, /obj/structure/cable/yellow{ @@ -24569,15 +24342,7 @@ dir = 6 }, /turf/open/floor/glass/reinforced, -/area/hallway/primary/central{ - dynamic_lighting = 2; - lighting_brightness_tube = 11; - lighting_colour_bulb = "#DDE6FF"; - lighting_colour_night = "#DDE6FF"; - lighting_colour_tube = "#DDE6FF"; - lighting_overlay_colour = "#DDE6FF"; - power_light = 0 - }) +/area/hallway/primary/central) "hJO" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -24599,9 +24364,7 @@ /obj/machinery/computer/security, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "hKc" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -24827,7 +24590,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosprivacy"; - name = "HoS Privacy Blast door" + name = "HoS Privacy Blast Door" }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) @@ -24942,6 +24705,7 @@ pixel_x = 33; pixel_y = -3 }, +/obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/engine/engine_room) "hOB" = ( @@ -25111,11 +24875,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/wood, /area/library) -"hRv" = ( -/turf/closed/wall/r_wall, -/area/security/prison{ - name = "Prison Dorms" - }) "hRz" = ( /obj/machinery/atmospherics/components/binary/circulator/cold, /obj/effect/turf_decal/box/corners{ @@ -25158,9 +24917,7 @@ dir = 8 }, /turf/open/floor/iron/freezer, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "hSa" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -25217,8 +24974,7 @@ /obj/structure/closet/emcloset, /obj/effect/turf_decal/bot, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) @@ -25282,8 +25038,7 @@ "hVD" = ( /obj/effect/turf_decal/tile/black/fourcorners, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/structure/weightmachine/weightlifter, /obj/effect/turf_decal/bot_white, @@ -25339,8 +25094,7 @@ req_one_access_txt = "47;63" }, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -25375,12 +25129,10 @@ /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "hYg" = ( /obj/machinery/smartfridge/extract/preloaded, -/turf/closed/wall/r_wall, +/turf/open/floor/iron/white, /area/science/xenobiology) "hYo" = ( /obj/machinery/space_heater, @@ -25393,15 +25145,13 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/camera/directional/east{ +/obj/machinery/camera/autoname/directional/east{ c_tag = "Interrogation room"; network = list("interrogation") }, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "hYv" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/wood, @@ -25435,9 +25185,7 @@ color = "#DE3A3A" }, /turf/open/floor/iron, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "hYY" = ( /obj/machinery/vending/engivend, /obj/structure/railing{ @@ -25479,6 +25227,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/port) "hZF" = ( @@ -25681,7 +25432,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/item/paper_bin{ pixel_x = -6; @@ -25802,7 +25553,6 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/shower{ dir = 1; - layer = 4; name = "emergency shower" }, /obj/effect/turf_decal/loading_area/white{ @@ -25967,9 +25717,7 @@ color = "#DE3A3A" }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "ijx" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -25983,7 +25731,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -25993,9 +25741,7 @@ name = "Vacant Office A"; req_access_txt = "12" }, -/obj/structure/barricade/wooden/crude{ - layer = 4 - }, +/obj/structure/barricade/wooden/crude, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -26095,8 +25841,7 @@ /area/chapel/office) "ilD" = ( /obj/structure/window/reinforced{ - dir = 8; - layer = 1 + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, @@ -26104,14 +25849,12 @@ "ilH" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "ilS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -26191,7 +25934,7 @@ pixel_x = -10; pixel_y = -23 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "MiniSat Core Hallway 3"; network = list("minisat") }, @@ -26309,7 +26052,7 @@ pixel_y = 3 }, /obj/machinery/door/window/brigdoor/westleft{ - name = "energy guns"; + name = "energy Guns"; req_access_txt = "3" }, /obj/structure/window/reinforced, @@ -26335,9 +26078,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/vending/security, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "ipA" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -26504,7 +26245,7 @@ "isp" = ( /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -26531,9 +26272,7 @@ network = list("security") }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "isP" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -26593,9 +26332,7 @@ dir = 8 }, /turf/open/floor/iron/freezer, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "itV" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -26619,14 +26356,12 @@ alpha = 180; dir = 4 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - name = "Medbay Junction"; - sortType = 5 - }, /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 1 }, +/obj/structure/disposalpipe/sorting/mail/destination/ce_office{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/break_room) "iuO" = ( @@ -26719,7 +26454,7 @@ icon_state = "4-8" }, /obj/machinery/firealarm/directional/north, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","engine") }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -26761,9 +26496,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "ixy" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -26799,6 +26532,9 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "ixS" = ( @@ -27012,6 +26748,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "iCf" = ( @@ -27136,7 +26875,7 @@ "iFb" = ( /obj/machinery/door/poddoor/incinerator_toxmix{ id = "tox_ESD"; - name = "Emergency space door" + name = "Emergency Space Door" }, /turf/open/floor/iron, /area/science/storage) @@ -27173,6 +26912,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "iFN" = ( @@ -27192,9 +26934,7 @@ icon_state = "1-2" }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "iGn" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -27206,7 +26946,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -27272,9 +27012,7 @@ /area/engine/engine_room) "iIu" = ( /turf/closed/wall, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "iIv" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ alpha = 180; @@ -27295,9 +27033,6 @@ /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, /turf/open/floor/iron, /area/engine/engineering) "iIE" = ( @@ -27414,8 +27149,7 @@ pixel_y = 1 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/light/floor{ brightness = 15; @@ -27538,7 +27272,7 @@ /turf/closed/wall/rust, /area/maintenance/central) "iMA" = ( -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Xenobiology Lab - Pen #1"; network = list("ss13","rd","xeno") }, @@ -27918,6 +27652,12 @@ }, /turf/open/floor/wood, /area/security/courtroom) +"iSF" = ( +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/turf/open/floor/engine/n2o, +/area/engine/atmos) "iSN" = ( /obj/structure/cable{ icon_state = "0-8" @@ -27987,8 +27727,7 @@ /area/maintenance/port/aft) "iUV" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 3 + dir = 4 }, /obj/structure/table, /obj/item/paper/guides/jobs/engi/gravity_gen, @@ -28118,7 +27857,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ id = "AIwindows"; - name = "AI View Blast door" + name = "AI View Blast Door" }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) @@ -28169,6 +27908,7 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engine/break_room) "iYu" = ( @@ -28358,6 +28098,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "jaG" = ( @@ -28386,7 +28129,7 @@ dir = 4 }, /obj/machinery/firealarm/directional/north, -/obj/machinery/camera/directional/north, +/obj/machinery/camera/autoname/directional/north, /obj/machinery/washing_machine, /obj/structure/window/reinforced{ dir = 8 @@ -28401,7 +28144,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "brigentrance"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -28410,9 +28153,7 @@ icon_state = "0-2" }, /turf/open/floor/plating, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "jbg" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -28507,7 +28248,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Teleporter Room" }, /turf/open/floor/iron/white, @@ -28585,7 +28326,7 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "jcP" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Xenobiology Lab - Pen #4"; network = list("ss13","rd","xeno") }, @@ -28606,15 +28347,7 @@ "jdh" = ( /obj/effect/landmark/start/assistant, /turf/open/floor/glass/reinforced, -/area/hallway/primary/central{ - dynamic_lighting = 2; - lighting_brightness_tube = 11; - lighting_colour_bulb = "#DDE6FF"; - lighting_colour_night = "#DDE6FF"; - lighting_colour_tube = "#DDE6FF"; - lighting_overlay_colour = "#DDE6FF"; - power_light = 0 - }) +/area/hallway/primary/central) "jdn" = ( /obj/item/shovel/spade, /obj/item/storage/belt/botanical, @@ -28695,11 +28428,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/port/aft) -"jeK" = ( -/turf/closed/wall, -/area/security/prison{ - name = "Prison Visitation" - }) "jeN" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/power/smes{ @@ -28769,9 +28497,7 @@ }, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "jgz" = ( /obj/structure/railing/corner{ dir = 8 @@ -28948,7 +28674,6 @@ /area/maintenance/port/aft) "jiR" = ( /obj/structure/sign/departments/holy, -/obj/structure/sign/departments/holy, /turf/closed/wall, /area/chapel/main) "jiS" = ( @@ -29057,8 +28782,7 @@ "jkH" = ( /obj/effect/turf_decal/siding/wood/end, /obj/structure/railing{ - dir = 10; - layer = 3.2 + dir = 10 }, /turf/open/floor/wood, /area/crew_quarters/theatre) @@ -29103,12 +28827,11 @@ /area/quartermaster/qm) "jlZ" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 1 + dir = 1 }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/item/kirbyplants/random, /turf/open/floor/iron/grid/steel, @@ -29126,6 +28849,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/quartermaster/warehouse) "jmw" = ( @@ -29196,6 +28920,23 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) +"jnZ" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ + alpha = 180 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/engine/engineering) "jof" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -29286,7 +29027,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "brigentrance"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, @@ -29312,12 +29053,10 @@ /area/quartermaster/storage) "jpI" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/machinery/light/floor{ brightness = 15; @@ -29425,11 +29164,6 @@ /obj/structure/aquarium, /turf/open/floor/iron, /area/quartermaster/qm) -"jrR" = ( -/turf/closed/wall, -/area/security/prison{ - name = "Prison Dorms" - }) "jrW" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral{ @@ -29581,9 +29315,7 @@ dir = 6 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "jtr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -29608,6 +29340,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/science/misc_lab) "jtU" = ( @@ -29848,7 +29583,6 @@ pixel_y = -2 }, /obj/machinery/door/window/northright{ - layer = 3.1; name = "Jetpack Storage"; req_access_txt = "19" }, @@ -29870,6 +29604,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron/tech, /area/engine/engine_room) "jxU" = ( @@ -30170,7 +29907,7 @@ "jCL" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -30201,7 +29938,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters{ id = "Chefwindow"; - name = "Chef window" + name = "Chef Window" }, /turf/open/floor/plating, /area/crew_quarters/kitchen) @@ -30228,7 +29965,7 @@ "jDF" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -30267,7 +30004,6 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, @@ -30581,8 +30317,7 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -30619,9 +30354,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "jJC" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -30669,7 +30402,7 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/shutters/preopen{ id = "hopshutter"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/plating, /area/maintenance/department/bridge) @@ -30735,8 +30468,7 @@ /area/maintenance/department/science) "jMm" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8; @@ -30758,9 +30490,7 @@ pixel_y = -8 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "jMC" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line{ @@ -30934,12 +30664,10 @@ /area/bridge) "jPF" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) @@ -31466,9 +31194,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, /obj/item/xenoartifact_labeler{ pixel_y = 6 }, @@ -31509,9 +31234,7 @@ icon_state = "1-2" }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "jZm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -31662,7 +31385,7 @@ "kch" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -31696,6 +31419,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/tech, /area/engine/engine_room) "kcZ" = ( @@ -32199,9 +31925,6 @@ /area/engine/engine_room) "klt" = ( /obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/light{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -32224,6 +31947,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/hallway/secondary/entry) "klu" = ( @@ -32285,8 +32009,7 @@ /area/hydroponics) "kma" = ( /obj/structure/railing{ - dir = 10; - layer = 3.1 + dir = 10 }, /obj/effect/spawner/randomvend/cola, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -32402,7 +32125,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow, /turf/open/floor/plating, @@ -32459,9 +32182,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "kpf" = ( /obj/machinery/status_display/evac, /turf/closed/wall/r_wall, @@ -32687,6 +32408,12 @@ /obj/effect/mapping_helpers/tile_breaker, /turf/open/floor/wood, /area/maintenance/central) +"kus" = ( +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/turf/open/floor/engine/plasma, +/area/engine/atmos) "kuy" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -32823,6 +32550,9 @@ /area/security/warden) "kvR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "kvU" = ( @@ -32902,8 +32632,7 @@ /area/security/checkpoint/medical) "kxr" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) @@ -32989,9 +32718,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/vending/coffee, /turf/open/floor/iron, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "kyR" = ( /turf/closed/wall/r_wall, /area/security/checkpoint/escape) @@ -33075,9 +32802,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "kBB" = ( /obj/machinery/light/floor, /obj/effect/landmark/start/ai, @@ -33191,7 +32916,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "AIwindows"; - name = "AI View Blast door" + name = "AI View Blast Door" }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -33368,7 +33093,6 @@ /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 1; - layer = 2.9; pixel_y = 3 }, /obj/structure/desk_bell{ @@ -33425,15 +33149,12 @@ /obj/structure/curtain, /obj/machinery/shower{ dir = 8; - layer = 4; name = "emergency shower"; pixel_x = -5; pixel_y = -5 }, /turf/open/floor/noslip/standard, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "kIi" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -33599,6 +33320,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/science/mixing) "kKw" = ( @@ -33616,9 +33340,7 @@ }, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "kKx" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -33740,9 +33462,7 @@ }, /obj/effect/turf_decal/guideline/guideline_edge/red, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "kLF" = ( /obj/effect/turf_decal/bot, /obj/structure/cable/yellow{ @@ -34242,6 +33962,9 @@ pixel_x = 1; pixel_y = 22 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron, /area/science/misc_lab) "kVe" = ( @@ -34486,7 +34209,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -34524,7 +34247,7 @@ "kZd" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/effect/turf_decal/delivery, /turf/open/floor/noslip/standard, @@ -34583,9 +34306,7 @@ color = "#DE3A3A" }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "kZA" = ( /obj/machinery/light/small{ dir = 1 @@ -34827,7 +34548,7 @@ "lcj" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -34878,9 +34599,6 @@ /turf/open/floor/wood, /area/security/prison) "ldP" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -34891,6 +34609,9 @@ pixel_x = -31; pixel_y = -3 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/engine/engineering) "lef" = ( @@ -34945,7 +34666,7 @@ "leQ" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow, /obj/effect/spawner/structure/window/reinforced/prison, @@ -34967,9 +34688,6 @@ pixel_x = -5; pixel_y = 5 }, -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_x = 21; pixel_y = 22 @@ -34980,7 +34698,7 @@ /obj/machinery/rnd/production/circuit_imprinter, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Incinerator"; network = list("ss13","engine") }, @@ -35216,7 +34934,6 @@ /obj/structure/closet/crate/rcd, /obj/machinery/door/window/northleft{ dir = 2; - layer = 3.1; name = "RCD Storage"; req_access_txt = "19" }, @@ -35408,7 +35125,7 @@ "lnE" = ( /obj/machinery/door/poddoor{ id = "Capoffice"; - name = "Captain blast door" + name = "Captain Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -35460,18 +35177,16 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","security") }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "lon" = ( /obj/machinery/door/window/eastleft{ dir = 2; - name = "Bar door"; + name = "Bar Door"; req_access_txt = "25" }, /obj/structure/window/reinforced{ @@ -35825,10 +35540,6 @@ dir = 2 }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ @@ -36005,6 +35716,9 @@ /obj/machinery/chem_heater{ pixel_y = 1 }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/iron, /area/medical/apothecary) "lwI" = ( @@ -36075,9 +35789,7 @@ dir = 1 }, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "lxn" = ( /obj/structure/closet/crate/coffin, /turf/open/floor/carpet/purple, @@ -36198,7 +35910,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Teleporter Room" }, /turf/open/floor/iron, @@ -36448,7 +36160,6 @@ /area/engine/atmos) "lEN" = ( /obj/machinery/shower{ - layer = 4; name = "emergency shower"; pixel_y = 12 }, @@ -36457,8 +36168,7 @@ /area/science/research) "lFd" = ( /obj/machinery/shower{ - dir = 8; - layer = 4 + dir = 8 }, /obj/effect/turf_decal/delivery, /obj/item/bikehorn/rubberducky, @@ -36688,7 +36398,7 @@ pixel_x = -1; pixel_y = 30 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Incinerator"; network = list("ss13","engine") }, @@ -36836,9 +36546,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "lNa" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -36887,7 +36595,7 @@ /area/engine/engine_room) "lOL" = ( /obj/machinery/smartfridge/drinks, -/turf/closed/wall, +/turf/open/floor/iron/cafeteria, /area/maintenance/port/aft) "lOQ" = ( /obj/effect/turf_decal/siding/wideplating/dark{ @@ -37169,9 +36877,7 @@ /turf/open/floor/wood, /area/maintenance/port/aft) "lUJ" = ( -/obj/machinery/chem_dispenser{ - layer = 2.7 - }, +/obj/machinery/chem_dispenser, /obj/effect/turf_decal/bot, /obj/machinery/newscaster{ pixel_x = -32 @@ -37221,9 +36927,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "lVx" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ @@ -37304,7 +37008,7 @@ /area/engine/engine_room) "lWy" = ( /obj/machinery/door/airlock/highsecurity{ - name = "radiation shelter" + name = "radiation Shelter" }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -37377,9 +37081,8 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - name = "HOS" +/obj/structure/disposalpipe/sorting/mail/destination/hos_office{ + dir = 8 }, /turf/open/floor/iron, /area/security/brig) @@ -37388,13 +37091,16 @@ /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "lYb" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -37474,8 +37180,7 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /obj/structure/table/wood{ pixel_y = -6 @@ -37531,9 +37236,7 @@ }, /obj/machinery/hydroponics/constructable, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "lZU" = ( /obj/machinery/light{ dir = 4 @@ -37598,9 +37301,7 @@ dir = 10 }, /turf/open/floor/iron/dark, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "mbm" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -37873,11 +37574,6 @@ }, /turf/open/floor/iron, /area/maintenance/central) -"mfy" = ( -/turf/closed/wall/r_wall, -/area/security/prison{ - name = "Prison Showers" - }) "mfz" = ( /obj/machinery/door/window/southleft{ dir = 1; @@ -38003,15 +37699,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/office) -"mhn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron/tech, -/area/engine/engine_room) "mhA" = ( /obj/structure/lattice, /obj/structure/railing, @@ -38042,6 +37729,20 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"mhP" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/engine/atmos) "mhX" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt/dust, @@ -38087,9 +37788,7 @@ /obj/effect/turf_decal/tile/black/fourcorners, /obj/effect/landmark/prisonspawn, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "mkd" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -38249,6 +37948,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/storage/primary) +"mms" = ( +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/turf/open/floor/iron, +/area/science/mixing) "mmy" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -38310,7 +38015,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosroom"; - name = "HoS Room Blast door" + name = "HoS Room Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -38324,9 +38029,7 @@ /obj/machinery/holopad, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "mnB" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -38420,7 +38123,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /obj/structure/sign/departments/minsky/security/command{ pixel_x = 32 @@ -38493,6 +38196,9 @@ /obj/machinery/light_switch{ pixel_x = 21 }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "mpL" = ( @@ -38541,8 +38247,7 @@ /area/hallway/primary/fore) "mqc" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/structure/chair/fancy/comfy{ color = "#596479"; @@ -38792,7 +38497,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/poddoor/preopen{ id = "cmoprivacy"; - name = "CMO Blast door" + name = "CMO Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -38891,9 +38596,7 @@ dir = 1 }, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "muC" = ( /obj/structure/railing, /obj/machinery/light/floor{ @@ -39148,7 +38851,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "cmoprivacy"; - name = "CMO Blast door" + name = "CMO Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -39364,8 +39067,7 @@ /area/chapel/office) "mCL" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8; @@ -39508,7 +39210,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "bridgedoors"; - name = "Bridge Access Blast door" + name = "Bridge Access Blast Door" }, /turf/open/floor/plating, /area/bridge) @@ -39537,8 +39239,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/quartermaster/exploration_prep) @@ -39695,9 +39396,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -39966,9 +39664,7 @@ /obj/effect/turf_decal/bot, /obj/structure/closet/secure_closet/evidence, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "mJX" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -40054,7 +39750,7 @@ /turf/open/floor/glass/reinforced, /area/chapel/main) "mKZ" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Incinerator"; network = list("ss13","engine") }, @@ -40070,10 +39766,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/camera/autoname{ - dir = 10; - network = list("ss13","prison") - }, /obj/structure/rack, /obj/structure/railing{ dir = 1 @@ -40095,6 +39787,9 @@ /obj/item/prison_scanner, /obj/item/prison_scanner, /obj/item/prison_scanner, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","prison") + }, /turf/open/floor/iron/techmaint, /area/security/prison) "mLh" = ( @@ -40208,14 +39903,9 @@ pixel_y = 17 }, /turf/open/floor/iron/freezer, -/area/security/prison{ - name = "Prison Toilet" - }) +/area/security/prison) "mMd" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ alpha = 180 }, @@ -40238,7 +39928,6 @@ /area/medical/chemistry) "mMT" = ( /obj/structure/sign/departments/holy, -/obj/structure/sign/departments/holy, /obj/structure/closet/emcloset, /turf/closed/wall, /area/chapel/main) @@ -40315,9 +40004,7 @@ }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "mOQ" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 28 @@ -40335,9 +40022,7 @@ icon_state = "0-8" }, /turf/open/floor/plating, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "mQz" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -40434,9 +40119,7 @@ pixel_x = 32 }, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "mRK" = ( /obj/structure/chair{ dir = 1 @@ -40638,9 +40321,7 @@ icon_state = "0-8" }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "mUD" = ( /obj/effect/turf_decal/tile/dark_green/half/contrasted{ dir = 8 @@ -40668,7 +40349,7 @@ "mUX" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/westleft{ - name = "laser guns"; + name = "laser Guns"; req_access_txt = "3" }, /obj/item/gun/energy/laser{ @@ -40714,7 +40395,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "hopshutter"; - name = "privacy shutters" + name = "Privacy Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -40922,9 +40603,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/camera/directional/north{ - network = list("ss13","security") - }, /obj/machinery/power/apc/auto_name/directional/east, /obj/effect/turf_decal/guideline/guideline_half_edge/red{ dir = 4 @@ -41023,9 +40701,7 @@ /obj/structure/disposalpipe/trunk, /obj/effect/turf_decal/bot, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "nae" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -41159,9 +40835,7 @@ /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/black/fourcorners, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "nds" = ( /obj/structure/easel, /obj/item/canvas/twentythree_nineteen, @@ -41220,7 +40894,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ id = "AIwindows"; - name = "AI View Blast door" + name = "AI View Blast Door" }, /obj/structure/cable{ icon_state = "0-2" @@ -41239,6 +40913,7 @@ /obj/effect/turf_decal/guideline/guideline_in/yellow{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engine/engineering) "ndT" = ( @@ -41299,6 +40974,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/light{ + bulb_colour = "#22bfa2"; + bulb_vacuum_colour = "#22bfa2"; + dir = 4; + nightshift_light_color = "#22bfa2" + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "neI" = ( @@ -41510,7 +41191,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -41534,7 +41215,7 @@ dir = 8 }, /obj/machinery/door/window/brigdoor/southright{ - name = "evidence chute"; + name = "evidence Chute"; req_access_txt = "1" }, /obj/machinery/disposal/deliveryChute, @@ -41542,13 +41223,10 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 4; - layer = 1 + dir = 4 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "nif" = ( /turf/closed/wall/r_wall, /area/science/test_area) @@ -41590,9 +41268,7 @@ pixel_x = -20 }, /turf/open/floor/carpet/green, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "niP" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/bot{ @@ -41628,11 +41304,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) -"njd" = ( -/turf/closed/wall/r_wall, -/area/security/prison{ - name = "Prison Processing" - }) "nju" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -41656,9 +41327,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "njD" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -41686,7 +41355,6 @@ /obj/machinery/smartfridge/chemistry/virology/preloaded, /obj/machinery/button/door{ id = "quarantineshutters"; - layer = 4; name = "Quarantine Lockdown"; pixel_x = 27; pixel_y = 8; @@ -41706,9 +41374,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "nkm" = ( /turf/open/floor/iron/white/side{ dir = 1 @@ -41744,9 +41410,7 @@ icon_state = "2-4" }, /turf/open/floor/iron, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "nlk" = ( /obj/item/storage/secure/safe/caps_spare{ pixel_x = 5; @@ -41856,9 +41520,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "nmf" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -41892,6 +41554,17 @@ }, /turf/open/floor/iron, /area/bridge) +"nmD" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/science/mixing) "nmM" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -41931,9 +41604,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "nnb" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -41950,9 +41621,7 @@ icon_state = "0-4" }, /turf/open/floor/plating, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "nnn" = ( /obj/structure/chair{ dir = 1 @@ -42062,7 +41731,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","medbay") }, /obj/machinery/airalarm/directional/north{ @@ -42099,6 +41768,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/quartermaster/qm) "npJ" = ( @@ -42172,9 +41842,7 @@ pixel_x = -25 }, /turf/open/floor/iron, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "nrd" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -42383,7 +42051,7 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/poddoor{ id = "AIwindows"; - name = "AI View Blast door" + name = "AI View Blast Door" }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) @@ -42765,7 +42433,7 @@ /obj/effect/turf_decal/siding/wideplating/dark/corner{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ view_range = 12 }, /obj/machinery/status_display/evac{ @@ -42804,7 +42472,7 @@ dir = 10 }, /obj/structure/closet/crate/wooden/toy, -/obj/machinery/camera/directional/north, +/obj/machinery/camera/autoname/directional/north, /obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/light_switch{ pixel_x = 12; @@ -42849,9 +42517,7 @@ "nAS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "nBc" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -42962,11 +42628,6 @@ /obj/item/trash/tray, /turf/open/floor/iron, /area/maintenance/port/aft) -"nCH" = ( -/turf/closed/wall, -/area/security/prison{ - name = "Prison Toilet" - }) "nDd" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ @@ -43016,7 +42677,7 @@ /obj/structure/transit_tube, /obj/machinery/door/poddoor{ id = "AIwindows"; - name = "AI View Blast door" + name = "AI View Blast Door" }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) @@ -43040,9 +42701,6 @@ }, /turf/open/floor/iron/dark, /area/engine/storage) -"nEb" = ( -/turf/closed/wall/r_wall, -/area/security/brig/dock) "nEq" = ( /obj/structure/chair/wood, /obj/effect/landmark/start/randommaint/vip, @@ -43258,8 +42916,7 @@ }, /obj/effect/turf_decal/bot, /obj/structure/railing{ - dir = 8; - layer = 3.1 + dir = 8 }, /turf/open/floor/iron/dark, /area/quartermaster/office) @@ -43396,9 +43053,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "nLc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -43417,7 +43072,7 @@ dir = 8; luminosity = 2 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Turbine Chamber"; network = list("turbine") }, @@ -43466,7 +43121,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Engidesk"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -43547,6 +43202,9 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/science/mixing) "nNC" = ( @@ -43570,7 +43228,7 @@ /turf/open/floor/iron, /area/maintenance/department/engine) "nNR" = ( -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","engine") }, /obj/structure/cable{ @@ -43596,8 +43254,7 @@ /area/engine/engine_room) "nOh" = ( /obj/structure/railing{ - dir = 9; - layer = 3.1 + dir = 9 }, /obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line{ @@ -43783,12 +43440,15 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "nQL" = ( @@ -44007,7 +43667,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters{ id = "Chefwindow"; - name = "Chef window" + name = "Chef Window" }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) @@ -44080,8 +43740,7 @@ req_access_txt = "39" }, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/item/radio/intercom{ dir = 1; @@ -44122,9 +43781,6 @@ /turf/open/floor/iron/grid/steel, /area/hydroponics) "nXu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 4 @@ -44197,16 +43853,13 @@ /obj/structure/curtain, /obj/machinery/shower{ dir = 8; - layer = 4; name = "emergency shower"; pixel_x = -5; pixel_y = -5 }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/noslip/standard, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "nYz" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 @@ -44229,18 +43882,15 @@ departmentType = 2; pixel_y = 29 }, -/obj/machinery/camera/autoname{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/carpet/orange, /area/quartermaster/qm) "nZj" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 3 + dir = 4 }, /obj/effect/decal/cleanable/blood/old, /obj/machinery/light{ @@ -44280,8 +43930,7 @@ /area/hallway/primary/central) "oaw" = ( /obj/structure/window/reinforced{ - dir = 8; - layer = 1 + dir = 8 }, /obj/effect/decal/cleanable/xenoblood/xsplatter, /turf/open/floor/engine, @@ -44310,9 +43959,7 @@ color = "#DE3A3A" }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "oaO" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -44436,15 +44083,7 @@ dir = 1 }, /turf/open/floor/glass/reinforced, -/area/hallway/primary/central{ - dynamic_lighting = 2; - lighting_brightness_tube = 11; - lighting_colour_bulb = "#DDE6FF"; - lighting_colour_night = "#DDE6FF"; - lighting_colour_tube = "#DDE6FF"; - lighting_overlay_colour = "#DDE6FF"; - power_light = 0 - }) +/area/hallway/primary/central) "odu" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -44478,7 +44117,7 @@ "odV" = ( /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; - name = "Detective Privacy Blast door" + name = "Detective Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -44540,7 +44179,6 @@ icon = 'icons/obj/airlock_machines.dmi'; icon_state = "airlock_control_standby"; id = "chapelgun"; - layer = 4; name = "Mass Driver Controller"; pixel_y = 32 }, @@ -44584,15 +44222,7 @@ dir = 4 }, /turf/open/floor/glass/reinforced, -/area/hallway/primary/central{ - dynamic_lighting = 2; - lighting_brightness_tube = 11; - lighting_colour_bulb = "#DDE6FF"; - lighting_colour_night = "#DDE6FF"; - lighting_colour_tube = "#DDE6FF"; - lighting_overlay_colour = "#DDE6FF"; - power_light = 0 - }) +/area/hallway/primary/central) "oeZ" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ alpha = 180 @@ -44618,9 +44248,7 @@ icon_state = "1-2" }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "ofC" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -44831,7 +44459,6 @@ "oiV" = ( /obj/item/kirbyplants{ icon_state = "plant-18"; - layer = 3; pixel_x = 16; pixel_y = -4 }, @@ -44905,8 +44532,7 @@ /area/hallway/primary/port) "ojN" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 3 + dir = 1 }, /obj/machinery/suit_storage_unit/exploration, /turf/open/floor/iron/dark, @@ -44949,7 +44575,7 @@ /turf/open/floor/iron, /area/bridge) "olf" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Xenobiology Lab - Pen #6"; network = list("ss13","rd","xeno") }, @@ -45059,7 +44685,7 @@ "omT" = ( /obj/machinery/door/poddoor/preopen{ id = "hosroom"; - name = "HoS Room Blast door" + name = "HoS Room Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -45076,8 +44702,7 @@ /area/solar/starboard/aft) "onv" = ( /obj/structure/window/reinforced{ - dir = 8; - layer = 1 + dir = 8 }, /obj/effect/decal/cleanable/glass, /turf/open/floor/engine, @@ -45090,7 +44715,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","security") }, /obj/machinery/power/apc/auto_name/directional/north, @@ -45210,6 +44835,9 @@ filter_type = "n2" }, /obj/effect/turf_decal/delivery, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/tech, /area/engine/engine_room) "opU" = ( @@ -45219,6 +44847,9 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron/tech, /area/engine/engine_room) "oqg" = ( @@ -45323,7 +44954,7 @@ }, /obj/structure/window/reinforced, /obj/machinery/door/window/brigdoor/westleft{ - name = "specialized weapons"; + name = "specialized Weapons"; req_access_txt = "3" }, /obj/effect/turf_decal/stripes/corner{ @@ -45338,7 +44969,7 @@ /obj/item/radio/intercom{ pixel_y = 29 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","rd") }, /turf/open/floor/iron/dark, @@ -45590,9 +45221,6 @@ /turf/closed/wall, /area/hallway/secondary/exit/departure_lounge) "ouV" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ alpha = 180; dir = 4 @@ -45609,6 +45237,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/break_room) "ova" = ( @@ -45629,9 +45260,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "ovj" = ( /obj/structure/plasticflaps/opaque, /obj/machinery/navbeacon{ @@ -45693,6 +45322,9 @@ /obj/effect/turf_decal/guideline/guideline_edge/brown{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/hallway/primary/port) "owK" = ( @@ -45755,9 +45387,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "oxF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -45873,9 +45503,7 @@ /turf/open/floor/iron/tech, /area/engine/engine_room) "oBk" = ( -/obj/item/kirbyplants/random{ - layer = 3.3 - }, +/obj/item/kirbyplants/random, /obj/machinery/firealarm/directional/west, /obj/machinery/camera/autoname/directional/west{ network = list("ss13","medbay"); @@ -46043,9 +45671,7 @@ prison_radio = 1 }, /turf/open/floor/iron, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "oEG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -46067,9 +45693,7 @@ icon_state = "4-8" }, /obj/structure/tank_dispenser, -/obj/structure/disposalpipe/sorting/mail{ - sortType = 25 - }, +/obj/structure/disposalpipe/sorting/mail/destination/toxins, /turf/open/floor/iron/dark, /area/science/mixing) "oEY" = ( @@ -46090,7 +45714,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","medbay") }, /obj/item/radio/intercom{ @@ -46125,9 +45749,7 @@ pixel_x = 8 }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "oFY" = ( /obj/machinery/air_sensor/atmos/plasma_tank, /turf/open/floor/engine/plasma, @@ -46268,7 +45890,7 @@ "oHV" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "medpriv1"; - name = "privacy door" + name = "privacy Door" }, /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -46277,7 +45899,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosroom"; - name = "HoS Room Blast door" + name = "HoS Room Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -46315,9 +45937,6 @@ /turf/open/floor/catwalk_floor, /area/maintenance/central) "oIr" = ( -/obj/machinery/camera/autoname/directional/east{ - network = list("ss13","medbay") - }, /obj/item/kirbyplants/random, /turf/open/floor/carpet/blue, /area/medical/exam_room) @@ -46490,7 +46109,7 @@ }, /obj/item/book/manual/wiki/plumbing, /obj/effect/turf_decal/stripes/line, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","medbay") }, /turf/open/floor/iron, @@ -46545,7 +46164,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","engine") }, /turf/open/floor/noslip/standard, @@ -46795,9 +46414,7 @@ }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "oON" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -47185,8 +46802,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/quartermaster/exploration_prep) @@ -47285,7 +46901,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "Engidesk"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -47296,9 +46912,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, /obj/structure/table, /obj/item/storage/box/ingredients/wildcard{ pixel_x = -5; @@ -47447,24 +47060,14 @@ dir = 8 }, /turf/open/floor/glass/reinforced, -/area/hallway/primary/central{ - dynamic_lighting = 2; - lighting_brightness_tube = 11; - lighting_colour_bulb = "#DDE6FF"; - lighting_colour_night = "#DDE6FF"; - lighting_colour_tube = "#DDE6FF"; - lighting_overlay_colour = "#DDE6FF"; - power_light = 0 - }) +/area/hallway/primary/central) "oXo" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; color = "#DE3A3A" }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "oXv" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/atmospherics/components/binary/pump{ @@ -47498,9 +47101,7 @@ color = "#DE3A3A" }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "oXS" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ alpha = 180 @@ -47719,7 +47320,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/camera/directional/north, +/obj/machinery/camera/autoname/directional/north, /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark/side, /area/hallway/primary/central) @@ -47731,7 +47332,7 @@ "paM" = ( /obj/machinery/door/poddoor/preopen{ id = "brigentrance"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -47741,9 +47342,7 @@ }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "paP" = ( /obj/docking_port/stationary{ dir = 8; @@ -47825,12 +47424,10 @@ /area/science/xenobiology) "pbg" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 10 @@ -47933,7 +47530,7 @@ /obj/machinery/newscaster{ pixel_y = 34 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","medbay") }, /turf/open/floor/iron, @@ -48034,14 +47631,11 @@ pixel_y = 4 }, /obj/item/taperecorder{ - layer = 2.9; pixel_x = -15; pixel_y = 4 }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "pgc" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -48067,9 +47661,7 @@ pixel_y = -32 }, /turf/open/floor/iron, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "pgK" = ( /obj/item/kirbyplants/random, /obj/structure/disposalpipe/segment{ @@ -48209,9 +47801,7 @@ color = "#DE3A3A" }, /turf/open/floor/iron, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "pjF" = ( /obj/structure/sign/departments/minsky/engineering/atmospherics{ pixel_x = 31; @@ -48264,7 +47854,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -48377,7 +47967,6 @@ "pkX" = ( /obj/machinery/button/door{ id = "Bountydoors"; - layer = 4; name = "Bounty glass doors"; normaldoorcontrol = 1; pixel_x = 1; @@ -48389,7 +47978,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor2"; - layer = 4; name = "Loading Doors"; pixel_x = 1; pixel_y = -37; @@ -48462,9 +48050,6 @@ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_in/blue, -/obj/machinery/light{ - dir = 8 - }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "pmb" = ( @@ -48511,7 +48096,7 @@ "pmH" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/door/airlock/public/glass{ - name = "visitation area" + name = "visitation Area" }, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -48520,9 +48105,7 @@ /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "pmQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -48541,8 +48124,7 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/turf_decal/bot, /obj/structure/window/reinforced{ - dir = 4; - layer = 1 + dir = 4 }, /turf/open/floor/iron, /area/engine/atmos) @@ -48623,8 +48205,7 @@ /area/science/research) "poD" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8; @@ -48683,9 +48264,7 @@ pixel_y = -2 }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "poU" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -48784,9 +48363,7 @@ }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "pqC" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -48824,8 +48401,7 @@ /area/maintenance/port/central) "prq" = ( /obj/effect/turf_decal/siding/wood{ - dir = 4; - layer = 2 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -48834,9 +48410,7 @@ dir = 5 }, /turf/open/floor/carpet/green, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "prv" = ( /turf/closed/wall, /area/crew_quarters/heads/captain) @@ -48869,6 +48443,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -48899,7 +48476,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor2"; - layer = 4; name = "Loading Doors"; pixel_x = -25; pixel_y = 4; @@ -48907,7 +48483,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor"; - layer = 4; name = "Loading Doors"; pixel_x = -25; pixel_y = -5; @@ -49058,12 +48633,10 @@ /area/maintenance/department/science) "pvw" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/turf_decal/bot, /obj/structure/closet/firecloset/full, @@ -49183,9 +48756,7 @@ }, /obj/structure/closet/secure_closet/evidence, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "pxB" = ( /obj/machinery/air_sensor/atmos/carbon_tank, /turf/open/floor/engine/co2, @@ -49390,9 +48961,7 @@ dir = 1 }, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "pBg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -49487,9 +49056,7 @@ dir = 8 }, /turf/open/floor/carpet/green, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "pCS" = ( /obj/item/radio/intercom{ pixel_x = 32; @@ -49598,17 +49165,15 @@ }, /area/hallway/primary/central) "pEs" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - name = "disposals"; - sortTypes = list(0,1) - }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, /obj/effect/turf_decal/guideline/guideline_in/purple{ dir = 1 }, +/obj/structure/disposalpipe/sorting/mail/destination/disposals/flip{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/primary/port) "pEw" = ( @@ -49697,9 +49262,7 @@ pixel_y = -25 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "pFn" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -49753,9 +49316,7 @@ pixel_y = 3 }, /turf/open/floor/iron/dark, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "pGh" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -49763,7 +49324,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistry_shutters"; - name = "chemistry shutters" + name = "chemistry Shutters" }, /turf/open/floor/plating, /area/medical/apothecary) @@ -49894,9 +49455,7 @@ "pIC" = ( /obj/machinery/suit_storage_unit/security, /turf/open/floor/iron/dark, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "pII" = ( /obj/structure/window/reinforced{ dir = 8; @@ -50048,7 +49607,7 @@ "pLf" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -50094,6 +49653,9 @@ /obj/effect/turf_decal/guideline/guideline_tri/blue{ color = "#267878" }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/iron, /area/hallway/secondary/entry) "pLG" = ( @@ -50188,9 +49750,7 @@ name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/structure/barricade/wooden/crude{ - layer = 4 - }, +/obj/structure/barricade/wooden/crude, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/port/central) @@ -50216,24 +49776,11 @@ }, /turf/open/floor/engine/vacuum, /area/engine/atmospherics_engine) -"pNF" = ( -/obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/prison, -/area/security/prison) "pNG" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "medpriv1"; - name = "privacy door" + name = "privacy Door" }, /turf/open/floor/plating, /area/medical/exam_room) @@ -50671,8 +50218,7 @@ "pUj" = ( /obj/effect/turf_decal/bot, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/closet/emcloset, /turf/open/floor/iron/dark/smooth_large, @@ -50793,26 +50339,18 @@ "pVO" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" }, /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "pVX" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/science) -"pWk" = ( -/obj/machinery/camera/autoname/directional/east{ - network = list("ss13","engine") - }, -/turf/open/floor/engine/n2o, -/area/engine/atmos) "pWo" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -50890,9 +50428,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "pYo" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -51024,13 +50560,12 @@ /area/maintenance/department/security) "pZd" = ( /obj/effect/turf_decal/siding/wideplating/dark, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","security") - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","security") + }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "pZe" = ( @@ -51066,9 +50601,7 @@ icon_state = "1-2" }, /turf/open/floor/iron, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "pZF" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -51098,7 +50631,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 5 }, /turf/open/floor/iron, /area/quartermaster/qm) @@ -51143,12 +50676,8 @@ /turf/open/floor/iron/tech, /area/engine/engine_room) "qat" = ( -/obj/structure/window/reinforced{ - layer = 2 - }, -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/siding/wood, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -51156,9 +50685,7 @@ /area/medical/exam_room) "qaG" = ( /obj/machinery/door/firedoor, -/obj/structure/barricade/wooden/crude{ - layer = 4 - }, +/obj/structure/barricade/wooden/crude, /turf/open/floor/iron/techmaint, /area/maintenance/port/central) "qaP" = ( @@ -51548,8 +51075,7 @@ /area/maintenance/starboard/aft) "qin" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 3 + dir = 1 }, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, @@ -51561,6 +51087,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -51627,7 +51156,7 @@ "qki" = ( /obj/machinery/door/poddoor/shutters{ id = "atmosshutters"; - name = "Atmos storage" + name = "Atmos Storage" }, /obj/effect/turf_decal/loading_area{ dir = 8 @@ -51820,6 +51349,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -51832,7 +51364,7 @@ dir = 1 }, /obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","rd","xeno") }, /obj/machinery/light{ @@ -51850,7 +51382,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ view_range = 12 }, /obj/effect/turf_decal/siding/wideplating/dark/corner{ @@ -51962,7 +51494,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/junction{ dir = 4 }, /turf/open/floor/iron, @@ -52024,12 +51556,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/iron/techmaint, /area/security/prison/shielded) -"qpr" = ( -/obj/machinery/camera/autoname/directional/east{ - network = list("ss13","engine") - }, -/turf/open/floor/engine/airless, -/area/engine/atmos) "qpu" = ( /obj/structure/window/reinforced, /turf/open/floor/iron/dark/smooth_large, @@ -52172,11 +51698,6 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/obj/machinery/camera/directional/east{ - c_tag = "Toxins Mixers"; - name = "science camera"; - network = list("ss13","rd") - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -52184,6 +51705,9 @@ pixel_x = 32; pixel_y = -3 }, +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","rd") + }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -52281,9 +51805,7 @@ pixel_x = 25 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "qtE" = ( /obj/structure/chair/fancy/sofa/old/right, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -52349,9 +51871,7 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/wood, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "quI" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -52565,7 +52085,7 @@ /obj/machinery/porta_turret/ai{ dir = 4 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "MiniSat Core Hallway 4"; network = list("minisat") }, @@ -52602,11 +52122,8 @@ dir = 4; nightshift_light_color = "#FFB16E" }, -/obj/machinery/camera/autoname{ - dir = 6; - pixel_y = 8 - }, /obj/machinery/airalarm/directional/east, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "qAA" = ( @@ -52672,7 +52189,6 @@ dir = 8 }, /obj/item/book/manual/wiki/security_space_law{ - layer = 4; pixel_y = -1 }, /obj/structure/filingcabinet/employment{ @@ -52772,8 +52288,7 @@ /area/space) "qBZ" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/structure/window/reinforced, /obj/machinery/light/floor{ @@ -53079,7 +52594,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -53110,7 +52625,6 @@ }, /obj/machinery/button/door{ id = "Bountydoors"; - layer = 4; name = "Bounty glass doors"; normaldoorcontrol = 1; pixel_y = 38; @@ -53124,7 +52638,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor2"; - layer = 4; name = "Loading Doors"; pixel_y = 28; req_access_txt = "31" @@ -53164,6 +52677,12 @@ /obj/structure/table/reinforced, /turf/open/floor/iron/techmaint, /area/science/xenobiology) +"qHP" = ( +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/turf/open/floor/engine/air, +/area/engine/atmos) "qHT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53234,9 +52753,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, /turf/open/floor/plating, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "qJC" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -53361,9 +52878,6 @@ /obj/structure/fans/tiny/invisible, /turf/open/space/basic, /area/space) -"qLO" = ( -/turf/closed/wall/r_wall, -/area/security/prison) "qLY" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -53403,9 +52917,7 @@ icon_state = "1-2" }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "qMu" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/dark_green/anticorner_ramp/contrasted{ @@ -53479,7 +52991,7 @@ /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -53518,6 +53030,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/science/misc_lab) "qOH" = ( @@ -53610,8 +53125,7 @@ "qQj" = ( /obj/effect/turf_decal/bot, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/machinery/vending/cola, /turf/open/floor/iron/dark/smooth_large, @@ -53654,17 +53168,6 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/security) -"qRj" = ( -/obj/machinery/door/poddoor/preopen{ - id = "Prisongate"; - name = "Prison blast door" - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/effect/spawner/structure/window/reinforced/prison, -/turf/open/floor/plating, -/area/security/prison) "qRk" = ( /obj/machinery/door/airlock/maintenance_hatch{ id_tag = "commissarydoor"; @@ -53908,9 +53411,7 @@ icon_state = "1-4" }, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "qVc" = ( /obj/structure/table/reinforced, /obj/structure/desk_bell{ @@ -53929,9 +53430,7 @@ /obj/effect/turf_decal/tile/black/fourcorners, /obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "qVx" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -54269,9 +53768,7 @@ }, /obj/effect/turf_decal/tile/black/fourcorners, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "qZM" = ( /obj/structure/window/reinforced, /obj/effect/turf_decal/box, @@ -54366,7 +53863,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","engine") }, /turf/open/floor/iron/dark, @@ -54392,9 +53889,7 @@ }, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "rbm" = ( /obj/effect/decal/cleanable/food/egg_smudge, /obj/structure/cable/yellow{ @@ -54560,19 +54055,12 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"rdD" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "rdM" = ( /obj/machinery/smartfridge/sci{ initial_contents = list(/obj/item/stock_parts/capacitor = 2, /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/micro_laser = 2, /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/scanning_module = 2); name = "Science vender" }, -/turf/closed/wall, +/turf/open/floor/iron, /area/engine/storage) "rdS" = ( /obj/structure/disposalpipe/segment{ @@ -54696,7 +54184,7 @@ /obj/structure/desk_bell/speed_demon, /obj/machinery/door/poddoor/shutters/preopen{ id = "hopshutter"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/iron, /area/crew_quarters/heads/hop) @@ -54896,7 +54384,7 @@ "rjq" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -54975,9 +54463,7 @@ dir = 2 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "rkH" = ( /obj/effect/spawner/lootdrop/ruinloot/science, /obj/structure/table, @@ -55047,7 +54533,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistry_shutters"; - name = "chemistry shutters" + name = "chemistry Shutters" }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -55135,7 +54621,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ id = "Capoffice"; - name = "Captain blast door" + name = "Captain Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -55230,7 +54716,10 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters{ id = "qm_warehouse"; - name = "warehouse shutters" + name = "warehouse Shutters" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) @@ -55335,18 +54824,11 @@ /area/crew_quarters/dorms) "rqw" = ( /obj/effect/turf_decal/siding/wood{ - dir = 4; - layer = 2 + dir = 4 }, /obj/structure/chair/wood/normal, /turf/open/floor/carpet/green, /area/security/courtroom) -"rqA" = ( -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13","engine") - }, -/turf/open/floor/engine/air, -/area/engine/atmos) "rqC" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -55409,6 +54891,9 @@ dir = 4 }, /obj/item/crowbar, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/science/mixing) "rrP" = ( @@ -55511,14 +54996,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - name = "Security" - }, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; color = "#DE3A3A" }, +/obj/structure/disposalpipe/sorting/mail/destination/security{ + dir = 8 + }, /turf/open/floor/iron, /area/security/brig) "ruG" = ( @@ -55700,12 +55184,6 @@ /obj/structure/musician/piano{ icon_state = "piano" }, -/obj/machinery/light{ - light_color = "#7AC3FF" - }, -/obj/machinery/camera/autoname/directional/south{ - c_tag = "Captain's Quarters" - }, /turf/open/floor/glass/reinforced, /area/crew_quarters/cafeteria) "rxH" = ( @@ -55830,7 +55308,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/window/southleft{ dir = 4; - name = "Isolation box"; + name = "Isolation Box"; req_one_access_txt = "2" }, /turf/open/floor/iron/dark, @@ -55931,15 +55409,7 @@ dir = 5 }, /turf/open/floor/glass/reinforced, -/area/hallway/primary/central{ - dynamic_lighting = 2; - lighting_brightness_tube = 11; - lighting_colour_bulb = "#DDE6FF"; - lighting_colour_night = "#DDE6FF"; - lighting_colour_tube = "#DDE6FF"; - lighting_overlay_colour = "#DDE6FF"; - power_light = 0 - }) +/area/hallway/primary/central) "rAD" = ( /obj/machinery/mineral/stacking_machine{ dir = 4; @@ -56109,7 +55579,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters{ id = "Chefwindow"; - name = "Chef window" + name = "Chef Window" }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) @@ -56159,9 +55629,7 @@ icon_state = "1-2" }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "rDh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -56445,9 +55913,7 @@ /obj/structure/railing/corner, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "rIi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56635,9 +56101,7 @@ pixel_x = -32 }, /turf/open/floor/iron, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "rLM" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -56803,7 +56267,7 @@ pixel_x = 1; pixel_y = 30 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","engine") }, /turf/open/floor/iron, @@ -56839,7 +56303,7 @@ }, /obj/machinery/door/window/northright{ dir = 8; - name = "Kitchen doors"; + name = "Kitchen Doors"; req_one_access_txt = "28;25;35" }, /turf/open/floor/iron/cafeteria, @@ -56933,9 +56397,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -56944,12 +56405,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) -"rSn" = ( -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13","engine") - }, -/turf/open/floor/engine/o2, -/area/engine/atmos) "rSL" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 28 @@ -57188,6 +56643,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/tech, /area/engine/engine_room) "rWl" = ( @@ -57231,7 +56689,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "brigentrance"; - name = "Brig Blast door" + name = "Brig Blast Door" }, /obj/structure/disposalpipe/segment{ dir = 2 @@ -57418,7 +56876,7 @@ initial_contents = list(/obj/item/stock_parts/capacitor = 2, /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/micro_laser = 2, /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/scanning_module = 2); name = "Science vender" }, -/turf/closed/wall, +/turf/open/floor/iron, /area/science/lab) "saf" = ( /obj/effect/spawner/structure/window, @@ -57433,10 +56891,6 @@ /area/maintenance/port/aft) "saj" = ( /obj/effect/turf_decal/tile/red/fourcorners/contrasted, -/obj/machinery/camera/autoname{ - dir = 6; - network = list("ss13","prison") - }, /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; freerange = 1; @@ -57451,12 +56905,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/prison, /area/security/prison) "sal" = ( /obj/structure/railing{ - dir = 1; - layer = 3.1 + dir = 1 }, /turf/open/floor/iron/sepia, /area/quartermaster/office) @@ -57588,9 +57042,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "scE" = ( /obj/structure/chair{ dir = 8 @@ -57693,6 +57145,9 @@ /obj/effect/turf_decal/guideline/guideline_half_ramp/_inverted/yellow{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/engine/engineering) "seq" = ( @@ -57871,7 +57326,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/machinery/turnstile{ dir = 1 @@ -57888,9 +57343,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "shi" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -58260,9 +57713,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "smL" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -58309,7 +57760,7 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 }, -/obj/machinery/camera/directional/north, +/obj/machinery/camera/autoname/directional/north, /obj/vehicle/ridden/janicart, /obj/item/key/janitor, /turf/open/floor/iron, @@ -58413,9 +57864,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "spz" = ( /obj/structure/flora/rock, /turf/open/floor/grass, @@ -58584,9 +58033,7 @@ req_access_txt = "1" }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "sud" = ( /obj/machinery/computer/security/telescreen/entertainment{ network = list("thunder","court"); @@ -58602,7 +58049,6 @@ }, /obj/machinery/button/door{ id = "quarantineshutters"; - layer = 4; name = "Quarantine Lockdown"; pixel_x = -25; req_access_txt = "39" @@ -58638,7 +58084,6 @@ "suS" = ( /obj/machinery/mineral/ore_redemption{ input_dir = 2; - layer = 2.5; output_dir = 1 }, /obj/machinery/door/window/westright{ @@ -58757,9 +58202,6 @@ /turf/open/floor/iron/dark, /area/bridge) "swN" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/command/glass{ name = "Bridge"; @@ -58772,7 +58214,7 @@ }, /obj/machinery/door/poddoor{ id = "Capoffice"; - name = "Captain blast door" + name = "Captain Blast Door" }, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -58792,9 +58234,7 @@ dir = 9 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "sxf" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -58997,8 +58437,7 @@ pixel_y = -3 }, /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 6 @@ -59038,24 +58477,16 @@ dir = 4 }, /obj/effect/spawner/structure/window, -/obj/structure/barricade/wooden/crude{ - layer = 4 - }, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/library) "sCn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/camera/autoname{ - dir = 6; +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/camera/autoname/directional/east{ network = list("ss13","security") }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "sCJ" = ( /mob/living/simple_animal/slime{ name = "sycamore" @@ -59173,9 +58604,7 @@ /obj/structure/rack, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "sEY" = ( /obj/machinery/computer/holodeck{ dir = 4 @@ -59234,7 +58663,7 @@ dir = 8 }, /obj/machinery/camera/preset/toxins{ - dir = 4 + dir = 8 }, /turf/open/floor/plating/airless, /area/science/test_area) @@ -59253,6 +58682,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "sFx" = ( @@ -59420,8 +58850,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 4; - layer = 3 + dir = 4 }, /turf/open/floor/iron/tech/grid, /area/engine/gravity_generator) @@ -59509,9 +58938,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "sKd" = ( /obj/structure/sink{ dir = 8; @@ -59522,9 +58949,7 @@ }, /obj/effect/landmark/prisonspawn, /turf/open/floor/iron/freezer, -/area/security/prison{ - name = "Prison Toilet" - }) +/area/security/prison) "sKg" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ alpha = 200; @@ -59672,8 +59097,7 @@ /area/chapel/main) "sMe" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8; @@ -59688,6 +59112,18 @@ /obj/item/stack/package_wrap, /turf/open/floor/wood, /area/vacant_room/office) +"sMC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/tech, +/area/engine/engine_room) "sMK" = ( /obj/structure/disposalpipe/sorting/mail{ dir = 4; @@ -59708,7 +59144,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ id = "AIwindows"; - name = "AI View Blast door" + name = "AI View Blast Door" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -59828,13 +59264,11 @@ dir = 1 }, /turf/open/floor/iron, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "sOQ" = ( /obj/machinery/door/poddoor/preopen{ id = "hosprivacy"; - name = "HoS Privacy Blast door" + name = "HoS Privacy Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -59882,9 +59316,7 @@ "sPh" = ( /obj/machinery/vending/cigarette, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "sPZ" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/bot, @@ -59944,9 +59376,7 @@ /obj/effect/turf_decal/siding/wood, /obj/effect/landmark/xeno_spawn, /turf/open/floor/carpet/green, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "sRf" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -59974,9 +59404,7 @@ /obj/machinery/vending/snack/blue, /obj/effect/turf_decal/bot, /turf/open/floor/holofloor/wood, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "sRs" = ( /obj/structure/chair/office, /obj/effect/turf_decal/tile/dark_red/half/contrasted{ @@ -60058,9 +59486,7 @@ dir = 10 }, /turf/open/floor/carpet/green, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "sSD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, @@ -60201,7 +59627,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/camera/directional/north, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/hallway/primary/port) "sVi" = ( @@ -60235,6 +59661,9 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/port) "sWe" = ( @@ -60266,9 +59695,7 @@ }, /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "sWO" = ( /obj/effect/spawner/randomvend/snack, /obj/effect/turf_decal/bot, @@ -60336,7 +59763,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -60375,8 +59802,7 @@ req_one_access_txt = "7;29" }, /obj/structure/window/reinforced{ - dir = 4; - layer = 3 + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 8 @@ -60564,12 +59990,9 @@ /area/science/robotics) "taQ" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, /obj/machinery/door/poddoor{ id = "Capoffice"; - name = "Captain blast door" + name = "Captain Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -60677,7 +60100,7 @@ /area/engine/atmospherics_engine) "tcL" = ( /obj/machinery/chem_master/condimaster, -/obj/machinery/camera/directional/north, +/obj/machinery/camera/autoname/directional/north, /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -60687,9 +60110,6 @@ /area/crew_quarters/bar) "tda" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/curtain/directional{ dir = 4 }, @@ -60757,9 +60177,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "tem" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -60940,11 +60358,6 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"tgR" = ( -/turf/closed/wall/r_wall, -/area/security/main{ - name = "Security Viewing Hall" - }) "thf" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/sign/warning/securearea{ @@ -61061,7 +60474,7 @@ "tiL" = ( /obj/machinery/door/poddoor{ id = "Capoffice"; - name = "Captain blast door" + name = "Captain Blast Door" }, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -61119,7 +60532,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Engidesk"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -61229,9 +60642,7 @@ dir = 4 }, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "tlq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -61246,6 +60657,9 @@ /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "tlI" = ( @@ -61450,13 +60864,13 @@ /obj/effect/turf_decal/box, /obj/machinery/door/window/westleft{ dir = 1; - name = "plumbing factory duct access"; + name = "plumbing Factory Duct Access"; red_alert_access = 1; req_one_access_txt = "5; 33" }, /obj/machinery/door/window/westleft{ dir = 2; - name = "plumbing factory duct access"; + name = "plumbing Factory Duct Access"; red_alert_access = 1; req_one_access_txt = "5; 33" }, @@ -61471,9 +60885,7 @@ dir = 4 }, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "tos" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate, @@ -61693,9 +61105,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -61777,9 +61186,7 @@ "trP" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "trS" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ @@ -61905,12 +61312,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","security") }, /obj/machinery/light_switch{ pixel_y = 28 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "tuq" = ( @@ -61994,7 +61404,7 @@ dir = 8 }, /obj/effect/turf_decal/guideline/guideline_tri/blue, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","medbay"); view_range = 10 }, @@ -62139,9 +61549,7 @@ dir = 10 }, /turf/open/floor/iron/dark, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "txq" = ( /obj/structure/sign/departments/medbay/alt2, /turf/closed/wall, @@ -62298,13 +61706,10 @@ /obj/machinery/conveyor{ id = "MailConv" }, -/obj/machinery/camera/autoname{ - dir = 10; - network = list("ss13","cargo") - }, /obj/structure/extinguisher_cabinet{ pixel_x = -32 }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/quartermaster/office) "tzQ" = ( @@ -62380,6 +61785,7 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm/directional/north, /obj/machinery/fax/eng, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/engine/engineering) "tAA" = ( @@ -62482,7 +61888,7 @@ }, /obj/item/storage/lockbox/loyalty, /obj/machinery/door/window/brigdoor/westleft{ - name = "mind shields"; + name = "mind Shields"; req_access_txt = "3" }, /obj/effect/turf_decal/stripes/line{ @@ -62887,6 +62293,14 @@ "tIR" = ( /turf/closed/wall, /area/maintenance/department/science) +"tIS" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/engine/atmos) "tIT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ @@ -62984,12 +62398,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig/dock) -"tKf" = ( -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13","engine") - }, -/turf/open/floor/engine/n2, -/area/engine/atmos) "tKh" = ( /obj/effect/spawner/structure/window, /obj/structure/cable/yellow{ @@ -63260,9 +62668,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "tQi" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ alpha = 180 @@ -63454,9 +62860,7 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "tSx" = ( /obj/structure/lattice/catwalk, /obj/machinery/power/solar{ @@ -63872,9 +63276,7 @@ "ual" = ( /obj/structure/sign/poster/official/walk, /turf/closed/wall/r_wall, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "uav" = ( /obj/machinery/status_display/evac{ pixel_y = 32 @@ -64058,6 +63460,9 @@ /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "uer" = ( @@ -64275,9 +63680,7 @@ /obj/item/seeds/cabbage, /obj/item/seeds/wheat, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "uhy" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/disposal/bin, @@ -64337,9 +63740,7 @@ pixel_y = -36 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "uin" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -64351,14 +63752,12 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "uiw" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "hosroom"; - name = "HoS Room Blast door" + name = "HoS Room Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -64577,7 +63976,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistry_shutters"; - name = "chemistry shutters" + name = "chemistry Shutters" }, /turf/open/floor/plating, /area/medical/apothecary) @@ -64618,9 +64017,7 @@ dir = 5 }, /turf/open/floor/iron/dark, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "unB" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -64763,6 +64160,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/science/mixing) "upJ" = ( @@ -64810,9 +64210,7 @@ req_access_txt = "1" }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "uql" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/iron/sepia, @@ -64879,9 +64277,7 @@ dir = 1 }, /turf/open/floor/carpet/green, -/area/security/main{ - name = "Security Break Room" - }) +/area/security/main) "utb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -64937,9 +64333,7 @@ color = "#DE3A3A" }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "utS" = ( /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; @@ -64980,13 +64374,6 @@ }, /turf/open/floor/iron/dark, /area/science/shuttledock) -"uun" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/security/brig) "uuu" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/stripes/line{ @@ -65044,9 +64431,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "uvn" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -65262,7 +64647,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow, /obj/structure/cable/yellow{ @@ -65285,9 +64670,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "uze" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/orange{ @@ -65584,6 +64967,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -32 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/quartermaster/qm) "uEa" = ( @@ -65627,8 +65011,7 @@ /area/crew_quarters/cafeteria) "uEB" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) @@ -65824,9 +65207,6 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -65837,7 +65217,7 @@ /obj/machinery/computer/security{ pixel_y = -3 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","security") }, /obj/machinery/computer/security/telescreen{ @@ -65942,12 +65322,12 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/structure/disposalpipe/sorting/mail/destination/testing_range{ + dir = 1 + }, /turf/open/floor/iron, /area/science/mixing) "uKa" = ( @@ -65985,9 +65365,7 @@ pixel_x = 32 }, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "uKi" = ( /turf/closed/wall, /area/science/robotics/mechbay) @@ -66140,7 +65518,7 @@ /turf/open/floor/wood, /area/maintenance/central) "uLK" = ( -/obj/machinery/camera/directional/west{ +/obj/machinery/camera/autoname/directional/west{ c_tag = "Xenobiology Lab - Pen #5"; network = list("ss13","rd","xeno") }, @@ -66322,7 +65700,6 @@ /obj/effect/turf_decal/stripes{ dir = 1 }, -/obj/machinery/light, /turf/open/floor/iron, /area/medical/medbay/lobby) "uPJ" = ( @@ -66357,9 +65734,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "uQg" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -66456,9 +65831,7 @@ dir = 4 }, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "uSu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/guideline/guideline_edge/purple{ @@ -66517,8 +65890,7 @@ /area/security/nuke_storage) "uTu" = ( /obj/structure/railing{ - dir = 8; - layer = 3.1 + dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -66661,7 +66033,7 @@ /turf/open/floor/plating, /area/bridge/meeting_room) "uWx" = ( -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","rd") }, /obj/machinery/requests_console{ @@ -66779,8 +66151,7 @@ /area/engine/engine_room) "uXK" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 3 + dir = 4 }, /mob/living/carbon/monkey, /turf/open/floor/vault, @@ -66879,6 +66250,9 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/iron, /area/engine/engineering) "uYJ" = ( @@ -67090,7 +66464,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ id = "AIwindows"; - name = "AI View Blast door" + name = "AI View Blast Door" }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/foyer) @@ -67129,7 +66503,7 @@ /obj/structure/cable/yellow, /obj/machinery/door/poddoor/shutters/preopen{ id = "hopshutter"; - name = "privacy shutters" + name = "Privacy Shutters" }, /turf/open/floor/engine{ initial_gas_mix = "n2=100;TEMP=80"; @@ -67239,9 +66613,7 @@ dir = 8 }, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Dorms" - }) +/area/security/prison) "vgM" = ( /obj/machinery/vending/medical, /turf/open/floor/iron/dark, @@ -67252,9 +66624,7 @@ "vhf" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, +/obj/effect/turf_decal/siding/wood, /obj/structure/table/wood, /turf/open/floor/carpet/green, /area/hallway/secondary/exit/departure_lounge) @@ -67442,7 +66812,7 @@ "vki" = ( /obj/structure/chair, /obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ c_tag = "Teleporter Room" }, /turf/open/floor/iron/dark, @@ -67471,9 +66841,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "vks" = ( /obj/machinery/firealarm/directional/west, /obj/structure/closet, @@ -67538,7 +66906,7 @@ "vlb" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -67662,9 +67030,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "vnq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, @@ -67812,7 +67178,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters{ id = "Chefwindow"; - name = "Chef window" + name = "Chef Window" }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) @@ -68234,18 +67600,6 @@ /obj/item/knife/kitchen, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) -"vzm" = ( -/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ - alpha = 180; - color = "#DE3A3A" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/security/brig) "vzt" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/light{ @@ -68413,9 +67767,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "vCx" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -68457,7 +67809,7 @@ "vCZ" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -68561,9 +67913,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "vDS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -68660,8 +68010,7 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -68752,9 +68101,7 @@ /turf/open/floor/iron, /area/maintenance/department/security) "vGZ" = ( -/obj/structure/window/reinforced{ - layer = 2 - }, +/obj/structure/window/reinforced, /turf/open/floor/wood, /area/medical/exam_room) "vHd" = ( @@ -68775,9 +68122,7 @@ }, /obj/item/flashlight/lamp, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "vHy" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -68794,9 +68139,7 @@ }, /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "vHU" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon, @@ -68959,6 +68302,7 @@ pixel_y = 10 }, /obj/machinery/digital_clock/directional/north, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "vLA" = ( @@ -69014,9 +68358,7 @@ icon_state = "1-2" }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "vMa" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -69036,9 +68378,7 @@ /obj/effect/turf_decal/guideline/guideline_edge/red, /obj/machinery/light, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "vMj" = ( /obj/structure/bed/roller, /obj/machinery/light, @@ -69048,8 +68388,7 @@ req_access_txt = "39" }, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/item/toy/plush/slimeplushie/green, /turf/open/floor/iron/grid/steel, @@ -69075,9 +68414,7 @@ /turf/open/floor/iron/grid/steel, /area/hydroponics) "vMG" = ( -/obj/structure/railing{ - layer = 3.1 - }, +/obj/structure/railing, /obj/structure/chair/fancy/comfy{ buildstackamount = 0; color = "#742925"; @@ -69135,9 +68472,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "vMV" = ( /obj/effect/turf_decal/guideline/guideline_edge/blue{ dir = 1 @@ -69204,6 +68539,9 @@ /obj/effect/turf_decal/guideline/guideline_ramp/yellow{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron{ dir = 8 }, @@ -69287,11 +68625,17 @@ dir = 1; pixel_y = 38 }, -/obj/structure/table/reinforced, /obj/machinery/button/massdriver{ id = "toxinsdriver"; pixel_y = 24 }, +/obj/machinery/disposal/bin{ + pixel_y = 2 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/science/misc_lab) "vPW" = ( @@ -69357,12 +68701,10 @@ pixel_y = 7 }, /obj/item/clothing/head/helmet/alt{ - layer = 3.00001; pixel_x = 6; pixel_y = 4 }, /obj/item/clothing/head/helmet/alt{ - layer = 3.00001; pixel_y = 1 }, /obj/machinery/light, @@ -69505,9 +68847,6 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "vSZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -69774,6 +69113,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, +/obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/engine/atmos) "vXn" = ( @@ -69857,9 +69197,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "vYG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -70193,9 +69531,7 @@ }, /obj/effect/turf_decal/guideline/guideline_edge/red, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "wdC" = ( /obj/machinery/power/solar_control{ dir = 8 @@ -70209,7 +69545,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","cargo") }, /turf/open/floor/noslip/standard, @@ -70332,6 +69668,9 @@ }, /obj/machinery/meter, /obj/effect/turf_decal/bot, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/dark, /area/engine/engine_room) "wgX" = ( @@ -70402,9 +69741,7 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/chem_dispenser{ - layer = 2.7 - }, +/obj/machinery/chem_dispenser, /turf/open/floor/iron, /area/medical/apothecary) "wiy" = ( @@ -70450,9 +69787,6 @@ pixel_x = -5; pixel_y = 16 }, -/obj/item/reagent_containers/food/drinks/bottle/beer{ - pixel_y = 27 - }, /obj/item/storage/firstaid/toxin{ pixel_x = 1; pixel_y = 3 @@ -70553,7 +69887,7 @@ }, /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; - name = "Prison blast door" + name = "Prison Blast Door" }, /obj/machinery/door/airlock/security/glass{ name = "Solitary Confinement"; @@ -70721,6 +70055,12 @@ }, /turf/open/floor/iron/dark, /area/science/shuttledock) +"wns" = ( +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, +/turf/open/floor/engine/n2, +/area/engine/atmos) "wnx" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 10 @@ -70833,7 +70173,6 @@ /turf/open/floor/iron/sepia, /area/quartermaster/office) "wqf" = ( -/obj/machinery/light/small, /obj/structure/cable{ icon_state = "1-4" }, @@ -70872,7 +70211,6 @@ "wqB" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/champagne{ - layer = 5; pixel_x = 6; pixel_y = 10 }, @@ -70966,7 +70304,7 @@ /turf/open/floor/iron/tech, /area/engine/atmos) "wtP" = ( -/obj/machinery/camera/directional/north, +/obj/machinery/camera/autoname/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -71167,21 +70505,17 @@ /obj/structure/curtain, /obj/machinery/shower{ dir = 8; - layer = 4; name = "emergency shower"; pixel_x = -5; pixel_y = -5 }, /turf/open/floor/noslip/standard, -/area/security/prison{ - name = "Prison Showers" - }) +/area/security/prison) "wyP" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/turf_decal/bot, /obj/structure/window/reinforced{ - dir = 4; - layer = 1 + dir = 4 }, /obj/machinery/camera/autoname/directional/south{ network = list("ss13","engine") @@ -71207,6 +70541,9 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/hallway/primary/port) "wzb" = ( @@ -71224,10 +70561,6 @@ /turf/open/floor/iron, /area/hallway/primary/port) "wzE" = ( -/obj/machinery/camera/autoname{ - dir = 6; - network = list("ss13","prison") - }, /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; freerange = 1; @@ -71238,6 +70571,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/wood, /area/security/prison) "wzY" = ( @@ -71450,9 +70784,7 @@ }, /obj/structure/table, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "wBR" = ( /obj/machinery/fax{ fax_name = "Lawyer"; @@ -71461,15 +70793,6 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/lawoffice) -"wCd" = ( -/obj/machinery/camera/autoname/directional/east, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/effect/turf_decal/guideline/guideline_edge/blue{ - color = "#267878"; - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/entry) "wCj" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plating, @@ -71624,8 +70947,7 @@ /area/crew_quarters/cafeteria) "wFD" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/landmark/start/assistant, /turf/open/floor/iron/dark/smooth_large, @@ -71651,7 +70973,7 @@ /area/engine/atmos) "wFR" = ( /obj/machinery/smartfridge/organ, -/turf/closed/wall, +/turf/open/floor/iron/dark, /area/medical/morgue) "wFT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -71731,7 +71053,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -71774,9 +71096,6 @@ name = "Chapel Office"; req_access_txt = "27" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /turf/open/floor/wood, /area/chapel/office) "wHQ" = ( @@ -71908,7 +71227,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "Engidesk"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -71945,9 +71264,7 @@ pixel_y = -7 }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "wKx" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /obj/structure/disposalpipe/segment{ @@ -72013,9 +71330,6 @@ /turf/open/floor/iron/white, /area/security/brig/medbay) "wLN" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, /obj/effect/turf_decal/guideline/guideline_half_edge/brown{ dir = 10 }, @@ -72029,6 +71343,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/hallway/primary/port) "wLT" = ( @@ -72155,8 +71472,7 @@ req_access_txt = "37" }, /obj/effect/turf_decal/siding/wood{ - dir = 1; - layer = 1 + dir = 1 }, /obj/structure/cable/yellow{ icon_state = "1-8" @@ -72353,7 +71669,6 @@ /obj/machinery/light, /obj/machinery/camera/motion{ c_tag = "MiniSat Upload Chamber"; - dir = 5; network = list("aiupload") }, /obj/structure/cable, @@ -72475,7 +71790,7 @@ /area/engine/atmos) "wSB" = ( /obj/machinery/door/morgue{ - name = "Mass driver room"; + name = "Mass Driver Room"; req_access_txt = "27" }, /obj/machinery/light_switch{ @@ -72502,9 +71817,7 @@ location = "Bridge" }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "wTw" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -72589,9 +71902,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Interrogation" - }) +/area/security/brig) "wUW" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ alpha = 180; @@ -72657,9 +71968,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "wXg" = ( /obj/structure/closet/crate, /obj/machinery/conveyor/inverted{ @@ -72783,9 +72092,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "wYT" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -73006,8 +72313,7 @@ /area/security/brig) "xdj" = ( /obj/structure/railing{ - dir = 6; - layer = 3.1 + dir = 6 }, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 6 @@ -73062,9 +72368,7 @@ }, /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, -/area/security/brig{ - name = "Brig Evidence" - }) +/area/security/brig) "xeg" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -73076,6 +72380,9 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","security") + }, /turf/open/floor/iron, /area/security/brig) "xel" = ( @@ -73091,6 +72398,18 @@ /obj/structure/disposalpipe/junction/flip, /turf/open/floor/iron, /area/hallway/primary/fore) +"xes" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/structure/sign/painting/library{ + pixel_y = -32 + }, +/obj/machinery/camera/autoname/directional/south{ + c_tag = "Captain's Quarters" + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "xeJ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -73099,13 +72418,15 @@ alpha = 180; color = "#DE3A3A" }, -/obj/structure/disposalpipe/junction, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "xeN" = ( @@ -73280,8 +72601,7 @@ name = "Genetics Desk Shutters" }, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /turf/open/floor/iron, /area/medical/genetics) @@ -73289,7 +72609,7 @@ /obj/machinery/porta_turret/ai{ dir = 4 }, -/obj/machinery/camera/directional/south{ +/obj/machinery/camera/autoname/directional/south{ c_tag = "MiniSat Core Hallway 2"; network = list("minisat") }, @@ -73370,7 +72690,6 @@ "xjE" = ( /obj/structure/table/wood, /obj/item/kirbyplants/random{ - layer = 3; pixel_y = 18 }, /obj/item/candle/infinite{ @@ -73508,7 +72827,6 @@ /obj/effect/turf_decal/delivery, /obj/structure/window/reinforced{ dir = 4; - layer = 2.9; pixel_x = 3 }, /obj/machinery/door/window/eastleft{ @@ -73863,9 +73181,7 @@ /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) "xqx" = ( -/obj/effect/decal/cleanable/cobweb{ - layer = 5 - }, +/obj/effect/decal/cleanable/cobweb, /obj/structure/closet/secure_closet/personal, /turf/open/floor/iron/dark, /area/vacant_room/commissary/commissary2) @@ -74096,9 +73412,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/security/brig/dock{ - name = "Security E.V.A. Storage" - }) +/area/security/brig/dock) "xuC" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /mob/living/simple_animal/bot/cleanbot/larry{ @@ -74114,9 +73428,6 @@ /turf/open/floor/iron/white, /area/medical/sleeper) "xuJ" = ( -/obj/structure/sign/departments/medbay/alt{ - pixel_y = -32 - }, /obj/structure/sign/departments/medbay/alt{ pixel_y = -32 }, @@ -74247,9 +73558,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "xwd" = ( /obj/machinery/door/airlock/mining{ req_access_txt = "48" @@ -74292,9 +73601,7 @@ icon_state = "4-8" }, /turf/open/floor/prison, -/area/security/prison{ - name = "Prison Visitation" - }) +/area/security/prison) "xwG" = ( /obj/structure/lattice, /obj/item/stack/rods, @@ -74428,8 +73735,7 @@ /obj/effect/turf_decal/tile/black/fourcorners, /obj/effect/turf_decal/bot_white, /obj/structure/window/reinforced{ - dir = 8; - layer = 3 + dir = 8 }, /obj/structure/weightmachine, /turf/open/floor/prison, @@ -74758,7 +74064,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/preopen{ id = "Engidesk"; - name = "engineering security door" + name = "engineering Security Door" }, /obj/machinery/door/firedoor, /obj/machinery/door/window/northleft{ @@ -74947,7 +74253,7 @@ "xFF" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgewindows"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -75014,7 +74320,7 @@ "xHa" = ( /obj/machinery/door/poddoor/shutters{ id = "atmosshutters"; - name = "Atmos storage" + name = "Atmos Storage" }, /obj/effect/turf_decal/loading_area{ dir = 8 @@ -75036,9 +74342,6 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "xHk" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral, /obj/item/kirbyplants/random{ pixel_y = 6 @@ -75101,7 +74404,6 @@ /area/engine/atmos) "xHY" = ( /obj/structure/sign/departments/minsky/supply/cargo, -/obj/structure/sign/departments/minsky/supply/cargo, /turf/closed/wall, /area/quartermaster/qm) "xHZ" = ( @@ -75120,13 +74422,13 @@ /obj/effect/turf_decal/box, /obj/machinery/door/window/westleft{ dir = 1; - name = "plumbing factory duct access"; + name = "plumbing Factory Duct Access"; red_alert_access = 1; req_one_access_txt = "5;33" }, /obj/machinery/door/window/westleft{ dir = 2; - name = "plumbing factory duct access"; + name = "plumbing Factory Duct Access"; red_alert_access = 1; req_one_access_txt = "5;33" }, @@ -75329,9 +74631,7 @@ pixel_x = -25 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "xLd" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -75416,8 +74716,7 @@ /area/ai_monitored/turret_protected/aisat/foyer) "xNG" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -75470,23 +74769,20 @@ /area/hallway/primary/central) "xPh" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 1 + dir = 1 }, /obj/effect/turf_decal/bot, /obj/structure/rack, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = -4; pixel_y = 8 }, /obj/item/storage/box/monkeycubes{ - layer = 3.1; pixel_x = 2 }, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/extinguisher_cabinet{ pixel_x = 24; @@ -75867,14 +75163,6 @@ dir = 8 }, /area/science/research) -"xWC" = ( -/obj/machinery/camera/motion/directional/south{ - c_tag = "MiniSat Exterior 3"; - network = list("minisat") - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) "xWL" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -76010,9 +75298,7 @@ "xZd" = ( /obj/effect/turf_decal/tile/black/fourcorners, /turf/open/floor/iron/techmaint, -/area/security/prison{ - name = "Prison Botany" - }) +/area/security/prison) "xZj" = ( /obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -76193,8 +75479,7 @@ /area/vacant_room/commissary/commissary1) "ybD" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/structure/window/reinforced, /turf/open/floor/iron/dark/smooth_large, @@ -76213,13 +75498,12 @@ }, /obj/structure/closet/secure_closet/personal, /obj/effect/turf_decal/box, -/obj/machinery/camera/autoname{ - dir = 10; - network = list("ss13","medbay") - }, /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","medbay") + }, /turf/open/floor/iron/grid/steel, /area/medical/virology) "ycb" = ( @@ -76297,7 +75581,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "quarantineshutters"; - name = "isolation shutters" + name = "Isolation Shutters" }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -76332,9 +75616,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "ydT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -76381,9 +75663,6 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -76448,7 +75727,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","medbay") }, /turf/open/floor/iron, @@ -76495,14 +75774,15 @@ icon_state = "0-2" }, /turf/open/floor/plating, -/area/security/main{ - name = "Security Locker Room" - }) +/area/security/main) "ygW" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron/tech, /area/engine/engine_room) "ygX" = ( @@ -76562,16 +75842,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron, /area/maintenance/department/medical) -"yji" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/guideline/guideline_edge/red, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/brig) "yjo" = ( /obj/structure/janitorialcart, /turf/open/floor/plating, @@ -76749,11 +76019,9 @@ dir = 8 }, /turf/open/floor/iron, -/area/security/main{ - name = "Security Viewing Hall" - }) +/area/security/main) "ylw" = ( -/obj/machinery/camera/directional/north{ +/obj/machinery/camera/autoname/directional/north{ network = list("ss13","rd") }, /obj/structure/disposalpipe/segment{ @@ -76818,9 +76086,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/security/prison{ - name = "Prison Processing" - }) +/area/security/prison) "ymh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -97244,16 +96510,16 @@ yeA yeA yeA yeA -nEb +emF rYy -nEb +emF yeA -nEb +emF tYo -nEb +emF jSQ -nEb -nEb +emF +emF yeA dXg yeA @@ -97501,16 +96767,16 @@ gsA gsA yeA yeA -nEb +emF hLc -nEb +emF yeA -nEb +emF eWz -nEb +emF lIC wWh -nEb +emF gto xdv fft @@ -97758,16 +97024,16 @@ gsA ewB gsA yeA -nEb +emF axV -nEb +emF jSQ -nEb +emF frI -nEb +emF lIC pEC -nEb +emF vIF tKq uAH @@ -98015,7 +97281,7 @@ gsA gsA yeA yeA -nEb +emF xjm eqJ kSR @@ -98024,7 +97290,7 @@ iQP dzx khv giZ -nEb +emF lIa lrw esM @@ -98079,7 +97345,7 @@ hOH hCg bOe jaQ -gXl +jaQ aSA vmg vmg @@ -98269,10 +97535,10 @@ emF gCz emF emF -nEb -nEb -nEb -nEb +emF +emF +emF +emF bkD eku gGe @@ -98281,7 +97547,7 @@ svr owK dAE cNI -nEb +emF onU aaB gUF @@ -98538,7 +97804,7 @@ oUy hVH hVH oFH -nEb +emF uyF sqR rAD @@ -98795,7 +98061,7 @@ qTn hVH hVH euH -nEb +emF oom wcV osV @@ -99052,7 +98318,7 @@ jwh kIy hVH puK -nEb +emF sIA sIA sIA @@ -99297,7 +98563,7 @@ crB crB crB crB -nEb +emF pbb qFt bmx @@ -99309,7 +98575,7 @@ oLS cnZ arv iZm -nEb +emF bzp nBY pSz @@ -99558,15 +98824,15 @@ bkK msW tuW msW -nEb -nEb -nEb -nEb -nEb -nEb -nEb -nEb -nEb +emF +emF +emF +emF +emF +emF +emF +emF +emF lfX bev xER @@ -100916,8 +100182,8 @@ rKp rlB hhY eUx -saH -fKo +nmD +mms psD qio qnA @@ -101871,7 +101137,7 @@ icK wgX mky pgq -eJV +crB vbe vbe vbe @@ -101896,7 +101162,7 @@ ifl hJO ttt pqC -guA +mqZ gFF ows waw @@ -102119,12 +101385,12 @@ gfJ xlC gqn lXM -vzm +pYj cuQ -vzm -vzm -vzm -vzm +pYj +pYj +pYj +pYj dYM cUS nke @@ -102153,7 +101419,7 @@ ava vMP ttt pqC -guA +mqZ bez sVZ sjM @@ -102385,12 +101651,12 @@ hcz rnz wxK eQG -eJV -eJV -eJV -eJV -eJV -eJV +crB +crB +crB +crB +crB +crB nlz wCj jBw @@ -102641,13 +101907,13 @@ hBK hBK jXu wxK -yji +eQG nrc nnk wKv vHl nKF -eJV +crB qyI xoe pSN @@ -102904,7 +102170,7 @@ mPQ bWU pfZ nKF -eJV +crB lKm wQr glO @@ -102926,7 +102192,7 @@ ttt pqC uJv qoz -gbm +gky saf ttg sdb @@ -103161,7 +102427,7 @@ fMW eFv hYs wUI -eJV +crB jFM aPu bFE @@ -103413,9 +102679,9 @@ pqn bRp nrP aYi -fHK -fHK -fHK +crB +crB +crB nlm cfN nlm @@ -105214,7 +104480,7 @@ tmA iSZ iSZ wHb -uun +gEo xqc hMu gUK @@ -105291,7 +104557,7 @@ tyx boR ijx iEd -hcU +dXJ pAt tKB fXp @@ -105708,16 +104974,16 @@ gsA gsA pia pia -qLO +gIf mtI mtI mtI mtI mtI -qLO -qRj +gIf +pVO aTs -qLO +gIf xNd nFk bDs @@ -105726,12 +104992,12 @@ ifC cmw wkK ifC -njd +gIf crc -njd -njd -njd -tgR +gIf +gIf +gIf +hBK bXM jJB vMg @@ -105965,7 +105231,7 @@ tKJ kuK tKJ tKJ -qLO +gIf mtI mtI mtI @@ -105974,8 +105240,8 @@ mtI mLg wBe pbr -qLO -qLO +gIf +gIf pLf jCL leQ @@ -105987,7 +105253,7 @@ sEO nmZ xLa fqU -njd +gIf gKr vYA jJB @@ -106222,7 +105488,7 @@ tRH dIl jGl pcO -qLO +gIf mtI mtI mtI @@ -106479,7 +105745,7 @@ cHR azn vur lxb -qLO +gIf mtI mtI mtI @@ -106501,8 +105767,8 @@ wBP vMT bzb stN -njd -njd +gIf +gIf vYA blA ylk @@ -106736,7 +106002,7 @@ hhv hhv hhv puk -qLO +gIf mtI mtI mtI @@ -106753,8 +106019,8 @@ lZI sFf cuM qEC -njd -njd +gIf +gIf ylT mnm uzb @@ -106993,7 +106259,7 @@ aym aKu hhv sXT -qLO +gIf mtI mtI mtI @@ -107250,7 +106516,7 @@ eAl hRN hhv euT -qLO +gIf mtI mtI mtI @@ -107273,7 +106539,7 @@ qtD eSn mUA pFk -njd +gIf eJN tQh gue @@ -107364,7 +106630,7 @@ kKM uLf nCn xkg -mhn +iIs pva txT hPc @@ -107507,7 +106773,7 @@ cHl dIe hhv fCc -qLO +gIf lTA mqL mfP @@ -107515,7 +106781,7 @@ lWa mfP hQk uQP -pNF +aDR xtP uZg dyS @@ -107524,13 +106790,13 @@ wNH xRm daa rCn -hae -hae -hae -hae -hae -hae -hae +gIf +gIf +gIf +gIf +gIf +gIf +gIf cHW ixv wdB @@ -107623,8 +106889,8 @@ kvR jxT bod opU -wdk -wdk +bJl +bJl ygW lDa ctA @@ -107764,7 +107030,7 @@ piE coK hhv fmg -qLO +gIf gtD mOm tQy @@ -107784,7 +107050,7 @@ pxh gdY qUY sPh -hae +gIf kyO rLJ pmH @@ -108021,30 +107287,30 @@ hhv hhv hhv jiS -qLO +gIf ifC ifC lWy ifC axg -jrR +iIu iIu pBe iIu iIu -nCH -nCH -nCH +iIu +iIu +iIu xxl hVD uce -hae +gIf heS aRF ilH awG oEA -hae +gIf eJN fld dKO @@ -108061,7 +107327,7 @@ rXp bCz iDQ wlS -gky +wlS wlS nyz ePP @@ -108278,7 +107544,7 @@ vvg gnD oif uwf -qLO +gIf qpo nQR pvz @@ -108291,17 +107557,17 @@ fPs hRZ aVh sKd -nCH +iIu dIJ dIJ jWe -hae +gIf xwE -jeK -hae -jeK +iIu +gIf +iIu pjc -hae +gIf vYA jth swU @@ -108350,7 +107616,7 @@ oGJ tlK ykx kNF -mGt +nvJ lxt iEd gtw @@ -108535,7 +107801,7 @@ oif tKJ pZZ eEJ -qLO +gIf aKq eyw oPx @@ -108546,19 +107812,19 @@ iIu wyJ kIg nYw -nCH +iIu mLU -nCH +iIu dhT kTx mOI -hae +gIf cJu aRF ilH awG hYV -hae +gIf vYA ova kLz @@ -108792,29 +108058,29 @@ tKJ tKJ tKJ voz -qLO +gIf ifC ifC ifC ifC -hRv -hRv -mfy -mfy -mfy -mfy gIf gIf gIf -qLO +gIf +gIf +gIf +gIf +gIf +gIf +gIf hkQ -qLO -hae -hae -hae -hae -hae -hae +gIf +gIf +gIf +gIf +gIf +gIf +gIf ciT vDJ vmS @@ -108909,8 +108175,8 @@ wMj bDL uFI mKJ -niY -dIL +guA +sMC crW kuR lOI @@ -109260,7 +108526,7 @@ yeA yeA yeA yeA -ewB +pia yeA yeA gsA @@ -109516,11 +108782,11 @@ yeA yeA yeA yeA -yeA +cnW ewB yeA yeA -xWC +gsA vcX mMd gVH @@ -109774,7 +109040,7 @@ yeA yeA yeA yeA -ewB +pia yeA yeA gsA @@ -110707,7 +109973,7 @@ egI lbl jOP mtO -hEj +fed hTN oQJ fbZ @@ -111203,7 +110469,7 @@ gfY ixK uYH nQH -iIy +jnZ iIy iIy aUb @@ -111964,9 +111230,9 @@ iRY uga sGZ vBI -nGy +tIS lJP -nGy +sGZ xaj mWE vWW @@ -112483,7 +111749,7 @@ kWN eML gfH qXB -fqL +wFG xph pwh mNb @@ -113246,7 +112512,7 @@ xAe iRY iRY nLv -wVX +mhP eNK pTW pTW @@ -113517,15 +112783,15 @@ sPZ sPZ iRY vgn -rqA +vgn vgn iRY lNN -tKf +lNN lNN iRY mwi -rSn +mwi mwi iRY yeA @@ -113773,15 +113039,15 @@ mib mib eTm iRY -vgn +qHP ePs vgn iRY -lNN +wns oRY lNN iRY -mwi +ayA sUj mwi iRY @@ -115005,7 +114271,7 @@ ovp iJe kgH wAl -mkd +xes dFC xFA qzz @@ -118913,15 +118179,15 @@ mLj lBr tfX iRY -lKh +gkI lKh lKh iRY -gpe +iSF ocM gpe iRY -eiL +kus pSx eiL iRY @@ -119171,15 +118437,15 @@ lBr tfX iRY lKh -qpr +lKh lKh iRY gpe -pWk +gpe gpe iRY eiL -cAP +eiL eiL iRY gsA @@ -120617,12 +119883,12 @@ ngu ngu ngu ngu -rdD +ngu nIs mpK eaE klt -wCd +hcr hcr hcr pLp diff --git a/_maps/map_files/debug/multiz.dmm b/_maps/map_files/debug/multiz.dmm index 5511f0963713e..f9c48642c49ca 100644 --- a/_maps/map_files/debug/multiz.dmm +++ b/_maps/map_files/debug/multiz.dmm @@ -39,7 +39,6 @@ /area/engine/gravity_generator) "al" = ( /obj/machinery/airalarm/directional/north{ - frequency = 1439; locked = 0; pixel_y = 23 }, @@ -69,7 +68,6 @@ /area/space/nearstation) "ap" = ( /obj/machinery/airalarm/directional/north{ - frequency = 1439; locked = 0; pixel_y = 23 }, @@ -99,7 +97,6 @@ charge = 5e+006 }, /obj/machinery/airalarm/directional/north{ - frequency = 1439; locked = 0; pixel_y = 23 }, @@ -240,12 +237,8 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/effect/turf_decal/bot{ - dir = 2 - }, -/turf/open/floor/iron{ - dir = 2 - }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, /area/engine/atmos) "aO" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -343,12 +336,8 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister, -/obj/effect/turf_decal/bot{ - dir = 2 - }, -/turf/open/floor/iron{ - dir = 2 - }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, /area/engine/atmos) "bc" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -507,7 +496,6 @@ icon_state = "0-2" }, /obj/machinery/airalarm/directional/north{ - frequency = 1439; locked = 0; pixel_y = 23 }, @@ -535,7 +523,6 @@ /area/hallway/primary/central) "bG" = ( /obj/machinery/airalarm/directional/north{ - frequency = 1439; locked = 0; pixel_y = 23 }, @@ -617,7 +604,6 @@ /area/hallway/primary/central) "bU" = ( /obj/machinery/airalarm/directional/north{ - frequency = 1439; locked = 0; pixel_y = 23 }, @@ -954,7 +940,6 @@ /area/storage/primary) "cW" = ( /obj/machinery/airalarm/directional/north{ - frequency = 1439; locked = 0; pixel_y = 23 }, @@ -964,6 +949,9 @@ pixel_x = -25 }, /obj/effect/turf_decal/stripes/corner, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/construction) "cX" = ( @@ -986,7 +974,6 @@ /area/construction) "da" = ( /obj/machinery/airalarm/directional/north{ - frequency = 1439; locked = 0; pixel_y = 23 }, @@ -1247,10 +1234,14 @@ /turf/open/floor/iron, /area/engine/engineering) "dX" = ( -/turf/open/floor/iron{ - dir = 2 +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 4 }, -/area/engine/atmos) +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/iron, +/area/construction) "dY" = ( /turf/open/floor/iron, /area/engine/atmos) @@ -1360,6 +1351,9 @@ /area/storage/primary) "es" = ( /obj/effect/turf_decal/stripes/asteroid/corner, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/iron, /area/construction) "et" = ( @@ -1512,6 +1506,9 @@ /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/hallway/primary/central) "eX" = ( @@ -1545,6 +1542,18 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"id" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/iron, +/area/construction) "ik" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -1552,6 +1561,12 @@ /obj/machinery/disposal/deliveryChute, /turf/open/floor/plating, /area/storage/primary) +"jn" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "kC" = ( /obj/structure/elevator_segment/primary, /obj/effect/turf_decal/stripes/line{ @@ -1559,6 +1574,13 @@ }, /turf/open/floor/iron, /area/construction) +"lj" = ( +/obj/effect/turf_decal/stripes/asteroid/line, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/construction) "ll" = ( /obj/structure/elevator_segment/primary, /obj/effect/turf_decal/stripes/line{ @@ -1566,6 +1588,15 @@ }, /turf/open/floor/iron, /area/construction) +"mG" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/iron, +/area/construction) "ne" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -1573,6 +1604,15 @@ /obj/structure/disposaloutlet, /turf/open/floor/plating, /area/storage/primary) +"nT" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/department/bridge) "og" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/ladder, @@ -1630,6 +1670,24 @@ }, /turf/open/floor/iron, /area/construction) +"sG" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/security) +"tk" = ( +/obj/structure/cable{ + icon_state = "8-16" + }, +/turf/open/floor/plating, +/area/construction) "ty" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1640,13 +1698,31 @@ /turf/open/floor/iron, /area/construction) "tY" = ( -/obj/structure/disposalpipe/trunk/multiz, +/obj/structure/disposalpipe/multiz, /turf/open/floor/plating, /area/storage/primary) "ux" = ( /obj/structure/ladder, /turf/open/floor/iron, /area/security) +"vl" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/security) +"vw" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/security) "vF" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -1661,6 +1737,12 @@ }, /turf/open/floor/iron, /area/construction) +"wA" = ( +/obj/structure/cable{ + icon_state = "8-32" + }, +/turf/open/openspace, +/area/security) "xK" = ( /obj/machinery/door/airlock, /obj/structure/cable{ @@ -1702,6 +1784,20 @@ }, /turf/open/floor/plating, /area/construction) +"BC" = ( +/obj/effect/turf_decal/stripes/asteroid/line, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/iron, +/area/construction) +"Cc" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/iron, +/area/security) "CA" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1712,6 +1808,12 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"CI" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/maintenance/department/bridge) "CN" = ( /obj/structure/elevator_segment/primary, /obj/machinery/light, @@ -1720,6 +1822,12 @@ }, /turf/open/floor/iron, /area/construction) +"Di" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/hallway/primary/central) "Dm" = ( /obj/machinery/light{ dir = 1 @@ -1747,6 +1855,12 @@ /obj/structure/elevator_segment/primary, /turf/open/floor/iron, /area/construction) +"Fs" = ( +/obj/structure/cable{ + icon_state = "8-16" + }, +/turf/open/floor/iron, +/area/construction) "Fz" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 @@ -1777,6 +1891,12 @@ /obj/machinery/light, /turf/open/floor/plating, /area/construction) +"Hv" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/iron, +/area/security) "HN" = ( /obj/effect/turf_decal/stripes/asteroid/corner{ dir = 1 @@ -1797,6 +1917,15 @@ dir = 8 }, /area/crew_quarters/dorms) +"Jv" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "Jz" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 @@ -1832,6 +1961,9 @@ /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/iron, /area/security) "KM" = ( @@ -1843,6 +1975,12 @@ "KR" = ( /turf/open/floor/iron, /area/security) +"LJ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/security) "LN" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -1870,6 +2008,12 @@ }, /turf/open/floor/plating, /area/construction) +"Ou" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/construction) "OE" = ( /obj/structure/elevator_segment/primary, /obj/effect/turf_decal/plaque, @@ -1910,6 +2054,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/storage/primary) +"Qx" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/iron, +/area/security) "QZ" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -1929,11 +2079,20 @@ dir = 8 }, /area/crew_quarters/dorms) +"SA" = ( +/obj/structure/cable{ + icon_state = "4-32" + }, +/turf/open/openspace, +/area/security) "SE" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 }, /obj/effect/turf_decal/stripes/asteroid/line, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/iron, /area/security) "SI" = ( @@ -1977,6 +2136,11 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) +"Yi" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/department/bridge) "YD" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 @@ -1984,7 +2148,7 @@ /turf/open/floor/iron, /area/security) "YL" = ( -/obj/structure/disposalpipe/trunk/multiz/down, +/obj/structure/disposalpipe/multiz/down, /turf/open/floor/iron, /area/storage/primary) @@ -2719,7 +2883,7 @@ bO bO cO cW -dm +id dy dy dy @@ -2773,7 +2937,7 @@ bN bN cP cX -dn +tk dn dn dn @@ -5416,9 +5580,9 @@ af af af af -af -bz -af +CI +nT +Yi af af af @@ -5470,7 +5634,7 @@ eg eg eg eg -eg +Di bA cN cN @@ -5524,11 +5688,11 @@ bE bE bE bE -bE +cc bE cN es -eI +dX eI eI eI @@ -5578,11 +5742,11 @@ bE bE bE bE -bE +cc bE cN -eu -au +lj +wA au au au @@ -5623,8 +5787,8 @@ af ah aw aw -dX -dX +dY +dY dY dY bE @@ -5632,10 +5796,10 @@ bE bE bE bE -bE -bE -ep -eu +jn +bO +mG +BC au au au @@ -5688,7 +5852,7 @@ bE bE bE bE -ep +Ou eu au au @@ -5742,7 +5906,7 @@ bE bE bE bE -ep +Fs eu au au @@ -8551,7 +8715,7 @@ au au au au -au +SA au au au @@ -8605,7 +8769,7 @@ au au au au -Kq +sG YD Fz au @@ -8659,7 +8823,7 @@ au au au au -Jz +vw ux Uc au @@ -8714,7 +8878,7 @@ au au au KL -KR +Hv Pl au au @@ -8778,7 +8942,7 @@ Jz KR KR KR -KR +Cc KR KR KR @@ -8822,17 +8986,17 @@ eP eT eT eT -bE -eT +jn +Jv eW -YD -YD -YD -KR -KR -KR -KR -KR +vl +vl +vl +LJ +LJ +LJ +LJ +Qx KR KR KR diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 23d06519def6f..34ea8d3916ae4 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -1430,7 +1430,7 @@ }, /obj/machinery/door/poddoor{ id = "cargounload"; - name = "supply dock unloading door" + name = "supply Dock Unloading Door" }, /turf/open/floor/plating, /area/quartermaster/storage) @@ -1459,7 +1459,7 @@ }, /obj/machinery/door/poddoor{ id = "cargoload"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /turf/open/floor/plating, /area/quartermaster/storage) @@ -1472,14 +1472,12 @@ "fe" = ( /obj/machinery/button/door{ id = "cargounload"; - layer = 4; name = "Loading Doors"; pixel_x = 24; pixel_y = 8 }, /obj/machinery/button/door{ id = "cargoload"; - layer = 4; name = "Loading Doors"; pixel_x = 24; pixel_y = -8 @@ -2240,6 +2238,13 @@ /obj/item/storage/toolbox/syndicate, /turf/open/floor/iron, /area/storage/primary) +"nA" = ( +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "nG" = ( /obj/structure/closet/secure_closet/RD{ locked = 0 @@ -2266,6 +2271,16 @@ }, /turf/open/floor/iron, /area/security/brig) +"pv" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "pC" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -2536,6 +2551,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/hallway/secondary/entry) +"El" = ( +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "EG" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2545,6 +2567,24 @@ }, /turf/open/floor/iron, /area/construction) +"EM" = ( +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/machinery/power/apc{ + dir = 1; + pixel_y = 23 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/maintenance/aft) +"EP" = ( +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "ES" = ( /obj/structure/cable{ icon_state = "1-8" @@ -2753,6 +2793,13 @@ /obj/structure/fans/tiny, /turf/open/floor/iron, /area/engine/engineering) +"VC" = ( +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/hallway/secondary/entry) "VF" = ( /obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/machinery/camera/directional/north, @@ -2844,6 +2891,14 @@ }, /turf/open/floor/iron, /area/bridge) +"YU" = ( +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "ZD" = ( /obj/machinery/suit_storage_unit/ce, /turf/open/floor/iron, @@ -5924,18 +5979,18 @@ ei ei ei ei -eB -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL +pv +VC +VC +VC +VC +VC +VC +VC +VC +VC +VC +EP eL eL ge @@ -6027,7 +6082,7 @@ eh eh eh eh -eL +El eh eh ge @@ -6119,7 +6174,7 @@ cN cN cN cN -fI +YU ge ge ge @@ -6211,7 +6266,7 @@ dy dm dM cN -Tt +nA vm fg aa @@ -6303,7 +6358,7 @@ dn dn dL cN -Tt +nA vm fg aa @@ -6395,7 +6450,7 @@ dn dn dL ef -Tt +nA vm fg aa @@ -6487,7 +6542,7 @@ dn dn dL ef -Tt +nA vm fg aa @@ -6579,7 +6634,7 @@ dn dn dL cN -Tt +nA vm fg aa @@ -6671,7 +6726,7 @@ dn dn dL cN -Tt +EM vm fg aa diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 3244b6d9d936f..b5ea559ea7f2b 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -738,9 +738,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/tdome/tdomeobserve) "cM" = ( /obj/machinery/seed_extractor, @@ -1730,9 +1728,7 @@ /obj/machinery/computer/security{ dir = 8 }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/centcom/control) @@ -2550,14 +2546,12 @@ "jy" = ( /obj/machinery/button/door/indestructible{ id = "XCCQMLoaddoor"; - layer = 4; name = "Loading Doors"; pixel_x = -27; pixel_y = -5 }, /obj/machinery/button/door/indestructible{ id = "XCCQMLoaddoor2"; - layer = 4; name = "Loading Doors"; pixel_x = -27; pixel_y = 5 @@ -2783,7 +2777,7 @@ "kv" = ( /obj/machinery/door/poddoor/shuttledock{ checkdir = 1; - name = "syndicate blast door"; + name = "syndicate Blast Door"; turftype = /turf/open/floor/plating/asteroid/snow }, /turf/open/floor/plating, @@ -3149,8 +3143,7 @@ /area/centcom/supply) "mi" = ( /obj/structure/railing{ - dir = 6; - layer = 3.1 + dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/siding/dark{ @@ -3185,8 +3178,7 @@ /area/centcom/supply) "mq" = ( /obj/structure/railing{ - dir = 10; - layer = 3.1 + dir = 10 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/siding/dark{ @@ -3315,7 +3307,6 @@ /obj/machinery/recharger, /obj/machinery/button/door/indestructible{ id = "XCCsecdepartment"; - layer = 3; name = "CC Security Checkpoint Control"; pixel_x = 24; pixel_y = 24 @@ -3326,9 +3317,7 @@ /turf/open/floor/iron, /area/centcom/control) "na" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 4 }, @@ -3507,9 +3496,7 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/centcom/control) @@ -3603,8 +3590,7 @@ /area/space) "om" = ( /obj/structure/railing{ - dir = 4; - layer = 4.1 + dir = 4 }, /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -3842,9 +3828,7 @@ /turf/open/floor/catwalk_floor/iron_smooth, /area/centcom/evac) "pw" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/filingcabinet/filingcabinet, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -3867,10 +3851,7 @@ /area/centcom/ferry) "py" = ( /obj/machinery/smartfridge, -/turf/closed/indestructible{ - icon = 'icons/turf/walls/wood_wall.dmi'; - icon_state = "wood" - }, +/turf/open/floor/wood, /area/centcom/holding) "pz" = ( /turf/open/space/basic, @@ -5215,7 +5196,7 @@ "ud" = ( /obj/machinery/door/poddoor/shutters{ id = "nukeop_ready"; - name = "shuttle dock" + name = "shuttle Dock" }, /turf/open/floor/plating, /area/syndicate_mothership/control) @@ -5326,9 +5307,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fourcolor, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/centcom/control) @@ -5449,9 +5428,7 @@ /turf/open/floor/grass, /area/centcom/evac) "uT" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/structure/filingcabinet/filingcabinet, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, @@ -6030,7 +6007,6 @@ }, /obj/machinery/button/door/indestructible{ id = "XCCcustoms1"; - layer = 3; name = "CC Emergency Docks Control"; pixel_x = 24; pixel_y = 24 @@ -6371,9 +6347,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/tdome/tdomeobserve) "yj" = ( /obj/machinery/door/airlock/centcom{ @@ -6488,9 +6462,7 @@ /area/centcom/control) "yA" = ( /obj/structure/closet/secure_closet/ertEngi, -/obj/machinery/airalarm/directional/north{ - pixel_y = 24 - }, +/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -7309,7 +7281,8 @@ /area/ctf) "BV" = ( /obj/machinery/chem_dispenser/drinks/beer, -/turf/closed/indestructible/hotelwall, +/obj/structure/table/wood, +/turf/open/floor/wood, /area/centcom/holding) "BW" = ( /obj/item/storage/firstaid/regular, @@ -7996,18 +7969,13 @@ /area/wizard_station) "ED" = ( /obj/machinery/vending/boozeomat, -/turf/closed/indestructible{ - icon = 'icons/turf/walls/wood_wall.dmi'; - icon_state = "wood" - }, +/turf/open/floor/wood, /area/centcom/holding) "EE" = ( /obj/machinery/chem_master/condimaster{ name = "HoochMaster 2000" }, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/tdome/tdomeobserve) @@ -8038,9 +8006,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/tdome/tdomeobserve) "EK" = ( /obj/machinery/status_display/evac, @@ -8604,9 +8570,7 @@ "GU" = ( /obj/structure/destructible/cult/tome, /obj/item/book/codex_gigas, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/centcom/ferry) @@ -8861,7 +8825,8 @@ /area/centcom/ferry) "HN" = ( /obj/machinery/smartfridge, -/turf/closed/indestructible/hotelwall, +/obj/effect/turf_decal/tile/green/fourcorners/contrasted, +/turf/open/floor/iron/white, /area/centcom/holding) "HO" = ( /obj/structure/table/reinforced, @@ -8938,9 +8903,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/tdome/tdomeobserve) "Ih" = ( /obj/effect/turf_decal/tile/red{ @@ -8950,8 +8913,7 @@ /area/tdome/tdomeobserve) "Ii" = ( /obj/structure/railing{ - dir = 4; - layer = 4.1 + dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/siding/dark{ @@ -9095,9 +9057,7 @@ /area/centcom/holding) "IK" = ( /obj/structure/closet/secure_closet/quartermaster, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/supply) @@ -9555,9 +9515,7 @@ pixel_y = 3 }, /obj/structure/table/reinforced, -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -9612,8 +9570,7 @@ /area/centcom/ferry) "Ks" = ( /obj/structure/railing{ - dir = 8; - layer = 4.1 + dir = 8 }, /obj/structure/table/reinforced, /obj/item/folder/red{ @@ -9813,14 +9770,12 @@ }, /obj/machinery/button/door/indestructible{ id = "XCCcustoms1"; - layer = 3.5; name = "CC Customs 1 Control"; pixel_x = 8; pixel_y = -24 }, /obj/machinery/button/door/indestructible{ id = "XCCcustoms2"; - layer = 3.5; name = "CC Customs 2 Control"; pixel_x = -8; pixel_y = -24 @@ -11271,7 +11226,8 @@ /area/tdome/tdomeadmin) "QT" = ( /obj/machinery/chem_dispenser/drinks, -/turf/closed/indestructible/hotelwall, +/obj/structure/table/wood, +/turf/open/floor/wood, /area/centcom/holding) "QV" = ( /obj/structure/window/reinforced/spawner/north, @@ -11666,8 +11622,7 @@ /area/centcom/evac) "Sk" = ( /obj/structure/railing{ - dir = 8; - layer = 4.1 + dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/siding/dark{ @@ -13512,9 +13467,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/centcom/control) "Zg" = ( /obj/structure/table, @@ -13554,9 +13507,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/tdome/tdomeobserve) "Zo" = ( /obj/structure/table/wood, @@ -13680,9 +13631,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/centcom/control) "ZN" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, diff --git a/_maps/shuttles/arrival/arrival_delta.dmm b/_maps/shuttles/arrival/arrival_delta.dmm index bec1698ff711c..1b127f1fb86ff 100644 --- a/_maps/shuttles/arrival/arrival_delta.dmm +++ b/_maps/shuttles/arrival/arrival_delta.dmm @@ -371,9 +371,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/shuttle/arrival) "PO" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -395,9 +393,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/shuttle/arrival) "XW" = ( /obj/item/kirbyplants{ @@ -406,9 +402,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/shuttle/arrival) (1,1,1) = {" diff --git a/_maps/shuttles/arrival/arrival_pubby.dmm b/_maps/shuttles/arrival/arrival_pubby.dmm index abe9c35f238c5..73ea179048e3b 100644 --- a/_maps/shuttles/arrival/arrival_pubby.dmm +++ b/_maps/shuttles/arrival/arrival_pubby.dmm @@ -75,7 +75,7 @@ /obj/structure/window/shuttle, /obj/machinery/door/poddoor/shutters/preopen{ id = "arrivy"; - name = "ship shutters" + name = "ship Shutters" }, /turf/open/floor/plating, /area/shuttle/arrival) diff --git a/_maps/shuttles/cargo/cargo_birdboat.dmm b/_maps/shuttles/cargo/cargo_birdboat.dmm index c72821ac09ed5..bfb8b78fa9070 100644 --- a/_maps/shuttles/cargo/cargo_birdboat.dmm +++ b/_maps/shuttles/cargo/cargo_birdboat.dmm @@ -60,7 +60,7 @@ "l" = ( /obj/machinery/door/poddoor{ id = "QMLoaddoor2"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /obj/machinery/conveyor{ dir = 8; @@ -117,7 +117,7 @@ "r" = ( /obj/machinery/door/poddoor{ id = "QMLoaddoor"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /obj/machinery/conveyor{ dir = 4; diff --git a/_maps/shuttles/cargo/cargo_box.dmm b/_maps/shuttles/cargo/cargo_box.dmm index 584d8f074330d..287b05af0e9fd 100644 --- a/_maps/shuttles/cargo/cargo_box.dmm +++ b/_maps/shuttles/cargo/cargo_box.dmm @@ -12,7 +12,7 @@ }, /obj/machinery/door/poddoor{ id = "QMLoaddoor2"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /obj/structure/fans/tiny, /turf/open/floor/plating, @@ -59,7 +59,7 @@ }, /obj/machinery/door/poddoor{ id = "QMLoaddoor"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /obj/structure/fans/tiny, /turf/open/floor/plating, diff --git a/_maps/shuttles/cargo/cargo_corg.dmm b/_maps/shuttles/cargo/cargo_corg.dmm index c3888d6ef9b49..d9ca44b7f99c5 100644 --- a/_maps/shuttles/cargo/cargo_corg.dmm +++ b/_maps/shuttles/cargo/cargo_corg.dmm @@ -13,7 +13,7 @@ }, /obj/machinery/door/poddoor{ id = "QMLoaddoor"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /obj/structure/fans/tiny, /turf/open/floor/plating, @@ -45,7 +45,7 @@ }, /obj/machinery/door/poddoor{ id = "QMLoaddoor"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /obj/structure/fans/tiny, /turf/open/floor/plating, @@ -64,7 +64,7 @@ }, /obj/machinery/door/poddoor{ id = "QMLoaddoor2"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /obj/structure/fans/tiny, /turf/open/floor/plating, @@ -116,7 +116,7 @@ }, /obj/machinery/door/poddoor{ id = "QMLoaddoor2"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /obj/structure/fans/tiny, /turf/open/floor/plating, diff --git a/_maps/shuttles/cargo/cargo_delta.dmm b/_maps/shuttles/cargo/cargo_delta.dmm index 4360b5abb7040..6728bc289a235 100644 --- a/_maps/shuttles/cargo/cargo_delta.dmm +++ b/_maps/shuttles/cargo/cargo_delta.dmm @@ -68,7 +68,7 @@ }, /obj/machinery/door/poddoor{ id = "cargounload"; - name = "supply dock unloading door" + name = "supply Dock Unloading Door" }, /obj/structure/fans/tiny, /turf/open/floor/plating, @@ -145,7 +145,7 @@ "s" = ( /obj/machinery/door/poddoor{ id = "cargoload"; - name = "supply dock loading door" + name = "supply Dock Loading Door" }, /obj/machinery/conveyor{ dir = 4; diff --git a/_maps/shuttles/cargo/cargo_fland.dmm b/_maps/shuttles/cargo/cargo_fland.dmm index 91a01408a0074..9a92f5efac6b1 100644 --- a/_maps/shuttles/cargo/cargo_fland.dmm +++ b/_maps/shuttles/cargo/cargo_fland.dmm @@ -54,7 +54,6 @@ "ah" = ( /obj/machinery/button/door{ id = "QMUnloadDoor"; - layer = 4; name = "Unloading Door Toggle"; pixel_x = 25; pixel_y = 6; @@ -62,7 +61,6 @@ }, /obj/machinery/button/door{ id = "QMLoadingDoor"; - layer = 4; name = "Loading Door Toggle"; pixel_x = 25; pixel_y = -6; @@ -443,7 +441,6 @@ "cX" = ( /obj/machinery/button/door{ id = "QMUnloadDoor"; - layer = 4; name = "Unloading Door Toggle"; pixel_x = 25; pixel_y = 6; @@ -451,7 +448,6 @@ }, /obj/machinery/button/door{ id = "QMLoadingDoor"; - layer = 4; name = "Loading Door Toggle"; pixel_x = 25; pixel_y = -6; diff --git a/_maps/shuttles/cargo/cargo_kilo.dmm b/_maps/shuttles/cargo/cargo_kilo.dmm index 73ac95ae19dfd..119f1419ce0a4 100644 --- a/_maps/shuttles/cargo/cargo_kilo.dmm +++ b/_maps/shuttles/cargo/cargo_kilo.dmm @@ -159,7 +159,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor"; - layer = 4; name = "Off Ramp Toggle"; pixel_x = -24; pixel_y = 6; @@ -167,7 +166,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor2"; - layer = 4; name = "On Ramp Toggle"; pixel_x = -24; pixel_y = -6; diff --git a/_maps/shuttles/cargo/cargo_rad.dmm b/_maps/shuttles/cargo/cargo_rad.dmm index ec7feb1c5b1d8..7a24a7b793650 100644 --- a/_maps/shuttles/cargo/cargo_rad.dmm +++ b/_maps/shuttles/cargo/cargo_rad.dmm @@ -314,7 +314,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor2"; - layer = 4; name = "Loading Doors"; pixel_x = 33; pixel_y = 5; @@ -322,7 +321,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor"; - layer = 4; name = "Loading Doors"; pixel_x = 33; pixel_y = -5; diff --git a/_maps/shuttles/emergency/emergency_birdboat.dmm b/_maps/shuttles/emergency/emergency_birdboat.dmm index e2ef18e7f3a35..7307074e8a6f7 100644 --- a/_maps/shuttles/emergency/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency/emergency_birdboat.dmm @@ -262,7 +262,7 @@ /area/shuttle/escape) "xJ" = ( /obj/machinery/door/airlock/command/glass{ - name = "bridge door"; + name = "bridge Door"; req_access_txt = "19" }, /obj/machinery/door/firedoor, @@ -297,7 +297,7 @@ /area/shuttle/escape) "Wn" = ( /obj/machinery/door/airlock/security/glass{ - name = "security airlock"; + name = "security Airlock"; req_access_txt = "63" }, /obj/machinery/door/firedoor, diff --git a/_maps/shuttles/emergency/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm index 17f25bd5a80a2..c67ec5cea34cf 100644 --- a/_maps/shuttles/emergency/emergency_delta.dmm +++ b/_maps/shuttles/emergency/emergency_delta.dmm @@ -927,9 +927,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/shuttle/escape) "Kr" = ( /obj/structure/table/reinforced, @@ -979,9 +977,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron{ - heat_capacity = 1e+006 - }, +/turf/open/floor/iron, /area/shuttle/escape) "MY" = ( /obj/structure/sink{ diff --git a/_maps/shuttles/emergency/emergency_fland.dmm b/_maps/shuttles/emergency/emergency_fland.dmm index 6f624de4c8e85..65b2116ce2033 100644 --- a/_maps/shuttles/emergency/emergency_fland.dmm +++ b/_maps/shuttles/emergency/emergency_fland.dmm @@ -1027,7 +1027,6 @@ dir = 4 }, /obj/structure/tank_dispenser/oxygen{ - layer = 2.7; pixel_x = -1; pixel_y = 2 }, @@ -1109,7 +1108,6 @@ /area/shuttle/escape) "NK" = ( /obj/structure/tank_dispenser/oxygen{ - layer = 2.7; pixel_x = -1; pixel_y = 2 }, diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm index 14f53ead034c7..a968c28f5da78 100644 --- a/_maps/shuttles/emergency/emergency_meta.dmm +++ b/_maps/shuttles/emergency/emergency_meta.dmm @@ -184,7 +184,6 @@ /area/shuttle/escape) "aA" = ( /obj/structure/tank_dispenser/oxygen{ - layer = 2.7; pixel_x = -1; pixel_y = 2 }, diff --git a/_maps/shuttles/emergency/emergency_meteor.dmm b/_maps/shuttles/emergency/emergency_meteor.dmm index aaf0be6de80c8..52dc1a1416fe8 100644 --- a/_maps/shuttles/emergency/emergency_meteor.dmm +++ b/_maps/shuttles/emergency/emergency_meteor.dmm @@ -7,8 +7,7 @@ /area/shuttle/escape/meteor) "c" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/plating/asteroid, /area/shuttle/escape/meteor) diff --git a/_maps/shuttles/emergency/emergency_pubby.dmm b/_maps/shuttles/emergency/emergency_pubby.dmm index 2df0b1ca45846..638c0e726d90d 100644 --- a/_maps/shuttles/emergency/emergency_pubby.dmm +++ b/_maps/shuttles/emergency/emergency_pubby.dmm @@ -80,8 +80,7 @@ "aG" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 + dir = 8 }, /obj/machinery/light{ dir = 1 @@ -125,8 +124,7 @@ "bd" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 + dir = 8 }, /obj/structure/table, /obj/item/food/canned/beans{ @@ -232,15 +230,13 @@ /area/shuttle/escape) "bB" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "bC" = ( /obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 + dir = 8 }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) @@ -277,8 +273,7 @@ }, /obj/item/storage/firstaid/regular, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, /obj/machinery/vending/wallmed/lite{ pixel_y = 30 @@ -402,8 +397,7 @@ /area/shuttle/escape) "xt" = ( /obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 + dir = 8 }, /turf/open/floor/plating, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency/emergency_russiafightpit.dmm b/_maps/shuttles/emergency/emergency_russiafightpit.dmm index 4aac7c764671e..be30341adae41 100644 --- a/_maps/shuttles/emergency/emergency_russiafightpit.dmm +++ b/_maps/shuttles/emergency/emergency_russiafightpit.dmm @@ -270,7 +270,7 @@ "aZ" = ( /obj/effect/decal/cleanable/shreds, /obj/machinery/door/window{ - name = "fight pit" + name = "fight Pit" }, /turf/open/floor/engine, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency/emergency_shelter.dmm b/_maps/shuttles/emergency/emergency_shelter.dmm index 06f4502718113..fbd17057ba781 100644 --- a/_maps/shuttles/emergency/emergency_shelter.dmm +++ b/_maps/shuttles/emergency/emergency_shelter.dmm @@ -110,7 +110,7 @@ /area/shuttle/escape) "aE" = ( /obj/machinery/smartfridge/survival_pod, -/turf/closed/wall/mineral/titanium/survival, +/turf/open/floor/pod/light, /area/shuttle/escape) "aF" = ( /obj/structure/extinguisher_cabinet, diff --git a/_maps/shuttles/emergency/emergency_theatre.dmm b/_maps/shuttles/emergency/emergency_theatre.dmm index 3f3755ff8d4e6..445a67b1940c0 100644 --- a/_maps/shuttles/emergency/emergency_theatre.dmm +++ b/_maps/shuttles/emergency/emergency_theatre.dmm @@ -3,17 +3,6 @@ /obj/machinery/door/airlock/gold, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) -"bP" = ( -/obj/machinery/light/floor{ - brightness = 15; - bulb_colour = "#FFE4CE"; - bulb_emergency_brightness_mul = 0.25; - bulb_vacuum_brightness = 15; - nightshift_brightness = 10; - nightshift_light_color = "#E6EBFF" - }, -/turf/open/floor/carpet/black, -/area/shuttle/escape) "ct" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -275,15 +264,6 @@ }, /turf/open/floor/carpet/black, /area/shuttle/escape) -"Gh" = ( -/obj/structure/chair/fancy/corp{ - dir = 1 - }, -/obj/structure/chair/fancy/corp{ - dir = 1 - }, -/turf/open/floor/carpet/black, -/area/shuttle/escape) "Hb" = ( /obj/machinery/door/airlock/gold, /turf/open/floor/carpet/black, @@ -437,7 +417,6 @@ /obj/machinery/light/floor{ brightness = 15; bulb_colour = "#FFE4CE"; - bulb_emergency_brightness_mul = 0.25; bulb_vacuum_brightness = 15; nightshift_brightness = 10; nightshift_light_color = "#E6EBFF" @@ -548,15 +527,6 @@ /obj/machinery/light/floor{ brightness = 15; bulb_colour = "#FFE4CE"; - bulb_emergency_brightness_mul = 0.25; - bulb_vacuum_brightness = 15; - nightshift_brightness = 10; - nightshift_light_color = "#E6EBFF" - }, -/obj/machinery/light/floor{ - brightness = 15; - bulb_colour = "#FFE4CE"; - bulb_emergency_brightness_mul = 0.25; bulb_vacuum_brightness = 15; nightshift_brightness = 10; nightshift_light_color = "#E6EBFF" @@ -639,10 +609,10 @@ SP SP gh qn -bP -bP -bP -bP +VZ +qn +qn +VZ qn qn qn @@ -663,7 +633,7 @@ qn RK RK RK -bP +qn qn qn qn @@ -684,7 +654,7 @@ wn RK RK RK -bP +qn qn ru qn @@ -705,7 +675,7 @@ LQ RK RK RK -bP +qn qn DN xm @@ -722,12 +692,12 @@ Ce Ce Ce Ce +VZ +qn +qn qn -bP -bP -bP -bP -bP +qn +VZ xm eX ww @@ -743,11 +713,11 @@ ux ux JG Ce -bP +qn +ga +ga +ga ga -Gh -Gh -Gh qn xm PH @@ -764,11 +734,11 @@ ux ux ux Ce -bP +qn +ga +ga +ga ga -Gh -Gh -Gh qn Pk PH @@ -785,11 +755,11 @@ ux ux ux Ce -bP +qn +ga +ga +ga ga -Gh -Gh -Gh qn xm Eq @@ -806,11 +776,11 @@ ux ux ux Ce -bP +qn +ga +ga +ga ga -Gh -Gh -Gh qn Pk PH @@ -827,11 +797,11 @@ ux ux JG Ce -bP +qn +ga +ga +ga ga -Gh -Gh -Gh qn xm XP @@ -848,12 +818,12 @@ Ce Ce Ce Ce +VZ +qn +qn qn -bP -bP -bP -bP -bP +qn +VZ xm IK xR @@ -873,7 +843,7 @@ yG sV sV sV -bP +qn qn DN xm @@ -894,7 +864,7 @@ wn sV sV sV -bP +qn qn ct qn @@ -915,7 +885,7 @@ qn sV sV sV -bP +qn qn qn qn @@ -933,9 +903,9 @@ yE yE ZW qn -bP -bP -bP +VZ +qn +qn VZ qn qn diff --git a/_maps/shuttles/emergency/emergency_tiny.dmm b/_maps/shuttles/emergency/emergency_tiny.dmm index fab550befce68..4a215e9df7590 100644 --- a/_maps/shuttles/emergency/emergency_tiny.dmm +++ b/_maps/shuttles/emergency/emergency_tiny.dmm @@ -68,8 +68,7 @@ }, /obj/item/flashlight/lamp/green{ pixel_x = -4; - pixel_y = 11; - layer = 4 + pixel_y = 11 }, /obj/item/toy/crayon/red, /obj/item/toy/crayon/blue{ @@ -674,7 +673,6 @@ /area/shuttle/escape) "ZY" = ( /obj/machinery/shower{ - layer = 4; name = "emergency shower"; pixel_y = 7 }, diff --git a/_maps/shuttles/exploration/exploration_corg.dmm b/_maps/shuttles/exploration/exploration_corg.dmm index 6ecc8a7f76c26..db18b46c76329 100644 --- a/_maps/shuttles/exploration/exploration_corg.dmm +++ b/_maps/shuttles/exploration/exploration_corg.dmm @@ -535,7 +535,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "yz" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2, +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2/flipped, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "yM" = ( @@ -968,7 +968,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "ZB" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2, +/obj/machinery/atmospherics/components/trinary/filter/atmos/o2/flipped, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "ZM" = ( diff --git a/_maps/shuttles/exploration/exploration_fland.dmm b/_maps/shuttles/exploration/exploration_fland.dmm index 7bbcc3233d0d2..1d29caf45bf83 100644 --- a/_maps/shuttles/exploration/exploration_fland.dmm +++ b/_maps/shuttles/exploration/exploration_fland.dmm @@ -9,9 +9,6 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/exploration) "aO" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/light{ dir = 1 }, @@ -275,11 +272,9 @@ /turf/open/floor/iron/grid/steel, /area/shuttle/exploration) "pl" = ( -/obj/machinery/camera{ - dir = 5 - }, +/obj/machinery/camera, /turf/template_noop, -/area/template_noop) +/area/shuttle/exploration) "py" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/cigarettes/cigpack_shadyjims{ @@ -790,9 +785,6 @@ /obj/item/mop, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/spray/cleaner, -/obj/machinery/light/small{ - dir = 8 - }, /obj/effect/turf_decal/box, /turf/open/floor/iron/grid/steel, /area/shuttle/exploration) diff --git a/_maps/shuttles/ferry/ferry_lighthouse.dmm b/_maps/shuttles/ferry/ferry_lighthouse.dmm index e11b4042c3902..a80d35d6ae27a 100644 --- a/_maps/shuttles/ferry/ferry_lighthouse.dmm +++ b/_maps/shuttles/ferry/ferry_lighthouse.dmm @@ -219,14 +219,6 @@ }, /turf/open/floor/wood, /area/shuttle/transport) -"bb" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "garbage"; - layer = 2.5 - }, -/turf/open/floor/wood, -/area/shuttle/transport) "bc" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ @@ -415,7 +407,7 @@ au au aR au -bb +ba bg ad aa diff --git a/_maps/shuttles/hunter/hunter_bounty.dmm b/_maps/shuttles/hunter/hunter_bounty.dmm index cbea0fa260013..9bc7ba09d5318 100644 --- a/_maps/shuttles/hunter/hunter_bounty.dmm +++ b/_maps/shuttles/hunter/hunter_bounty.dmm @@ -213,12 +213,10 @@ /area/shuttle/hunter) "js" = ( /obj/item/kirbyplants{ - icon_state = "plant-10"; - layer = 3.9 + icon_state = "plant-10" }, /obj/structure/railing{ - dir = 2; - layer = 4.1 + dir = 2 }, /obj/effect/turf_decal/edges/techfloor{ dir = 1 @@ -317,8 +315,7 @@ /area/shuttle/hunter) "mn" = ( /obj/structure/railing{ - dir = 6; - layer = 4.1 + dir = 6 }, /obj/item/trash/sosjerky{ anchored = 1; @@ -332,12 +329,10 @@ /obj/item/cigbutt{ anchored = 1; color = "#808080"; - layer = 2; pixel_x = -4; pixel_y = 11 }, /obj/structure/lattice{ - layer = 3; color = "#808080" }, /turf/open/floor/plating/elevatorshaft{ @@ -346,8 +341,7 @@ /area/shuttle/hunter) "ms" = ( /obj/structure/railing{ - dir = 2; - layer = 4.1 + dir = 2 }, /turf/open/floor/iron/stairs{ icon = 'icons/obj/stairs.dmi'; @@ -517,8 +511,7 @@ }, /obj/structure/reagent_dispensers/fueltank, /obj/structure/railing{ - dir = 2; - layer = 4.1 + dir = 2 }, /obj/effect/turf_decal/delivery, /obj/structure/sign/warning/nosmoking{ @@ -665,15 +658,13 @@ /area/shuttle/hunter) "Gx" = ( /obj/structure/railing{ - dir = 10; - layer = 4.1 + dir = 10 }, /obj/effect/decal/cleanable/leaper_sludge{ color = "#808080" }, /obj/item/trash/energybar{ color = "#808080"; - layer = 2; pixel_x = -2; pixel_y = 4 }, @@ -681,13 +672,11 @@ /obj/item/cigbutt{ anchored = 1; color = "#808080"; - layer = 2; pixel_x = -4; pixel_y = 1 }, /obj/effect/decal/cleanable/plasma, /obj/structure/lattice{ - layer = 3; color = "#808080" }, /turf/open/floor/plating/elevatorshaft{ @@ -1037,8 +1026,7 @@ color = "#c1b6a5" }, /obj/structure/railing{ - dir = 8; - layer = 4.1 + dir = 8 }, /obj/effect/turf_decal/edges/techfloor{ dir = 8 diff --git a/_maps/shuttles/hunter/hunter_russian.dmm b/_maps/shuttles/hunter/hunter_russian.dmm index ff61f7963a81a..ebde43f81b867 100644 --- a/_maps/shuttles/hunter/hunter_russian.dmm +++ b/_maps/shuttles/hunter/hunter_russian.dmm @@ -413,8 +413,7 @@ "wj" = ( /obj/machinery/vending/sovietsoda, /obj/structure/railing{ - dir = 4; - layer = 4.1 + dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, @@ -458,8 +457,7 @@ "yi" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/structure/railing{ - dir = 4; - layer = 4.1 + dir = 4 }, /obj/effect/turf_decal/bot, /turf/open/floor/mineral/plastitanium, @@ -571,8 +569,7 @@ "Ca" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/structure/railing{ - dir = 8; - layer = 4.1 + dir = 8 }, /obj/effect/turf_decal/bot, /turf/open/floor/mineral/plastitanium, @@ -585,8 +582,7 @@ /area/shuttle/hunter) "Ck" = ( /obj/structure/railing{ - dir = 2; - layer = 3.1 + dir = 2 }, /obj/structure/closet{ name = "mastercraft traditional russian clothes" @@ -663,8 +659,7 @@ dir = 5 }, /obj/structure/railing{ - dir = 4; - layer = 4.1 + dir = 4 }, /mob/living/simple_animal/bot/medbot{ name = "\improper Doctor Nikolay" @@ -674,12 +669,10 @@ /area/shuttle/hunter) "Hl" = ( /obj/structure/railing{ - dir = 8; - layer = 3.1 + dir = 8 }, /obj/structure/railing{ - dir = 4; - layer = 3.1 + dir = 4 }, /turf/open/floor/iron/stairs, /area/shuttle/hunter) @@ -847,8 +840,7 @@ "Pz" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/structure/railing{ - dir = 1; - layer = 3.1 + dir = 1 }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -899,8 +891,7 @@ "QV" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/structure/railing{ - dir = 4; - layer = 4.1 + dir = 4 }, /obj/machinery/airalarm/directional/south{ req_access = null; @@ -952,8 +943,7 @@ pixel_x = -3 }, /obj/structure/railing{ - dir = 4; - layer = 4.1 + dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/wood{ @@ -1023,8 +1013,7 @@ /area/shuttle/hunter) "Uo" = ( /obj/structure/railing{ - dir = 2; - layer = 3.1 + dir = 2 }, /obj/structure/dresser, /turf/open/floor/mineral/plastitanium, diff --git a/_maps/shuttles/hunter/hunter_space_cop.dmm b/_maps/shuttles/hunter/hunter_space_cop.dmm index 9af90520c5c5e..7b59aca19b9f6 100644 --- a/_maps/shuttles/hunter/hunter_space_cop.dmm +++ b/_maps/shuttles/hunter/hunter_space_cop.dmm @@ -181,7 +181,7 @@ /obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/poddoor/preopen{ id = "hunter_police_bridge"; - name = "Bridge View Blast door" + name = "Bridge View Blast Door" }, /turf/open/floor/plating, /area/shuttle/hunter) @@ -376,8 +376,7 @@ }, /obj/item/newspaper, /obj/structure/railing{ - dir = 4; - layer = 3.1 + dir = 4 }, /obj/item/stamp{ pixel_x = -8; @@ -761,8 +760,7 @@ dir = 8 }, /obj/structure/railing{ - dir = 2; - layer = 4.1 + dir = 2 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/grid/steel, @@ -772,8 +770,7 @@ /area/shuttle/hunter) "zM" = ( /obj/structure/railing{ - dir = 4; - layer = 3.1 + dir = 4 }, /obj/machinery/computer/crew{ dir = 8 @@ -802,8 +799,7 @@ "BT" = ( /obj/effect/turf_decal/box/corners, /obj/structure/railing{ - dir = 2; - layer = 4.1 + dir = 2 }, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -1127,8 +1123,7 @@ /obj/effect/turf_decal/bot/left, /obj/structure/railing{ color = "#A47449"; - dir = 8; - layer = 3.1 + dir = 8 }, /obj/effect/mob_spawn/human/fugitive_hunter{ dir = 1 @@ -1137,8 +1132,7 @@ /area/shuttle/hunter) "OU" = ( /obj/structure/railing{ - dir = 2; - layer = 4.1 + dir = 2 }, /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/tech/grid, @@ -1162,8 +1156,7 @@ dir = 8 }, /obj/structure/railing{ - dir = 2; - layer = 4.1 + dir = 2 }, /obj/effect/turf_decal/siding/dark, /obj/effect/turf_decal/delivery/white, @@ -1199,8 +1192,7 @@ }, /obj/structure/railing{ color = "#A47449"; - dir = 8; - layer = 3.1 + dir = 8 }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/bot/left, diff --git a/_maps/shuttles/infiltrator/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator/infiltrator_advanced.dmm index 006563a1ae8a9..c20ea1aae749d 100644 --- a/_maps/shuttles/infiltrator/infiltrator_advanced.dmm +++ b/_maps/shuttles/infiltrator/infiltrator_advanced.dmm @@ -6,7 +6,7 @@ /obj/structure/window/plastitanium, /obj/machinery/door/poddoor/shutters{ id = "syndieshutters"; - name = "blast shutters" + name = "blast Shutters" }, /obj/structure/grille, /turf/open/floor/plating, diff --git a/_maps/shuttles/infiltrator/infiltrator_basic.dmm b/_maps/shuttles/infiltrator/infiltrator_basic.dmm index cfd243288488b..df51e6e24bafb 100644 --- a/_maps/shuttles/infiltrator/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator/infiltrator_basic.dmm @@ -15,7 +15,7 @@ /obj/structure/window/plastitanium, /obj/machinery/door/poddoor/shutters{ id = "syndieshutters"; - name = "blast shutters" + name = "blast Shutters" }, /obj/structure/grille, /turf/open/floor/plating, @@ -180,7 +180,7 @@ "aY" = ( /obj/machinery/door/poddoor{ id = "smindicate"; - name = "outer blast door" + name = "outer Blast Door" }, /obj/machinery/button/door{ id = "smindicate"; diff --git a/_maps/shuttles/labour/labour_box.dmm b/_maps/shuttles/labour/labour_box.dmm index ee59df17e13f6..5551be0fad18b 100644 --- a/_maps/shuttles/labour/labour_box.dmm +++ b/_maps/shuttles/labour/labour_box.dmm @@ -117,8 +117,7 @@ "r" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/plating/airless, /area/shuttle/labor) @@ -132,8 +131,7 @@ req_one_access_txt = "63;42;38" }, /obj/structure/window/reinforced{ - dir = 4; - layer = 1 + dir = 4 }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/labor) diff --git a/_maps/shuttles/labour/labour_corg.dmm b/_maps/shuttles/labour/labour_corg.dmm index 549f27418bc10..644f7f678900e 100644 --- a/_maps/shuttles/labour/labour_corg.dmm +++ b/_maps/shuttles/labour/labour_corg.dmm @@ -22,8 +22,7 @@ "g" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 4; - layer = 1 + dir = 4 }, /obj/structure/table, /obj/machinery/recharger{ diff --git a/_maps/shuttles/labour/labour_delta.dmm b/_maps/shuttles/labour/labour_delta.dmm index 3ae2674011275..5570513dcdb75 100644 --- a/_maps/shuttles/labour/labour_delta.dmm +++ b/_maps/shuttles/labour/labour_delta.dmm @@ -78,8 +78,7 @@ /area/shuttle/labor) "l" = ( /obj/structure/window/reinforced{ - dir = 4; - layer = 1 + dir = 4 }, /obj/machinery/door/window/southleft{ name = "Gulag"; @@ -254,8 +253,7 @@ "x" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, diff --git a/_maps/shuttles/labour/labour_fland.dmm b/_maps/shuttles/labour/labour_fland.dmm index eb0727570448c..759cfb35495b1 100644 --- a/_maps/shuttles/labour/labour_fland.dmm +++ b/_maps/shuttles/labour/labour_fland.dmm @@ -8,8 +8,7 @@ req_one_access_txt = "63;42;38" }, /obj/structure/window/reinforced{ - dir = 4; - layer = 1 + dir = 4 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/mineral/plastitanium, @@ -30,9 +29,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, /obj/structure/chair/fancy/shuttle{ dir = 8 }, @@ -44,6 +40,7 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_x = -32 }, +/obj/machinery/light/small/directional/west, /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) "w" = ( @@ -52,6 +49,7 @@ output_dir = 1 }, /obj/effect/turf_decal/stripes/full, +/obj/machinery/light/small/directional/east, /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) "x" = ( diff --git a/_maps/shuttles/labour/labour_kilo.dmm b/_maps/shuttles/labour/labour_kilo.dmm index 9e336c3c809df..5037c91bd584f 100644 --- a/_maps/shuttles/labour/labour_kilo.dmm +++ b/_maps/shuttles/labour/labour_kilo.dmm @@ -87,8 +87,7 @@ req_one_access_txt = "63;42;38" }, /obj/structure/window/reinforced{ - dir = 4; - layer = 1 + dir = 4 }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/labor) @@ -163,9 +162,6 @@ /obj/structure/chair/fancy/shuttle{ dir = 4 }, -/obj/structure/chair/fancy/shuttle{ - dir = 4 - }, /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) "J" = ( diff --git a/_maps/shuttles/mining/mining_box.dmm b/_maps/shuttles/mining/mining_box.dmm index ac90c3155fd87..e1280c8ac54ba 100644 --- a/_maps/shuttles/mining/mining_box.dmm +++ b/_maps/shuttles/mining/mining_box.dmm @@ -52,8 +52,7 @@ "j" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 diff --git a/_maps/shuttles/mining/mining_delta.dmm b/_maps/shuttles/mining/mining_delta.dmm index dc3f34e6a65d0..76d56290fd8b1 100644 --- a/_maps/shuttles/mining/mining_delta.dmm +++ b/_maps/shuttles/mining/mining_delta.dmm @@ -249,8 +249,7 @@ "t" = ( /obj/structure/shuttle/engine/propulsion/burst, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, diff --git a/_maps/shuttles/mining/mining_fland.dmm b/_maps/shuttles/mining/mining_fland.dmm index 6eb8af3231697..3d7f0099d4d77 100644 --- a/_maps/shuttles/mining/mining_fland.dmm +++ b/_maps/shuttles/mining/mining_fland.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/closed/wall/mineral/plastitanium, -/area/shuttle/mining/large) +/area/shuttle/mining) "c" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -10,14 +10,17 @@ /obj/structure/chair/fancy/shuttle{ dir = 1 }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/pod/dark, -/area/shuttle/mining/large) +/area/shuttle/mining) "g" = ( /obj/effect/spawner/structure/window/hollow/survival_pod/directional{ dir = 4 }, /turf/open/floor/plating, -/area/shuttle/mining/large) +/area/shuttle/mining) "h" = ( /obj/structure/chair/fancy/shuttle{ dir = 1 @@ -26,7 +29,7 @@ dir = 8 }, /turf/open/floor/pod/dark, -/area/shuttle/mining/large) +/area/shuttle/mining) "l" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -35,19 +38,19 @@ /obj/structure/chair/fancy/shuttle{ dir = 1 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/pod/dark, -/area/shuttle/mining/large) +/area/shuttle/mining) "m" = ( /obj/structure/ore_box, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/light/small{ - dir = 4 - }, /turf/open/floor/pod/dark, -/area/shuttle/mining/large) +/area/shuttle/mining) "n" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -63,26 +66,26 @@ name = "Mining Shuttle External Airlock" }, /turf/open/floor/pod/light, -/area/shuttle/mining/large) +/area/shuttle/mining) "q" = ( /obj/structure/shuttle/engine/heater, /obj/effect/turf_decal/stripes/full, /obj/effect/spawner/structure/window/hollow/survival_pod/directional, /turf/open/floor/plating/airless, -/area/shuttle/mining/large) +/area/shuttle/mining) "r" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/pod/dark, -/area/shuttle/mining/large) +/area/shuttle/mining) "t" = ( /obj/effect/spawner/structure/window/hollow/survival_pod/directional{ dir = 8 }, /turf/open/floor/plating, -/area/shuttle/mining/large) +/area/shuttle/mining) "v" = ( /obj/effect/turf_decal/box/white/corners, /obj/effect/turf_decal/box/white/corners{ @@ -96,14 +99,14 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/pod/dark, -/area/shuttle/mining/large) +/area/shuttle/mining) "w" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/pod/dark, -/area/shuttle/mining/large) +/area/shuttle/mining) "y" = ( /obj/item/clothing/suit/hazardvest{ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; @@ -184,66 +187,57 @@ /obj/item/pickaxe/emergency, /obj/item/pickaxe/emergency, /obj/effect/turf_decal/delivery, -/obj/machinery/light/small{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, /turf/open/floor/pod/dark, -/area/shuttle/mining/large) +/area/shuttle/mining) "z" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/shuttle/engine/propulsion/left, /turf/open/floor/plating/airless, -/area/shuttle/mining/large) +/area/shuttle/mining) "A" = ( /obj/machinery/computer/shuttle_flight/mining, /obj/effect/turf_decal/stripes/box, /obj/effect/turf_decal/stripes/white/box, /turf/open/floor/pod/dark, -/area/shuttle/mining/large) +/area/shuttle/mining) "B" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /obj/structure/table/reinforced, -/obj/machinery/light/small{ - dir = 8 - }, /obj/item/storage/firstaid/regular, /turf/open/floor/pod/dark, -/area/shuttle/mining/large) +/area/shuttle/mining) "E" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/shuttle/engine/propulsion/right, /turf/open/floor/plating/airless, -/area/shuttle/mining/large) +/area/shuttle/mining) "F" = ( /obj/structure/shuttle/engine/propulsion/burst/cargo, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, -/area/shuttle/mining/large) +/area/shuttle/mining) "I" = ( /turf/closed/wall/mineral/titanium/survival/nodiagonal, -/area/shuttle/mining/large) +/area/shuttle/mining) "K" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, /obj/structure/table/reinforced, -/obj/machinery/light/small{ - dir = 4 - }, /turf/open/floor/pod/dark, -/area/shuttle/mining/large) +/area/shuttle/mining) "N" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, /turf/open/floor/pod/dark, -/area/shuttle/mining/large) +/area/shuttle/mining) "P" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -268,16 +262,16 @@ name = "Mining Shuttle External Airlock" }, /turf/open/floor/pod/light, -/area/shuttle/mining/large) +/area/shuttle/mining) "U" = ( /turf/closed/wall/mineral/titanium/survival, -/area/shuttle/mining/large) +/area/shuttle/mining) "V" = ( /obj/effect/spawner/structure/window/hollow/survival_pod/directional{ dir = 1 }, /turf/open/floor/plating, -/area/shuttle/mining/large) +/area/shuttle/mining) (1,1,1) = {" U diff --git a/_maps/shuttles/mining/mining_large.dmm b/_maps/shuttles/mining/mining_large.dmm index a8168844eaf67..3e66da10b8f00 100644 --- a/_maps/shuttles/mining/mining_large.dmm +++ b/_maps/shuttles/mining/mining_large.dmm @@ -189,8 +189,7 @@ "aG" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /turf/open/floor/plating/airless, /area/shuttle/mining/large) diff --git a/_maps/shuttles/mining/mining_rad.dmm b/_maps/shuttles/mining/mining_rad.dmm index 4a89e5993da5b..4d2c0e52e08cc 100644 --- a/_maps/shuttles/mining/mining_rad.dmm +++ b/_maps/shuttles/mining/mining_rad.dmm @@ -42,16 +42,6 @@ }, /turf/open/floor/plating, /area/shuttle/mining) -"i" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/chair/fancy/shuttle{ - dir = 4 - }, -/obj/effect/turf_decal/box/white, -/turf/open/floor/iron/tech, -/area/shuttle/mining) "j" = ( /obj/structure/shuttle/engine/propulsion/left, /turf/open/floor/plating/airless, @@ -82,8 +72,7 @@ "C" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -104,6 +93,9 @@ "I" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/emergency, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/iron/tech, /area/shuttle/mining) "K" = ( @@ -116,16 +108,6 @@ /obj/effect/turf_decal/box/white, /turf/open/floor/iron/tech, /area/shuttle/mining) -"P" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/chair/fancy/shuttle{ - dir = 8 - }, -/obj/effect/turf_decal/box/white, -/turf/open/floor/iron/tech, -/area/shuttle/mining) "Q" = ( /obj/machinery/status_display/evac{ pixel_x = 33; @@ -169,6 +151,9 @@ /obj/machinery/newscaster{ pixel_y = 33 }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/iron/tech, /area/shuttle/mining) @@ -185,7 +170,7 @@ K s I e -i +e X a j @@ -203,7 +188,7 @@ c s Y O -P +O X v G diff --git a/_maps/shuttles/pirate/pirate_default.dmm b/_maps/shuttles/pirate/pirate_default.dmm index 6981f8d8b10c7..cb203dd12db0c 100644 --- a/_maps/shuttles/pirate/pirate_default.dmm +++ b/_maps/shuttles/pirate/pirate_default.dmm @@ -204,8 +204,7 @@ /area/shuttle/pirate) "hO" = ( /obj/structure/railing{ - dir = 9; - layer = 4.1 + dir = 9 }, /obj/effect/turf_decal/siding/dark{ dir = 9 @@ -274,8 +273,7 @@ /area/shuttle/pirate) "jT" = ( /obj/structure/railing{ - dir = 8; - layer = 4.1 + dir = 8 }, /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -417,9 +415,8 @@ /turf/open/floor/grass/no_border, /area/shuttle/pirate) "mV" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ - dir = 4; - piping_layer = 4 +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste/layer4{ + dir = 4 }, /turf/open/floor/plating/airless, /area/shuttle/pirate) @@ -694,8 +691,7 @@ /area/shuttle/pirate) "sS" = ( /obj/structure/rack{ - dir = 8; - layer = 2.9 + dir = 8 }, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -919,8 +915,7 @@ /area/shuttle/pirate) "zL" = ( /obj/structure/railing{ - dir = 8; - layer = 4.1 + dir = 8 }, /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -1050,8 +1045,7 @@ pixel_x = 10 }, /obj/structure/sign/departments/cargo{ - pixel_y = 32; - layer = 2.8 + pixel_y = 32 }, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -1336,8 +1330,7 @@ aidisabled = 1; dir = 1; name = "Pirate Corvette APC"; - pixel_y = 24; - req_access = null + pixel_y = 24 }, /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/delivery, @@ -1646,8 +1639,7 @@ /area/shuttle/pirate) "Py" = ( /obj/structure/rack{ - dir = 8; - layer = 2.9 + dir = 8 }, /obj/item/restraints/legcuffs/bola/tactical, /obj/item/restraints/legcuffs/bola{ @@ -1688,8 +1680,7 @@ /area/shuttle/pirate) "QI" = ( /obj/structure/rack{ - dir = 8; - layer = 2.9 + dir = 8 }, /obj/item/ammo_box/magazine/m12g/breacher{ pixel_x = -7; @@ -2225,8 +2216,7 @@ dir = 8 }, /obj/structure/railing{ - dir = 8; - layer = 4.1 + dir = 8 }, /obj/structure/table_frame/wood, /obj/item/restraints/handcuffs/cable/white, diff --git a/_maps/shuttles/tram/tram_corg.dmm b/_maps/shuttles/tram/tram_corg.dmm index 45d4c28be4c1c..26726c66e7eab 100644 --- a/_maps/shuttles/tram/tram_corg.dmm +++ b/_maps/shuttles/tram/tram_corg.dmm @@ -85,7 +85,7 @@ /area/shuttle/pod_1) "E" = ( /turf/closed/wall/mineral/titanium, -/area/template_noop) +/area/shuttle/pod_1) "I" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/computer/shuttle_flight{ @@ -94,9 +94,6 @@ }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_1) -"K" = ( -/turf/closed/wall/mineral/titanium, -/area/shuttle/pod_1) "M" = ( /obj/structure/chair/fancy/shuttle{ dir = 4 @@ -126,11 +123,11 @@ (1,1,1) = {" E -K +E S -K +E S -K +E e "} (2,1,1) = {" @@ -140,7 +137,7 @@ p M c y -K +E "} (3,1,1) = {" S @@ -158,14 +155,14 @@ p D W w -K +E "} (5,1,1) = {" E -K +E S -K +E S -K +E e "} diff --git a/_maps/shuttles/whiteship/whiteship_cere.dmm b/_maps/shuttles/whiteship/whiteship_cere.dmm index 8e737609e6aea..11247ce554567 100644 --- a/_maps/shuttles/whiteship/whiteship_cere.dmm +++ b/_maps/shuttles/whiteship/whiteship_cere.dmm @@ -82,7 +82,7 @@ /area/shuttle/abandoned) "aq" = ( /obj/machinery/door/airlock/titanium{ - name = "mech bay" + name = "mech Bay" }, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/abandoned) @@ -302,7 +302,6 @@ "aO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/tank_dispenser/oxygen{ - layer = 2.7; pixel_x = -1; pixel_y = 2 }, @@ -395,7 +394,7 @@ /area/shuttle/abandoned) "bV" = ( /obj/machinery/door/airlock/titanium{ - name = "mech bay external airlock" + name = "mech Bay External Airlock" }, /obj/effect/decal/cleanable/dirt/dust, /obj/docking_port/mobile{ diff --git a/_maps/shuttles/whiteship/whiteship_fland.dmm b/_maps/shuttles/whiteship/whiteship_fland.dmm index af3d979de19bc..ad745625971a4 100644 --- a/_maps/shuttles/whiteship/whiteship_fland.dmm +++ b/_maps/shuttles/whiteship/whiteship_fland.dmm @@ -227,7 +227,7 @@ /area/shuttle/abandoned) "jR" = ( /obj/machinery/door/airlock/titanium{ - name = "Power unit" + name = "Power Unit" }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -292,7 +292,7 @@ /area/shuttle/abandoned) "nN" = ( /obj/machinery/smartfridge, -/turf/closed/wall/mineral/titanium, +/turf/open/floor/wood, /area/shuttle/abandoned) "nT" = ( /obj/effect/decal/cleanable/dirt/dust, diff --git a/_maps/shuttles/whiteship/whiteship_meta.dmm b/_maps/shuttles/whiteship/whiteship_meta.dmm index df60296b94b5b..fb3f02d582df0 100644 --- a/_maps/shuttles/whiteship/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship/whiteship_meta.dmm @@ -641,8 +641,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Salvage Ship Bridge APC"; - pixel_y = 24; - req_access = null + pixel_y = 24 }, /obj/item/camera{ pixel_x = 12; @@ -844,8 +843,7 @@ /obj/machinery/power/apc{ dir = 8; name = "Salvage Ship Cargo APC"; - pixel_x = -24; - req_access = null + pixel_x = -24 }, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -1152,8 +1150,7 @@ /obj/structure/cable, /obj/machinery/power/apc{ name = "Salvage Ship Engineering APC"; - pixel_y = -24; - req_access = null + pixel_y = -24 }, /obj/structure/closet/crate, /obj/item/stack/sheet/iron/twenty, @@ -1238,7 +1235,7 @@ /area/shuttle/abandoned/bar) "dS" = ( /obj/machinery/smartfridge, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/open/floor/iron, /area/shuttle/abandoned/bar) "dT" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -1353,7 +1350,6 @@ pixel_y = 14 }, /obj/item/reagent_containers/food/condiment/enzyme{ - layer = 5; pixel_x = -5; pixel_y = 6 }, @@ -1496,8 +1492,7 @@ /obj/machinery/power/apc{ dir = 1; name = "Salvage Ship Bar APC"; - pixel_y = 24; - req_access = null + pixel_y = 24 }, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, @@ -1888,8 +1883,7 @@ /obj/structure/cable, /obj/machinery/power/apc{ name = "Salvage Ship Crew Quarters APC"; - pixel_y = -24; - req_access = null + pixel_y = -24 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 diff --git a/_maps/shuttles/whiteship/whiteship_pubby.dmm b/_maps/shuttles/whiteship/whiteship_pubby.dmm index 10f56400cce19..d4cfaab8a60c0 100644 --- a/_maps/shuttles/whiteship/whiteship_pubby.dmm +++ b/_maps/shuttles/whiteship/whiteship_pubby.dmm @@ -31,8 +31,7 @@ /area/shuttle/abandoned) "h" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -47,8 +46,7 @@ /area/shuttle/abandoned) "j" = ( /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 diff --git a/_maps/templates/capsule_checkpoint.dmm b/_maps/templates/capsule_checkpoint.dmm index 2de715a92a23b..6214bd80996f6 100644 --- a/_maps/templates/capsule_checkpoint.dmm +++ b/_maps/templates/capsule_checkpoint.dmm @@ -18,7 +18,7 @@ /obj/machinery/door/window/checkpoint{ req_access_txt = "2"; dir = 1; - name = "checkpoint windoor" + name = "Checkpoint" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -34,7 +34,7 @@ /obj/machinery/door/window/checkpoint{ req_access_txt = "2"; dir = 4; - name = "checkpoint windoor" + name = "Checkpoint" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -45,7 +45,7 @@ /obj/effect/turf_decal/tile/red/fourcorners/contrasted, /obj/machinery/door/window/checkpoint{ req_access_txt = "2"; - name = "checkpoint windoor" + name = "Checkpoint" }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/pod, @@ -73,7 +73,7 @@ /obj/machinery/door/window/checkpoint{ req_access_txt = "2"; dir = 8; - name = "checkpoint windoor" + name = "Checkpoint" }, /obj/effect/turf_decal/stripes/line{ dir = 8 diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm index 46387b928f7e6..e7436bfc7c1be 100644 --- a/_maps/templates/shelter_2.dmm +++ b/_maps/templates/shelter_2.dmm @@ -66,8 +66,7 @@ /area/survivalpod) "n" = ( /obj/structure/window/reinforced/survival_pod{ - dir = 8; - layer = 3 + dir = 8 }, /obj/machinery/door/window/survival_pod{ dir = 1 @@ -186,7 +185,7 @@ /area/survivalpod) "B" = ( /obj/structure/chair/fancy/comfy{ - color = "#666666" ; + color = "#666666"; dir = 1 }, /turf/open/floor/carpet/black, diff --git a/_maps/templates/shelter_4.dmm b/_maps/templates/shelter_4.dmm index c8c8a12754175..6c4bf512cbc07 100644 --- a/_maps/templates/shelter_4.dmm +++ b/_maps/templates/shelter_4.dmm @@ -27,7 +27,7 @@ /area/survivalpod) "ah" = ( /obj/item/gps/computer, -/turf/closed/wall/mineral/titanium/survival/nodiagonal, +/turf/open/floor/pod/dark, /area/survivalpod) "ai" = ( /turf/closed/wall/mineral/titanium/survival/nodiagonal, @@ -56,16 +56,15 @@ /turf/open/floor/plating/asteroid/basalt, /area/template_noop) "ao" = ( -/obj/structure/closet/crate, /obj/effect/decal/cleanable/cobweb, -/obj/item/mecha_parts/mecha_equipment/drill, +/obj/structure/fans, /turf/open/floor/pod/dark, /area/survivalpod) "ap" = ( /turf/open/floor/pod/dark, /area/survivalpod) "aq" = ( -/obj/machinery/vendor/mining, +/obj/machinery/smartfridge/survival_pod, /turf/open/floor/pod/dark, /area/survivalpod) "ar" = ( @@ -90,9 +89,7 @@ /turf/open/floor/plating/asteroid/basalt, /area/template_noop) "aw" = ( -/obj/structure/closet/crate, -/obj/item/storage/toolbox/mechanical, -/obj/item/stack/sheet/iron/ten, +/obj/machinery/stasis/survival_pod, /turf/open/floor/pod/dark, /area/survivalpod) "ax" = ( @@ -183,7 +180,8 @@ /turf/closed/wall/mineral/titanium/survival, /area/survivalpod) "aO" = ( -/obj/structure/fans, +/obj/structure/closet/crate, +/obj/item/mecha_parts/mecha_equipment/drill, /turf/open/floor/pod/light, /area/survivalpod) "aP" = ( @@ -316,6 +314,9 @@ /area/survivalpod) "bo" = ( /obj/item/rollerbed, +/obj/structure/closet/crate, +/obj/item/stack/sheet/iron/ten, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/pod/dark, /area/survivalpod) "bp" = ( @@ -324,6 +325,10 @@ }, /turf/open/floor/pod/light, /area/survivalpod) +"QN" = ( +/obj/machinery/vendor/mining, +/turf/open/floor/pod/light, +/area/survivalpod) (1,1,1) = {" aa @@ -409,7 +414,7 @@ ab ag aP aU -aU +QN bb bg aZ @@ -507,9 +512,9 @@ ab "} (11,1,1) = {" aa +ai ah ap -ap aA aE ab diff --git a/_maps/templates/shelter_6.dmm b/_maps/templates/shelter_6.dmm index 83af7b9a4bb8a..ed58b5477cf5d 100644 --- a/_maps/templates/shelter_6.dmm +++ b/_maps/templates/shelter_6.dmm @@ -15,13 +15,14 @@ /area/survivalpod) "e" = ( /obj/item/gps/computer, -/turf/closed/wall/mineral/titanium/survival, +/turf/open/floor/pod/light, /area/survivalpod) "g" = ( -/obj/machinery/smartfridge/survival_pod, -/turf/closed/wall/mineral/titanium/survival, +/obj/machinery/stasis/survival_pod, +/turf/open/floor/pod/light, /area/survivalpod) "h" = ( +/obj/machinery/smartfridge/survival_pod, /turf/open/floor/pod/dark, /area/survivalpod) "i" = ( @@ -41,6 +42,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/fans, /turf/open/floor/pod/dark, /area/survivalpod) "m" = ( @@ -72,8 +74,8 @@ a "} (2,1,1) = {" a -m -m +a +a c b c @@ -83,10 +85,10 @@ a "} (3,1,1) = {" a -m +a +d d d -j D d a @@ -95,9 +97,9 @@ a (4,1,1) = {" a c -e +d l -i +g k d c @@ -106,8 +108,8 @@ a (5,1,1) = {" b b -j -i +d +e i i j @@ -117,7 +119,7 @@ b (6,1,1) = {" a c -g +d h i n @@ -133,7 +135,7 @@ D j d d -a +m a "} (8,1,1) = {" @@ -143,8 +145,8 @@ a c b c -a -a +m +m a "} (9,1,1) = {" diff --git a/beestation.dme b/beestation.dme index a23ea0463ef16..a65cde70d91f8 100644 --- a/beestation.dme +++ b/beestation.dme @@ -27,6 +27,7 @@ #include "code\__DEFINES\_tick.dm" #include "code\__DEFINES\access.dm" #include "code\__DEFINES\achievements.dm" +#include "code\__DEFINES\actions.dm" #include "code\__DEFINES\actionspeed_modification.dm" #include "code\__DEFINES\admin.dm" #include "code\__DEFINES\ai.dm" @@ -79,6 +80,7 @@ #include "code\__DEFINES\explosions.dm" #include "code\__DEFINES\exports.dm" #include "code\__DEFINES\fastdmm2.dm" +#include "code\__DEFINES\fields.dm" #include "code\__DEFINES\flags.dm" #include "code\__DEFINES\fonts.dm" #include "code\__DEFINES\food.dm" @@ -154,6 +156,7 @@ #include "code\__DEFINES\roundend.dm" #include "code\__DEFINES\rust_g.dm" #include "code\__DEFINES\say.dm" +#include "code\__DEFINES\SDQL.dm" #include "code\__DEFINES\shuttles.dm" #include "code\__DEFINES\sight.dm" #include "code\__DEFINES\sound.dm" @@ -180,7 +183,6 @@ #include "code\__DEFINES\tools.dm" #include "code\__DEFINES\toys.dm" #include "code\__DEFINES\traitor.dm" -#include "code\__DEFINES\traits.dm" #include "code\__DEFINES\turfs.dm" #include "code\__DEFINES\typeids.dm" #include "code\__DEFINES\uplink.dm" @@ -239,6 +241,10 @@ #include "code\__DEFINES\dcs\signals\signals_obj\signals_machine\signals_teleporter.dm" #include "code\__DEFINES\power\apc_defines.dm" #include "code\__DEFINES\power\power.dm" +#include "code\__DEFINES\traits\_traits.dm" +#include "code\__DEFINES\traits\declarations.dm" +#include "code\__DEFINES\traits\macros.dm" +#include "code\__DEFINES\traits\sources.dm" #include "code\__HELPERS\_extools_api.dm" #include "code\__HELPERS\_lists.dm" #include "code\__HELPERS\_logging.dm" @@ -250,6 +256,7 @@ #include "code\__HELPERS\chat.dm" #include "code\__HELPERS\cmp.dm" #include "code\__HELPERS\colors.dm" +#include "code\__HELPERS\combat.dm" #include "code\__HELPERS\construction.dm" #include "code\__HELPERS\dates.dm" #include "code\__HELPERS\datums.dm" @@ -273,6 +280,7 @@ #include "code\__HELPERS\names.dm" #include "code\__HELPERS\path.dm" #include "code\__HELPERS\patrons.dm" +#include "code\__HELPERS\position_point_vector.dm" #include "code\__HELPERS\priority_announce.dm" #include "code\__HELPERS\pronouns.dm" #include "code\__HELPERS\qdel.dm" @@ -290,6 +298,7 @@ #include "code\__HELPERS\stoplag.dm" #include "code\__HELPERS\string_assoc_lists.dm" #include "code\__HELPERS\string_lists.dm" +#include "code\__HELPERS\test_helpers.dm" #include "code\__HELPERS\text.dm" #include "code\__HELPERS\time.dm" #include "code\__HELPERS\turfs.dm" @@ -316,7 +325,6 @@ #include "code\_globalvars\religion.dm" #include "code\_globalvars\soul_glimmer.dm" #include "code\_globalvars\time_vars.dm" -#include "code\_globalvars\traits.dm" #include "code\_globalvars\turf.dm" #include "code\_globalvars\xenoartifact.dm" #include "code\_globalvars\lists\achievements.dm" @@ -334,6 +342,7 @@ #include "code\_globalvars\lists\traitor.dm" #include "code\_globalvars\lists\typecache.dm" #include "code\_globalvars\lists\wiremod.dm" +#include "code\_globalvars\traits\_traits.dm" #include "code\_js\byjax.dm" #include "code\_js\menus.dm" #include "code\_onclick\adjacent.dm" @@ -544,7 +553,6 @@ #include "code\datums\mutations.dm" #include "code\datums\numbered_display.dm" #include "code\datums\outfit.dm" -#include "code\datums\position_point_vector.dm" #include "code\datums\profiling.dm" #include "code\datums\progressbar.dm" #include "code\datums\radiation_wave.dm" @@ -680,8 +688,8 @@ #include "code\datums\components\remote_materials.dm" #include "code\datums\components\riding.dm" #include "code\datums\components\rotation.dm" -#include "code\datums\components\server.dm" #include "code\datums\components\seclight_attachable.dm" +#include "code\datums\components\server.dm" #include "code\datums\components\shell.dm" #include "code\datums\components\shielded.dm" #include "code\datums\components\shuttle_cling.dm" @@ -2190,6 +2198,7 @@ #include "code\modules\atmospherics\machinery\atmosmachinery.dm" #include "code\modules\atmospherics\machinery\datum_pipeline.dm" #include "code\modules\atmospherics\machinery\components\components_base.dm" +#include "code\modules\atmospherics\machinery\components\mapping.dm" #include "code\modules\atmospherics\machinery\components\binary_devices\binary_devices.dm" #include "code\modules\atmospherics\machinery\components\binary_devices\circulator.dm" #include "code\modules\atmospherics\machinery\components\binary_devices\dp_vent_pump.dm" @@ -3264,7 +3273,6 @@ #include "code\modules\mob\living\simple_animal\hostile\bosses\paperwizard.dm" #include "code\modules\mob\living\simple_animal\hostile\gorilla\emotes.dm" #include "code\modules\mob\living\simple_animal\hostile\gorilla\gorilla.dm" -#include "code\modules\mob\living\simple_animal\hostile\gorilla\visuals_icons.dm" #include "code\modules\mob\living\simple_animal\hostile\jungle\_jungle_mobs.dm" #include "code\modules\mob\living\simple_animal\hostile\jungle\leaper.dm" #include "code\modules\mob\living\simple_animal\hostile\jungle\mega_arachnid.dm" @@ -3665,6 +3673,7 @@ #include "code\modules\reagents\chem_splash.dm" #include "code\modules\reagents\reagent_containers.dm" #include "code\modules\reagents\reagent_dispenser.dm" +#include "code\modules\reagents\__DEFINES\reagent_defines.dm" #include "code\modules\reagents\chemistry\colors.dm" #include "code\modules\reagents\chemistry\holder.dm" #include "code\modules\reagents\chemistry\reagents.dm" @@ -3923,7 +3932,7 @@ #include "code\modules\shuttle\super_cruise\shuttle_components\plasma_refiner.dm" #include "code\modules\shuttle\super_cruise\shuttle_components\shuttle_console.dm" #include "code\modules\shuttle\super_cruise\shuttle_components\shuttle_docking.dm" -#include "code\modules\spells\spell.dm" +#include "code\modules\spells\__DEFINES\spell.dm" #include "code\modules\spells\spell_types\aimed.dm" #include "code\modules\spells\spell_types\area_teleport.dm" #include "code\modules\spells\spell_types\barnyard.dm" diff --git a/bin/temp-fast-test.cmd b/bin/temp-fast-test.cmd deleted file mode 100644 index f604245f8c27d..0000000000000 --- a/bin/temp-fast-test.cmd +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -:: Nuke this task once the Del the World unit test passes. This exists to fix those errors easily. - -call "%~dp0\..\tools\build\build.bat" --wait-on-error dm-test -DREFERENCE_TRACKING_FAST %* diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm index 9f230e56fe99c..a6aa434ccb7e4 100644 --- a/code/__DEFINES/MC.dm +++ b/code/__DEFINES/MC.dm @@ -4,12 +4,12 @@ #define MC_SPLIT_TICK_INIT(phase_count) var/original_tick_limit = Master.current_ticklimit; var/split_tick_phases = ##phase_count #define MC_SPLIT_TICK \ - if(split_tick_phases > 1){\ - Master.current_ticklimit = ((original_tick_limit - TICK_USAGE) / split_tick_phases) + TICK_USAGE;\ - --split_tick_phases;\ - } else {\ - Master.current_ticklimit = original_tick_limit;\ - } + if(split_tick_phases > 1){\ + Master.current_ticklimit = ((original_tick_limit - TICK_USAGE) / split_tick_phases) + TICK_USAGE;\ + --split_tick_phases;\ + } else {\ + Master.current_ticklimit = original_tick_limit;\ + } // Used to smooth out costs to try and avoid oscillation. #define MC_AVERAGE_FAST(average, current) (0.7 * (average) + 0.3 * (current)) @@ -84,8 +84,8 @@ #define SUBSYSTEM_DEF(X) GLOBAL_REAL(SS##X, /datum/controller/subsystem/##X);\ /datum/controller/subsystem/##X/New(){\ - NEW_SS_GLOBAL(SS##X);\ - PreInit();\ + NEW_SS_GLOBAL(SS##X);\ + PreInit();\ ss_id=#X;\ }\ /datum/controller/subsystem/##X @@ -108,8 +108,8 @@ #define PROCESSING_SUBSYSTEM_DEF(X) GLOBAL_REAL(SS##X, /datum/controller/subsystem/processing/##X);\ /datum/controller/subsystem/processing/##X/New(){\ - NEW_SS_GLOBAL(SS##X);\ - PreInit();\ + NEW_SS_GLOBAL(SS##X);\ + PreInit();\ ss_id="processing_[#X]";\ }\ /datum/controller/subsystem/processing/##X diff --git a/code/__DEFINES/_readme.dm b/code/__DEFINES/README.md similarity index 100% rename from code/__DEFINES/_readme.dm rename to code/__DEFINES/README.md diff --git a/code/__DEFINES/SDQL.dm b/code/__DEFINES/SDQL.dm new file mode 100644 index 0000000000000..c52d61f6ccf0d --- /dev/null +++ b/code/__DEFINES/SDQL.dm @@ -0,0 +1,29 @@ +#define SDQL2_STATE_ERROR 0 +#define SDQL2_STATE_IDLE 1 +#define SDQL2_STATE_PRESEARCH 2 +#define SDQL2_STATE_SEARCHING 3 +#define SDQL2_STATE_EXECUTING 4 +#define SDQL2_STATE_SWITCHING 5 +#define SDQL2_STATE_HALTING 6 + +#define SDQL2_VALID_OPTION_TYPES list("proccall", "select", "priority", "autogc" , "sequential") +#define SDQL2_VALID_OPTION_VALUES list("async", "blocking", "force_nulls", "skip_nulls", "high", "normal", "keep_alive" , "true") + +#define SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS (1<<0) +#define SDQL2_OPTION_BLOCKING_CALLS (1<<1) +#define SDQL2_OPTION_HIGH_PRIORITY (1<<2) //High priority SDQL query, allow using almost all of the tick. +#define SDQL2_OPTION_DO_NOT_AUTOGC (1<<3) + +#define SDQL2_OPTIONS_DEFAULT (SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS) + +#define SDQL2_IS_RUNNING (state == SDQL2_STATE_EXECUTING || state == SDQL2_STATE_SEARCHING || state == SDQL2_STATE_SWITCHING || state == SDQL2_STATE_PRESEARCH) +#define SDQL2_HALT_CHECK if(!SDQL2_IS_RUNNING) {state = SDQL2_STATE_HALTING; return FALSE;}; + +#define SDQL2_TICK_CHECK ((options & SDQL2_OPTION_HIGH_PRIORITY)? CHECK_TICK_HIGH_PRIORITY : CHECK_TICK) + +#define SDQL2_STAGE_SWITCH_CHECK if(state != SDQL2_STATE_SWITCHING){\ + if(state == SDQL2_STATE_HALTING){\ + state = SDQL2_STATE_IDLE;\ + return FALSE}\ + state = SDQL2_STATE_ERROR;\ + CRASH("SDQL2 fatal error");}; diff --git a/code/__DEFINES/_globals.dm b/code/__DEFINES/_globals.dm index 50527061bd770..4d91a5184cf7a 100644 --- a/code/__DEFINES/_globals.dm +++ b/code/__DEFINES/_globals.dm @@ -3,8 +3,8 @@ //Creates a global initializer with a given InitValue expression, do not use #define GLOBAL_MANAGED(X, InitValue)\ /datum/controller/global_vars/proc/InitGlobal##X(){\ - ##X = ##InitValue;\ - gvars_datum_init_order += #X;\ + ##X = ##InitValue;\ + gvars_datum_init_order += #X;\ } //Creates an empty global initializer, do not use #define GLOBAL_UNMANAGED(X) /datum/controller/global_vars/proc/InitGlobal##X() { return; } @@ -13,8 +13,8 @@ #ifndef TESTING #define GLOBAL_PROTECT(X)\ /datum/controller/global_vars/InitGlobal##X(){\ - ..();\ - gvars_datum_protected_varlist[#X] = TRUE;\ + ..();\ + gvars_datum_protected_varlist[#X] = TRUE;\ } #else #define GLOBAL_PROTECT(X) diff --git a/code/__DEFINES/_helpers.dm b/code/__DEFINES/_helpers.dm index 5fc95acb1af11..5f6fb4d9af78d 100644 --- a/code/__DEFINES/_helpers.dm +++ b/code/__DEFINES/_helpers.dm @@ -12,3 +12,6 @@ // Custom types that we define don't get a unique id, but this is useful for identifying // types that don't normally have a way to run istype() on them. #define TYPEID(thing) copytext(REF(thing), 4, 6) + +/// Takes a datum as input, returns its ref string +#define text_ref(datum) ref(datum) diff --git a/code/__DEFINES/actions.dm b/code/__DEFINES/actions.dm new file mode 100644 index 0000000000000..b89528a9baec9 --- /dev/null +++ b/code/__DEFINES/actions.dm @@ -0,0 +1,8 @@ +// Checks to see if the mob is able to use their hands, or if they are blocked by cuffs or stuns +#define AB_CHECK_HANDS_BLOCKED (1<<0) +// Checks to see if the mob is incapacitated by stuns or paralysis effects +#define AB_CHECK_INCAPACITATED (1<<1) +// Checks to see if the mob is standing +#define AB_CHECK_LYING (1<<2) +// Checks to see if the mob in concious +#define AB_CHECK_CONSCIOUS (1<<3) diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index dacec6626ae2a..895091ee19594 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -92,3 +92,10 @@ GLOBAL_VAR_INIT(ghost_role_flags, (~0)) #define DEADMIN_POSITION_HEAD (1<<0) #define DEADMIN_POSITION_SECURITY (1<<1) #define DEADMIN_POSITION_SILICON (1<<2) + +/// State when an interview has been approved +#define INTERVIEW_APPROVED "interview_approved" +/// State when an interview as been denied +#define INTERVIEW_DENIED "interview_denied" +/// State when an interview has had no action on it yet +#define INTERVIEW_PENDING "interview_pending" diff --git a/code/__DEFINES/ai.dm b/code/__DEFINES/ai.dm index 7fe4abbd805a9..6a1ddeb798449 100644 --- a/code/__DEFINES/ai.dm +++ b/code/__DEFINES/ai.dm @@ -185,3 +185,12 @@ #define BB_BASIC_MOB_CURRENT_TARGET "BB_basic_current_target" #define BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION "BB_basic_current_target_hiding_location" #define BB_TARGETTING_DATUM "targetting_datum" + +// AI laws +#define LAW_VALENTINES "valentines" +#define LAW_DEVIL "devil" +#define LAW_ZEROTH "zeroth" +#define LAW_INHERENT "inherent" +#define LAW_SUPPLIED "supplied" +#define LAW_ION "ion" +#define LAW_HACKED "hacked" diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm index 3bcd628b099d9..bea77804af2a6 100644 --- a/code/__DEFINES/antagonists.dm +++ b/code/__DEFINES/antagonists.dm @@ -119,6 +119,9 @@ /// TC to charge someone if they get a free implant through choice or /// because they have nothing else that supports an implant. #define UPLINK_IMPLANT_TELECRYSTAL_COST 3 +// Traitor types +#define TRAITOR_HUMAN "human" +#define TRAITOR_AI "AI" ///Checks if given mob is a hive host #define IS_HIVEHOST(mob) (mob.mind?.has_antag_datum(/datum/antagonist/hivemind)) @@ -144,3 +147,22 @@ /// The dimensions of the antagonist preview icon. Will be scaled to this size. #define ANTAGONIST_PREVIEW_ICON_SIZE 96 + +// Changelings +// ------------------------------------ + +#define LING_FAKEDEATH_TIME 600 //1 minute. +#define LING_DEAD_GENETICDAMAGE_HEAL_CAP 50 //The lowest value of geneticdamage handle_changeling() can take it to while dead. +#define LING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob + +// Clockcult +// ------------------------------------ + +#define SIGIL_TRANSMISSION_RANGE 4 +/// Clockcult drone +#define CLOCKDRONE "drone_clock" + +// Abductors +// ------------------------------------ + +#define ABDUCTOR_MAX_TEAMS 4 diff --git a/code/__DEFINES/configuration.dm b/code/__DEFINES/configuration.dm index 175702249ad16..b97629a946f30 100644 --- a/code/__DEFINES/configuration.dm +++ b/code/__DEFINES/configuration.dm @@ -59,3 +59,10 @@ // Defib stats /// The time (in deciseconds) in which a fresh body can be defibbed #define DEFIB_TIME_LIMIT 900 + +#define VALUE_MODE_NUM 0 +#define VALUE_MODE_TEXT 1 +#define VALUE_MODE_FLAG 2 + +#define KEY_MODE_TEXT 0 +#define KEY_MODE_TYPE 1 diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm index 2cc4c0eaabc25..02079493f1cbc 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm @@ -107,7 +107,7 @@ #define COMPONENT_BLOCK_CONTAMINATION 1 ///! from base of datum/radiation_wave/check_obstructions(): (datum/radiation_wave, width) #define COMSIG_ATOM_RAD_WAVE_PASSING "atom_rad_wave_pass" - #define COMPONENT_RAD_WAVE_HANDLED 1 + #define COMPONENT_RAD_WAVE_HANDLED 1 ///! from internal loop in atom/movable/proc/CanReach(): (list/next) #define COMSIG_ATOM_CANREACH "atom_can_reach" #define COMPONENT_ALLOW_REACH (1<<0) diff --git a/code/__DEFINES/dcs/signals/signals_datum/signals_datum.dm b/code/__DEFINES/dcs/signals/signals_datum/signals_datum.dm index e9fc41ba61575..e76747e22846f 100644 --- a/code/__DEFINES/dcs/signals/signals_datum/signals_datum.dm +++ b/code/__DEFINES/dcs/signals/signals_datum/signals_datum.dm @@ -71,7 +71,7 @@ // /datum/component/two_handed signals #define COMSIG_TWOHANDED_WIELD "twohanded_wield" //from base of datum/component/two_handed/proc/wield(mob/living/carbon/user): (/mob/user) - #define COMPONENT_TWOHANDED_BLOCK_WIELD 1 + #define COMPONENT_TWOHANDED_BLOCK_WIELD 1 #define COMSIG_TWOHANDED_UNWIELD "twohanded_unwield" //from base of datum/component/two_handed/proc/unwield(mob/living/carbon/user): (/mob/user) // /datum/action signals @@ -120,5 +120,5 @@ #define COMSIG_PARENT_MOVED_RELAY "parent_moved_relay" /// Called when a buffer tries to send some stored data to something (datum/source, mob/user, datum/buffer, obj/item/buffer_parent) (buffer item may be null) -#define COMSIG_PARENT_RECIEVE_BUFFER "recieve_buffer" - #define COMPONENT_BUFFER_RECIEVED (1 << 0) +#define COMSIG_PARENT_RECEIVE_BUFFER "receive_buffer" + #define COMPONENT_BUFFER_RECEIVED (1 << 0) diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm index 34ac00a867905..016833787b053 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob.dm @@ -58,7 +58,7 @@ #define SPEECH_FORCED 7 */ #define COMSIG_MOB_EMOTE "mob_emote" // from /mob/living/emote(): () #define COMSIG_MOB_SWAP_HANDS "mob_swap_hands" //from base of mob/swap_hand() - #define COMPONENT_BLOCK_SWAP 1 + #define COMPONENT_BLOCK_SWAP 1 #define COMSIG_MOB_DEADSAY "mob_deadsay" // from /mob/say_dead(): (mob/speaker, message) #define MOB_DEADSAY_SIGNAL_INTERCEPT 1 #define COMSIG_MOB_POINTED "mob_pointed" //from base of /mob/verb/pointed: (atom/A) diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_item.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_item.dm index 555630211a3a4..1e123e41a5d4f 100644 --- a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_item.dm +++ b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_item.dm @@ -30,12 +30,12 @@ #define COMSIG_ITEM_HIT_REACT "item_hit_react" //! from base of obj/item/hit_reaction(): (mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", damage = 0, attack_type = MELEE_ATTACK) #define COMPONENT_HIT_REACTION_BLOCK (1<<0) #define COMSIG_ITEM_SHARPEN_ACT "sharpen_act" //! from base of item/sharpener/attackby(): (amount, max) - #define COMPONENT_BLOCK_SHARPEN_APPLIED 1 - #define COMPONENT_BLOCK_SHARPEN_BLOCKED 2 - #define COMPONENT_BLOCK_SHARPEN_ALREADY 4 - #define COMPONENT_BLOCK_SHARPEN_MAXED 8 + #define COMPONENT_BLOCK_SHARPEN_APPLIED 1 + #define COMPONENT_BLOCK_SHARPEN_BLOCKED 2 + #define COMPONENT_BLOCK_SHARPEN_ALREADY 4 + #define COMPONENT_BLOCK_SHARPEN_MAXED 8 #define COMSIG_ITEM_CHECK_WIELDED "item_check_wielded" //! used to check if the item is wielded for special effects - #define COMPONENT_IS_WIELDED 1 + #define COMPONENT_IS_WIELDED 1 #define COMSIG_ITEM_DISABLE_EMBED "item_disable_embed" ///from [/obj/item/proc/disableEmbedding]: ///Called when an item is being offered, from [/obj/item/proc/on_offered(mob/living/carbon/offerer)] diff --git a/code/__DEFINES/directional.dm b/code/__DEFINES/directional.dm index bfde544b44716..14d4ae1d7f17d 100644 --- a/code/__DEFINES/directional.dm +++ b/code/__DEFINES/directional.dm @@ -16,8 +16,14 @@ /// Inverse direction, taking into account UP|DOWN if necessary. #define REVERSE_DIR(dir) ( ((dir & 85) << 1) | ((dir & 170) >> 1) ) +/obj/var/_reflection_is_directional = FALSE + /// Create directional subtypes for a path to simplify mapping. -#define MAPPING_DIRECTIONAL_HELPERS(path, offset) ##path/directional/north {\ +#define MAPPING_DIRECTIONAL_HELPERS(path, offset)\ +##path {\ + _reflection_is_directional = TRUE;\ +} \ +##path/directional/north {\ dir = NORTH; \ pixel_y = offset; \ } \ diff --git a/code/__DEFINES/dynamic.dm b/code/__DEFINES/dynamic.dm index cb6f3d4218339..359221e265c8a 100644 --- a/code/__DEFINES/dynamic.dm +++ b/code/__DEFINES/dynamic.dm @@ -40,3 +40,5 @@ #define DYNAMIC_EXECUTE_SUCCESS 1 #define DYNAMIC_EXECUTE_NOT_ENOUGH_PLAYERS 2 #define DYNAMIC_EXECUTE_FAILURE 0 + +#define RULESET_STOP_PROCESSING 1 diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm index 625d6402293b8..84573363b15d6 100644 --- a/code/__DEFINES/economy.dm +++ b/code/__DEFINES/economy.dm @@ -9,10 +9,10 @@ #define PAYCHECK_COMMAND_DEPT 80 // given from department budget #define PAYCHECK_VIP 2000 /* Note: The current intention for crazy amount of money to VIP is that they can be a rich shitter - or be targeted by antags for their money - oh, my, being rich isn't always good. - The first buff to their money was to 2,000 credits. Nerf is fine if you think it's necessary, - but if you decrease their payment too much, they'll be no longer interested. - I recommend to nerf their gimmick spawn chance instead. */ + or be targeted by antags for their money - oh, my, being rich isn't always good. + The first buff to their money was to 2,000 credits. Nerf is fine if you think it's necessary, + but if you decrease their payment too much, they'll be no longer interested. + I recommend to nerf their gimmick spawn chance instead. */ #define PAYCHECK_WELFARE 20 //NEETbucks diff --git a/code/__DEFINES/fields.dm b/code/__DEFINES/fields.dm new file mode 100644 index 0000000000000..deb72cc87b2a8 --- /dev/null +++ b/code/__DEFINES/fields.dm @@ -0,0 +1,4 @@ +//Field shapes +#define FIELD_NO_SHAPE 0 //Does not update turfs automatically +#define FIELD_SHAPE_RADIUS_SQUARE 1 //Uses current_range and square_depth_up/down +#define FIELD_SHAPE_CUSTOM_SQUARE 2 //Uses square_height and square_width and square_depth_up/down diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index b849ed37652c6..8fb1dfae1eb18 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -109,6 +109,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define XENOBIOLOGY_COMPATIBLE (1<<9) /// Are hidden stashes allowed to spawn here? #define HIDDEN_STASH_LOCATION (1<<10) +/// Indicates that this area uses an APC from another location (Skips the unit tests for APCs) +#define REMOTE_APC (1<<11) /* These defines are used specifically with the atom/pass_flags bitmask @@ -199,7 +201,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 if(HAS_TRAIT_FROM_ONLY(x, TRAIT_KEEP_TOGETHER, KEEP_TOGETHER_ORIGINAL))\ REMOVE_TRAIT(x, TRAIT_KEEP_TOGETHER, KEEP_TOGETHER_ORIGINAL);\ else if(!HAS_TRAIT(x, TRAIT_KEEP_TOGETHER))\ - x.appearance_flags &= ~KEEP_TOGETHER + x.appearance_flags &= ~KEEP_TOGETHER //dir macros ///Returns true if the dir is diagonal, false otherwise diff --git a/code/__DEFINES/html_assistant.dm b/code/__DEFINES/html_assistant.dm index 03f95ad20158b..4867ef425c55a 100644 --- a/code/__DEFINES/html_assistant.dm +++ b/code/__DEFINES/html_assistant.dm @@ -1,26 +1,26 @@ #define TOOLTIP_CSS_SETUP \ "" // IE11 does not support the max-content attribute, so 'width: max-content;' doesn't work. diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm index 11213c98bf06e..925253207a2b0 100644 --- a/code/__DEFINES/hud.dm +++ b/code/__DEFINES/hud.dm @@ -17,3 +17,5 @@ #define APPEARANCE_UI_IGNORE_ALPHA (RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|RESET_ALPHA|PIXEL_SCALE) /// Used for HUD objects #define APPEARANCE_UI (RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|PIXEL_SCALE) + +#define ACTION_BUTTON_DEFAULT_BACKGROUND "default" diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 76b2c333cca3c..a863801156656 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -213,3 +213,8 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list( /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy))) + +// Collection flags for RPED inventory +#define COLLECT_ONE 0 +#define COLLECT_EVERYTHING 1 +#define COLLECT_SAME 2 diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index f1c3ec8771334..18c1b7f0fbf3a 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -176,3 +176,72 @@ GLOBAL_LIST_INIT(approved_status_pictures, list( "redalert", "shuttle", )) + +// Holopad defines +// --------------------------------------------------- + +#define HOLOPAD_MAX_DIAL_TIME 200 + +#define HOLORECORD_DELAY "delay" +#define HOLORECORD_SAY "say" +#define HOLORECORD_SOUND "sound" +#define HOLORECORD_LANGUAGE "lang" +#define HOLORECORD_PRESET "preset" +#define HOLORECORD_RENAME "rename" + +#define HOLORECORD_MAX_LENGTH 200 + +// Camera defines +// --------------------------------------------------- + +#define CAMERA_UPGRADE_XRAY 1 +#define CAMERA_UPGRADE_EMP_PROOF 2 +#define CAMERA_UPGRADE_MOTION 4 + +// Status Display defines +// --------------------------------------------------- + +#define SD_BLANK 0 // 0 = Blank +#define SD_EMERGENCY 1 // 1 = Emergency Shuttle timer +#define SD_MESSAGE 2 // 2 = Arbitrary message(s) +#define SD_PICTURE 3 // 3 = alert picture + +// Assembly defines +// --------------------------------------------------- + +#define WIRE_RECEIVE (1<<0) +#define WIRE_PULSE (1<<1) +#define WIRE_PULSE_SPECIAL (1<<2) +#define WIRE_RADIO_RECEIVE (1<<3) +#define WIRE_RADIO_PULSE (1<<4) +#define ASSEMBLY_BEEP_VOLUME 5 + +// Camera defines +// --------------------------------------------------- + +#define CHUNK_SIZE 16 // Only chunk sizes that are to the power of 2. E.g: 2, 4, 8, 16, etc.. + +// Circulator defines +// --------------------------------------------------- + +#define CIRCULATOR_HOT 0 +#define CIRCULATOR_COLD 1 + +// Particle Accelerator defines +// --------------------------------------------------- + +#define PA_CONSTRUCTION_UNSECURED 0 +#define PA_CONSTRUCTION_UNWIRED 1 +#define PA_CONSTRUCTION_PANEL_OPEN 2 +#define PA_CONSTRUCTION_COMPLETE 3 + +// Solar defines +// --------------------------------------------------- + +#define SOLAR_MAX_DIST 40 +#define SOLARGENRATE 1500 + +// Genpop defines +// --------------------------------------------------- + +#define SENTENCE_MAX_TIMER 10 HOURS //Permabrig. diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index 6e4d76e358965..269058b4ba5df 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -74,12 +74,12 @@ require only minor tweaks. /// enum - how space transitions should affect this level #define ZTRAIT_LINKAGE "Linkage" - /// UNAFFECTED if absent - no space transitions - #define UNAFFECTED null - /// SELFLOOPING - space transitions always self-loop - #define SELFLOOPING "Self" - /// CROSSLINKED - mixed in with the cross-linked space pool - #define CROSSLINKED "Cross" + /// UNAFFECTED if absent - no space transitions + #define UNAFFECTED null + /// SELFLOOPING - space transitions always self-loop + #define SELFLOOPING "Self" + /// CROSSLINKED - mixed in with the cross-linked space pool + #define CROSSLINKED "Cross" /// string - type path of the z-level's baseturf (defaults to space) #define ZTRAIT_BASETURF "Baseturf" @@ -89,11 +89,11 @@ require only minor tweaks. #define ZTRAITS_STATION list(ZTRAIT_LINKAGE = SELFLOOPING, ZTRAIT_STATION = TRUE) #define ZTRAITS_SPACE list(ZTRAIT_LINKAGE = SELFLOOPING, ZTRAIT_DYNAMIC_LEVEL = TRUE) #define ZTRAITS_LAVALAND list(\ - ZTRAIT_MINING = TRUE, \ - ZTRAIT_LAVA_RUINS = TRUE, \ - ZTRAIT_BOMBCAP_MULTIPLIER = 2, \ + ZTRAIT_MINING = TRUE, \ + ZTRAIT_LAVA_RUINS = TRUE, \ + ZTRAIT_BOMBCAP_MULTIPLIER = 2, \ ZTRAIT_ASHSTORM = TRUE, \ - ZTRAIT_BASETURF = /turf/open/lava/smooth/lava_land_surface) + ZTRAIT_BASETURF = /turf/open/lava/smooth/lava_land_surface) #define ZTRAITS_REEBE list(ZTRAIT_REEBE = TRUE, ZTRAIT_BOMBCAP_MULTIPLIER = 0.5) #define ZTRAITS_DEBUG list(ZTRAIT_DEBUG = TRUE) #define DL_NAME "name" @@ -102,7 +102,7 @@ require only minor tweaks. /// must correspond to _basemap.dm for things to work correctly #define DEFAULT_MAP_TRAITS list(\ - DECLARE_LEVEL("CentCom", ZTRAITS_CENTCOM),\ + DECLARE_LEVEL("CentCom", ZTRAITS_CENTCOM),\ ) // Camera lock flags @@ -159,3 +159,23 @@ require only minor tweaks. #define STARLIGHT_MODE_STARLIGHT "starlight" #define STARLIGHT_MODE_CYCLE "cycle" + +//Individual defines +#define CLUSTER_CHECK_NONE 0 //No checks are done, cluster as much as possible +#define CLUSTER_CHECK_DIFFERENT_TURFS (1<<1) //Don't let turfs of DIFFERENT types cluster +#define CLUSTER_CHECK_DIFFERENT_ATOMS (1<<2) //Don't let atoms of DIFFERENT types cluster +#define CLUSTER_CHECK_SAME_TURFS (1<<3) //Don't let turfs of the SAME type cluster +#define CLUSTER_CHECK_SAME_ATOMS (1<<4) //Don't let atoms of the SAME type cluster + +//Combined defines +#define CLUSTER_CHECK_SAMES 24 //Don't let any of the same type cluster +#define CLUSTER_CHECK_DIFFERENTS 6 //Don't let any of different types cluster +#define CLUSTER_CHECK_ALL_TURFS 10 //Don't let ANY turfs cluster same and different types +#define CLUSTER_CHECK_ALL_ATOMS 20 //Don't let ANY atoms cluster same and different types + +//All +#define CLUSTER_CHECK_ALL 30 //Don't let anything cluster, like, at all + +// Ruin generation +#define OPEN_CONNECTION 1 +#define ROOM_CONNECTION 16 diff --git a/code/__DEFINES/pipe_construction.dm b/code/__DEFINES/pipe_construction.dm index 609e3d8328f0f..10cf379b2a26a 100644 --- a/code/__DEFINES/pipe_construction.dm +++ b/code/__DEFINES/pipe_construction.dm @@ -75,6 +75,8 @@ //If you don't want to fuck up disposals, add to this list, and don't change the order. //If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete +GLOBAL_LIST_INIT(disabled_tagger_locations, list()) + GLOBAL_LIST_INIT(TAGGERLOCATIONS, list( "Disposals", "Cargo Bay", @@ -153,7 +155,7 @@ MAPPING_HELPER_SORT(detective_office, 30) #if defined(UNIT_TESTS) || defined(SPACEMAN_DMM) GLOBAL_LIST_INIT(tagger_destination_areas, list( - "Disposals" = list(/area/maintenance/disposal, /area/quartermaster/sorting), + "Disposals" = list(/area/maintenance/disposal, /area/quartermaster/sorting, /area/janitor), "Cargo Bay" = list(/area/quartermaster), "QM Office" = list(/area/quartermaster/qm, /area/quartermaster/qm_bedroom), "Engineering" = list(/area/engine, /area/engineering), @@ -171,14 +173,14 @@ GLOBAL_LIST_INIT(tagger_destination_areas, list( "Library" = list(/area/library), "Chapel" = list(/area/chapel), "Theatre" = list(/area/crew_quarters/theatre), - "Bar" = list(/area/crew_quarters/bar), + "Bar" = list(/area/crew_quarters/bar, /area/crew_quarters/cafeteria), "Kitchen" = list(/area/crew_quarters/kitchen), "Hydroponics" = list(/area/hydroponics), "Janitor Closet" = list(/area/janitor), "Genetics" = list(/area/medical/genetics), "Testing Range" = list(/area/science/misc_lab, /area/science/test_area, /area/science/mixing), "Toxins" = list(/area/science/misc_lab, /area/science/test_area, /area/science/mixing), - "Dormitories" = list(/area/crew_quarters/dorms, /area/commons/dorms), + "Dormitories" = list(/area/crew_quarters/dorms, /area/commons/dorms, /area/crew_quarters/fitness), "Virology" = list(/area/medical/virology), "Xenobiology" = list(/area/science/xenobiology), "Law Office" = list(/area/lawoffice), diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index d43c028ae2f26..f9f6c5180c921 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -190,3 +190,35 @@ GLOBAL_PROTECT(undatumized_preference_tags_character) /// Normal behavior - success! #define PREFERENCE_LOAD_SUCCESS 3 +// Priorities must be in order! +/// The default priority level +#define PREFERENCE_PRIORITY_DEFAULT 1 + +/// The priority at which species runs, needed for external organs to apply properly. +#define PREFERENCE_PRIORITY_SPECIES 2 + +/// The priority at which gender is determined, needed for proper randomization. +#define PREFERENCE_PRIORITY_GENDER 3 + +/// The priority at which body model is decided, applied after gender so we can +/// make sure they're non-binary. +#define PREFERENCE_PRIORITY_BODY_MODEL 4 + +/// The priority at which eye color is applied, needed so IPCs get the right screen color. +#define PREFERENCE_PRIORITY_EYE_COLOR 5 + +/// The priority at which hair color is applied, needed so IPCs get the right antenna color. +#define PREFERENCE_PRIORITY_HAIR_COLOR 6 + +/// The priority at which names are decided, needed for proper randomization. +#define PREFERENCE_PRIORITY_NAMES 7 + +/// The maximum preference priority, keep this updated, but don't use it for `priority`. +#define MAX_PREFERENCE_PRIORITY PREFERENCE_PRIORITY_NAMES + +/// For choiced preferences, this key will be used to set display names in constant data. +#define CHOICED_PREFERENCE_DISPLAY_NAMES "display_names" + +/// For main feature preferences, this key refers to a feature considered supplemental. +/// For instance, hair color being supplemental to hair. +#define SUPPLEMENTAL_FEATURE_KEY "supplemental_feature" diff --git a/code/__DEFINES/qdel.dm b/code/__DEFINES/qdel.dm index 039658baad9dc..419b0c1176eeb 100644 --- a/code/__DEFINES/qdel.dm +++ b/code/__DEFINES/qdel.dm @@ -1,20 +1,27 @@ -//defines that give qdel hints. these can be given as a return in destory() or by calling +//! Defines that give qdel hints. +//! +//! These can be given as a return in [/atom/proc/Destroy] or by calling [/proc/qdel]. +/// `qdel` should queue the object for deletion. +#define QDEL_HINT_QUEUE 0 +/// `qdel` should let the object live after calling [/atom/proc/Destroy]. +#define QDEL_HINT_LETMELIVE 1 +/// Functionally the same as the above. `qdel` should assume the object will gc on its own, and not check it. +#define QDEL_HINT_IWILLGC 2 +/// Qdel should assume this object won't GC, and queue a hard delete using a hard reference. +#define QDEL_HINT_HARDDEL 3 +// Qdel should assume this object won't gc, and hard delete it posthaste. +#define QDEL_HINT_HARDDEL_NOW 4 -#define QDEL_HINT_QUEUE 0 //qdel should queue the object for deletion. -#define QDEL_HINT_LETMELIVE 1 //qdel should let the object live after calling destory. -#define QDEL_HINT_IWILLGC 2 //functionally the same as the above. qdel should assume the object will gc on its own, and not check it. -#define QDEL_HINT_HARDDEL 3 //qdel should assume this object won't gc, and queue a hard delete using a hard reference. -#define QDEL_HINT_HARDDEL_NOW 4 //qdel should assume this object won't gc, and hard del it post haste. -//defines for the gc_destroyed var #ifdef REFERENCE_TRACKING /** If REFERENCE_TRACKING is enabled, qdel will call this object's find_references() verb. * * Functionally identical to [QDEL_HINT_QUEUE] if [GC_FAILURE_HARD_LOOKUP] is not enabled in _compiler_options.dm. */ -#define QDEL_HINT_FINDREFERENCE 5 -/// Behavior as QDEL_HINT_FINDREFERENCE, but only if the GC fails and a hard delete is forced. +#warn TG0001 qdel REFERENCE_TRACKING enabled +#define QDEL_HINT_FINDREFERENCE 5 +/// Behavior as [QDEL_HINT_FINDREFERENCE], but only if the GC fails and a hard delete is forced. #define QDEL_HINT_IFFAIL_FINDREFERENCE 6 #endif @@ -24,19 +31,37 @@ #define GC_QUEUE_HARDDELETE 3 //! short queue for things that hard delete instead of going thru the gc subsystem, this is purely so if they *can* softdelete, they will soft delete rather then wasting time with a hard delete. #define GC_QUEUE_COUNT 3 //! Number of queues, used for allocating the nested lists. Don't forget to increase this if you add a new queue stage + +// Defines for the ssgarbage queue items +#define GC_QUEUE_ITEM_QUEUE_TIME 1 //! Time this item entered the queue +#define GC_QUEUE_ITEM_REF 2 //! Ref to the item +#define GC_QUEUE_ITEM_GCD_DESTROYED 3 //! Item's gc_destroyed var value. Used to detect ref reuse. +#define GC_QUEUE_ITEM_INDEX_COUNT 3 //! Number of item indexes, used for allocating the nested lists. Don't forget to increase this if you add a new queue item index + // Defines for the time an item has to get its reference cleaned before it fails the queue and moves to the next. #define GC_FILTER_QUEUE (1 SECONDS) #define GC_CHECK_QUEUE (5 MINUTES) #define GC_DEL_QUEUE (10 SECONDS) + #define QDEL_ITEM_ADMINS_WARNED (1<<0) //! Set when admins are told about lag causing qdels in this type. #define QDEL_ITEM_SUSPENDED_FOR_LAG (1<<1) //! Set when a type can no longer be hard deleted on failure because of lag it causes while this happens. // Defines for the [gc_destroyed][/datum/var/gc_destroyed] var. -#define GC_QUEUED_FOR_QUEUING -1 #define GC_CURRENTLY_BEING_QDELETED -2 #define QDELING(X) (X.gc_destroyed) #define QDELETED(X) (isnull(X) || QDELING(X)) #define QDESTROYING(X) (!X || X.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) +// This is a bit hacky, we do it to avoid people relying on a return value for the macro +// If you need that you should use QDEL_IN_STOPPABLE instead +#define QDEL_IN(item, time) ; \ + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), (time) > GC_FILTER_QUEUE ? WEAKREF(item) : item), time); +#define QDEL_IN_STOPPABLE(item, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), (time) > GC_FILTER_QUEUE ? WEAKREF(item) : item), time, TIMER_STOPPABLE) +#define QDEL_IN_CLIENT_TIME(item, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), item), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME) +#define QDEL_NULL(item) qdel(item); item = null +#define QDEL_LIST(L) if(L) { for(var/I in L) qdel(I); L.Cut(); } +#define QDEL_LIST_IN(L, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(______qdel_list_wrapper), L), time, TIMER_STOPPABLE) +#define QDEL_LIST_ASSOC(L) if(L) { for(var/I in L) { qdel(L[I]); qdel(I); } L.Cut(); } +#define QDEL_LIST_ASSOC_VAL(L) if(L) { for(var/I in L) qdel(L[I]); L.Cut(); } diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index dbc4021b72b7d..3a746e3639194 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -27,7 +27,7 @@ #define MODE_KEY_BINARY "b" #define MODE_TOKEN_BINARY ":b" - #define WHISPER_MODE "the type of whisper" +#define WHISPER_MODE "the type of whisper" #define MODE_WHISPER "whisper" #define MODE_WHISPER_CRIT "whispercrit" @@ -108,3 +108,9 @@ ///How far away blind people can see visible messages from #define BLIND_TEXT_DIST 2 + +// Emote flags + +#define EMOTE_AUDIBLE (1<<0) +#define EMOTE_ANIMATED (1<<1) + diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index a716c5eab7d22..2130756a1cdcc 100644 --- a/code/__DEFINES/shuttles.dm +++ b/code/__DEFINES/shuttles.dm @@ -101,3 +101,9 @@ #define SHUTTLE_DANGER_SUBPAR 1 /// Possibility for most people on this shuttle to die with little effort #define SHUTTLE_DANGER_HIGH 2 + +#define CUSTOM_SHUTTLE_ACCELERATION_SCALE 10 +#define CUSTOM_SHUTTLE_MIN_THRUST_TO_WEIGHT 1 + +#define SHUTTLE_CREATOR_MAX_SIZE CONFIG_GET(number/max_shuttle_size) +#define CUSTOM_SHUTTLE_LIMIT CONFIG_GET(number/max_shuttle_count) diff --git a/code/__DEFINES/species.dm b/code/__DEFINES/species.dm index c1bd925ea15d6..37cfa87983886 100644 --- a/code/__DEFINES/species.dm +++ b/code/__DEFINES/species.dm @@ -10,13 +10,13 @@ #define SPECIES_HUMAN "human" #define SPECIES_IPC "ipc" #define SPECIES_LIZARD "lizard" - #define SPECIES_ASHWALKER "ashlizard" +#define SPECIES_ASHWALKER "ashlizard" #define SPECIES_MONKEY "monkey" #define SPECIES_MOTH "moth" #define SPECIES_OOZELING "oozeling" - #define SPECIES_LUMINESCENT "lum" - #define SPECIES_SLIMEPERSON "slime" - #define SPECIES_STARGAZER "stargazer" +#define SPECIES_LUMINESCENT "lum" +#define SPECIES_SLIMEPERSON "slime" +#define SPECIES_STARGAZER "stargazer" #define SPECIES_PLASMAMAN "plasmaman" #define SPECIES_PODPERSON "pod" #define SPECIES_PUMPKINPERSON "pumpkin_man" diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index 192faf6690af2..ed91e45473c6e 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -153,3 +153,4 @@ #define IS_IN_STASIS(mob) (mob.has_status_effect(STATUS_EFFECT_STASIS)) #define STATUS_EFFECT_OFFERING /datum/status_effect/offering // you are offering up an item to people + diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index b37a72da289ea..af8bb4bc0f3d6 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -93,11 +93,11 @@ ///type and all subtypes should always immediately call Initialize in New() #define INITIALIZE_IMMEDIATE(X) ##X/New(loc, ...){\ - ..();\ - if(!(flags_1 & INITIALIZED_1)) {\ - args[1] = TRUE;\ - SSatoms.InitAtom(src, FALSE, args);\ - }\ + ..();\ + if(!(flags_1 & INITIALIZED_1)) {\ + args[1] = TRUE;\ + SSatoms.InitAtom(src, FALSE, args);\ + }\ } //! ### SS initialization hints diff --git a/code/__DEFINES/text.dm b/code/__DEFINES/text.dm index 4a7bd6239a909..c553a4586ecc6 100644 --- a/code/__DEFINES/text.dm +++ b/code/__DEFINES/text.dm @@ -33,3 +33,7 @@ #define SANITIZE "sanitize" #define SANITIZE_SIMPLE "sanitize_simple" #define ADMIN_SCRUB "admin_scrub" + +/// BYOND's string procs don't support being used on datum references (as in it doesn't look for a name for stringification) +/// We just use this macro to ensure that we will only pass strings to this BYOND-level function without developers needing to really worry about it. +#define LOWER_TEXT(thing) lowertext(UNLINT("[thing]")) diff --git a/code/__DEFINES/traits/_traits.dm b/code/__DEFINES/traits/_traits.dm new file mode 100644 index 0000000000000..0c2b51f69bd77 --- /dev/null +++ b/code/__DEFINES/traits/_traits.dm @@ -0,0 +1,119 @@ +#define SIGNAL_ADDTRAIT(trait_ref) "addtrait [trait_ref]" +#define SIGNAL_REMOVETRAIT(trait_ref) "removetrait [trait_ref]" + +// trait accessor defines +#define ADD_TRAIT(target, trait, source) \ + do { \ + var/list/_L; \ + if (!target.status_traits) { \ + target.status_traits = list(); \ + _L = target.status_traits; \ + _L[trait] = list(source); \ + SEND_SIGNAL(target, SIGNAL_ADDTRAIT(trait), trait); \ + } else { \ + _L = target.status_traits; \ + if (_L[trait]) { \ + _L[trait] |= list(source); \ + } else { \ + _L[trait] = list(source); \ + SEND_SIGNAL(target, SIGNAL_ADDTRAIT(trait), trait); \ + } \ + } \ + } while (0) +#define REMOVE_TRAIT(target, trait, sources) \ + do { \ + var/list/_L = target.status_traits; \ + var/list/_S; \ + if (sources && !islist(sources)) { \ + _S = list(sources); \ + } else { \ + _S = sources\ + }; \ + if (_L && _L[trait]) { \ + for (var/_T in _L[trait]) { \ + if ((!_S && (_T != ROUNDSTART_TRAIT)) || (_T in _S)) { \ + _L[trait] -= _T \ + } \ + };\ + if (!length(_L[trait])) { \ + _L -= trait; \ + SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(trait), trait); \ + }; \ + if (!length(_L)) { \ + target.status_traits = null \ + }; \ + } \ + } while (0) +#define REMOVE_TRAIT_NOT_FROM(target, trait, sources) \ + do { \ + var/list/_traits_list = target.status_traits; \ + var/list/_sources_list; \ + if (sources && !islist(sources)) { \ + _sources_list = list(sources); \ + } else { \ + _sources_list = sources\ + }; \ + if (_traits_list && _traits_list[trait]) { \ + for (var/_trait_source in _traits_list[trait]) { \ + if (!(_trait_source in _sources_list)) { \ + _traits_list[trait] -= _trait_source \ + } \ + };\ + if (!length(_traits_list[trait])) { \ + _traits_list -= trait; \ + SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(trait), trait); \ + }; \ + if (!length(_traits_list)) { \ + target.status_traits = null \ + }; \ + } \ + } while (0) +#define REMOVE_TRAITS_NOT_IN(target, sources) \ + do { \ + var/list/_L = target.status_traits; \ + var/list/_S = sources; \ + if (_L) { \ + for (var/_T in _L) { \ + _L[_T] &= _S;\ + if (!length(_L[_T])) { \ + _L -= _T; \ + SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(_T), _T); \ + }; \ + };\ + if (!length(_L)) { \ + target.status_traits = null\ + };\ + }\ + } while (0) +#define REMOVE_TRAITS_IN(target, sources) \ + do { \ + var/list/_L = target.status_traits; \ + var/list/_S = sources; \ + if (sources && !islist(sources)) { \ + _S = list(sources); \ + } else { \ + _S = sources\ + }; \ + if (_L) { \ + for (var/_T in _L) { \ + _L[_T] -= _S;\ + if (!length(_L[_T])) { \ + _L -= _T; \ + SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(_T)); \ + }; \ + };\ + if (!length(_L)) { \ + target.status_traits = null\ + };\ + }\ + } while (0) + +#define HAS_TRAIT(target, trait) (target.status_traits ? (target.status_traits[trait] ? TRUE : FALSE) : FALSE) +#define HAS_TRAIT_FROM(target, trait, source) (target.status_traits ? (target.status_traits[trait] ? (source in target.status_traits[trait]) : FALSE) : FALSE) +#define HAS_TRAIT_FROM_ONLY(target, trait, source) (\ + target.status_traits ?\ + (target.status_traits[trait] ?\ + ((source in target.status_traits[trait]) && (length(target.status_traits) == 1))\ + : FALSE)\ + : FALSE) +#define HAS_TRAIT_NOT_FROM(target, trait, source) (target.status_traits ? (target.status_traits[trait] ? (length(target.status_traits[trait] - source) > 0) : FALSE) : FALSE) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits/declarations.dm similarity index 61% rename from code/__DEFINES/traits.dm rename to code/__DEFINES/traits/declarations.dm index d207836b91066..8e5d0d5446fd5 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -1,122 +1,8 @@ -#define SIGNAL_ADDTRAIT(trait_ref) "addtrait [trait_ref]" -#define SIGNAL_REMOVETRAIT(trait_ref) "removetrait [trait_ref]" +// This file contains all of the "static" define strings that tie to a trait. +// WARNING: The sections here actually matter in this file as it's tested by CI. Please do not toy with the sections." -// trait accessor defines -#define ADD_TRAIT(target, trait, source) \ - do { \ - var/list/_L; \ - if (!target.status_traits) { \ - target.status_traits = list(); \ - _L = target.status_traits; \ - _L[trait] = list(source); \ - SEND_SIGNAL(target, SIGNAL_ADDTRAIT(trait), trait); \ - } else { \ - _L = target.status_traits; \ - if (_L[trait]) { \ - _L[trait] |= list(source); \ - } else { \ - _L[trait] = list(source); \ - SEND_SIGNAL(target, SIGNAL_ADDTRAIT(trait), trait); \ - } \ - } \ - } while (0) -#define REMOVE_TRAIT(target, trait, sources) \ - do { \ - var/list/_L = target.status_traits; \ - var/list/_S; \ - if (sources && !islist(sources)) { \ - _S = list(sources); \ - } else { \ - _S = sources\ - }; \ - if (_L && _L[trait]) { \ - for (var/_T in _L[trait]) { \ - if ((!_S && (_T != ROUNDSTART_TRAIT)) || (_T in _S)) { \ - _L[trait] -= _T \ - } \ - };\ - if (!length(_L[trait])) { \ - _L -= trait; \ - SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(trait), trait); \ - }; \ - if (!length(_L)) { \ - target.status_traits = null \ - }; \ - } \ - } while (0) -#define REMOVE_TRAIT_NOT_FROM(target, trait, sources) \ - do { \ - var/list/_traits_list = target.status_traits; \ - var/list/_sources_list; \ - if (sources && !islist(sources)) { \ - _sources_list = list(sources); \ - } else { \ - _sources_list = sources\ - }; \ - if (_traits_list && _traits_list[trait]) { \ - for (var/_trait_source in _traits_list[trait]) { \ - if (!(_trait_source in _sources_list)) { \ - _traits_list[trait] -= _trait_source \ - } \ - };\ - if (!length(_traits_list[trait])) { \ - _traits_list -= trait; \ - SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(trait), trait); \ - }; \ - if (!length(_traits_list)) { \ - target.status_traits = null \ - }; \ - } \ - } while (0) -#define REMOVE_TRAITS_NOT_IN(target, sources) \ - do { \ - var/list/_L = target.status_traits; \ - var/list/_S = sources; \ - if (_L) { \ - for (var/_T in _L) { \ - _L[_T] &= _S;\ - if (!length(_L[_T])) { \ - _L -= _T; \ - SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(_T), _T); \ - }; \ - };\ - if (!length(_L)) { \ - target.status_traits = null\ - };\ - }\ - } while (0) -#define REMOVE_TRAITS_IN(target, sources) \ - do { \ - var/list/_L = target.status_traits; \ - var/list/_S = sources; \ - if (sources && !islist(sources)) { \ - _S = list(sources); \ - } else { \ - _S = sources\ - }; \ - if (_L) { \ - for (var/_T in _L) { \ - _L[_T] -= _S;\ - if (!length(_L[_T])) { \ - _L -= _T; \ - SEND_SIGNAL(target, SIGNAL_REMOVETRAIT(_T)); \ - }; \ - };\ - if (!length(_L)) { \ - target.status_traits = null\ - };\ - }\ - } while (0) -#define HAS_TRAIT(target, trait) (target.status_traits ? (target.status_traits[trait] ? TRUE : FALSE) : FALSE) -#define HAS_TRAIT_FROM(target, trait, source) (target.status_traits ? (target.status_traits[trait] ? (source in target.status_traits[trait]) : FALSE) : FALSE) -#define HAS_TRAIT_FROM_ONLY(target, trait, source) (\ - target.status_traits ?\ - (target.status_traits[trait] ?\ - ((source in target.status_traits[trait]) && (length(target.status_traits) == 1))\ - : FALSE)\ - : FALSE) -#define HAS_TRAIT_NOT_FROM(target, trait, source) (target.status_traits ? (target.status_traits[trait] ? (length(target.status_traits[trait] - source) > 0) : FALSE) : FALSE) +// BEGIN TRAIT DEFINES /* Remember to update _globalvars/traits.dm if you're adding/removing/renaming traits. @@ -287,8 +173,26 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Used for limbs. #define TRAIT_DISABLED_BY_WOUND "disabled-by-wound" +/// Can use the nuclear device's UI, regardless of a lack of hands +#define TRAIT_CAN_USE_NUKE "can_use_nuke" + +///Mob is being tracked on glob suit sensors list +#define TRACKED_SENSORS_TRAIT "tracked_sensors" +///Mob is tracked by suit sensors, and on glob suit sensors list +#define TRAIT_SUIT_SENSORS "suit_sensors" +///Mob is tracked by nanites, and on glob suit sensors list +#define TRAIT_NANITE_SENSORS "nanite_sensors" + +/// Trait for psyphoza, flag for examine logic +#define TRAIT_PSYCHIC_SENSE "psychic_sense" + +/** + * Atom Traits + */ ///Used for managing KEEP_TOGETHER in [appearance_flags] #define TRAIT_KEEP_TOGETHER "keep-together" +/// Buckling yourself to objects with this trait won't immobilize you +#define TRAIT_NO_IMMOBILIZE "no_immobilize" //important_recursive_contents traits /* @@ -299,7 +203,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai ///every hearing sensitive atom has this trait #define TRAIT_HEARING_SENSITIVE "hearing_sensitive" -// item traits +/** + * Item Traits + */ #define TRAIT_NODROP "nodrop" #define TRAIT_NO_STORAGE_INSERT "no_storage_insert" //cannot be inserted in a storage. #define TRAIT_SPRAYPAINTED "spraypainted" @@ -321,8 +227,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_LIVING_HEART "living_heart" /// Prevents stripping this equipment #define TRAIT_NO_STRIP "no_strip" -/// Buckling yourself to objects with this trait won't immobilize you -#define TRAIT_NO_IMMOBILIZE "no_immobilize" //quirk traits #define TRAIT_ALCOHOL_TOLERANCE "alcohol_tolerance" @@ -367,133 +271,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai ///Turf trait for when a turf is transparent #define TURF_Z_TRANSPARENT_TRAIT "turf_z_transparent" -// common trait sources -#define TRAIT_GENERIC "generic" -#define GENERIC_ITEM_TRAIT "generic_item" -#define UNCONSCIOUS_TRAIT "unconscious" -#define EYE_DAMAGE "eye_damage" -#define GENETIC_MUTATION "genetic" -#define OBESITY "obesity" -#define MAGIC_TRAIT "magic" -#define TRAUMA_TRAIT "trauma" -#define DISEASE_TRAIT "disease" -#define SPECIES_TRAIT "species" -#define ORGAN_TRAIT "organ" -#define ROUNDSTART_TRAIT "roundstart" //cannot be removed without admin intervention -#define JOB_TRAIT "job" -#define CYBORG_ITEM_TRAIT "cyborg-item" -#define ADMIN_TRAIT "admin" // (B)admins only. -#define CHANGELING_TRAIT "changeling" -#define CULT_TRAIT "cult" -#define CURSED_ITEM_TRAIT "cursed-item" // The item is magically cursed -#define ABSTRACT_ITEM_TRAIT "abstract-item" -#define STATUS_EFFECT_TRAIT "status-effect" -#define CLOTHING_TRAIT "clothing" -#define CLOTHING_FEET_TRAIT "feet" -#define VEHICLE_TRAIT "vehicle" // inherited from riding vehicles -#define INNATE_TRAIT "innate" -#define CRIT_HEALTH_TRAIT "crit_health" -#define OXYLOSS_TRAIT "oxyloss" -//trait associated to being buckled -#define BUCKLED_TRAIT "buckled" -//trait associated to being held in a chokehold -#define CHOKEHOLD_TRAIT "chokehold" -//trait associated to resting -#define RESTING_TRAIT "resting" -//trait associated to a stat value or range of -#define STAT_TRAIT "stat" -/// Trait associated to wearing a suit -#define SUIT_TRAIT "suit" -/// Trait associated to lying down (having a [lying_angle] of a different value than zero). -#define LYING_DOWN_TRAIT "lying-down" -/// Trait associated to lacking electrical power. -#define POWER_LACK_TRAIT "power-lack" -#define GLASSES_TRAIT "glasses" -#define CURSE_TRAIT "eldritch" -#define STATION_TRAIT "station-trait" -#define TRAIT_RUSTY "rust_trait" -#define ACTION_TRAIT "action_trait" -#define TURF_TRAIT "turf" - -// unique trait sources, still defines -#define CLONING_POD_TRAIT "cloning-pod" -#define STATUE_MUTE "statue" -#define CHANGELING_DRAIN "drain" -#define MAGIC_BLIND "magic_blind" -#define HIGHLANDER "highlander" -#define TRAIT_HULK "hulk" -#define STASIS_MUTE "stasis" -#define GENETICS_SPELL "genetics_spell" -#define EYES_COVERED "eyes_covered" -#define CULT_EYES "cult_eyes" -#define TRAIT_SANTA "santa" -#define SCRYING_ORB "scrying-orb" -#define ABDUCTOR_ANTAGONIST "abductor-antagonist" -#define NUKEOP_TRAIT "nuke-op" -#define DEATHSQUAD_TRAIT "deathsquad" -#define MEGAFAUNA_TRAIT "megafauna" -#define CLOWN_NUKE_TRAIT "clown-nuke" -#define STICKY_MOUSTACHE_TRAIT "sticky-moustache" -#define CHAINSAW_FRENZY_TRAIT "chainsaw-frenzy" -#define CHRONO_GUN_TRAIT "chrono-gun" -#define REVERSE_BEAR_TRAP_TRAIT "reverse-bear-trap" -#define CURSED_MASK_TRAIT "cursed-mask" -#define HIS_GRACE_TRAIT "his-grace" -#define HAND_REPLACEMENT_TRAIT "magic-hand" -#define HOT_POTATO_TRAIT "hot-potato" -#define SABRE_SUICIDE_TRAIT "sabre-suicide" -#define ABDUCTOR_VEST_TRAIT "abductor-vest" -#define CAPTURE_THE_FLAG_TRAIT "capture-the-flag" -#define EYE_OF_GOD_TRAIT "eye-of-god" -#define SHAMEBRERO_TRAIT "shamebrero" -#define JAUNT_TRAIT "jaunt" -#define CHRONOSUIT_TRAIT "chronosuit" -#define LOCKED_HELMET_TRAIT "locked-helmet" -#define NINJA_SUIT_TRAIT "ninja-suit" -#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant" -#define HIVEMIND_TRAIT "hivemind-trait" -#define VR_ZONE_TRAIT "vr_zone_trait" -#define GLUED_ITEM_TRAIT "glued-item" -#define LEGION_CORE_TRAIT "legion_core_trait" -#define MIRROR_TRAIT "mirror_trait" -#define CRAYON_TRAIT "crayon_trait" -#define HOLYWATER_TRAIT "holywater" -#define VANGUARD_TRAIT "vanguard" -#define STARGAZER_TRAIT "stargazer" -#define HOLOPARASITE_CLOAK_TRAIT "holopara_cloak_trait" -#define HOLOPARASITE_SCOUT_TRAIT "holopara_scout_trait" -#define HOLOPARASITE_STAT_TRAIT "holopara_stat_trait" -#define PARRY_TRAIT "parry_trait" -#define ELEMENT_TRAIT(source) "element_trait_[source]" -#define LIGHTPINK_TRAIT "lightpinktrait" -#define BATTLE_ROYALE_TRAIT "battleroyale_trait" -#define MADE_UNCLONEABLE "made-uncloneable" -#define TRAIT_JAWS_OF_LIFE "jaws-of-life" -#define STICKY_NODROP "sticky-nodrop" //sticky nodrop sounds like a good soundcloud rapper's name -//#define SKILLCHIP_TRAIT "skillchip" -#define BUSY_FLOORBOT_TRAIT "busy-floorbot" -#define PULLED_WHILE_SOFTCRIT_TRAIT "pulled-while-softcrit" -#define LOCKED_BORG_TRAIT "locked-borg" -#define LACKING_LOCOMOTION_APPENDAGES_TRAIT "lacking-locomotion-appengades" //trait associated to not having locomotion appendages nor the ability to fly or float -#define LACKING_MANIPULATION_APPENDAGES_TRAIT "lacking-manipulation-appengades" //trait associated to not having fine manipulation appendages such as hands -#define HANDCUFFED_TRAIT "handcuffed" -/// Trait granted by [/obj/item/warpwhistle] -#define WARPWHISTLE_TRAIT "warpwhistle" -/// Trait applied by by [/datum/component/soulstoned] -#define SOULSTONE_TRAIT "soulstone" -/// Trait applied to slimes by low temperature -#define SLIME_COLD "slime-cold" -/// Trait applied to bots by being tipped over -#define BOT_TIPPED_OVER "bot-tipped-over" -/// Trait applied to PAIs by being folded -#define PAI_FOLDED "pai-folded" -/// Trait applied to brain mobs when they lack external aid for locomotion, such as being inside a mech. -#define BRAIN_UNAIDED "brain-unaided" -#define TRAIT_PRESERVE_UI_WITHOUT_CLIENT "preserve_ui_without_client" //this mob should never close ui even if it doesn't have a client -#define EXPERIMENTAL_SURGERY_TRAIT "experimental_surgery" -#define NINJA_KIDNAPPED_TRAIT "ninja_kidnapped" -#define TABLE_TRAIT "table_trait" - ///Traits given by station traits #define STATION_TRAIT_BANANIUM_SHIPMENTS "station_trait_bananium_shipments" #define STATION_TRAIT_CARP_INFESTATION "station_trait_carp_infestation" @@ -511,19 +288,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Trait applied when the MMI component is added to an [/obj/item/integrated_circuit] #define TRAIT_COMPONENT_MMI "component_mmi" -/// Can use the nuclear device's UI, regardless of a lack of hands -#define TRAIT_CAN_USE_NUKE "can_use_nuke" - -///Mob is being tracked on glob suit sensors list -#define TRACKED_SENSORS_TRAIT "tracked_sensors" -///Mob is tracked by suit sensors, and on glob suit sensors list -#define TRAIT_SUIT_SENSORS "suit_sensors" -///Mob is tracked by nanites, and on glob suit sensors list -#define TRAIT_NANITE_SENSORS "nanite_sensors" - -/// Trait for psyphoza, flag for examine logic -#define TRAIT_PSYCHIC_SENSE "psychic_sense" - ///Movement type traits for movables. See elements/movetype_handler.dm #define TRAIT_MOVE_GROUND "move_ground" #define TRAIT_MOVE_FLYING "move_flying" @@ -532,11 +296,5 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_MOVE_PHASING "move_phasing" /// Disables the floating animation. See above. #define TRAIT_NO_FLOATING_ANIM "no-floating-animation" -/// Trait given to an atom/movable when they orbit something. -#define ORBITING_TRAIT "orbiting" -#define VENTCRAWLING_TRAIT "ventcrawling" -#define SPECIES_FLIGHT_TRAIT "species-flight" -#define NO_GRAVITY_TRAIT "no-gravity" -#define LIFECANDLE_TRAIT "lifecandle" -#define LEAPER_BUBBLE_TRAIT "leaper-bubble" +// END TRAIT DEFINES diff --git a/code/__DEFINES/traits/macros.dm b/code/__DEFINES/traits/macros.dm new file mode 100644 index 0000000000000..3ef7fbbde73cb --- /dev/null +++ b/code/__DEFINES/traits/macros.dm @@ -0,0 +1,4 @@ +/// Trait given by a specific status effect +#define TRAIT_STATUS_EFFECT(effect_id) "[effect_id]-trait" +/// Trait applied by element +#define ELEMENT_TRAIT(source) "element_trait_[source]" diff --git a/code/__DEFINES/traits/sources.dm b/code/__DEFINES/traits/sources.dm new file mode 100644 index 0000000000000..fea059205dc72 --- /dev/null +++ b/code/__DEFINES/traits/sources.dm @@ -0,0 +1,135 @@ + +// common trait sources +#define TRAIT_GENERIC "generic" +#define GENERIC_ITEM_TRAIT "generic_item" +#define UNCONSCIOUS_TRAIT "unconscious" +#define EYE_DAMAGE "eye_damage" +#define GENETIC_MUTATION "genetic" +#define OBESITY "obesity" +#define MAGIC_TRAIT "magic" +#define TRAUMA_TRAIT "trauma" +#define DISEASE_TRAIT "disease" +#define SPECIES_TRAIT "species" +#define ORGAN_TRAIT "organ" +#define ROUNDSTART_TRAIT "roundstart" //cannot be removed without admin intervention +#define JOB_TRAIT "job" +#define CYBORG_ITEM_TRAIT "cyborg-item" +#define ADMIN_TRAIT "admin" // (B)admins only. +#define CHANGELING_TRAIT "changeling" +#define CULT_TRAIT "cult" +#define CURSED_ITEM_TRAIT "cursed-item" // The item is magically cursed +#define ABSTRACT_ITEM_TRAIT "abstract-item" +#define STATUS_EFFECT_TRAIT "status-effect" +#define CLOTHING_TRAIT "clothing" +#define CLOTHING_FEET_TRAIT "feet" +#define VEHICLE_TRAIT "vehicle" // inherited from riding vehicles +#define INNATE_TRAIT "innate" +#define CRIT_HEALTH_TRAIT "crit_health" +#define OXYLOSS_TRAIT "oxyloss" +//trait associated to being buckled +#define BUCKLED_TRAIT "buckled" +//trait associated to being held in a chokehold +#define CHOKEHOLD_TRAIT "chokehold" +//trait associated to resting +#define RESTING_TRAIT "resting" +//trait associated to a stat value or range of +#define STAT_TRAIT "stat" +/// Trait associated to wearing a suit +#define SUIT_TRAIT "suit" +/// Trait associated to lying down (having a [lying_angle] of a different value than zero). +#define LYING_DOWN_TRAIT "lying-down" +/// Trait associated to lacking electrical power. +#define POWER_LACK_TRAIT "power-lack" +#define GLASSES_TRAIT "glasses" +#define CURSE_TRAIT "eldritch" +#define STATION_TRAIT "station-trait" +#define TRAIT_RUSTY "rust_trait" +#define ACTION_TRAIT "action_trait" +#define TURF_TRAIT "turf" + +// unique trait sources, still defines +#define CLONING_POD_TRAIT "cloning-pod" +#define STATUE_MUTE "statue" +#define CHANGELING_DRAIN "drain" +#define MAGIC_BLIND "magic_blind" +#define HIGHLANDER "highlander" +#define TRAIT_HULK "hulk" +#define STASIS_MUTE "stasis" +#define GENETICS_SPELL "genetics_spell" +#define EYES_COVERED "eyes_covered" +#define CULT_EYES "cult_eyes" +#define TRAIT_SANTA "santa" +#define SCRYING_ORB "scrying-orb" +#define ABDUCTOR_ANTAGONIST "abductor-antagonist" +#define NUKEOP_TRAIT "nuke-op" +#define DEATHSQUAD_TRAIT "deathsquad" +#define MEGAFAUNA_TRAIT "megafauna" +#define CLOWN_NUKE_TRAIT "clown-nuke" +#define STICKY_MOUSTACHE_TRAIT "sticky-moustache" +#define CHAINSAW_FRENZY_TRAIT "chainsaw-frenzy" +#define CHRONO_GUN_TRAIT "chrono-gun" +#define REVERSE_BEAR_TRAP_TRAIT "reverse-bear-trap" +#define CURSED_MASK_TRAIT "cursed-mask" +#define HIS_GRACE_TRAIT "his-grace" +#define HAND_REPLACEMENT_TRAIT "magic-hand" +#define HOT_POTATO_TRAIT "hot-potato" +#define SABRE_SUICIDE_TRAIT "sabre-suicide" +#define ABDUCTOR_VEST_TRAIT "abductor-vest" +#define CAPTURE_THE_FLAG_TRAIT "capture-the-flag" +#define EYE_OF_GOD_TRAIT "eye-of-god" +#define SHAMEBRERO_TRAIT "shamebrero" +#define JAUNT_TRAIT "jaunt" +#define CHRONOSUIT_TRAIT "chronosuit" +#define LOCKED_HELMET_TRAIT "locked-helmet" +#define NINJA_SUIT_TRAIT "ninja-suit" +#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant" +#define HIVEMIND_TRAIT "hivemind-trait" +#define VR_ZONE_TRAIT "vr_zone_trait" +#define GLUED_ITEM_TRAIT "glued-item" +#define LEGION_CORE_TRAIT "legion_core_trait" +#define MIRROR_TRAIT "mirror_trait" +#define CRAYON_TRAIT "crayon_trait" +#define HOLYWATER_TRAIT "holywater" +#define VANGUARD_TRAIT "vanguard" +#define STARGAZER_TRAIT "stargazer" +#define HOLOPARASITE_CLOAK_TRAIT "holopara_cloak_trait" +#define HOLOPARASITE_SCOUT_TRAIT "holopara_scout_trait" +#define HOLOPARASITE_STAT_TRAIT "holopara_stat_trait" +#define PARRY_TRAIT "parry_trait" +#define LIGHTPINK_TRAIT "lightpinktrait" +#define BATTLE_ROYALE_TRAIT "battleroyale_trait" +#define MADE_UNCLONEABLE "made-uncloneable" +#define TRAIT_JAWS_OF_LIFE "jaws-of-life" +#define STICKY_NODROP "sticky-nodrop" //sticky nodrop sounds like a good soundcloud rapper's name +//#define SKILLCHIP_TRAIT "skillchip" +#define BUSY_FLOORBOT_TRAIT "busy-floorbot" +#define PULLED_WHILE_SOFTCRIT_TRAIT "pulled-while-softcrit" +#define LOCKED_BORG_TRAIT "locked-borg" +#define LACKING_LOCOMOTION_APPENDAGES_TRAIT "lacking-locomotion-appengades" //trait associated to not having locomotion appendages nor the ability to fly or float +#define LACKING_MANIPULATION_APPENDAGES_TRAIT "lacking-manipulation-appengades" //trait associated to not having fine manipulation appendages such as hands +#define HANDCUFFED_TRAIT "handcuffed" +/// Trait granted by [/obj/item/warpwhistle] +#define WARPWHISTLE_TRAIT "warpwhistle" +/// Trait applied by by [/datum/component/soulstoned] +#define SOULSTONE_TRAIT "soulstone" +/// Trait applied to slimes by low temperature +#define SLIME_COLD "slime-cold" +/// Trait applied to bots by being tipped over +#define BOT_TIPPED_OVER "bot-tipped-over" +/// Trait applied to PAIs by being folded +#define PAI_FOLDED "pai-folded" +/// Trait applied to brain mobs when they lack external aid for locomotion, such as being inside a mech. +#define BRAIN_UNAIDED "brain-unaided" +#define TRAIT_PRESERVE_UI_WITHOUT_CLIENT "preserve_ui_without_client" //this mob should never close ui even if it doesn't have a client +#define EXPERIMENTAL_SURGERY_TRAIT "experimental_surgery" +#define NINJA_KIDNAPPED_TRAIT "ninja_kidnapped" +#define TABLE_TRAIT "table_trait" + +/// Trait given to an atom/movable when they orbit something. +#define ORBITING_TRAIT "orbiting" + +#define VENTCRAWLING_TRAIT "ventcrawling" +#define SPECIES_FLIGHT_TRAIT "species-flight" +#define NO_GRAVITY_TRAIT "no-gravity" +#define LIFECANDLE_TRAIT "lifecandle" +#define LEAPER_BUBBLE_TRAIT "leaper-bubble" diff --git a/code/__DEFINES/turfs.dm b/code/__DEFINES/turfs.dm index ade1d8c2699a1..d4606518d19b7 100644 --- a/code/__DEFINES/turfs.dm +++ b/code/__DEFINES/turfs.dm @@ -12,16 +12,16 @@ //supposedly the fastest way to do this according to https://gist.github.com/Giacom/be635398926bb463b42a ///Returns a list of turf in a square #define RANGE_TURFS(RADIUS, CENTER) \ - block( \ - locate(max(CENTER.x-(RADIUS),1), max(CENTER.y-(RADIUS),1), CENTER.z), \ - locate(min(CENTER.x+(RADIUS),world.maxx), min(CENTER.y+(RADIUS),world.maxy), CENTER.z) \ - ) + block( \ + locate(max(CENTER.x-(RADIUS),1), max(CENTER.y-(RADIUS),1), CENTER.z), \ + locate(min(CENTER.x+(RADIUS),world.maxx), min(CENTER.y+(RADIUS),world.maxy), CENTER.z) \ + ) #define RANGE_TURFS_XY(XRADIUS, YRADIUS, CENTER) \ - block( \ - locate(max(CENTER.x-(XRADIUS),1), max(CENTER.y-(YRADIUS),1), CENTER.z), \ - locate(min(CENTER.x+(XRADIUS),world.maxx), min(CENTER.y+(YRADIUS),world.maxy), CENTER.z) \ - ) + block( \ + locate(max(CENTER.x-(XRADIUS),1), max(CENTER.y-(YRADIUS),1), CENTER.z), \ + locate(min(CENTER.x+(XRADIUS),world.maxx), min(CENTER.y+(YRADIUS),world.maxy), CENTER.z) \ + ) ///Returns all turfs in a zlevel #define Z_TURFS(ZLEVEL) block(locate(1,1,ZLEVEL), locate(world.maxx, world.maxy, ZLEVEL)) diff --git a/code/__DEFINES/weather.dm b/code/__DEFINES/weather.dm index 4840ef976fc79..ce63aa7f9ad67 100644 --- a/code/__DEFINES/weather.dm +++ b/code/__DEFINES/weather.dm @@ -1,2 +1,7 @@ //A reference to this list is passed into area sound managers, and it's modified in a manner that preserves that reference in ash_storm.dm GLOBAL_LIST_EMPTY(ash_storm_sounds) + +#define STARTUP_STAGE 1 +#define MAIN_STAGE 2 +#define WIND_DOWN_STAGE 3 +#define END_STAGE 4 diff --git a/code/__DEFINES/zmimic.dm b/code/__DEFINES/zmimic.dm index a56e30be3638b..685a6870ec51c 100644 --- a/code/__DEFINES/zmimic.dm +++ b/code/__DEFINES/zmimic.dm @@ -1,6 +1,6 @@ #define TURF_IS_MIMICKING(T) (isturf(T) && (T:z_flags & Z_MIMIC_BELOW)) -#define CHECK_OO_EXISTENCE(OO) if (OO && !MOVABLE_IS_ON_ZTURF(OO) && !OO:destruction_timer) { OO:destruction_timer = QDEL_IN(OO, 10 SECONDS); } +#define CHECK_OO_EXISTENCE(OO) if (OO && !MOVABLE_IS_ON_ZTURF(OO) && !OO:destruction_timer) { OO:destruction_timer = QDEL_IN_STOPPABLE(OO, 10 SECONDS); } #define UPDATE_OO_IF_PRESENT CHECK_OO_EXISTENCE(src:bound_overlay); if (src:bound_overlay) { update_above(); } // These aren't intended to be used anywhere else, they just can't be undef'd because DM is dum. diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index 8118796298447..aee6b5e598bda 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -279,9 +279,9 @@ return list_to_clear.len < start_len /** - Returns list containing all the entries from first list that are not present in second. - If skiprep = 1, repeated elements are treated as one. - If either of arguments is not a list, returns null + * Returns list containing all the entries from first list that are not present in second. + * If skiprep = 1, repeated elements are treated as one. + * If either of arguments is not a list, returns null */ /proc/difflist(list/first, list/second, skiprep=0) if(!islist(first) || !islist(second)) @@ -296,9 +296,9 @@ return result /** - Returns list containing entries that are in either list but not both. - If skipref = 1, repeated elements are treated as one. - If either of arguments is not a list, returns null + * Returns list containing entries that are in either list but not both. + * If skipref = 1, repeated elements are treated as one. + * If either of arguments is not a list, returns null */ /proc/unique_merge_list(list/first, list/second, skiprep=0) if(!islist(first) || !islist(second)) @@ -672,9 +672,9 @@ copied_list[key_or_value] = new_value /** - takes an input_key, as text, and the list of keys already used, outputting a replacement key in the format of "[input_key] ([number_of_duplicates])" if it finds a duplicate - - use this for lists of things that might have the same name, like mobs or objects, that you plan on giving to a player as input + * takes an input_key, as text, and the list of keys already used, outputting a replacement key in the format of "[input_key] ([number_of_duplicates])" if it finds a duplicate + * + * use this for lists of things that might have the same name, like mobs or objects, that you plan on giving to a player as input */ /proc/avoid_assoc_duplicate_keys(input_key, list/used_key_list) if(!input_key || !istype(used_key_list)) @@ -700,9 +700,9 @@ .[thing] = TRUE /*! - #### Definining a counter as a series of key -> numeric value entries +#### Definining a counter as a series of key -> numeric value entries - #### All these procs modify in place. +#### All these procs modify in place. */ /proc/counterlist_scale(list/L, scalar) diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index bb1e1321e8768..9e81c7044de12 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -1,9 +1,9 @@ #define BP_MAX_ROOM_SIZE 300 GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/engineering, \ - /area/engine/supermatter, \ - /area/engine/atmospherics_engine, \ - /area/ai_monitored/turret_protected/ai)) + /area/engine/supermatter, \ + /area/engine/atmospherics_engine, \ + /area/ai_monitored/turret_protected/ai)) // Gets an atmos isolated contained space // Returns an associative list of turf|dirs pairs diff --git a/code/__HELPERS/atoms.dm b/code/__HELPERS/atoms.dm index bbb95ec8224ac..faaf640f82dca 100644 --- a/code/__HELPERS/atoms.dm +++ b/code/__HELPERS/atoms.dm @@ -142,25 +142,6 @@ return TRUE return FALSE -/* -rough example of the "cone" made by the 3 dirs checked - B - \ - \ - > - < - \ - \ -B --><-- A - / - / - < - > - / - / - B -*/ - ///ultra range (no limitations on distance, faster than range for distances > 8); including areas drastically decreases performance /proc/urange(dist = 0, atom/center = usr, orange = FALSE, areas = FALSE) if(!dist) diff --git a/code/__HELPERS/combat.dm b/code/__HELPERS/combat.dm new file mode 100644 index 0000000000000..3f1b431ab8784 --- /dev/null +++ b/code/__HELPERS/combat.dm @@ -0,0 +1,2 @@ +// Inherit the new values passed to the component +#define ISWIELDED(O) (SEND_SIGNAL(O, COMSIG_ITEM_CHECK_WIELDED) & COMPONENT_IS_WIELDED) diff --git a/code/__HELPERS/datums.dm b/code/__HELPERS/datums.dm index 83aa93db52b56..039f75b2edb97 100644 --- a/code/__HELPERS/datums.dm +++ b/code/__HELPERS/datums.dm @@ -13,7 +13,7 @@ //Takes: Anything that could possibly have variables and a varname to check. //Returns: 1 if found, 0 if not. /proc/hasvar(datum/A, varname) - if(A.vars.Find(lowertext(varname))) + if(A.vars.Find(LOWER_TEXT(varname))) return 1 else return 0 diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index 9406b6117a09a..8032b809a06e7 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -295,7 +295,7 @@ DEFINE_BITFIELD(smoothing_junction, list( if(smooth_directional) { \ if(atom.dir != dir) { \ break set_adj_in_dir; \ - }; \ + }; \ }; \ #define SET_ADJ_IN_DIR(direction, direction_flag) \ diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index f6473d991c524..cf0d7c1d81fe0 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -18,57 +18,57 @@ remember you first need to setup an /icon var like so: GLOBAL_DATUM_INIT(my_icon, /icon, new('iconfile.dmi')) icon/ChangeOpacity(amount = 1) - A very common operation in DM is to try to make an icon more or less transparent. Making an icon more - transparent is usually much easier than making it less so, however. This proc basically is a frontend - for MapColors() which can change opacity any way you like, in much the same way that SetIntensity() - can make an icon lighter or darker. If amount is 0.5, the opacity of the icon will be cut in half. - If amount is 2, opacity is doubled and anything more than half-opaque will become fully opaque. + A very common operation in DM is to try to make an icon more or less transparent. Making an icon more + transparent is usually much easier than making it less so, however. This proc basically is a frontend + for MapColors() which can change opacity any way you like, in much the same way that SetIntensity() + can make an icon lighter or darker. If amount is 0.5, the opacity of the icon will be cut in half. + If amount is 2, opacity is doubled and anything more than half-opaque will become fully opaque. icon/GrayScale() - Converts the icon to grayscale instead of a fully colored icon. Alpha values are left intact. + Converts the icon to grayscale instead of a fully colored icon. Alpha values are left intact. icon/ColorTone(tone) - Similar to GrayScale(), this proc converts the icon to a range of black -> tone -> white, where tone is an - RGB color (its alpha is ignored). This can be used to create a sepia tone or similar effect. - See also the global ColorTone() proc. + Similar to GrayScale(), this proc converts the icon to a range of black -> tone -> white, where tone is an + RGB color (its alpha is ignored). This can be used to create a sepia tone or similar effect. + See also the global ColorTone() proc. icon/MinColors(icon) - The icon is blended with a second icon where the minimum of each RGB pixel is the result. - Transparency may increase, as if the icons were blended with ICON_ADD. You may supply a color in place of an icon. + The icon is blended with a second icon where the minimum of each RGB pixel is the result. + Transparency may increase, as if the icons were blended with ICON_ADD. You may supply a color in place of an icon. icon/MaxColors(icon) - The icon is blended with a second icon where the maximum of each RGB pixel is the result. - Opacity may increase, as if the icons were blended with ICON_OR. You may supply a color in place of an icon. + The icon is blended with a second icon where the maximum of each RGB pixel is the result. + Opacity may increase, as if the icons were blended with ICON_OR. You may supply a color in place of an icon. icon/Opaque(background = "#000000") - All alpha values are set to 255 throughout the icon. Transparent pixels become black, or whatever background color you specify. + All alpha values are set to 255 throughout the icon. Transparent pixels become black, or whatever background color you specify. icon/BecomeAlphaMask() - You can convert a simple grayscale icon into an alpha mask to use with other icons very easily with this proc. - The black parts become transparent, the white parts stay white, and anything in between becomes a translucent shade of white. + You can convert a simple grayscale icon into an alpha mask to use with other icons very easily with this proc. + The black parts become transparent, the white parts stay white, and anything in between becomes a translucent shade of white. icon/AddAlphaMask(mask) - The alpha values of the mask icon will be blended with the current icon. Anywhere the mask is opaque, - the current icon is untouched. Anywhere the mask is transparent, the current icon becomes transparent. - Where the mask is translucent, the current icon becomes more transparent. + The alpha values of the mask icon will be blended with the current icon. Anywhere the mask is opaque, + the current icon is untouched. Anywhere the mask is transparent, the current icon becomes transparent. + Where the mask is translucent, the current icon becomes more transparent. icon/UseAlphaMask(mask, mode) - Sometimes you may want to take the alpha values from one icon and use them on a different icon. - This proc will do that. Just supply the icon whose alpha mask you want to use, and src will change - so it has the same colors as before but uses the mask for opacity. + Sometimes you may want to take the alpha values from one icon and use them on a different icon. + This proc will do that. Just supply the icon whose alpha mask you want to use, and src will change + so it has the same colors as before but uses the mask for opacity. COLOR MANAGEMENT AND HSV RGB isn't the only way to represent color. Sometimes it's more useful to work with a model called HSV, which stands for hue, saturation, and value. - * The hue of a color describes where it is along the color wheel. It goes from red to yellow to green to - cyan to blue to magenta and back to red. - * The saturation of a color is how much color is in it. A color with low saturation will be more gray, - and with no saturation at all it is a shade of gray. - * The value of a color determines how bright it is. A high-value color is vivid, moderate value is dark, - and no value at all is black. + * The hue of a color describes where it is along the color wheel. It goes from red to yellow to green to + cyan to blue to magenta and back to red. + * The saturation of a color is how much color is in it. A color with low saturation will be more gray, + and with no saturation at all it is a shade of gray. + * The value of a color determines how bright it is. A high-value color is vivid, moderate value is dark, + and no value at all is black. Just as BYOND uses "#rrggbb" to represent RGB values, a similar format is used for HSV: "#hhhssvv". The hue is three hex digits because it ranges from 0 to 0x5FF. - * 0 to 0xFF - red to yellow - * 0x100 to 0x1FF - yellow to green - * 0x200 to 0x2FF - green to cyan - * 0x300 to 0x3FF - cyan to blue - * 0x400 to 0x4FF - blue to magenta - * 0x500 to 0x5FF - magenta to red + * 0 to 0xFF - red to yellow + * 0x100 to 0x1FF - yellow to green + * 0x200 to 0x2FF - green to cyan + * 0x300 to 0x3FF - cyan to blue + * 0x400 to 0x4FF - blue to magenta + * 0x500 to 0x5FF - magenta to red Knowing this, you can figure out that red is "#000ffff" in HSV format, which is hue 0 (red), saturation 255 (as colorful as possible), value 255 (as bright as possible). Green is "#200ffff" and blue is "#400ffff". @@ -78,42 +78,42 @@ More than one HSV color can match the same RGB color. Here are some procs you can use for color management: ReadRGB(rgb) - Takes an RGB string like "#ffaa55" and converts it to a list such as list(255,170,85). If an RGBA format is used - that includes alpha, the list will have a fourth item for the alpha value. + Takes an RGB string like "#ffaa55" and converts it to a list such as list(255,170,85). If an RGBA format is used + that includes alpha, the list will have a fourth item for the alpha value. hsv(hue, sat, val, apha) - Counterpart to rgb(), this takes the values you input and converts them to a string in "#hhhssvv" or "#hhhssvvaa" - format. Alpha is not included in the result if null. + Counterpart to rgb(), this takes the values you input and converts them to a string in "#hhhssvv" or "#hhhssvvaa" + format. Alpha is not included in the result if null. ReadHSV(rgb) - Takes an HSV string like "#100FF80" and converts it to a list such as list(256,255,128). If an HSVA format is used that - includes alpha, the list will have a fourth item for the alpha value. + Takes an HSV string like "#100FF80" and converts it to a list such as list(256,255,128). If an HSVA format is used that + includes alpha, the list will have a fourth item for the alpha value. RGBtoHSV(rgb) - Takes an RGB or RGBA string like "#ffaa55" and converts it into an HSV or HSVA color such as "#080aaff". + Takes an RGB or RGBA string like "#ffaa55" and converts it into an HSV or HSVA color such as "#080aaff". HSVtoRGB(hsv) - Takes an HSV or HSVA string like "#080aaff" and converts it into an RGB or RGBA color such as "#ff55aa". + Takes an HSV or HSVA string like "#080aaff" and converts it into an RGB or RGBA color such as "#ff55aa". BlendRGB(rgb1, rgb2, amount) - Blends between two RGB or RGBA colors using regular RGB blending. If amount is 0, the first color is the result; - if 1, the second color is the result. 0.5 produces an average of the two. Values outside the 0 to 1 range are allowed as well. - The returned value is an RGB or RGBA color. + Blends between two RGB or RGBA colors using regular RGB blending. If amount is 0, the first color is the result; + if 1, the second color is the result. 0.5 produces an average of the two. Values outside the 0 to 1 range are allowed as well. + The returned value is an RGB or RGBA color. BlendHSV(hsv1, hsv2, amount) - Blends between two HSV or HSVA colors using HSV blending, which tends to produce nicer results than regular RGB - blending because the brightness of the color is left intact. If amount is 0, the first color is the result; if 1, - the second color is the result. 0.5 produces an average of the two. Values outside the 0 to 1 range are allowed as well. - The returned value is an HSV or HSVA color. + Blends between two HSV or HSVA colors using HSV blending, which tends to produce nicer results than regular RGB + blending because the brightness of the color is left intact. If amount is 0, the first color is the result; if 1, + the second color is the result. 0.5 produces an average of the two. Values outside the 0 to 1 range are allowed as well. + The returned value is an HSV or HSVA color. BlendRGBasHSV(rgb1, rgb2, amount) - Like BlendHSV(), but the colors used and the return value are RGB or RGBA colors. The blending is done in HSV form. + Like BlendHSV(), but the colors used and the return value are RGB or RGBA colors. The blending is done in HSV form. HueToAngle(hue) - Converts a hue to an angle range of 0 to 360. Angle 0 is red, 120 is green, and 240 is blue. + Converts a hue to an angle range of 0 to 360. Angle 0 is red, 120 is green, and 240 is blue. AngleToHue(hue) - Converts an angle to a hue in the valid range. + Converts an angle to a hue in the valid range. RotateHue(hsv, angle) - Takes an HSV or HSVA value and rotates the hue forward through red, green, and blue by an angle from 0 to 360. - (Rotating red by 60° produces yellow.) The result is another HSV or HSVA color with the same saturation and value - as the original, but a different hue. + Takes an HSV or HSVA value and rotates the hue forward through red, green, and blue by an angle from 0 to 360. + (Rotating red by 60° produces yellow.) The result is another HSV or HSVA color with the same saturation and value + as the original, but a different hue. GrayScale(rgb) - Takes an RGB or RGBA color and converts it to grayscale. Returns an RGB or RGBA string. + Takes an RGB or RGBA color and converts it to grayscale. Returns an RGB or RGBA string. ColorTone(rgb, tone) - Similar to GrayScale(), this proc converts an RGB or RGBA color to a range of black -> tone -> white instead of - using strict shades of gray. The tone value is an RGB color; any alpha value is ignored. + Similar to GrayScale(), this proc converts an RGB or RGBA color to a range of black -> tone -> white instead of + using strict shades of gray. The tone value is an RGB color; any alpha value is ignored. */ /* @@ -1046,7 +1046,7 @@ world if(uppercase == 1) letter = uppertext(letter) else if(uppercase == -1) - letter = lowertext(letter) + letter = LOWER_TEXT(letter) var/image/text_image = new(loc = A) text_image.maptext = MAPTEXT("[letter]") diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices.dm index 7ef11cc7c06a1..1542b1d072cf6 100644 --- a/code/__HELPERS/matrices.dm +++ b/code/__HELPERS/matrices.dm @@ -82,9 +82,9 @@ //Dumps the matrix data in a matrix-grid format /* - a d 0 - b e 0 - c f 1 + a d 0 + b e 0 + c f 1 */ /matrix/proc/togrid() . = list() diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index c41372e4e04db..1f2906396ed95 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -192,22 +192,22 @@ GLOBAL_DATUM(syndicate_code_response_regex, /regex) if(2) switch(rand(1,3))//Food, drinks, or things. Only selectable once. if(1) - . += lowertext(pick(drinks)) + . += LOWER_TEXT(pick(drinks)) if(2) - . += lowertext(pick(foods)) + . += LOWER_TEXT(pick(foods)) if(3) - . += lowertext(pick(locations)) + . += LOWER_TEXT(pick(locations)) safety -= 2 if(3) switch(rand(1,4))//Abstract nouns, objects, adjectives, threats. Can be selected more than once. if(1) - . += lowertext(pick(nouns)) + . += LOWER_TEXT(pick(nouns)) if(2) - . += lowertext(pick(objects)) + . += LOWER_TEXT(pick(objects)) if(3) - . += lowertext(pick(adjectives)) + . += LOWER_TEXT(pick(adjectives)) if(4) - . += lowertext(pick(threats)) + . += LOWER_TEXT(pick(threats)) if(!return_list) if(words==1) . += "." diff --git a/code/datums/position_point_vector.dm b/code/__HELPERS/position_point_vector.dm similarity index 100% rename from code/datums/position_point_vector.dm rename to code/__HELPERS/position_point_vector.dm diff --git a/code/__HELPERS/qdel.dm b/code/__HELPERS/qdel.dm index ba31b067c4aa5..738c2c4e62d76 100644 --- a/code/__HELPERS/qdel.dm +++ b/code/__HELPERS/qdel.dm @@ -1,10 +1,2 @@ -#define QDEL_IN(item, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), item), time, TIMER_STOPPABLE) -#define QDEL_IN_CLIENT_TIME(item, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), item), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME) -#define QDEL_NULL(item) qdel(item); item = null -#define QDEL_LIST(L) if(L) { for(var/I in L) qdel(I); L.Cut(); } -#define QDEL_LIST_IN(L, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(______qdel_list_wrapper), L), time, TIMER_STOPPABLE) -#define QDEL_LIST_ASSOC(L) if(L) { for(var/I in L) { qdel(L[I]); qdel(I); } L.Cut(); } -#define QDEL_LIST_ASSOC_VAL(L) if(L) { for(var/I in L) qdel(L[I]); L.Cut(); } - /proc/______qdel_list_wrapper(list/L) //the underscores are to encourage people not to use this directly. QDEL_LIST(L) diff --git a/code/__HELPERS/sanitize_values.dm b/code/__HELPERS/sanitize_values.dm index 53acf40b9a4de..410a4736babe7 100644 --- a/code/__HELPERS/sanitize_values.dm +++ b/code/__HELPERS/sanitize_values.dm @@ -75,7 +75,7 @@ if(97 to 102) //letters a to f . += char if(65 to 70) //letters A to F - char = lowertext(char) + char = LOWER_TEXT(char) . += char else break diff --git a/code/__HELPERS/string_assoc_lists.dm b/code/__HELPERS/string_assoc_lists.dm index e269da7da5eb2..569649ed59611 100644 --- a/code/__HELPERS/string_assoc_lists.dm +++ b/code/__HELPERS/string_assoc_lists.dm @@ -5,14 +5,14 @@ GLOBAL_LIST_EMPTY(string_assoc_lists) * Caches associative lists with non-numeric stringify-able index keys and stringify-able values (text/typepath -> text/path/number). */ /datum/proc/string_assoc_list(list/values) - var/list/string_id = list() - for(var/val in values) - string_id += "[val]_[values[val]]" - string_id.Join("-") + var/list/string_id = list() + for(var/val in values) + string_id += "[val]_[values[val]]" + string_id.Join("-") - . = GLOB.string_assoc_lists[string_id] + . = GLOB.string_assoc_lists[string_id] - if(.) - return + if(.) + return - return GLOB.string_assoc_lists[string_id] = values + return GLOB.string_assoc_lists[string_id] = values diff --git a/code/__HELPERS/test_helpers.dm b/code/__HELPERS/test_helpers.dm new file mode 100644 index 0000000000000..2d24710cd2cd2 --- /dev/null +++ b/code/__HELPERS/test_helpers.dm @@ -0,0 +1,35 @@ +#if defined(UNIT_TESTS) || defined(SPACEMAN_DMM) + +/// Builds (and returns) a list of atoms that we shouldn't initialize in generic testing, like Create and Destroy. +/// It is appreciated to add the reason why the atom shouldn't be initialized if you add it to this list. +/datum/unit_test/proc/build_list_of_uncreatables() + RETURN_TYPE(/list) + var/list/output = list() + for (var/type in subtypesof(/datum/ignore_type)) + var/datum/ignore_type/temp = new() + temp.add_ignores(output) + return output + +// Extension procs crash byond with enough of them due to stack overflows, this allows us to do it +// without traversing the stack +/datum/ignore_type/proc/add_ignores(list/target) + return + +#define CREATION_TEST_IGNORE_SELF(path) /datum/ignore_type##path/add_ignores(list/target) {\ + target += path;\ +} + +#define CREATION_TEST_IGNORE_SUBTYPES(path) /datum/ignore_type##path/add_ignores(list/target) {\ + target += typesof(path);\ +} + +// Annoyingly, dview is defined inside of _DEFINES, so we are doing it here +CREATION_TEST_IGNORE_SELF(/mob/dview) + +#else + +#define CREATION_TEST_IGNORE_SELF(path) ; + +#define CREATION_TEST_IGNORE_SUBTYPES(path) ; + +#endif diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index c372ddc110e6b..8d0210a4a856c 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -838,7 +838,7 @@ GLOBAL_LIST_INIT(alphabet, list("a","b","c","d","e","f","g","h","i","j","k","l", return string var/base = next_backslash == 1 ? "" : copytext(string, 1, next_backslash) - var/macro = lowertext(copytext(string, next_backslash + length(string[next_backslash]), next_space)) + var/macro = LOWER_TEXT(copytext(string, next_backslash + length(string[next_backslash]), next_space)) var/rest = next_backslash > leng ? "" : copytext(string, next_space + length(string[next_space])) //See https://secure.byond.com/docs/ref/info.html#/DM/text/macros diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index 012085514f552..9a0ebd34382eb 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -98,4 +98,4 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0) /// Returns the time in an ISO-8601 friendly format. Used when dumping data into external services such as ElasticSearch /proc/iso_timestamp(timevar) - return time2text(timevar || world.timeofday, "YYYY-MM-DDThh:mm:ss") + return time2text(timevar || world.timeofday, "YYYY-MM-DDThh:mm:ss") diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 9e97d2b6c031e..459498718f414 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -545,7 +545,7 @@ Takes a string and a datum. The string is well, obviously the string being check if(/turf) return "turf" else //regex everything else (works for /proc too) - return lowertext(replacetext("[the_type]", "[type2parent(the_type)]/", "")) + return LOWER_TEXT(replacetext("[the_type]", "[type2parent(the_type)]/", "")) /// Return html to load a url. /// for use inside of browse() calls to html assets that might be loaded on a cdn. diff --git a/code/__HELPERS/unused.dm b/code/__HELPERS/unused.dm deleted file mode 100644 index fce25720b7513..0000000000000 --- a/code/__HELPERS/unused.dm +++ /dev/null @@ -1,39 +0,0 @@ - - -/datum/projectile_data - var/src_x - var/src_y - var/time - var/distance - var/power_x - var/power_y - var/dest_x - var/dest_y - -/datum/projectile_data/New(var/src_x, var/src_y, var/time, var/distance, \ - var/power_x, var/power_y, var/dest_x, var/dest_y) - src.src_x = src_x - src.src_y = src_y - src.time = time - src.distance = distance - src.power_x = power_x - src.power_y = power_y - src.dest_x = dest_x - src.dest_y = dest_y - -/proc/projectile_trajectory(src_x, src_y, rotation, angle, power) - - // returns the destination (Vx,y) that a projectile shot at [src_x], [src_y], with an angle of [angle], - // rotated at [rotation] and with the power of [power] - // Thanks to VistaPOWA for this function - - var/power_x = power * cos(angle) - var/power_y = power * sin(angle) - var/time = 2* power_y / 10 //10 = g - - var/distance = time * power_x - - var/dest_x = src_x + distance*sin(rotation); - var/dest_y = src_y + distance*cos(rotation); - - return new /datum/projectile_data(src_x, src_y, time, distance, power_x, power_y, dest_x, dest_y) diff --git a/code/__byond_version_compat.dm b/code/__byond_version_compat.dm index 0b6ff6cad451e..fc667f8b9dd82 100644 --- a/code/__byond_version_compat.dm +++ b/code/__byond_version_compat.dm @@ -20,7 +20,7 @@ /savefile/byond_version = MIN_COMPILER_VERSION #endif -#ifdef FASTDMM +#if defined(FASTDMM) || defined(CIBUILDING) #define YES_I_WANT_515 #endif // Temporary 515 block until it is completely compatible. diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 931aa9e059103..ce997dd8a79f9 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -138,9 +138,9 @@ #define CBT #endif -#if defined(OPENDREAM) +#if defined(OPENDREAM) && !defined(CIBUILDING) #error Compiling BeeStation in OpenDream is unsupported due to BeeStation's dependence on the auxtools DLL to function. -#elif !defined(CBT) && !defined(SPACEMAN_DMM) && !defined(FASTDMM) +#elif !defined(CBT) && !defined(SPACEMAN_DMM) && !defined(FASTDMM) && !defined(CIBUILDING) #warn Building with Dream Maker is no longer supported and will result in missing interface files. #warn Switch to VSCode and when prompted install the recommended extensions, you can then either use the UI or press Ctrl+Shift+B to build the codebase. #endif diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index ad4f498bb79f4..1d42389c7ab66 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -160,7 +160,7 @@ GLOBAL_LIST_INIT(ai_core_display_screens, sort_list(list( else if(input == "Random") input = pick(GLOB.ai_core_display_screens - "Random") - return "ai-[lowertext(input)]" + return "ai-[LOWER_TEXT(input)]" /proc/resolve_ai_icon(input) if (input == "Portrait") diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm index ea096240ae963..d706b5c99c5d1 100644 --- a/code/_globalvars/logging.dm +++ b/code/_globalvars/logging.dm @@ -122,3 +122,8 @@ GLOBAL_PROTECT(picture_logging_prefix) GLOBAL_LIST_EMPTY(harddel_log) GLOBAL_PROTECT(harddel_log) #endif + +#if defined(UNIT_TESTS) || defined(SPACEMAN_DMM) +GLOBAL_VAR(test_log) +GLOBAL_PROTECT(test_log) +#endif diff --git a/code/_globalvars/soul_glimmer.dm b/code/_globalvars/soul_glimmer.dm index 217efcaa4acd9..c7e77b755ff70 100644 --- a/code/_globalvars/soul_glimmer.dm +++ b/code/_globalvars/soul_glimmer.dm @@ -1,8 +1,8 @@ /* - Colours and assignments for psychic sense - colour - color - :trolled: + Colours and assignments for psychic sense + colour + color + :trolled: */ //ALL the psychic soul colours diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits/_traits.dm similarity index 61% rename from code/_globalvars/traits.dm rename to code/_globalvars/traits/_traits.dm index bd77f0b85bb23..b95624dcb8a12 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -1,22 +1,23 @@ /* - FUN ZONE OF ADMIN LISTINGS - Try to keep this in sync with __DEFINES/traits.dm - quirks have it's own panel so we don't need them here. + FUN ZONE OF ADMIN LISTINGS + Try to keep this in sync with __DEFINES/traits.dm + quirks have it's own panel so we don't need them here. */ GLOBAL_LIST_INIT(traits_by_type, list( /mob = list( "TRAIT_KNOCKEDOUT" = TRAIT_KNOCKEDOUT, "TRAIT_IMMOBILIZED" = TRAIT_IMMOBILIZED, "TRAIT_FLOORED" = TRAIT_FLOORED, - "TRAIT_INCAPACITATED" = TRAIT_INCAPACITATED, "TRAIT_FORCED_STANDING" = TRAIT_FORCED_STANDING, "TRAIT_HANDS_BLOCKED" = TRAIT_HANDS_BLOCKED, "TRAIT_UI_BLOCKED" = TRAIT_UI_BLOCKED, "TRAIT_PULL_BLOCKED" = TRAIT_PULL_BLOCKED, "TRAIT_RESTRAINED" = TRAIT_RESTRAINED, + "TRAIT_INCAPACITATED" = TRAIT_INCAPACITATED, + "TRAIT_CRITICAL_CONDITION" = TRAIT_CRITICAL_CONDITION, "TRAIT_BLIND" = TRAIT_BLIND, "TRAIT_MUTE" = TRAIT_MUTE, - "TRAIT_EMOTEMUTE " = TRAIT_EMOTEMUTE, + "TRAIT_EMOTEMUTE" = TRAIT_EMOTEMUTE, "TRAIT_DEAF" = TRAIT_DEAF, "TRAIT_NEARSIGHT" = TRAIT_NEARSIGHT, "TRAIT_FAT" = TRAIT_FAT, @@ -41,6 +42,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_SHOCKIMMUNE" = TRAIT_SHOCKIMMUNE, "TRAIT_STABLEHEART" = TRAIT_STABLEHEART, "TRAIT_STABLELIVER" = TRAIT_STABLELIVER, + "TRAIT_NOVOMIT" = TRAIT_NOVOMIT, "TRAIT_RESISTHEAT" = TRAIT_RESISTHEAT, "TRAIT_RESISTHEATHANDS" = TRAIT_RESISTHEATHANDS, "TRAIT_RESISTCOLD" = TRAIT_RESISTCOLD, @@ -62,7 +64,9 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_NOLIMBDISABLE" = TRAIT_NOLIMBDISABLE, "TRAIT_EASYLIMBDISABLE" = TRAIT_EASYLIMBDISABLE, "TRAIT_TOXINLOVER" = TRAIT_TOXINLOVER, + "TRAIT_NOHAIRLOSS" = TRAIT_NOHAIRLOSS, "TRAIT_NOBREATH" = TRAIT_NOBREATH, + "TRAIT_SEE_ANTIMAGIC" = TRAIT_SEE_ANTIMAGIC, "TRAIT_DEPRESSION" = TRAIT_DEPRESSION, "TRAIT_JOLLY" = TRAIT_JOLLY, "TRAIT_NOCRITDAMAGE" = TRAIT_NOCRITDAMAGE, @@ -73,6 +77,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_NOSOFTCRIT" = TRAIT_NOSOFTCRIT, "TRAIT_NOSTAMCRIT" = TRAIT_NOSTAMCRIT, "TRAIT_MINDSHIELD" = TRAIT_MINDSHIELD, + "TRAIT_FAKE_MINDSHIELD" = TRAIT_FAKE_MINDSHIELD, "TRAIT_DISSECTED" = TRAIT_DISSECTED, "TRAIT_SIXTHSENSE" = TRAIT_SIXTHSENSE, "TRAIT_FEARLESS" = TRAIT_FEARLESS, @@ -123,30 +128,115 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_ALWAYS_STUBS" = TRAIT_ALWAYS_STUBS, "TRAIT_NAIVE" = TRAIT_NAIVE, "TRAIT_DROPS_ITEMS_ON_DEATH" = TRAIT_DROPS_ITEMS_ON_DEATH, + "TRAIT_DRINKSBLOOD" = TRAIT_DRINKSBLOOD, + "TRAIT_MINDSWAPPED" = TRAIT_MINDSWAPPED, + "TRAIT_SOMMELIER" = TRAIT_SOMMELIER, + "TRAIT_BARMASTER" = TRAIT_BARMASTER, + "TRAIT_HIVE_BURNT" = TRAIT_HIVE_BURNT, "TRAIT_MOTH_BURNT" = TRAIT_MOTH_BURNT, - "TRAIT_METALANGUAGE_KEY_ALLOWED" = TRAIT_METALANGUAGE_KEY_ALLOWED + "TRAIT_SPECIAL_TRAUMA_BOOST" = TRAIT_SPECIAL_TRAUMA_BOOST, + "TRAIT_METALANGUAGE_KEY_ALLOWED" = TRAIT_METALANGUAGE_KEY_ALLOWED, + "TRAIT_HYPERSPACED" = TRAIT_HYPERSPACED, + "TRAIT_FREE_HYPERSPACE_MOVEMENT" = TRAIT_FREE_HYPERSPACE_MOVEMENT, + "TRAIT_FAST_CUFF_REMOVAL" = TRAIT_FAST_CUFF_REMOVAL, + "TRAIT_BLEED_HELD" = TRAIT_BLEED_HELD, + "TRAIT_NO_BLOOD" = TRAIT_NO_BLOOD, + "TRAIT_NO_BLEEDING" = TRAIT_NO_BLEEDING, + "TRAIT_BLOOD_COOLANT" = TRAIT_BLOOD_COOLANT, + "TRAIT_MADNESS_IMMUNE" = TRAIT_MADNESS_IMMUNE, + "TRAIT_ALCOHOL_TOLERANCE" = TRAIT_ALCOHOL_TOLERANCE, + "TRAIT_AGEUSIA" = TRAIT_AGEUSIA, + "TRAIT_HEAVY_SLEEPER" = TRAIT_HEAVY_SLEEPER, + "TRAIT_NIGHT_VISION" = TRAIT_NIGHT_VISION, + "TRAIT_LIGHT_STEP" = TRAIT_LIGHT_STEP, + "TRAIT_SPIRITUAL" = TRAIT_SPIRITUAL, + "TRAIT_VORACIOUS" = TRAIT_VORACIOUS, + "TRAIT_SELF_AWARE" = TRAIT_SELF_AWARE, + "TRAIT_FREERUNNING" = TRAIT_FREERUNNING, + "TRAIT_SKITTISH" = TRAIT_SKITTISH, + "TRAIT_POOR_AIM" = TRAIT_POOR_AIM, + "TRAIT_PROSOPAGNOSIA" = TRAIT_PROSOPAGNOSIA, + "TRAIT_NEET" = TRAIT_NEET, + "TRAIT_DRUNK_HEALING" = TRAIT_DRUNK_HEALING, + "TRAIT_TAGGER" = TRAIT_TAGGER, + "TRAIT_PHOTOGRAPHER" = TRAIT_PHOTOGRAPHER, + "TRAIT_MUSICIAN" = TRAIT_MUSICIAN, + "TRAIT_LIGHT_DRINKER" = TRAIT_LIGHT_DRINKER, + "TRAIT_EMPATH" = TRAIT_EMPATH, + "TRAIT_FRIENDLY" = TRAIT_FRIENDLY, + "TRAIT_GRABWEAKNESS" = TRAIT_GRABWEAKNESS, + "TRAIT_BRAIN_TUMOR" = TRAIT_BRAIN_TUMOR, + "TRAIT_PROSKATER" = TRAIT_PROSKATER, + "TRAIT_PLUSHIELOVER" = TRAIT_PLUSHIELOVER, + "TRAIT_CAN_USE_NUKE" = TRAIT_CAN_USE_NUKE, + "TRACKED_SENSORS_TRAIT" = TRACKED_SENSORS_TRAIT, + "TRAIT_SUIT_SENSORS" = TRAIT_SUIT_SENSORS, + "TRAIT_NANITE_SENSORS" = TRAIT_NANITE_SENSORS, + "TRAIT_PSYCHIC_SENSE" = TRAIT_PSYCHIC_SENSE + ), + /obj/item/integrated_circuit = list( + "TRAIT_COMPONENT_MMI" = TRAIT_COMPONENT_MMI, ), /obj/item/bodypart = list( - "TRAIT_PARALYSIS" = TRAIT_PARALYSIS - ), + "TRAIT_PARALYSIS" = TRAIT_PARALYSIS, + "TRAIT_DISABLED_BY_WOUND" = TRAIT_DISABLED_BY_WOUND + ), /obj/item = list( "TRAIT_NODROP" = TRAIT_NODROP, "TRAIT_NO_STORAGE_INSERT" = TRAIT_NO_STORAGE_INSERT, "TRAIT_SPRAYPAINTED" = TRAIT_SPRAYPAINTED, "TRAIT_T_RAY_VISIBLE" = TRAIT_T_RAY_VISIBLE, + "TRAIT_FOOD_FRIED" = TRAIT_FOOD_FRIED, "TRAIT_NO_TELEPORT" = TRAIT_NO_TELEPORT, "TRAIT_STARGAZED" = TRAIT_STARGAZED, "TRAIT_DOOR_PRYER" = TRAIT_DOOR_PRYER, "TRAIT_FISH_SAFE_STORAGE" = TRAIT_FISH_SAFE_STORAGE, - "TRAIT_FISH_CASE_COMPATIBILE" = TRAIT_FISH_CASE_COMPATIBILE - ), + "TRAIT_FISH_CASE_COMPATIBILE" = TRAIT_FISH_CASE_COMPATIBILE, + "TRAIT_NEEDS_TWO_HANDS" = TRAIT_NEEDS_TWO_HANDS, + "TRAIT_AI_BAGATTACK" = TRAIT_AI_BAGATTACK, + "TRAIT_ALLOW_HERETIC_CASTING" = TRAIT_ALLOW_HERETIC_CASTING, + "TRAIT_LIVING_HEART" = TRAIT_LIVING_HEART, + "TRAIT_NO_STRIP" = TRAIT_NO_STRIP, + "TRAIT_DRYABLE" = TRAIT_DRYABLE, + "TRAIT_DRIED" = TRAIT_DRIED, + "TRAIT_CUSTOMIZABLE_REAGENT_HOLDER" = TRAIT_CUSTOMIZABLE_REAGENT_HOLDER, + "TRAIT_ODD_CUSTOMIZABLE_FOOD_INGREDIENT" = TRAIT_ODD_CUSTOMIZABLE_FOOD_INGREDIENT, + ), + /obj = list( + "TRAIT_FROZEN" = TRAIT_FROZEN + ), /atom/movable = list( + "TRAIT_AREA_SENSITIVE" = TRAIT_AREA_SENSITIVE, + "TRAIT_HEARING_SENSITIVE" = TRAIT_HEARING_SENSITIVE, "TRAIT_MOVE_GROUND" = TRAIT_MOVE_GROUND, "TRAIT_MOVE_FLYING" = TRAIT_MOVE_FLYING, "TRAIT_MOVE_VENTCRAWLING" = TRAIT_MOVE_VENTCRAWLING, "TRAIT_MOVE_FLOATING" = TRAIT_MOVE_FLOATING, - "TRAIT_MOVE_PHASING" = TRAIT_MOVE_PHASING - ) + "TRAIT_MOVE_PHASING" = TRAIT_MOVE_PHASING, + "TRAIT_NO_FLOATING_ANIM" = TRAIT_NO_FLOATING_ANIM + ), + /atom = list( + "TRAIT_KEEP_TOGETHER" = TRAIT_KEEP_TOGETHER, + "TRAIT_NO_IMMOBILIZE" = TRAIT_NO_IMMOBILIZE, + ), + /turf = list( + "TRAIT_FIREDOOR_STOP" = TRAIT_FIREDOOR_STOP, + "TURF_Z_TRANSPARENT_TRAIT" = TURF_Z_TRANSPARENT_TRAIT + ), + /datum/controller/subsystem/processing/station = list( + "STATION_TRAIT_BANANIUM_SHIPMENTS" = STATION_TRAIT_BANANIUM_SHIPMENTS, + "STATION_TRAIT_CARP_INFESTATION" = STATION_TRAIT_CARP_INFESTATION, + "STATION_TRAIT_PREMIUM_INTERNALS" = STATION_TRAIT_PREMIUM_INTERNALS, + "STATION_TRAIT_LATE_ARRIVALS" = STATION_TRAIT_LATE_ARRIVALS, + "STATION_TRAIT_RANDOM_ARRIVALS" = STATION_TRAIT_RANDOM_ARRIVALS, + "STATION_TRAIT_HANGOVER" = STATION_TRAIT_HANGOVER, + "STATION_TRAIT_FILLED_MAINT" = STATION_TRAIT_FILLED_MAINT, + "STATION_TRAIT_EMPTY_MAINT" = STATION_TRAIT_EMPTY_MAINT, + "STATION_TRAIT_PDA_GLITCHED" = STATION_TRAIT_PDA_GLITCHED, + "STATION_TRAIT_DISTANT_SUPPLY_LINES" = STATION_TRAIT_DISTANT_SUPPLY_LINES, + "STATION_TRAIT_STRONG_SUPPLY_LINES" = STATION_TRAIT_STRONG_SUPPLY_LINES, + "STATION_TRAIT_UNITED_BUDGET" = STATION_TRAIT_UNITED_BUDGET + ) )) /// value -> trait name, generated on use from trait_by_type global diff --git a/code/_js/menus.dm b/code/_js/menus.dm index 05e6edc6a6dab..fc7c3a42662df 100644 --- a/code/_js/menus.dm +++ b/code/_js/menus.dm @@ -1,37 +1,37 @@ #define js_dropdowns {" function dropdowns() { - var divs = document.getElementsByTagName('div'); - var headers = new Array(); - var links = new Array(); - for(var i=0;i=0) { - elem.className = elem.className.replace('visible','hidden'); - this.className = this.className.replace('open','closed'); - this.innerHTML = this.innerHTML.replace('-','+'); - } - else { - elem.className = elem.className.replace('hidden','visible'); - this.className = this.className.replace('closed','open'); - this.innerHTML = this.innerHTML.replace('+','-'); - } - return false; - } - })(links\[i\]); - } - } + var divs = document.getElementsByTagName('div'); + var headers = new Array(); + var links = new Array(); + for(var i=0;i=0) { + elem.className = elem.className.replace('visible','hidden'); + this.className = this.className.replace('open','closed'); + this.innerHTML = this.innerHTML.replace('-','+'); + } + else { + elem.className = elem.className.replace('hidden','visible'); + this.className = this.className.replace('closed','open'); + this.innerHTML = this.innerHTML.replace('+','-'); + } + return false; + } + })(links\[i\]); + } + } } "} diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index a693513d24988..746143d90e357 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -527,3 +527,6 @@ return TRUE return FALSE + +#undef MAX_SAFE_BYOND_ICON_SCALE_TILES +#undef MAX_SAFE_BYOND_ICON_SCALE_PX diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index d8313a8e922c1..390a399b04a18 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -1,5 +1,3 @@ -#define ACTION_BUTTON_DEFAULT_BACKGROUND "default" - /atom/movable/screen/movable/action_button var/datum/action/linked_action var/actiontooltipstyle = "" @@ -252,3 +250,5 @@ var/matrix/M = matrix() M.Translate(x_offset,y_offset) button.transform = M + +#undef AB_MAX_COLUMNS diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index d9a94490bc3ea..9ade1b296467e 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -6,13 +6,13 @@ /mob/proc/throw_alert(category, type, severity, obj/new_master, override = FALSE) /* Proc to create or update an alert. Returns the alert if the alert is new or updated, 0 if it was thrown already - category is a text string. Each mob may only have one alert per category; the previous one will be replaced - path is a type path of the actual alert type to throw - severity is an optional number that will be placed at the end of the icon_state for this alert - For example, high pressure's icon_state is "highpressure" and can be serverity 1 or 2 to get "highpressure1" or "highpressure2" - new_master is optional and sets the alert's icon state to "template" in the ui_style icons with the master as an overlay. - Clicks are forwarded to master - Override makes it so the alert is not replaced until cleared by a clear_alert with clear_override, and it's used for hallucinations. + category is a text string. Each mob may only have one alert per category; the previous one will be replaced + path is a type path of the actual alert type to throw + severity is an optional number that will be placed at the end of the icon_state for this alert + For example, high pressure's icon_state is "highpressure" and can be serverity 1 or 2 to get "highpressure1" or "highpressure2" + new_master is optional and sets the alert's icon state to "template" in the ui_style icons with the master as an overlay. + Clicks are forwarded to master + Override makes it so the alert is not replaced until cleared by a clear_alert with clear_override, and it's used for hallucinations. */ if(!category || QDELETED(src)) @@ -710,8 +710,7 @@ so as to remain in compliance with the most up-to-date laws." reorganize_alerts(M) return 1 -/mob - var/list/alerts = list() // contains /atom/movable/screen/alert only // On /mob so clientless mobs will throw alerts properly +/mob/var/list/alerts = list() // contains /atom/movable/screen/alert only // On /mob so clientless mobs will throw alerts properly /atom/movable/screen/alert/Click(location, control, params) if(!usr || !usr.client) diff --git a/code/_onclick/hud/credits.dm b/code/_onclick/hud/credits.dm index 5ed1978c7b366..faeb26d4866ff 100644 --- a/code/_onclick/hud/credits.dm +++ b/code/_onclick/hud/credits.dm @@ -60,6 +60,8 @@ GLOBAL_LIST(end_titles) plane = SPLASHSCREEN_PLANE var/matrix/target +CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/credit) + /atom/movable/screen/credit/Initialize(mapload, credited) . = ..() maptext = MAPTEXT("[credited]") @@ -86,6 +88,8 @@ GLOBAL_LIST(end_titles) icon = 'icons/title_cards.dmi' screen_loc = "4,1" +CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/credit/title_card) + /atom/movable/screen/credit/title_card/Initialize(mapload, credited, title_icon_state) icon_state = title_icon_state . = ..() @@ -101,3 +105,8 @@ GLOBAL_LIST(end_titles) contribs.Cut(21) return contribs + +#undef CREDIT_ROLL_SPEED +#undef CREDIT_SPAWN_SPEED +#undef CREDIT_ANIMATE_HEIGHT +#undef CREDIT_EASE_DURATION diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index abcdedd7fe187..08b8159ddf7a6 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -1,6 +1,5 @@ -/mob - var/list/screens = list() +/mob/var/list/screens = list() /mob/proc/overlay_fullscreen(category, type, severity) var/atom/movable/screen/fullscreen/screen = screens[category] @@ -112,9 +111,9 @@ plane = FULLSCREEN_PLANE /atom/movable/screen/fullscreen/law_change - icon_state = "law_change" - layer = BLIND_LAYER - plane = FULLSCREEN_PLANE + icon_state = "law_change" + layer = BLIND_LAYER + plane = FULLSCREEN_PLANE /atom/movable/screen/fullscreen/curse icon_state = "curse" diff --git a/code/_onclick/hud/holoparasite.dm b/code/_onclick/hud/holoparasite.dm index e339109028978..b91a3f3e86ff4 100644 --- a/code/_onclick/hud/holoparasite.dm +++ b/code/_onclick/hud/holoparasite.dm @@ -117,7 +117,9 @@ var/static/list/mutable_appearance/timer_fraction_overlays COOLDOWN_DECLARE(timer) -/atom/movable/screen/holoparasite/Initialize(_mapload, mob/living/simple_animal/hostile/holoparasite/_owner) +CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/holoparasite) + +/atom/movable/screen/holoparasite/Initialize(mapload, mob/living/simple_animal/hostile/holoparasite/_owner) . = ..() if(!istype(_owner)) CRASH("Tried to create a holoparasite HUD element without a parent holoparasite!") diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index c81b2e997f7ea..3eae770387a68 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -128,8 +128,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list( return ..() -/mob - var/hud_type = /datum/hud +/mob/var/hud_type = /datum/hud /mob/proc/create_mob_hud() if(!client || hud_used) diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm index 3f404f6031ea0..78f02d8a9702c 100755 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -264,6 +264,8 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT +CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/parallax_layer) + /atom/movable/screen/parallax_layer/Initialize(mapload, view) . = ..() if (!view) @@ -315,6 +317,8 @@ /atom/movable/screen/parallax_layer/random/space_gas icon_state = "random_layer1" +CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/parallax_layer/random/space_gas) + /atom/movable/screen/parallax_layer/random/space_gas/Initialize(mapload, view) . = ..() src.add_atom_colour(SSparallax.assign_random_parallax_colour(), ADMIN_COLOUR_PRIORITY) diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index d3346d2bde048..19bf15624cf23 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -372,3 +372,6 @@ GLOBAL_LIST_EMPTY(radial_menus) /datum/radial_menu_choice/Destroy(force, ...) . = ..() QDEL_NULL(image) + +#undef NEXT_PAGE_ID +#undef DEFAULT_CHECK_DELAY diff --git a/code/_onclick/hud/rendering/plane_master_controller.dm b/code/_onclick/hud/rendering/plane_master_controller.dm index 9799ca8b9ec7f..46665788d9640 100644 --- a/code/_onclick/hud/rendering/plane_master_controller.dm +++ b/code/_onclick/hud/rendering/plane_master_controller.dm @@ -8,6 +8,8 @@ INITIALIZE_IMMEDIATE(/atom/movable/plane_master_controller) ///Ensures that all the planes are correctly in the controlled_planes list. +CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/plane_master_controller) + /atom/movable/plane_master_controller/Initialize(mapload, datum/hud/hud) . = ..() if(!istype(hud)) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index d12383cc8c265..734cc2645047f 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -233,6 +233,8 @@ /// A reference to the object in the slot. Grabs or items, generally. var/datum/component/storage/master = null +CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/close) + /atom/movable/screen/close/Initialize(mapload, new_master) . = ..() master = new_master @@ -440,6 +442,8 @@ /// A reference to the object in the slot. Grabs or items, generally. var/datum/component/storage/master = null +CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/storage) + /atom/movable/screen/storage/Initialize(mapload, new_master) . = ..() master = new_master @@ -704,6 +708,8 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/splash) +CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/splash) + /atom/movable/screen/splash/Initialize(mapload, client/C, visible, use_previous_title) . = ..() if(!istype(C)) @@ -745,6 +751,8 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/splash) /atom/movable/screen/component_button var/atom/movable/screen/parent +CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/component_button) + /atom/movable/screen/component_button/Initialize(mapload, atom/movable/screen/parent) . = ..() src.parent = parent diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 86011abca63a6..39b5f2570be59 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -131,7 +131,7 @@ else user.record_accidental_poking() M.attacked_by(src, user) - M.time_of_last_attack_recieved = time + M.time_of_last_attack_received = time user.time_of_last_attack_dealt = time user.check_for_accidental_attack() @@ -258,5 +258,5 @@ if(time_of_last_attack_dealt > time) //We attacked again after the proc got called return //10 seconds passed after we last attacked someone - either it was an accident, or we robusted someone into being horizontal - if(time_of_last_attack_dealt > time_of_last_attack_recieved + 100) + if(time_of_last_attack_dealt > time_of_last_attack_received + 100) SSblackbox.record_feedback("tally", "accidental_attack_data", 1, "Lasted ten seconds of not being hit after hitting somoene") diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm index 49970f5daf6c2..9260ba6b0cbd4 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -1,10 +1,3 @@ -#define VALUE_MODE_NUM 0 -#define VALUE_MODE_TEXT 1 -#define VALUE_MODE_FLAG 2 - -#define KEY_MODE_TEXT 0 -#define KEY_MODE_TYPE 1 - /datum/config_entry var/name //read-only, this is determined by the last portion of the derived entry type var/config_entry_value @@ -25,7 +18,7 @@ /datum/config_entry/New() if(type == abstract_type) CRASH("Abstract config entry [type] instatiated!") - name = lowertext(type2top(type)) + name = LOWER_TEXT(type2top(type)) if(islist(config_entry_value)) var/list/L = config_entry_value default = L.Copy() @@ -178,7 +171,7 @@ if(key_pos || value_mode == VALUE_MODE_FLAG) key_name = copytext(str_val, 1, key_pos) if(!case_sensitive) - key_name = lowertext(key_name) + key_name = LOWER_TEXT(key_name) if(key_pos) key_value = copytext(str_val, key_pos + length(str_val[key_pos])) var/new_key diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 6a8e5d9b915ee..0e1208e019332 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -107,7 +107,7 @@ if(IsAdminAdvancedProcCall()) return - var/filename_to_test = world.system_type == MS_WINDOWS ? lowertext(filename) : filename + var/filename_to_test = world.system_type == MS_WINDOWS ? LOWER_TEXT(filename) : filename if(filename_to_test in stack) log_config("Warning: Config recursion detected ([english_list(stack)]), breaking!") return @@ -134,10 +134,10 @@ var/value = null if(pos) - entry = lowertext(copytext(L, 1, pos)) + entry = LOWER_TEXT(copytext(L, 1, pos)) value = copytext(L, pos + length(L[pos])) else - entry = lowertext(L) + entry = LOWER_TEXT(L) if(!entry) continue @@ -290,10 +290,10 @@ var/data = null if(pos) - command = lowertext(copytext(t, 1, pos)) + command = LOWER_TEXT(copytext(t, 1, pos)) data = copytext(t, pos + length(t[pos])) else - command = lowertext(t) + command = LOWER_TEXT(t) if(!command) continue diff --git a/code/controllers/configuration/entries/resources.dm b/code/controllers/configuration/entries/resources.dm index ed43c972c11bf..b955bda920170 100644 --- a/code/controllers/configuration/entries/resources.dm +++ b/code/controllers/configuration/entries/resources.dm @@ -6,7 +6,7 @@ /datum/config_entry/string/asset_transport /datum/config_entry/string/asset_transport/ValidateAndSet(str_val) - return (lowertext(str_val) in list("simple", "webroot")) && ..(lowertext(str_val)) + return (LOWER_TEXT(str_val) in list("simple", "webroot")) && ..(LOWER_TEXT(str_val)) /datum/config_entry/string/asset_cdn_webroot protection = CONFIG_ENTRY_LOCKED diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 1611e038abbdc..a0ffdc45b2f60 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -1,7 +1,7 @@ - /** - * Failsafe - * - * Pretty much pokes the MC to make sure it's still alive. +/** + * Failsafe + * + * Pretty much pokes the MC to make sure it's still alive. **/ GLOBAL_REAL(Failsafe, /datum/controller/failsafe) @@ -104,7 +104,7 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe) to_chat(GLOB.admins, "ERROR: DEFCON [defcon_pretty()]. Could not restart MC, runtime encountered. I will silently keep retrying.") //if the return number was 0, it just means the mc was restarted too recently, and it just needs some time before we try again //no need to handle that specially when defcon 0 can handle it - + if(0) //DEFCON 0! (mc failed to restart) var/rtn = Recreate_MC() if(rtn > 0) diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 9873be1a8e4ae..8750fcfd16720 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -1,10 +1,10 @@ - /** - * StonedMC - * - * Designed to properly split up a given tick among subsystems - * Note: if you read parts of this code and think "why is it doing it that way" - * Odds are, there is a reason - * +/** + * StonedMC + * + * Designed to properly split up a given tick among subsystems + * Note: if you read parts of this code and think "why is it doing it that way" + * Odds are, there is a reason + * **/ //Init the debugger datum first so we can debug Master diff --git a/code/controllers/subsystem/area_contents.dm b/code/controllers/subsystem/area_contents.dm index 272c72eb7ea63..904714f0ba0b4 100644 --- a/code/controllers/subsystem/area_contents.dm +++ b/code/controllers/subsystem/area_contents.dm @@ -53,3 +53,5 @@ SUBSYSTEM_DEF(area_contents) clear.turfs_to_uncontain = list() marked_for_clearing.len-- + +#undef ALLOWED_LOOSE_TURFS diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index f53b8384e98a4..142f1539861a5 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -271,3 +271,10 @@ SUBSYSTEM_DEF(atoms) rustg_file_append(initlog, "[GLOB.log_directory]/initialize.log") #undef SUBSYSTEM_INIT_SOURCE + +#undef BAD_INIT_QDEL_BEFORE +#undef BAD_INIT_DIDNT_INIT +#undef BAD_INIT_SLEPT +#undef BAD_INIT_NO_HINT +#undef PROFILE_INIT_ATOM_BEGIN +#undef PROFILE_INIT_ATOM_END diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index 5b568b171a137..8b59f7dddf67c 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -194,7 +194,7 @@ feedback data can be recorded in 5 formats: "tally" used to track the number of occurrences of multiple related values i.e. how many times each type of gun is fired further calls to the same key will: - add or subtract from the saved value of the data key if it already exists + add or subtract from the saved value of the data key if it already exists append the key and it's value if it doesn't exist calls: SSblackbox.record_feedback("tally", "example", 1, "sample data") SSblackbox.record_feedback("tally", "example", 4, "sample data") @@ -206,7 +206,7 @@ feedback data can be recorded in 5 formats: the final element in the data list is used as the tracking key, all prior elements are used for nesting all data list elements must be strings further calls to the same key will: - add or subtract from the saved value of the data key if it already exists in the same multi-dimensional position + add or subtract from the saved value of the data key if it already exists in the same multi-dimensional position append the key and it's value if it doesn't exist calls: SSblackbox.record_feedback("nested tally", "example", 1, list("fruit", "orange", "apricot")) SSblackbox.record_feedback("nested tally", "example", 2, list("fruit", "orange", "orange")) diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 556af64d4f899..bd56dbc82709f 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -358,7 +358,7 @@ You are expected to do your own escaping of the data, and expected to provide yo The duplicate_key arg can be true to automatically generate this part of the query or set to a string that is appended to the end of the query Ignore_errors instructes mysql to continue inserting rows if some of them have errors. - the erroneous row(s) aren't inserted and there isn't really any way to know why or why errored + the erroneous row(s) aren't inserted and there isn't really any way to know why or why errored Delayed insert mode was removed in mysql 7 and only works with MyISAM type tables, It was included because it is still supported in mariadb. It does not work with duplicate_key and the mysql server ignores it in those cases diff --git a/code/controllers/subsystem/explosion.dm b/code/controllers/subsystem/explosion.dm index 12a3dcf6730a9..76c517e7eb0b2 100644 --- a/code/controllers/subsystem/explosion.dm +++ b/code/controllers/subsystem/explosion.dm @@ -626,3 +626,7 @@ SUBSYSTEM_DEF(explosions) currentpart = SSEXPLOSIONS_TURFS #undef SSAIR_REBUILD_PIPENETS + +#undef EXPLOSION_THROW_SPEED +#undef SSEX_TURF +#undef SSEX_OBJ diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 0903d29dd8142..5712d240c4347 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -1,3 +1,26 @@ +/*! +## Debugging GC issues + +In order to debug `qdel()` failures, there are several tools available. +To enable these tools, define `TESTING` in [_compile_options.dm](https://github.com/tgstation/-tg-station/blob/master/code/_compile_options.dm). + +First is a verb called "Find References", which lists **every** refererence to an object in the world. This allows you to track down any indirect or obfuscated references that you might have missed. + +Complementing this is another verb, "qdel() then Find References". +This does exactly what you'd expect; it calls `qdel()` on the object and then it finds all references remaining. +This is great, because it means that `Destroy()` will have been called before it starts to find references, +so the only references you'll find will be the ones preventing the object from `qdel()`ing gracefully. + +If you have a datum or something you are not destroying directly (say via the singulo), +the next tool is `QDEL_HINT_FINDREFERENCE`. You can return this in `Destroy()` (where you would normally `return ..()`), +to print a list of references once it enters the GC queue. + +Finally is a verb, "Show qdel() Log", which shows the deletion log that the garbage subsystem keeps. This is helpful if you are having race conditions or need to review the order of deletions. + +Note that for any of these tools to work `TESTING` must be defined. +By using these methods of finding references, you can make your life far, far easier when dealing with `qdel()` failures. +*/ + SUBSYSTEM_DEF(garbage) name = "Garbage" priority = FIRE_PRIORITY_GARBAGE @@ -10,8 +33,8 @@ SUBSYSTEM_DEF(garbage) var/list/collection_timeout = list(GC_FILTER_QUEUE, GC_CHECK_QUEUE, GC_DEL_QUEUE) // deciseconds to wait before moving something up in the queue to the next level //Stat tracking - var/delslasttick = 0 // number of del()'s we've done this tick - var/gcedlasttick = 0 // number of things that gc'ed last tick + var/delslasttick = 0 // number of del()'s we've done this tick + var/gcedlasttick = 0 // number of things that gc'ed last tick var/totaldels = 0 var/totalgcs = 0 @@ -21,7 +44,7 @@ SUBSYSTEM_DEF(garbage) var/list/pass_counts var/list/fail_counts - var/list/items = list() // Holds our qdel_item statistics datums + var/list/items = list() // Holds our qdel_item statistics datums //Queue var/list/queues @@ -33,19 +56,6 @@ SUBSYSTEM_DEF(garbage) #endif #endif -/datum/controller/subsystem/garbage/get_metrics() - . = ..() - var/list/cust = list() - // You can calculate TGCR in kibana - cust["total_harddels"] = totaldels - cust["total_softdels"] = totalgcs - var/i = 0 - for(var/list/L in queues) - i++ - cust["queue_[i]"] = length(L) - - .["custom"] = cust - /datum/controller/subsystem/garbage/PreInit() InitQueues() @@ -68,36 +78,42 @@ SUBSYSTEM_DEF(garbage) msg += "TGR:[round((totalgcs/(totaldels+totalgcs))*100, 0.01)]%" msg += " P:[pass_counts.Join(",")]" msg += "|F:[fail_counts.Join(",")]" - . = ..(msg) + return ..() /datum/controller/subsystem/garbage/Shutdown() //Adds the del() log to the qdel log file - var/list/dellog = list() + var/list/del_log = list() //sort by how long it's wasted hard deleting - sortTim(items, cmp=GLOBAL_PROC_REF(cmp_qdel_item_time), associative = TRUE) + sortTim(items, cmp=/proc/cmp_qdel_item_time, associative = TRUE) for(var/path in items) var/datum/qdel_item/I = items[path] - dellog += "Path: [path]" + var/list/entry = list() + del_log[path] = entry + if (I.qdel_flags & QDEL_ITEM_SUSPENDED_FOR_LAG) - dellog += "\tSUSPENDED FOR LAG" + entry["SUSPENDED FOR LAG"] = TRUE if (I.failures) - dellog += "\tFailures: [I.failures]" - dellog += "\tqdel() Count: [I.qdels]" - dellog += "\tDestroy() Cost: [I.destroy_time]ms" + entry["Failures"] = I.failures + entry["qdel() Count"] = I.qdels + entry["Destroy() Cost (ms)"] = I.destroy_time + if (I.hard_deletes) - dellog += "\tTotal Hard Deletes [I.hard_deletes]" - dellog += "\tTime Spent Hard Deleting: [I.hard_delete_time]ms" - dellog += "\tHighest Time Spent Hard Deleting: [I.hard_delete_max]ms" + entry["Total Hard Deletes"] = I.hard_deletes + entry["Time Spend Hard Deleting (ms)"] = I.hard_delete_time + entry["Highest Time Spend Hard Deleting (ms)"] = I.hard_delete_max if (I.hard_deletes_over_threshold) - dellog += "\tHard Deletes Over Threshold: [I.hard_deletes_over_threshold]" + entry["Hard Deletes Over Threshold"] = I.hard_deletes_over_threshold if (I.slept_destroy) - dellog += "\tSleeps: [I.slept_destroy]" + entry["Total Sleeps"] = I.slept_destroy if (I.no_respect_force) - dellog += "\tIgnored force: [I.no_respect_force] times" + entry["Total Ignored Force"] = I.no_respect_force if (I.no_hint) - dellog += "\tNo hint: [I.no_hint] times" - log_qdel(dellog.Join("\n")) + entry["Total No Hint"] = I.no_hint + if(LAZYLEN(I.extra_details)) + entry["Deleted Metadata"] = I.extra_details + + log_qdel("", del_log) /datum/controller/subsystem/garbage/fire() //the fact that this resets its processing each fire (rather then resume where it left off) is intentional. @@ -129,6 +145,7 @@ SUBSYSTEM_DEF(garbage) pass_counts[i] = 0 fail_counts[i] = 0 + /datum/controller/subsystem/garbage/proc/HandleQueue(level = GC_QUEUE_FILTER) if (level == GC_QUEUE_FILTER) delslasttick = 0 @@ -145,31 +162,37 @@ SUBSYSTEM_DEF(garbage) lastlevel = level - //We do this rather then for(var/refID in queue) because that sort of for loop copies the whole list. +// 1 from the hard reference in the queue, and 1 from the variable used before this +#define REFS_WE_EXPECT 2 + + //We do this rather then for(var/list/ref_info in queue) because that sort of for loop copies the whole list. //Normally this isn't expensive, but the gc queue can grow to 40k items, and that gets costly/causes overrun. for (var/i in 1 to length(queue)) var/list/L = queue[i] - if (length(L) < 2) + if (length(L) < GC_QUEUE_ITEM_INDEX_COUNT) count++ if (MC_TICK_CHECK) return continue - var/GCd_at_time = L[1] - if(GCd_at_time > cut_off_time) + var/queued_at_time = L[GC_QUEUE_ITEM_QUEUE_TIME] + if(queued_at_time > cut_off_time) break // Everything else is newer, skip them count++ - var/refID = L[2] - var/datum/D - D = locate(refID) + var/datum/D = L[GC_QUEUE_ITEM_REF] - if (!D || D.gc_destroyed != GCd_at_time) // So if something else coincidentally gets the same ref, it's not deleted by mistake + // If that's all we've got, send er off +#if DM_VERSION >= 515 + if (refcount(D) == REFS_WE_EXPECT) +#else + if (!D || D.gc_destroyed != queued_at_time) +#endif ++gcedlasttick ++totalgcs pass_counts[level]++ #ifdef REFERENCE_TRACKING - reference_find_on_fail -= refID //It's deleted we don't care anymore. + reference_find_on_fail -= text_ref(D) //It's deleted we don't care anymore. #endif if (MC_TICK_CHECK) return @@ -185,7 +208,9 @@ SUBSYSTEM_DEF(garbage) switch (level) if (GC_QUEUE_CHECK) #ifdef REFERENCE_TRACKING - if(reference_find_on_fail[refID]) + // Decides how many refs to look for (potentially) + // Based off the remaining and the ones we can account for + if(reference_find_on_fail[text_ref(D)]) INVOKE_ASYNC(D, TYPE_PROC_REF(/datum,find_references)) ref_searching = TRUE #ifdef GC_FAILURE_HARD_LOOKUP @@ -193,12 +218,18 @@ SUBSYSTEM_DEF(garbage) INVOKE_ASYNC(D, TYPE_PROC_REF(/datum,find_references)) ref_searching = TRUE #endif - reference_find_on_fail -= refID + reference_find_on_fail -= text_ref(D) #endif var/type = D.type var/datum/qdel_item/I = items[type] - log_world("## TESTING: GC: -- [FAST_REF(D)] | [type] was unable to be GC'd --") + var/message = "## TESTING: GC: -- [text_ref(D)] | [type] was unable to be GC'd --" + log_world(message) + + var/detail = D.dump_harddel_info() + if(detail) + LAZYADD(I.extra_details, detail) + #ifdef TESTING for(var/c in GLOB.admins) //Using testing() here would fill the logs with ADMIN_VV garbage var/client/admin = c @@ -233,38 +264,41 @@ SUBSYSTEM_DEF(garbage) queue.Cut(1,count+1) count = 0 +#undef REFS_WE_EXPECT + /datum/controller/subsystem/garbage/proc/Queue(datum/D, level = GC_QUEUE_FILTER) if (isnull(D)) return if (level > GC_QUEUE_COUNT) HardDelete(D) return - var/gctime = world.time - var/refid = FAST_REF(D) + var/queue_time = world.time - D.gc_destroyed = gctime - var/list/queue = queues[level] + if (D.gc_destroyed <= 0) + D.gc_destroyed = queue_time - queue[++queue.len] = list(gctime, refid) // not += for byond reasons + var/list/queue = queues[level] + queue[++queue.len] = list(queue_time, D, D.gc_destroyed) // not += for byond reasons //this is mainly to separate things profile wise. /datum/controller/subsystem/garbage/proc/HardDelete(datum/D) ++delslasttick ++totaldels var/type = D.type - var/refID = FAST_REF(D) + var/refID = text_ref(D) + var/datum/qdel_item/type_info = items[type] + var/detail = D.dump_harddel_info() + if(detail) + LAZYADD(type_info.extra_details, detail) var/tick_usage = TICK_USAGE del(D) - tick_usage = TICK_USAGE_TO_MS(tick_usage) - var/datum/qdel_item/I = items[type] - - I.hard_deletes++ - I.hard_delete_time += tick_usage - if (tick_usage > I.hard_delete_max) - I.hard_delete_max = tick_usage + type_info.hard_deletes++ + type_info.hard_delete_time += tick_usage + if (tick_usage > type_info.hard_delete_max) + type_info.hard_delete_max = tick_usage if (tick_usage > highest_del_ms) highest_del_ms = tick_usage highest_del_type_string = "[type]" @@ -273,16 +307,16 @@ SUBSYSTEM_DEF(garbage) if (time > 0.1 SECONDS) postpone(time) - var/threshold = CONFIG_GET(number/hard_deletes_overrun_threshold) if (threshold && (time > threshold SECONDS)) - if (!(I.qdel_flags & QDEL_ITEM_ADMINS_WARNED)) + if (!(type_info.qdel_flags & QDEL_ITEM_ADMINS_WARNED)) log_game("Error: [type]([refID]) took longer than [threshold] seconds to delete (took [round(time/10, 0.1)] seconds to delete)") - I.qdel_flags |= QDEL_ITEM_ADMINS_WARNED - I.hard_deletes_over_threshold++ + message_admins("Error: [type]([refID]) took longer than [threshold] seconds to delete (took [round(time/10, 0.1)] seconds to delete).") + type_info.qdel_flags |= QDEL_ITEM_ADMINS_WARNED + type_info.hard_deletes_over_threshold++ var/overrun_limit = CONFIG_GET(number/hard_deletes_overrun_limit) - if (overrun_limit && I.hard_deletes_over_threshold >= overrun_limit) - I.qdel_flags |= QDEL_ITEM_SUSPENDED_FOR_LAG + if (overrun_limit && type_info.hard_deletes_over_threshold >= overrun_limit) + type_info.qdel_flags |= QDEL_ITEM_SUSPENDED_FOR_LAG /datum/controller/subsystem/garbage/Recover() InitQueues() //We first need to create the queues before recovering data @@ -304,78 +338,85 @@ SUBSYSTEM_DEF(garbage) var/no_hint = 0 //!Number of times it's not even bother to give a qdel hint var/slept_destroy = 0 //!Number of times it's slept in its destroy var/qdel_flags = 0 //!Flags related to this type's trip thru qdel. + var/list/extra_details //!Lazylist of string metadata about the deleted objects /datum/qdel_item/New(mytype) name = "[mytype]" +/// Should be treated as a replacement for the 'del' keyword. +/// +/// Datums passed to this will be given a chance to clean up references to allow the GC to collect them. +/proc/qdel(datum/to_delete, force = FALSE) + if(!istype(to_delete)) + del(to_delete) + return + + var/datum/qdel_item/trash = SSgarbage.items[to_delete.type] + if (isnull(trash)) + trash = SSgarbage.items[to_delete.type] = new /datum/qdel_item(to_delete.type) + trash.qdels++ -// Should be treated as a replacement for the 'del' keyword. -// Datums passed to this will be given a chance to clean up references to allow the GC to collect them. -/proc/qdel(datum/D, force=FALSE, ...) - if(!istype(D)) - del(D) + if(!isnull(to_delete.gc_destroyed)) + if(to_delete.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) + CRASH("[to_delete.type] destroy proc was called multiple times, likely due to a qdel loop in the Destroy logic") return - var/datum/qdel_item/I = SSgarbage.items[D.type] - if (!I) - I = SSgarbage.items[D.type] = new /datum/qdel_item(D.type) - I.qdels++ + if (SEND_SIGNAL(to_delete, COMSIG_PARENT_PREQDELETED, force)) // Give the components a chance to prevent their parent from being deleted + return - if(isnull(D.gc_destroyed)) - if (SEND_SIGNAL(D, COMSIG_PARENT_PREQDELETED, force)) // Give the components a chance to prevent their parent from being deleted - return - D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED - var/start_time = world.time - var/start_tick = world.tick_usage - SEND_SIGNAL(D, COMSIG_PARENT_QDELETING, force) // Let the (remaining) components know about the result of Destroy - var/hint = D.Destroy(arglist(args.Copy(2))) // Let our friend know they're about to get fucked up. - if(world.time != start_time) - I.slept_destroy++ - else - I.destroy_time += TICK_USAGE_TO_MS(start_tick) - if(!D) + to_delete.gc_destroyed = GC_CURRENTLY_BEING_QDELETED + var/start_time = world.time + var/start_tick = world.tick_usage + SEND_SIGNAL(to_delete, COMSIG_PARENT_QDELETING, force) // Let the (remaining) components know about the result of Destroy + var/hint = to_delete.Destroy(force) // Let our friend know they're about to get fucked up. + + if(world.time != start_time) + trash.slept_destroy++ + else + trash.destroy_time += TICK_USAGE_TO_MS(start_tick) + + if(isnull(to_delete)) + return + + switch(hint) + if (QDEL_HINT_QUEUE) //qdel should queue the object for deletion. + SSgarbage.Queue(to_delete) + if (QDEL_HINT_IWILLGC) + to_delete.gc_destroyed = world.time return - switch(hint) - if (QDEL_HINT_QUEUE) //qdel should queue the object for deletion. - SSgarbage.Queue(D) - if (QDEL_HINT_IWILLGC) - D.gc_destroyed = world.time + if (QDEL_HINT_LETMELIVE) //qdel should let the object live after calling destory. + if(!force) + to_delete.gc_destroyed = null //clear the gc variable (important!) return - if (QDEL_HINT_LETMELIVE) //qdel should let the object live after calling destory. - if(!force) - D.gc_destroyed = null //clear the gc variable (important!) - return - // Returning LETMELIVE after being told to force destroy - // indicates the objects Destroy() does not respect force - #ifdef TESTING - if(!I.no_respect_force) - testing("WARNING: [D.type] has been force deleted, but is \ - returning an immortal QDEL_HINT, indicating it does \ - not respect the force flag for qdel(). It has been \ - placed in the queue, further instances of this type \ - will also be queued.") - #endif - I.no_respect_force++ + // Returning LETMELIVE after being told to force destroy + // indicates the objects Destroy() does not respect force + #ifdef TESTING + if(!trash.no_respect_force) + testing("WARNING: [to_delete.type] has been force deleted, but is \ + returning an immortal QDEL_HINT, indicating it does \ + not respect the force flag for qdel(). It has been \ + placed in the queue, further instances of this type \ + will also be queued.") + #endif + trash.no_respect_force++ - SSgarbage.Queue(D) - if (QDEL_HINT_HARDDEL) //qdel should assume this object won't gc, and queue a hard delete - SSgarbage.Queue(D, GC_QUEUE_HARDDELETE) - if (QDEL_HINT_HARDDEL_NOW) //qdel should assume this object won't gc, and hard del it post haste. - SSgarbage.HardDelete(D) - #ifdef REFERENCE_TRACKING - if (QDEL_HINT_FINDREFERENCE) //qdel will, if REFERENCE_TRACKING is enabled, display all references to this object, then queue the object for deletion. - SSgarbage.Queue(D) - D.find_references() //This breaks ci. Consider it insurance against somehow pring reftracking on accident - if (QDEL_HINT_IFFAIL_FINDREFERENCE) //qdel will, if REFERENCE_TRACKING is enabled and the object fails to collect, display all references to this object. - SSgarbage.Queue(D) - SSgarbage.reference_find_on_fail[FAST_REF(D)] = TRUE + SSgarbage.Queue(to_delete) + if (QDEL_HINT_HARDDEL) //qdel should assume this object won't gc, and queue a hard delete + SSgarbage.Queue(to_delete, GC_QUEUE_HARDDELETE) + if (QDEL_HINT_HARDDEL_NOW) //qdel should assume this object won't gc, and hard del it post haste. + SSgarbage.HardDelete(to_delete) + #ifdef REFERENCE_TRACKING + if (QDEL_HINT_FINDREFERENCE) //qdel will, if REFERENCE_TRACKING is enabled, display all references to this object, then queue the object for deletion. + SSgarbage.Queue(to_delete) + INVOKE_ASYNC(to_delete, TYPE_PROC_REF(/datum, find_references)) + if (QDEL_HINT_IFFAIL_FINDREFERENCE) //qdel will, if REFERENCE_TRACKING is enabled and the object fails to collect, display all references to this object. + SSgarbage.Queue(to_delete) + SSgarbage.reference_find_on_fail[text_ref(to_delete)] = TRUE + #endif + else + #ifdef TESTING + if(!trash.no_hint) + testing("WARNING: [to_delete.type] is not returning a qdel hint. It is being placed in the queue. Further instances of this type will also be queued.") #endif - else - #ifdef TESTING - if(!I.no_hint) - testing("WARNING: [D.type] is not returning a qdel hint. It is being placed in the queue. Further instances of this type will also be queued.") - #endif - I.no_hint++ - SSgarbage.Queue(D) - else if(D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) - CRASH("[D.type] destroy proc was called multiple times, likely due to a qdel loop in the Destroy logic") + trash.no_hint++ + SSgarbage.Queue(to_delete) diff --git a/code/controllers/subsystem/init_profiler.dm b/code/controllers/subsystem/init_profiler.dm index 64fc98f1d93b7..33f93ae9b41ce 100644 --- a/code/controllers/subsystem/init_profiler.dm +++ b/code/controllers/subsystem/init_profiler.dm @@ -24,3 +24,5 @@ SUBSYSTEM_DEF(init_profiler) fdel(prof_file) WRITE_FILE(prof_file, current_profile_data) world.Profile(PROFILE_CLEAR) //Now that we're written this data out, dump it. We don't want it getting mixed up with our current round data + +#undef INIT_PROFILE_NAME diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index a097b8881fa25..dbf2fe8c90742 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -180,7 +180,7 @@ SUBSYSTEM_DEF(mapping) qdel(T, TRUE) /* Nuke threats, for making the blue tiles on the station go RED - Used by the AI doomsday and the self-destruct nuke. + Used by the AI doomsday and the self-destruct nuke. */ /datum/controller/subsystem/mapping/proc/add_nuke_threat(datum/nuke) @@ -277,6 +277,7 @@ SUBSYSTEM_DEF(mapping) return parsed_maps /datum/controller/subsystem/mapping/proc/LoadStationRooms() +#ifndef UNIT_TESTS var/start_time = REALTIMEOFDAY for(var/obj/effect/spawner/room/R as() in random_room_spawners) var/list/possibletemplates = list() @@ -296,9 +297,11 @@ SUBSYSTEM_DEF(mapping) template.spawned = TRUE template.stationinitload(get_turf(R), centered = template.centerspawner) SSmapping.random_room_spawners -= R + R.after_place(null, get_turf(R), null, null) qdel(R) random_room_spawners = null INIT_ANNOUNCE("Loaded Random Rooms in [(REALTIMEOFDAY - start_time)/10]s!") +#endif /datum/controller/subsystem/mapping/proc/loadWorld() //if any of these fail, something has gone horribly, HORRIBLY, wrong diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm index 3e83a54f3208a..957e5806f02a7 100644 --- a/code/controllers/subsystem/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -281,3 +281,5 @@ SUBSYSTEM_DEF(overlays) overlays |= cached_other else if(cut_old) cut_overlays() + +#undef ZM_AUTOMANGLE diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index 9f52cb99494b8..8fc983a9c44b8 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -330,3 +330,5 @@ SUBSYSTEM_DEF(persistence) var/json_file = file("data/paintings.json") fdel(json_file) WRITE_FILE(json_file, json_encode(paintings)) + +#undef FILE_ANTAG_REP diff --git a/code/controllers/subsystem/processing/networks.dm b/code/controllers/subsystem/processing/networks.dm index 899129b2162c3..1bbd0382e1684 100644 --- a/code/controllers/subsystem/processing/networks.dm +++ b/code/controllers/subsystem/processing/networks.dm @@ -140,10 +140,11 @@ SUBSYSTEM_DEF(networks) /// Check if we are a list. If so process the list if(islist(current.receiver_id)) // are we a broadcast list var/list/receivers = current.receiver_id - var/receiver_id = receivers[receivers.len] // pop it - receivers.len-- - _process_packet(receiver_id, current) - if(receivers.len == 0) // pop it if done + if (length(receivers)) + var/receiver_id = receivers[receivers.len] // pop it + receivers.len-- + _process_packet(receiver_id, current) + if(!length(receivers)) // pop it if done count_broadcasts_packets++ POP_PACKET(current) else // else set up a broadcast or send a single targete diff --git a/code/controllers/subsystem/profiler.dm b/code/controllers/subsystem/profiler.dm index 48975cdc92718..004b95d4ab70b 100644 --- a/code/controllers/subsystem/profiler.dm +++ b/code/controllers/subsystem/profiler.dm @@ -83,3 +83,6 @@ SUBSYSTEM_DEF(profiler) #endif write_cost = MC_AVERAGE(write_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) #endif + +#undef PROFILER_FILENAME +#undef SENDMAPS_FILENAME diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index ec8fd7615daf2..0915c95c0bacd 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -61,7 +61,8 @@ SUBSYSTEM_DEF(shuttle) var/shuttles_loaded = FALSE /datum/controller/subsystem/shuttle/Initialize() - initial_load() + // 30 seconds max to load, don't hold up everything if SSshuttles throws an exception and fails to load + AWAIT(initial_load(), 30 SECONDS) if(!arrivals) WARNING("No /obj/docking_port/mobile/arrivals placed on the map!") @@ -74,11 +75,13 @@ SUBSYSTEM_DEF(shuttle) return SS_INIT_SUCCESS /datum/controller/subsystem/shuttle/proc/initial_load() + RETURN_TYPE(/datum/task) shuttles_loaded = TRUE + var/datum/task/parent_task = new() for(var/s in stationary) var/obj/docking_port/stationary/S = s - S.load_roundstart() - CHECK_TICK + parent_task.add_subtask(S.load_roundstart()) + return parent_task /datum/controller/subsystem/shuttle/fire() for(var/thing in mobile) @@ -904,3 +907,5 @@ SUBSYSTEM_DEF(shuttle) preview_shuttle = loaded_shuttle_reference.value if(loaded_shuttle) user.forceMove(get_turf(loaded_shuttle)) + +#undef MAX_TRANSIT_REQUEST_RETRIES diff --git a/code/controllers/subsystem/spatial_gridmap.dm b/code/controllers/subsystem/spatial_gridmap.dm index 1337424866a06..d6673b3890294 100644 --- a/code/controllers/subsystem/spatial_gridmap.dm +++ b/code/controllers/subsystem/spatial_gridmap.dm @@ -600,3 +600,7 @@ SUBSYSTEM_DEF(spatial_grid) #undef GRID_CELL_ADD #undef GRID_CELL_REMOVE #undef GRID_CELL_SET + +#undef NUMBER_OF_PREGENERATED_ORANGES_EARS +#undef BOUNDING_BOX_MIN +#undef BOUNDING_BOX_MAX diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 7795de18d3ba6..4513ff01dc85c 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -207,3 +207,6 @@ SUBSYSTEM_DEF(throwing) thrownthing.movement_type &= ~THROWN qdel(src) + +#undef MAX_THROWING_DIST +#undef MAX_TICKS_TO_MAKE_UP diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index d354bd2410bed..264736836da3d 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -90,7 +90,7 @@ SUBSYSTEM_DEF(ticker) var/use_rare_music = prob(1) for(var/S in provisional_title_music) - var/lower = lowertext(S) + var/lower = LOWER_TEXT(S) var/list/L = splittext(lower,"+") switch(L.len) if(3) //rare+MAP+sound.ogg or MAP+rare.sound.ogg -- Rare Map-specific sounds @@ -114,7 +114,7 @@ SUBSYSTEM_DEF(ticker) for(var/S in music) var/list/L = splittext(S,".") if(L.len >= 2) - var/ext = lowertext(L[L.len]) //pick the real extension, no 'honk.ogg.exe' nonsense here + var/ext = LOWER_TEXT(L[L.len]) //pick the real extension, no 'honk.ogg.exe' nonsense here if(byond_sound_formats[ext]) continue music -= S @@ -333,20 +333,22 @@ SUBSYSTEM_DEF(ticker) transfer_characters() //transfer keys to the new mobs - for(var/I in round_start_events) - var/datum/callback/cb = I - cb.InvokeAsync() - LAZYCLEARLIST(round_start_events) - log_world("Game start took [(world.timeofday - init_start)/10]s") round_start_time = world.time round_start_timeofday = world.timeofday INVOKE_ASYNC(SSdbcore, TYPE_PROC_REF(/datum/controller/subsystem/dbcore, SetRoundStart)) + current_state = GAME_STATE_PLAYING + + // Now that nothing can enter the callback list, fire them off + for(var/I in round_start_events) + var/datum/callback/cb = I + cb.InvokeAsync() + LAZYCLEARLIST(round_start_events) + to_chat(world, "Welcome to [station_name()], enjoy your stay!") SEND_SOUND(world, sound(SSstation.announcer.get_rand_welcome_sound())) - current_state = GAME_STATE_PLAYING Master.SetRunLevel(RUNLEVEL_GAME) if(SSevents.holidays) @@ -739,3 +741,5 @@ SUBSYSTEM_DEF(ticker) SEND_SOUND(world, sound(round_end_sound)) rustg_file_append(login_music, "data/last_round_lobby_music.txt") + +#undef ROUND_START_MUSIC_LIST diff --git a/code/controllers/subsystem/topic.dm b/code/controllers/subsystem/topic.dm index ced309a55bfd5..3698541a08b07 100644 --- a/code/controllers/subsystem/topic.dm +++ b/code/controllers/subsystem/topic.dm @@ -83,12 +83,12 @@ SUBSYSTEM_DEF(topic) * * Params: * - * * addr: address of the recieving BYOND server (*including* the byond://) + * * addr: address of the receiving BYOND server (*including* the byond://) * * query: name of the topic endpoint to request - * * params: associated list of parameters to send to the recieving server + * * params: associated list of parameters to send to the receiving server * * anonymous: TRUE or FALSE whether to use anonymous token for the request *(default: FALSE)* * Note that request will fail if a token cannot be found for the target server and anonymous is not set. - * * nocheck: TRUE or FALSE whether to check if the recieving server is authorized to get the topic call *(default: FALSE)* + * * nocheck: TRUE or FALSE whether to check if the receiving server is authorized to get the topic call *(default: FALSE)* */ /datum/controller/subsystem/topic/proc/export_async(addr, query, list/params, anonymous = FALSE, nocheck = FALSE) DECLARE_ASYNC diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 2f5953ff772c3..a207e34b66854 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -231,13 +231,13 @@ SUBSYSTEM_DEF(traumas) ) phobia_species = list("lizards" = typecacheof(list(/datum/species/lizard)), - "skeletons" = typecacheof(list(/datum/species/skeleton, /datum/species/plasmaman)), - "conspiracies" = typecacheof(list(/datum/species/abductor, /datum/species/lizard)), - "robots" = typecacheof(list(/datum/species/android)), - "the supernatural" = typecacheof(list(/datum/species/golem/clockwork, /datum/species/golem/runic)), - "aliens" = typecacheof(list(/datum/species/abductor, /datum/species/pod, - /datum/species/shadow)), - "anime" = typecacheof(list(/datum/species/human/felinid)) - ) + "skeletons" = typecacheof(list(/datum/species/skeleton, /datum/species/plasmaman)), + "conspiracies" = typecacheof(list(/datum/species/abductor, /datum/species/lizard)), + "robots" = typecacheof(list(/datum/species/android)), + "the supernatural" = typecacheof(list(/datum/species/golem/clockwork, /datum/species/golem/runic)), + "aliens" = typecacheof(list(/datum/species/abductor, /datum/species/pod, + /datum/species/shadow)), + "anime" = typecacheof(list(/datum/species/human/felinid)) + ) return SS_INIT_SUCCESS diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index 4dd1278c52f87..95e164474eecb 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -1,8 +1,3 @@ -#define STARTUP_STAGE 1 -#define MAIN_STAGE 2 -#define WIND_DOWN_STAGE 3 -#define END_STAGE 4 - //Used for all kinds of weather, ex. lavaland ash storms. SUBSYSTEM_DEF(weather) name = "Weather" @@ -78,10 +73,10 @@ SUBSYSTEM_DEF(weather) next_hit_by_zlevel["[z]"] = null /datum/controller/subsystem/weather/proc/get_weather(z, area/active_area) - var/datum/weather/A - for(var/V in processing) - var/datum/weather/W = V - if((z in W.impacted_z_levels) && W.area_type == active_area.type) - A = W - break - return A + var/datum/weather/A + for(var/V in processing) + var/datum/weather/W = V + if((z in W.impacted_z_levels) && W.area_type == active_area.type) + A = W + break + return A diff --git a/code/controllers/subsystem/zclear.dm b/code/controllers/subsystem/zclear.dm index 0b068359f5039..811762c18c28b 100644 --- a/code/controllers/subsystem/zclear.dm +++ b/code/controllers/subsystem/zclear.dm @@ -348,3 +348,6 @@ SUBSYSTEM_DEF(zclear) var/tracking //Callback when completed, z value passed as parameters var/datum/callback/completion_callback + +#undef CLEAR_TURF_PROCESSING_TIME +#undef CHECK_ZLEVEL_TICKS diff --git a/code/controllers/subsystem/zcopy.dm b/code/controllers/subsystem/zcopy.dm index bacec54dcc206..4b25f767d567e 100644 --- a/code/controllers/subsystem/zcopy.dm +++ b/code/controllers/subsystem/zcopy.dm @@ -2,11 +2,6 @@ *! Here be dragons. */ -/// The multiplication factor for openturf shadower darkness. Lighting will be multiplied by this. -#define SHADOWER_DARKENING_FACTOR 0.8 -/// The above, but as an RGB string for lighting-less turfs. -#define SHADOWER_DARKENING_COLOR "#CCCCCC" - SUBSYSTEM_DEF(zcopy) name = "Z-Copy" wait = 1 diff --git a/code/datums/action.dm b/code/datums/action.dm index 6792456a3f271..23f7128358ee0 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -1,12 +1,3 @@ -// Checks to see if the mob is able to use their hands, or if they are blocked by cuffs or stuns -#define AB_CHECK_HANDS_BLOCKED (1<<0) -// Checks to see if the mob is incapacitated by stuns or paralysis effects -#define AB_CHECK_INCAPACITATED (1<<1) -// Checks to see if the mob is standing -#define AB_CHECK_LYING (1<<2) -// Checks to see if the mob in concious -#define AB_CHECK_CONSCIOUS (1<<3) - /datum/action var/name = "Generic Action" var/desc = null diff --git a/code/datums/ai/hunting_behavior/hunting_behaviors.dm b/code/datums/ai/hunting_behavior/hunting_behaviors.dm index f838ba0586167..bb5a1a8b27c7c 100644 --- a/code/datums/ai/hunting_behavior/hunting_behaviors.dm +++ b/code/datums/ai/hunting_behavior/hunting_behaviors.dm @@ -100,7 +100,7 @@ if(QDELETED(hunted)) //Target is gone for some reason. forget about this task! - controller[hunting_target_key] = null + controller.blackboard[hunting_target_key] = null finish_action(controller, FALSE, hunting_target_key) return diff --git a/code/datums/ai/tamed/tamed_behaviour.dm b/code/datums/ai/tamed/tamed_behaviour.dm index a61feb146cd67..3c998e09f1cf9 100644 --- a/code/datums/ai/tamed/tamed_behaviour.dm +++ b/code/datums/ai/tamed/tamed_behaviour.dm @@ -69,3 +69,5 @@ var/mob/living/simple_animal/simple_pawn = controller.pawn if(!istype(simple_pawn) || simple_pawn.stat) return + +#undef FOLLOW_TOLERANCE diff --git a/code/datums/ai/tamed/tamed_controller.dm b/code/datums/ai/tamed/tamed_controller.dm index d66f0e97bd0f0..741d9e1bab86b 100644 --- a/code/datums/ai/tamed/tamed_controller.dm +++ b/code/datums/ai/tamed/tamed_controller.dm @@ -229,3 +229,10 @@ return set_command_mode(speaker, command) + +#undef TAMED_COMMAND_FOLLOW +#undef TAMED_COMMAND_STOP +#undef TAMED_COMMAND_WANDER +#undef TAMED_COMMAND_ATTACK +#undef ANGER_THRESHOLD_ATTACK +#undef ANGER_RESET_TIME diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 393d7bcc20bc9..dfb9b1ee11f3d 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -1,12 +1,3 @@ -#define LAW_VALENTINES "valentines" -#define LAW_DEVIL "devil" -#define LAW_ZEROTH "zeroth" -#define LAW_INHERENT "inherent" -#define LAW_SUPPLIED "supplied" -#define LAW_ION "ion" -#define LAW_HACKED "hacked" - - /datum/ai_laws var/name = "Unknown Laws" var/zeroth = null diff --git a/code/datums/alarm.dm b/code/datums/alarm.dm index 0d7faf9d8e0b7..ba06b1c879219 100644 --- a/code/datums/alarm.dm +++ b/code/datums/alarm.dm @@ -5,7 +5,7 @@ //The system as a whole differs from reading off a global list in a few ways. //In that A, it allows us to send cameras for ais/borgs/potentially others to jump to //And B, it's not like we're giving you all the alarms that have been sent, because of the seperate listing for each reviever -//You only recieve alarms sent after you start to listen +//You only receive alarms sent after you start to listen //Also of note, due to an optimzation done on areas, one alarm handler will only ever send one "on" or "off" alarm //So the whole only receving stuff sent post creation thing actually matters //Honestly I'm not sure how much of this is a feature, and how much is just old code diff --git a/code/datums/brain_damage/hypnosis.dm b/code/datums/brain_damage/hypnosis.dm index b2b880f56318f..824c2050a21ce 100644 --- a/code/datums/brain_damage/hypnosis.dm +++ b/code/datums/brain_damage/hypnosis.dm @@ -44,7 +44,7 @@ if(prob(2)) switch(rand(1,2)) if(1) - to_chat(owner, "...[lowertext(hypnotic_phrase)]...") + to_chat(owner, "...[LOWER_TEXT(hypnotic_phrase)]...") if(2) new /datum/hallucination/chat(owner, TRUE, FALSE, "[hypnotic_phrase]") diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm index b1c5d00fffd2d..33a6eec70573d 100644 --- a/code/datums/brain_damage/imaginary_friend.dm +++ b/code/datums/brain_damage/imaginary_friend.dm @@ -94,6 +94,8 @@ to_chat(src, "You are absolutely loyal to your friend, no matter what.") to_chat(src, "You cannot directly influence the world around you, but you can see what [owner] cannot.") +CREATION_TEST_IGNORE_SUBTYPES(/mob/camera/imaginary_friend) + /mob/camera/imaginary_friend/Initialize(mapload, _trauma) . = ..() diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm index 32e993533bf4f..f819577165c70 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -211,7 +211,7 @@ word = copytext(word, 1, suffix_foundon) word = html_decode(word) - if(lowertext(word) in common_words) + if(LOWER_TEXT(word) in common_words) new_message += word + suffix else if(prob(30) && message_split.len > 2) diff --git a/code/datums/brain_damage/mrat.dm b/code/datums/brain_damage/mrat.dm index 964bf75ce15ef..be0925b5f3043 100644 --- a/code/datums/brain_damage/mrat.dm +++ b/code/datums/brain_damage/mrat.dm @@ -114,6 +114,8 @@ to_chat(src, "Your job is to answer [owner]'s question(s) and you are given this form to assist in that.") to_chat(src, "Don't be stupid with this or you will face the consequences.") +CREATION_TEST_IGNORE_SUBTYPES(/mob/camera/imaginary_friend/mrat) + /mob/camera/imaginary_friend/mrat/Initialize(mapload, _trauma) . = ..() costume = new diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index e57177fff103b..e91a588b846ff 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -60,7 +60,7 @@ lose_text = "" var/paralysis_type var/list/paralysis_traits = list() - //for descriptions + //for descriptions /datum/brain_trauma/severe/paralysis/New(specific_type) if(specific_type) diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm index 64932f19e2c9b..d6dfcfe69401c 100644 --- a/code/datums/brain_damage/special.dm +++ b/code/datums/brain_damage/special.dm @@ -58,10 +58,10 @@ /datum/brain_trauma/special/ghost_control/on_gain() owner._AddComponent(list(/datum/component/deadchat_control, "democracy", list( - "up" = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), owner, NORTH), - "down" = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), owner, SOUTH), - "left" = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), owner, WEST), - "right" = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), owner, EAST)), 120)) + "up" = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), owner, NORTH), + "down" = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), owner, SOUTH), + "left" = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), owner, WEST), + "right" = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), owner, EAST)), 120)) ..() /datum/brain_trauma/special/ghost_control/on_lose() diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm index ba9da36e06630..3ba80201c2fa6 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -127,6 +127,8 @@ var/mob/living/carbon/body var/datum/brain_trauma/severe/split_personality/trauma +CREATION_TEST_IGNORE_SUBTYPES(/mob/living/split_personality) + /mob/living/split_personality/Initialize(mapload, _trauma) if(iscarbon(loc)) body = loc diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index a8bce61569c5b..6205bcff0edca 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -567,7 +567,9 @@ #undef CHAT_MESSAGE_WIDTH #undef CHAT_LAYER_Z_STEP #undef CHAT_LAYER_MAX_Z +#undef CHAT_MESSAGE_MAX_LENGTH #undef CHAT_MESSAGE_ICON_SIZE +#undef MESSAGE_FADE_PIXEL_Y #undef BALLOON_TEXT_FADE_TIME #undef BALLOON_TEXT_FULLY_VISIBLE_TIME #undef BALLOON_TEXT_SPAWN_TIME @@ -578,3 +580,8 @@ #undef CHATMESSAGE_SHOW_LANGUAGE_ICON #undef COLOR_PERSON_UNKNOWN #undef COLOR_CHAT_EMOTE +#undef BUCKET_LIMIT +#undef CM_COLOR_SAT_MIN +#undef CM_COLOR_SAT_MAX +#undef CM_COLOR_LUM_MIN +#undef CM_COLOR_LUM_MAX diff --git a/code/datums/components/COMPONENT_TEMPLATE.md b/code/datums/components/COMPONENT_TEMPLATE.md index c2777a67d5a6a..f8a1022dcf4d4 100644 --- a/code/datums/components/COMPONENT_TEMPLATE.md +++ b/code/datums/components/COMPONENT_TEMPLATE.md @@ -1,7 +1,7 @@ # Template file for your new component -See _component.dm for detailed explanations +See dcs/flags.dm for detailed explanations ```dm /datum/component/mycomponent diff --git a/code/datums/components/README.md b/code/datums/components/README.md index 307459c36ac8e..d31cce94f083b 100644 --- a/code/datums/components/README.md +++ b/code/datums/components/README.md @@ -130,4 +130,4 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo * Counterpart to `RegisterWithParent()` * Used to unregister the signals that should only be on the `parent` object -### See/Define signals and their arguments in __DEFINES\components.dm +### See/Define signals and their arguments in __DEFINES\dcs\flags.dm diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index 320bb2ec0eb42..5656a8a6621fb 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -325,12 +325,17 @@ var/list/dc = datum_components if(!dc) return null - var/datum/component/C = dc[c_type] - if(C) - if(length(C)) - C = C[1] - if(C.type == c_type) - return C + var/list/components = dc[c_type] + var/datum/component/component + if(components) + if(length(components)) + component = components[1] + else if (istype(components, /datum/component)) + component = components + if (component == null) + return null + if(component.type == c_type) + return component return null /datum/proc/GetComponents(c_type) diff --git a/code/datums/components/alert_research.dm b/code/datums/components/alert_research.dm deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/code/datums/components/aquarium.dm b/code/datums/components/aquarium.dm index 84a1778d95ab9..942580274f872 100644 --- a/code/datums/components/aquarium.dm +++ b/code/datums/components/aquarium.dm @@ -27,7 +27,7 @@ CRASH("Invalid property type provided for aquarium content component") properties.parent = src - ADD_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, src) + ADD_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, REF(src)) RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(enter_aquarium)) //If component is added to something already in aquarium at the time initialize it properly. var/atom/movable/movable_parent = parent @@ -37,7 +37,7 @@ /datum/component/aquarium_content/PreTransfer() . = ..() - REMOVE_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, src) + REMOVE_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, REF(src)) /datum/component/aquarium_content/Destroy(force, silent) if(current_aquarium) diff --git a/code/datums/components/archaeology.dm b/code/datums/components/archaeology.dm deleted file mode 100644 index 5eb8eeed65cc2..0000000000000 --- a/code/datums/components/archaeology.dm +++ /dev/null @@ -1,101 +0,0 @@ -/datum/component/archaeology - dupe_mode = COMPONENT_DUPE_UNIQUE - var/list/archdrops = list(/obj/item/bikehorn = list(ARCH_PROB = 100, ARCH_MAXDROP = 1)) // honk~ - var/prob2drop - var/dug - var/datum/callback/callback - -/datum/component/archaeology/Initialize(list/_archdrops = list(), datum/callback/_callback) - archdrops = _archdrops - for(var/i in archdrops) - if(isnull(archdrops[i][ARCH_MAXDROP])) - archdrops[i][ARCH_MAXDROP] = 1 - stack_trace("ARCHAEOLOGY WARNING: [parent] contained a null max_drop value in [i].") - if(isnull(archdrops[i][ARCH_PROB])) - archdrops[i][ARCH_PROB] = 100 - stack_trace("ARCHAEOLOGY WARNING: [parent] contained a null probability value in [i].") - callback = _callback - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(Dig)) - RegisterSignal(parent, COMSIG_ATOM_EX_ACT, PROC_REF(BombDig)) - RegisterSignal(parent, COMSIG_ATOM_SING_PULL, PROC_REF(SingDig)) - -/datum/component/archaeology/InheritComponent(datum/component/archaeology/A, i_am_original) - var/list/other_archdrops = A.archdrops - var/list/_archdrops = archdrops - for(var/I in other_archdrops) - _archdrops[I] += other_archdrops[I] - -/datum/component/archaeology/proc/Dig(datum/source, obj/item/I, mob/living/user) - SIGNAL_HANDLER - - if(dug) - to_chat(user, "Looks like someone has dug here already.") - return - - if(!isturf(user.loc)) - return - - if(I.tool_behaviour == TOOL_SHOVEL || I.tool_behaviour == TOOL_MINING) - to_chat(user, "You start digging...") - - if(I.use_tool(parent, user, 40, volume=50)) - to_chat(user, "You dig a hole.") - gets_dug() - dug = TRUE - SSblackbox.record_feedback("tally", "pick_used_mining", 1, I.type) - return COMPONENT_NO_AFTERATTACK - -/datum/component/archaeology/proc/gets_dug() - if(dug) - return - else - var/turf/open/OT = get_turf(parent) - for(var/thing in archdrops) - var/maxtodrop = archdrops[thing][ARCH_MAXDROP] - for(var/i in 1 to maxtodrop) - if(prob(archdrops[thing][ARCH_PROB])) // can't win them all! - new thing(OT) - - if(isopenturf(OT)) - if(OT.postdig_icon_change) - if(istype(OT, /turf/open/floor/plating/asteroid/) && !OT.postdig_icon) - var/turf/open/floor/plating/asteroid/AOT = parent - AOT.icon_plating = "[AOT.environment_type]_dug" - AOT.icon_state = "[AOT.environment_type]_dug" - else - if(isplatingturf(OT)) - var/turf/open/floor/plating/POT = parent - POT.icon_plating = "[POT.postdig_icon]" - POT.icon_state = "[OT.postdig_icon]" - - if(OT.slowdown) //Things like snow slow you down until you dig them. - OT.slowdown = 0 - dug = TRUE - if(callback) - callback.Invoke() - -/datum/component/archaeology/proc/SingDig(datum/source, S, current_size) - SIGNAL_HANDLER - - switch(current_size) - if(STAGE_THREE) - if(prob(30)) - gets_dug() - if(STAGE_FOUR) - if(prob(50)) - gets_dug() - else - if(current_size >= STAGE_FIVE && prob(70)) - gets_dug() - -/datum/component/archaeology/proc/BombDig(datum/source, severity, target) - SIGNAL_HANDLER - - switch(severity) - if(3) - return - if(2) - if(prob(20)) - gets_dug() - if(1) - gets_dug() diff --git a/code/datums/components/buffer.dm b/code/datums/components/buffer.dm index a5b4052792a3d..dc5ed2189c40f 100644 --- a/code/datums/components/buffer.dm +++ b/code/datums/components/buffer.dm @@ -1,7 +1,7 @@ -/// Helper that allows for atoms to recieve buffer information +/// Helper that allows for atoms to receive buffer information #define REGISTER_BUFFER_HANDLER(TYPEPATH) ##TYPEPATH/ComponentInitialize() {\ . = ..();\ - RegisterSignal(src, COMSIG_PARENT_RECIEVE_BUFFER, PROC_REF(_buffer_handler));\ + RegisterSignal(src, COMSIG_PARENT_RECEIVE_BUFFER, PROC_REF(_buffer_handler));\ }\ #define DEFINE_BUFFER_HANDLER(TYPEPATH) ##TYPEPATH/proc/_buffer_handler(datum/source, mob/user, atom/buffer, obj/item/buffer_parent) @@ -26,7 +26,7 @@ /datum/component/buffer/proc/intercept_attack(datum/source, atom/attack_target, mob/user, params) SIGNAL_HANDLER - if ((SEND_SIGNAL(attack_target, COMSIG_PARENT_RECIEVE_BUFFER, user, target, parent) & COMPONENT_BUFFER_RECIEVED)) + if ((SEND_SIGNAL(attack_target, COMSIG_PARENT_RECEIVE_BUFFER, user, target, parent) & COMPONENT_BUFFER_RECEIVED)) return COMPONENT_CANCEL_ATTACK_CHAIN return NONE diff --git a/code/datums/components/construction.dm b/code/datums/components/construction.dm index 0b2ef42c26afe..6c6f941e6305b 100644 --- a/code/datums/components/construction.dm +++ b/code/datums/components/construction.dm @@ -91,9 +91,10 @@ return user.transferItemToLoc(I, parent) // Using stacks - else if(istype(I, /obj/item/stack)) - INVOKE_ASYNC(I, TYPE_PROC_REF(/obj/item, use_tool), parent, user, 0, current_step["amount"], 50) - return TRUE + else + if(istype(I, /obj/item/stack)) + INVOKE_ASYNC(I, TYPE_PROC_REF(/obj/item, use_tool), parent, user, 0, current_step["amount"], 50) + return TRUE // Going backwards? Undo the last action. Drop/respawn the items used in last action, if any. if(. && diff == BACKWARD && target_step && !target_step["no_refund"]) @@ -108,8 +109,9 @@ if(located_item) located_item.forceMove(drop_location()) - else if(ispath(target_step_key, /obj/item/stack)) - new target_step_key(drop_location(), target_step["amount"]) + else + if(ispath(target_step_key, /obj/item/stack)) + new target_step_key(drop_location(), target_step["amount"]) return TRUE return FALSE diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 1489651c899e3..7f195a3d60152 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -121,7 +121,7 @@ name = "Tail Club" result = /obj/item/club/tailclub reqs = list(/obj/item/organ/tail/lizard = 1, - /obj/item/stack/sheet/iron = 1) + /obj/item/stack/sheet/iron = 1) time = 40 category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -142,7 +142,7 @@ name = "Liz O' Nine Tails" result = /obj/item/melee/chainofcommand/tailwhip reqs = list(/obj/item/organ/tail/lizard = 1, - /obj/item/stack/cable_coil = 1) + /obj/item/stack/cable_coil = 1) time = 40 category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -151,7 +151,7 @@ name = "Cat O' Nine Tails" result = /obj/item/melee/chainofcommand/tailwhip/kitty reqs = list(/obj/item/organ/tail/cat = 1, - /obj/item/stack/cable_coil = 1) + /obj/item/stack/cable_coil = 1) time = 40 category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -815,7 +815,7 @@ result = /obj/item/clothing/accessory/talisman time = 20 reqs = list(/obj/item/stack/sheet/bone = 2, - /obj/item/stack/sheet/sinew = 1) + /obj/item/stack/sheet/sinew = 1) category = CAT_PRIMAL /datum/crafting_recipe/bonecodpiece @@ -823,7 +823,7 @@ result = /obj/item/clothing/accessory/skullcodpiece time = 20 reqs = list(/obj/item/stack/sheet/bone = 2, - /obj/item/stack/sheet/animalhide/goliath_hide = 1) + /obj/item/stack/sheet/animalhide/goliath_hide = 1) category = CAT_PRIMAL /datum/crafting_recipe/bracers @@ -831,7 +831,7 @@ result = /obj/item/clothing/gloves/bracer time = 20 reqs = list(/obj/item/stack/sheet/bone = 2, - /obj/item/stack/sheet/sinew = 1) + /obj/item/stack/sheet/sinew = 1) category = CAT_PRIMAL /datum/crafting_recipe/skullhelm @@ -947,7 +947,7 @@ result = /obj/item/spear/bonespear time = 30 reqs = list(/obj/item/stack/sheet/bone = 4, - /obj/item/stack/sheet/sinew = 1) + /obj/item/stack/sheet/sinew = 1) category = CAT_PRIMAL dangerous_craft = TRUE @@ -956,7 +956,7 @@ result = /obj/item/fireaxe/boneaxe time = 50 reqs = list(/obj/item/stack/sheet/bone = 6, - /obj/item/stack/sheet/sinew = 3) + /obj/item/stack/sheet/sinew = 3) category = CAT_PRIMAL dangerous_craft = TRUE @@ -1014,9 +1014,9 @@ result = /obj/item/pressure_plate time = 5 reqs = list(/obj/item/stack/sheet/iron = 1, - /obj/item/stack/tile/iron = 1, - /obj/item/stack/cable_coil = 2, - /obj/item/assembly/igniter = 1) + /obj/item/stack/tile/iron = 1, + /obj/item/stack/cable_coil = 2, + /obj/item/assembly/igniter = 1) category = CAT_MISC @@ -1304,8 +1304,8 @@ result = /obj/structure/guillotine time = 150 // Building a functioning guillotine takes time reqs = list(/obj/item/stack/sheet/plasteel = 3, - /obj/item/stack/sheet/wood = 20, - /obj/item/stack/cable_coil = 10) + /obj/item/stack/sheet/wood = 20, + /obj/item/stack/cable_coil = 10) tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_WELDER) category = CAT_STRUCTURE dangerous_craft = TRUE diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm index 8fb8434ee5ec0..692a89e9707a3 100644 --- a/code/datums/components/crafting/tailoring.dm +++ b/code/datums/components/crafting/tailoring.dm @@ -70,8 +70,8 @@ time = 45 tools = list(TOOL_SCREWDRIVER, TOOL_MULTITOOL) reqs = list(/obj/item/clothing/mask/gas/old = 1, - /obj/item/assembly/voice = 1, - /obj/item/stack/cable_coil = 5) + /obj/item/assembly/voice = 1, + /obj/item/stack/cable_coil = 5) category = CAT_CLOTHING /datum/crafting_recipe/hudsunsec diff --git a/code/datums/components/cult_ritual_item.dm b/code/datums/components/cult_ritual_item.dm index 8b785485c6f11..1b3c1651a011a 100644 --- a/code/datums/components/cult_ritual_item.dm +++ b/code/datums/components/cult_ritual_item.dm @@ -221,7 +221,7 @@ log_game("[rune.cultist_name] rune erased by [key_name(cultist)] with [parent].") message_admins("[ADMIN_LOOKUPFLW(cultist)] erased a [rune.cultist_name] rune with [parent].") - to_chat(cultist, "You carefully erase the [lowertext(rune.cultist_name)] rune.") + to_chat(cultist, "You carefully erase the [LOWER_TEXT(rune.cultist_name)] rune.") qdel(rune) /* @@ -330,7 +330,7 @@ var/obj/effect/rune/made_rune = new rune_to_scribe(our_turf, chosen_keyword) made_rune.add_mob_blood(cultist) - to_chat(cultist, "The [lowertext(made_rune.cultist_name)] rune [made_rune.cultist_desc]") + to_chat(cultist, "The [LOWER_TEXT(made_rune.cultist_name)] rune [made_rune.cultist_desc]") SSblackbox.record_feedback("tally", "cult_runes_scribed", 1, made_rune.cultist_name) return TRUE diff --git a/code/datums/components/customizable_reagent_holder.dm b/code/datums/components/customizable_reagent_holder.dm index d470a27c3cce7..5485245139e92 100644 --- a/code/datums/components/customizable_reagent_holder.dm +++ b/code/datums/components/customizable_reagent_holder.dm @@ -58,7 +58,7 @@ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(customizable_attack)) RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) RegisterSignal(parent, COMSIG_ATOM_PROCESSED, PROC_REF(on_processed)) - ADD_TRAIT(parent, TRAIT_CUSTOMIZABLE_REAGENT_HOLDER, src) + ADD_TRAIT(parent, TRAIT_CUSTOMIZABLE_REAGENT_HOLDER, REF(src)) /datum/component/customizable_reagent_holder/UnregisterFromParent() @@ -68,7 +68,7 @@ COMSIG_PARENT_EXAMINE, COMSIG_ATOM_PROCESSED, )) - REMOVE_TRAIT(parent, TRAIT_CUSTOMIZABLE_REAGENT_HOLDER, src) + REMOVE_TRAIT(parent, TRAIT_CUSTOMIZABLE_REAGENT_HOLDER, REF(src)) /datum/component/customizable_reagent_holder/PostTransfer() if(!isatom(parent)) diff --git a/code/datums/components/deadchat_control.dm b/code/datums/components/deadchat_control.dm index b74f6e95958f4..e8db522517d6c 100644 --- a/code/datums/components/deadchat_control.dm +++ b/code/datums/components/deadchat_control.dm @@ -31,7 +31,7 @@ return ..() /datum/component/deadchat_control/proc/deadchat_react(mob/source, message) - message = lowertext(message) + message = LOWER_TEXT(message) if(!inputs[message]) return if(deadchat_mode == ANARCHY_MODE) diff --git a/code/datums/components/deployable.dm b/code/datums/components/deployable.dm index 5202dbae3701c..d5f59ead787c8 100644 --- a/code/datums/components/deployable.dm +++ b/code/datums/components/deployable.dm @@ -66,7 +66,7 @@ return if (!consumed && reload_type && istype(target, reload_type)) if (loaded) - to_chat(user, "You already have \a target docked!") + to_chat(user, "You already have a target docked!") return if(target.has_buckled_mobs()) if(target.buckled_mobs.len > 1) diff --git a/code/datums/components/forensics.dm b/code/datums/components/forensics.dm index 069f3ad1fd489..f4e5786234a40 100644 --- a/code/datums/components/forensics.dm +++ b/code/datums/components/forensics.dm @@ -31,7 +31,7 @@ RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_act)) /datum/component/forensics/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_COMPONENT_CLEAN_ACT)) + UnregisterSignal(parent, list(COMSIG_COMPONENT_CLEAN_ACT)) /datum/component/forensics/PostTransfer() if(!isatom(parent)) diff --git a/code/datums/components/haircolor_clothes.dm b/code/datums/components/haircolor_clothes.dm index f578e0a848b71..cae0c1c1f42d2 100644 --- a/code/datums/components/haircolor_clothes.dm +++ b/code/datums/components/haircolor_clothes.dm @@ -1,18 +1,18 @@ /datum/component/haircolor_clothing/Initialize() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(onEquip)) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, PROC_REF(update_color)) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(onEquip)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, PROC_REF(update_color)) /datum/component/haircolor_clothing/proc/onEquip(obj/item/I, mob/living/carbon/human/H, slot) - SIGNAL_HANDLER - if(ishuman(H) && slot == ITEM_SLOT_HEAD) - update_color(I, H) - H.update_inv_head() //Color might have been changed + SIGNAL_HANDLER + if(ishuman(H) && slot == ITEM_SLOT_HEAD) + update_color(I, H) + H.update_inv_head() //Color might have been changed /datum/component/haircolor_clothing/proc/update_color(obj/item/I, mob/living/carbon/human/H) - SIGNAL_HANDLER - if(ishuman(H)) - I.add_atom_colour("#[H.hair_color]", FIXED_COLOUR_PRIORITY) + SIGNAL_HANDLER + if(ishuman(H)) + I.add_atom_colour("#[H.hair_color]", FIXED_COLOUR_PRIORITY) /datum/component/haircolor_clothing/Destroy() - UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED,COMSIG_ATOM_UPDATE_ICON)) - return ..() + UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED,COMSIG_ATOM_UPDATE_ICON)) + return ..() diff --git a/code/datums/components/lockon_aiming.dm b/code/datums/components/lockon_aiming.dm index 7c79b801c31d4..6edd2d6694fd1 100644 --- a/code/datums/components/lockon_aiming.dm +++ b/code/datums/components/lockon_aiming.dm @@ -212,3 +212,6 @@ LOCKON_RANGING_BREAK_CHECK cd++ CHECK_TICK + +#undef LOCKON_IGNORE_RESULT +#undef LOCKON_RANGING_BREAK_CHECK diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 0ee11efeb5eb7..c9dc0b984c16c 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -69,7 +69,7 @@ var/datum/material/M = I var/amt = materials[I] if(amt) - examine_texts += "It has [amt] units of [lowertext(M.name)] stored." + examine_texts += "It has [amt] units of [LOWER_TEXT(M.name)] stored." /// Proc that allows players to fill the parent with mats /datum/component/material_container/proc/on_attackby(datum/source, obj/item/I, mob/living/user) diff --git a/code/datums/components/nanites.dm b/code/datums/components/nanites.dm index 4b0ce2501eee2..615312bcca556 100644 --- a/code/datums/components/nanites.dm +++ b/code/datums/components/nanites.dm @@ -298,11 +298,11 @@ for(var/datum/nanite_program/program as anything in programs) program.on_death(gibbed) -/datum/component/nanites/proc/receive_signal(datum/source, code, source = "an unidentified source") +/datum/component/nanites/proc/receive_signal(datum/source, code, signal_source = "an unidentified source") SIGNAL_HANDLER for(var/datum/nanite_program/program as anything in programs) - program.receive_nanite_signal(code, source) + program.receive_nanite_signal(code, signal_source) /datum/component/nanites/proc/receive_comm_signal(datum/source, comm_code, comm_message, comm_source = "an unidentified source") SIGNAL_HANDLER diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/remote_materials.dm index b9f6b495efb3c..2f969041e604c 100644 --- a/code/datums/components/remote_materials.dm +++ b/code/datums/components/remote_materials.dm @@ -28,7 +28,7 @@ handles linking back and forth. RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy)) RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(check_z_disconnect)) - RegisterSignal(parent, COMSIG_PARENT_RECIEVE_BUFFER, PROC_REF(recieve_buffer)) + RegisterSignal(parent, COMSIG_PARENT_RECEIVE_BUFFER, PROC_REF(receive_buffer)) var/turf/T = get_turf(parent) if (force_connect || (mapload && is_station_level(T.z))) @@ -121,7 +121,7 @@ handles linking back and forth. if (silo.remote_attackby(parent, user, I, mat_container_flags)) return COMPONENT_NO_AFTERATTACK -/datum/component/remote_materials/proc/recieve_buffer(datum/source, mob/user, datum/buffer, obj/item/buffer_parent) +/datum/component/remote_materials/proc/receive_buffer(datum/source, mob/user, datum/buffer, obj/item/buffer_parent) if (!QDELETED(buffer) && istype(buffer, /obj/machinery/ore_silo)) var/atom/P = parent if (!is_valid_link(P, buffer)) @@ -142,7 +142,7 @@ handles linking back and forth. mat_container = silo.GetComponent(/datum/component/material_container) to_chat(user, "You connect [parent] to [silo] from the multitool's buffer.") SEND_SIGNAL(parent, COMSIG_REMOTE_MATERIALS_CHANGED) - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED /datum/component/remote_materials/proc/on_hold() return silo && silo.holds["[get_area(parent)]/[category]"] diff --git a/code/datums/components/shuttle_cling.dm b/code/datums/components/shuttle_cling.dm index 9aad75697f5c4..befe1d5531d6a 100644 --- a/code/datums/components/shuttle_cling.dm +++ b/code/datums/components/shuttle_cling.dm @@ -36,7 +36,7 @@ src.direction = direction - ADD_TRAIT(parent, TRAIT_HYPERSPACED, src) + ADD_TRAIT(parent, TRAIT_HYPERSPACED, REF(src)) RegisterSignals(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_UNBUCKLE, COMSIG_MOVABLE_NO_LONGER_PULLED, COMSIG_MOVABLE_POST_THROW), PROC_REF(update_state)) @@ -155,7 +155,7 @@ qdel(src) /datum/component/shuttle_cling/Destroy(force, silent) - REMOVE_TRAIT(parent, TRAIT_HYPERSPACED, src) + REMOVE_TRAIT(parent, TRAIT_HYPERSPACED, REF(src)) QDEL_NULL(hyperloop) return ..() diff --git a/code/datums/components/sound_player.dm b/code/datums/components/sound_player.dm index 9bad9718a0537..fc1ff34041c77 100644 --- a/code/datums/components/sound_player.dm +++ b/code/datums/components/sound_player.dm @@ -1,7 +1,7 @@ /** * Sound Player component * - * Component that will play a sound upon recieving some signal + * Component that will play a sound upon receiving some signal */ /datum/component/sound_player ///Volume of the sound when played diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index e5dc6532d6403..8757402c7b2e9 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -118,7 +118,7 @@ UnregisterSignal(user, COMSIG_MOVABLE_DISPOSING) // Disposal pipes related shits -/datum/component/squeak/proc/disposing_react(datum/source, obj/structure/disposalholder/holder, obj/machinery/disposal/source) +/datum/component/squeak/proc/disposing_react(datum/source, obj/structure/disposalholder/holder, obj/machinery/disposal/disposals_unit) SIGNAL_HANDLER //We don't need to worry about unregistering this signal as it will happen for us automaticaly when the holder is qdeleted diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index e36ffb3f4dc11..aeae6ab3eced1 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -108,9 +108,9 @@ /datum/component/storage/concrete/pockets/helmet/Initialize() . = ..() can_hold = typecacheof(list(/obj/item/reagent_containers/food/drinks/bottle/vodka, - /obj/item/reagent_containers/food/drinks/bottle/molotov, - /obj/item/reagent_containers/food/drinks/drinkingglass, - /obj/item/ammo_box/a762)) + /obj/item/reagent_containers/food/drinks/bottle/molotov, + /obj/item/reagent_containers/food/drinks/drinkingglass, + /obj/item/ammo_box/a762)) /datum/component/storage/concrete/pockets/void_cloak quickdraw = TRUE diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index 238c9f1460413..47cae4599df1a 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -1,7 +1,3 @@ -#define COLLECT_ONE 0 -#define COLLECT_EVERYTHING 1 -#define COLLECT_SAME 2 - // External storage-related logic: // /mob/proc/ClickOn() in /_onclick/click.dm - clicking items in storages // /mob/living/Move() in /modules/mob/living/living.dm - hiding storage boxes on mob movement diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm index 6b7efd812e1d5..b0b1127c7cb01 100644 --- a/code/datums/components/twohanded.dm +++ b/code/datums/components/twohanded.dm @@ -63,9 +63,6 @@ if(require_twohands) ADD_TRAIT(parent, TRAIT_NEEDS_TWO_HANDS, ABSTRACT_ITEM_TRAIT) -// Inherit the new values passed to the component -#define ISWIELDED(O) (SEND_SIGNAL(O, COMSIG_ITEM_CHECK_WIELDED) & COMPONENT_IS_WIELDED) - /datum/component/two_handed/InheritComponent(datum/component/two_handed/new_comp, original, require_twohands, wieldsound, unwieldsound, \ force_multiplier, force_wielded, force_unwielded, block_power_wielded, block_power_unwielded, icon_wielded, \ unwield_on_swap, auto_wield, ignore_attack_self) diff --git a/code/datums/components/udder.dm b/code/datums/components/udder.dm index abfea6a842241..cbb1f5ea64ca9 100644 --- a/code/datums/components/udder.dm +++ b/code/datums/components/udder.dm @@ -71,6 +71,8 @@ ///optional proc to callback to when the udder generates milk var/datum/callback/on_generate_callback +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/udder) + /obj/item/udder/Initialize(mapload, udder_mob, on_generate_callback, reagent_produced_typepath = /datum/reagent/consumable/milk) src.udder_mob = udder_mob src.on_generate_callback = on_generate_callback diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm index 85c49f68d8b67..4837172ccca5d 100644 --- a/code/datums/components/uplink.dm +++ b/code/datums/components/uplink.dm @@ -290,8 +290,8 @@ /datum/component/uplink/proc/new_ringtone(datum/source, mob/living/user, new_ring_text) SIGNAL_HANDLER - if(trim(lowertext(new_ring_text)) != trim(lowertext(unlock_code))) - if(failsafe_code && trim(lowertext(new_ring_text)) == trim(lowertext(failsafe_code))) + if(trim(LOWER_TEXT(new_ring_text)) != trim(LOWER_TEXT(unlock_code))) + if(failsafe_code && trim(LOWER_TEXT(new_ring_text)) == trim(LOWER_TEXT(failsafe_code))) failsafe() return COMPONENT_STOP_RINGTONE_CHANGE return @@ -323,8 +323,8 @@ if(channel != RADIO_CHANNEL_UPLINK) return - if(!findtext(lowertext(message_to_use), lowertext(unlock_code))) - if(failsafe_code && findtext(lowertext(message_to_use), lowertext(failsafe_code))) + if(!findtext(LOWER_TEXT(message_to_use), LOWER_TEXT(unlock_code))) + if(failsafe_code && findtext(LOWER_TEXT(message_to_use), LOWER_TEXT(failsafe_code))) failsafe() return locked = FALSE @@ -380,3 +380,5 @@ return explosion(T,1,2,3) qdel(parent) //Alternatively could brick the uplink. + +#undef PEN_ROTATIONS diff --git a/code/datums/datum.dm b/code/datums/datum.dm index 5de92c7d2911a..270c870bedef5 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -64,6 +64,10 @@ #endif #endif + // If we have called dump_harddel_info already. Used to avoid duped calls (since we call it immediately in some cases on failure to process) + // Create and destroy is weird and I wanna cover my bases + var/harddel_deets_dumped = FALSE + #ifdef DATUMVAR_DEBUGGING_MODE var/list/cached_vars #endif @@ -267,3 +271,16 @@ return SEND_SIGNAL(source, COMSIG_CD_RESET(index), S_TIMER_COOLDOWN_TIMELEFT(source, index)) TIMER_COOLDOWN_END(source, index) + +/// Return text from this proc to provide extra context to hard deletes that happen to it +/// Optional, you should use this for cases where replication is difficult and extra context is required +/// Can be called more then once per object, use harddel_deets_dumped to avoid duplicate calls (I am so sorry) +/datum/proc/dump_harddel_info() + return + +///images are pretty generic, this should help a bit with tracking harddels related to them +/image/dump_harddel_info() + if(harddel_deets_dumped) + return + harddel_deets_dumped = TRUE + return "Image icon: [icon] - icon_state: [icon_state] [loc ? "loc: [loc] ([loc.x],[loc.y],[loc.z])" : ""]" diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 43c33c1ed7799..3903f5cb097c5 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -505,7 +505,7 @@ var/datum/disease/advance/D2 = pick(diseases) D2.Mix(D1) - // Should be only 1 entry left, but if not let's only return a single entry + // Should be only 1 entry left, but if not let's only return a single entry var/datum/disease/advance/to_return = pick(diseases) to_return.dormant = FALSE to_return.Refresh(new_name = TRUE) diff --git a/code/datums/diseases/advance/symptoms/alcohol.dm b/code/datums/diseases/advance/symptoms/alcohol.dm index 8b0528fe16095..a7131e7938c0d 100644 --- a/code/datums/diseases/advance/symptoms/alcohol.dm +++ b/code/datums/diseases/advance/symptoms/alcohol.dm @@ -12,7 +12,7 @@ prefixes = list("Drunken ", "Alcoholic ") var/target = 30 //how drunk should the target get? by default, its *just* below enough to cause vomiting threshold_desc = "Stealth 3: The host only reaches a slight buzz.
          \ - Stage Speed 6: The levels of alcohol produced can be lethal. Overriden by the stealth threshold.
          " + Stage Speed 6: The levels of alcohol produced can be lethal. Overriden by the stealth threshold.
          " /datum/symptom/alcohol/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/beesymptom.dm b/code/datums/diseases/advance/symptoms/beesymptom.dm index da419f002982c..046fef87a0b50 100644 --- a/code/datums/diseases/advance/symptoms/beesymptom.dm +++ b/code/datums/diseases/advance/symptoms/beesymptom.dm @@ -14,7 +14,7 @@ prefixes = list("Hive ") bodies = list("Bees", "Hive") threshold_desc = "Resistance 12: The bees become symbiotic with the host, synthesizing honey and no longer stinging the stomach lining, and no longer attacking the host. Bees will also contain honey, unless transmission exceeds 10.
          \ - Transmission 8: Bees now contain a completely random toxin." + Transmission 8: Bees now contain a completely random toxin." /datum/symptom/beesease/severityset(datum/disease/advance/A) . = ..() @@ -67,12 +67,12 @@ M.updatehealth() if(prob(10)) M.visible_message("[M] buzzes.", \ - "Your stomach buzzes violently!") + "Your stomach buzzes violently!") if(prob(15)) to_chat(M, "You feel something moving in your throat.") if(prob(10)) M.visible_message("[M] coughs up a bee!", \ - "You cough up a bee!") + "You cough up a bee!") if(toxic_bees) new /mob/living/simple_animal/hostile/poison/bees/toxin(M.loc) else if(honey) diff --git a/code/datums/diseases/advance/symptoms/blobspores.dm b/code/datums/diseases/advance/symptoms/blobspores.dm index ba6f930ae581a..846d015981526 100644 --- a/code/datums/diseases/advance/symptoms/blobspores.dm +++ b/code/datums/diseases/advance/symptoms/blobspores.dm @@ -14,8 +14,8 @@ var/strong_blob var/node_blob threshold_desc = "Resistance 11: There is a chance to spawn a factory blob, instead of a normal blob.
          \ - Resistance 8: Spawns a strong blob instead of a normal blob \ - Resistance 14: Has a chance to spawn a blob node instead of a normal blob
          " + Resistance 8: Spawns a strong blob instead of a normal blob \ + Resistance 14: Has a chance to spawn a blob node instead of a normal blob
          " /datum/symptom/blobspores/severityset(datum/disease/advance/A) . = ..() @@ -23,8 +23,8 @@ severity += 1 if(CONFIG_GET(flag/unconditional_symptom_thresholds)) threshold_desc = "Always: There is a chance to spawn a factory blob, instead of a normal blob.
          \ - Always: Spawns a strong blob instead of a normal blob \ - Resistance 8: Has a chance to spawn a blob node instead of a normal blob
          " + Always: Spawns a strong blob instead of a normal blob \ + Resistance 8: Has a chance to spawn a blob node instead of a normal blob
          " /datum/symptom/blobspores/Start(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/braindamage.dm b/code/datums/diseases/advance/symptoms/braindamage.dm index 3472df3dd1aab..4e076548371ac 100644 --- a/code/datums/diseases/advance/symptoms/braindamage.dm +++ b/code/datums/diseases/advance/symptoms/braindamage.dm @@ -15,7 +15,7 @@ var/lethal = FALSE var/moretrauma = FALSE threshold_desc = "transmission 12: The disease's damage reaches lethal levels.
          \ - Speed 9: Host's brain develops even more traumas than normal." + Speed 9: Host's brain develops even more traumas than normal." /datum/symptom/braindamage/severityset(datum/disease/advance/A) . = ..() @@ -23,7 +23,7 @@ severity += 1 if(CONFIG_GET(flag/unconditional_symptom_thresholds)) threshold_desc = "transmission 7: The disease's damage reaches lethal levels.
          \ - Speed 6: Host's brain develops even more traumas than normal." + Speed 6: Host's brain develops even more traumas than normal." /datum/symptom/braindamage/Start(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm index bbf244f714e38..b71f5bd62e516 100644 --- a/code/datums/diseases/advance/symptoms/choking.dm +++ b/code/datums/diseases/advance/symptoms/choking.dm @@ -33,7 +33,7 @@ Bonus suffixes = list(" Tuberculosis") var/paralysis = FALSE threshold_desc = "Stage Speed 8: Additionally synthesizes pancuronium and sodium thiopental inside the host.
          \ - Transmission 8: Doubles the damage caused by the symptom." + Transmission 8: Doubles the damage caused by the symptom." /datum/symptom/asphyxiation/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/clockwork.dm b/code/datums/diseases/advance/symptoms/clockwork.dm index 51e3c94fb8c45..9c84bd2161db6 100644 --- a/code/datums/diseases/advance/symptoms/clockwork.dm +++ b/code/datums/diseases/advance/symptoms/clockwork.dm @@ -16,8 +16,8 @@ var/replacebody = FALSE var/robustbits = FALSE threshold_desc = "Stage Speed 4:The virus will replace the host's organic organs with mundane, biometallic versions. +1 severity.
          \ - Resistance 4:The virus will eventually convert the host's entire body to biometallic materials, and maintain its cellular integrity. +1 severity.
          \ - Stage Speed 12:Biometallic mass created by the virus will be superior to typical organic mass. -3 severity." + Resistance 4:The virus will eventually convert the host's entire body to biometallic materials, and maintain its cellular integrity. +1 severity.
          \ + Stage Speed 12:Biometallic mass created by the virus will be superior to typical organic mass. -3 severity." /datum/symptom/robotic_adaptation/OnAdd(datum/disease/advance/A) A.infectable_biotypes |= MOB_ROBOTIC @@ -32,8 +32,8 @@ severity += 1 //at this stage, even one EMP will hurt, a lot. if(CONFIG_GET(flag/unconditional_symptom_thresholds)) threshold_desc = "Always:The virus will replace the host's organic organs with mundane, biometallic versions. +1 severity.
          \ - Resistance 4:The virus will eventually convert the host's entire body to biometallic materials, and maintain its cellular integrity. +1 severity.
          \ - Stage Speed 6:Biometallic mass created by the virus will be superior to typical organic mass. -3 severity." + Resistance 4:The virus will eventually convert the host's entire body to biometallic materials, and maintain its cellular integrity. +1 severity.
          \ + Stage Speed 6:Biometallic mass created by the virus will be superior to typical organic mass. -3 severity." /datum/symptom/robotic_adaptation/Start(datum/disease/advance/A) @@ -68,7 +68,7 @@ switch(O.slot) //i hate doing it this way, but the cleaner way runtimes and does not work if(ORGAN_SLOT_BRAIN) O.name = "enigmatic gearbox" - O.desc ="An engineer would call this inconcievable wonder of gears and metal a 'black box'" + O.desc ="An engineer would call this inconceivable wonder of gears and metal a 'black box'" O.icon_state = "brain-clock" O.status = ORGAN_ROBOTIC O.organ_flags = ORGAN_SYNTHETIC @@ -288,7 +288,7 @@ /obj/item/organ/brain/clockwork name = "enigmatic gearbox" - desc ="An engineer would call this inconcievable wonder of gears and metal a 'black box'" + desc ="An engineer would call this inconceivable wonder of gears and metal a 'black box'" icon_state = "brain-clock" status = ORGAN_ROBOTIC organ_flags = ORGAN_SYNTHETIC diff --git a/code/datums/diseases/advance/symptoms/cockroach.dm b/code/datums/diseases/advance/symptoms/cockroach.dm index 739d897a2c274..407eaa8728bba 100644 --- a/code/datums/diseases/advance/symptoms/cockroach.dm +++ b/code/datums/diseases/advance/symptoms/cockroach.dm @@ -46,7 +46,7 @@ if(5) if(prob(30)) M.visible_message("[M] squirms as a cockroach crawls from their pores!", \ - "A cockroach crawls out of your face!!") + "A cockroach crawls out of your face!!") new /mob/living/basic/cockroach(M.loc) if(prob(50)) to_chat(M, "You feel something crawling in your pipes!") diff --git a/code/datums/diseases/advance/symptoms/confusion.dm b/code/datums/diseases/advance/symptoms/confusion.dm index 1854c5b29f613..2c9b32da65f0e 100644 --- a/code/datums/diseases/advance/symptoms/confusion.dm +++ b/code/datums/diseases/advance/symptoms/confusion.dm @@ -32,8 +32,8 @@ Bonus bodies = list("Ditz") var/brain_damage = FALSE threshold_desc = "Resistance 6: Causes brain damage over time.
          \ - Transmission 6: Increases confusion duration.
          \ - Stealth 4: The symptom remains hidden until active." + Transmission 6: Increases confusion duration.
          \ + Stealth 4: The symptom remains hidden until active." /datum/symptom/confusion/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm index 3311a7a1fb2ad..ac7f62e0a1dc9 100644 --- a/code/datums/diseases/advance/symptoms/cough.dm +++ b/code/datums/diseases/advance/symptoms/cough.dm @@ -31,10 +31,10 @@ BONUS bodies = list("Cough") var/infective = FALSE threshold_desc = "Resistance 3: Host will drop small items when coughing.
          \ - Resistance 10: Occasionally causes coughing fits that stun the host.
          \ - Stage Speed 6: Increases cough frequency.
          \ - Stealth 4: The symptom remains hidden until active.
          \ - Transmission 11: The host's coughing will occasionally spread the virus." + Resistance 10: Occasionally causes coughing fits that stun the host.
          \ + Stage Speed 6: Increases cough frequency.
          \ + Stealth 4: The symptom remains hidden until active.
          \ + Transmission 11: The host's coughing will occasionally spread the virus." /datum/symptom/cough/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index 94e438e0c1632..73ae8badee36e 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -31,7 +31,7 @@ Bonus prefixes = list("Aural ") bodies = list("Ear") threshold_desc = "Resistance 9: Causes permanent deafness, instead of intermittent.
          \ - Stealth 4: The symptom remains hidden until active." + Stealth 4: The symptom remains hidden until active." /datum/symptom/deafness/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/fever.dm b/code/datums/diseases/advance/symptoms/fever.dm index 042a34f2fdf11..fb19e732ae1c6 100644 --- a/code/datums/diseases/advance/symptoms/fever.dm +++ b/code/datums/diseases/advance/symptoms/fever.dm @@ -31,7 +31,7 @@ Bonus suffixes = list(" Fever") var/unsafe = FALSE //over the heat threshold threshold_desc = "Resistance 5: Increases fever intensity, fever can overheat and harm the host.
          \ - Resistance 10: Further increases fever intensity." + Resistance 10: Further increases fever intensity." /datum/symptom/fever/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm index ba506eaa76a3e..e2f6529c7582f 100644 --- a/code/datums/diseases/advance/symptoms/fire.dm +++ b/code/datums/diseases/advance/symptoms/fire.dm @@ -33,9 +33,9 @@ Bonus suffixes = list(" Combustion") var/infective = FALSE threshold_desc = "Stage Speed 4: Increases the intensity of the flames.
          \ - Stage Speed 8: Further increases flame intensity.
          \ - Transmission 8: Host will spread the virus through skin flakes when bursting into flame.
          \ - Stealth 4: The symptom remains hidden until active." + Stage Speed 8: Further increases flame intensity.
          \ + Transmission 8: Host will spread the virus through skin flakes when bursting into flame.
          \ + Stealth 4: The symptom remains hidden until active." /datum/symptom/fire/Start(datum/disease/advance/A) if(!..()) @@ -127,8 +127,8 @@ Bonus var/chems = FALSE var/explosion_power = 1 threshold_desc = "Stealth 3: Doubles the intensity of the effect, but reduces its frequency.
          \ - Stage Speed 8: Increases explosion radius when the host is wet.
          \ - Resistance 8: Additionally synthesizes chlorine trifluoride and napalm inside the host." + Stage Speed 8: Increases explosion radius when the host is wet.
          \ + Resistance 8: Additionally synthesizes chlorine trifluoride and napalm inside the host." /datum/symptom/alkali/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index cad4fdcf192cc..63a6863de6f87 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -33,7 +33,7 @@ Bonus var/bleed = FALSE var/damage = FALSE threshold_desc = "Resistance 10: The host takes brute damage as their flesh is burst open
          \ - Transmission 8: The host will bleed far more violently, losing even more blood, and spraying infected blood everywhere." + Transmission 8: The host will bleed far more violently, losing even more blood, and spraying infected blood everywhere." /datum/symptom/flesh_eating/Start(datum/disease/advance/A) if(!..()) @@ -72,7 +72,7 @@ Bonus var/turf/T = H.loc playsound(T, 'sound/effects/splat.ogg', 50, 1) H.visible_message("Blood bursts from [H]'s flesh!", \ - "Blood spews forth from your flesh! It hurts!") + "Blood spews forth from your flesh! It hurts!") for(var/i in 0 to geysers) var/geyserdir = pick_n_take(geyserdirs) var/geyserdist = rand(1, max(1,bloodsplatters)) @@ -119,7 +119,7 @@ Bonus var/chems = FALSE var/zombie = FALSE threshold_desc = "Stage Speed 7: Synthesizes Heparin and Lipolicide inside the host, causing increased bleeding and hunger.
          \ - Stealth 5: The symptom remains hidden until active." + Stealth 5: The symptom remains hidden until active." /datum/symptom/flesh_death/severityset(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm index 780d5957234f0..53db86f10757a 100644 --- a/code/datums/diseases/advance/symptoms/genetics.dm +++ b/code/datums/diseases/advance/symptoms/genetics.dm @@ -33,8 +33,8 @@ Bonus bodies = list("Mutant") var/no_reset = FALSE threshold_desc = "Resistance 8: Causes two harmful mutations at once.
          \ - Stage Speed 10: Increases mutation frequency.
          \ - Stealth 5: The mutations persist even if the virus is cured." + Stage Speed 10: Increases mutation frequency.
          \ + Stealth 5: The mutations persist even if the virus is cured." /datum/symptom/genetic_mutation/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/hallucigen.dm b/code/datums/diseases/advance/symptoms/hallucigen.dm index 0ee9da994bbcc..a4cf39c37320a 100644 --- a/code/datums/diseases/advance/symptoms/hallucigen.dm +++ b/code/datums/diseases/advance/symptoms/hallucigen.dm @@ -31,7 +31,7 @@ Bonus suffixes = list(" Psychosis") var/fake_healthy = FALSE threshold_desc = "Stage Speed 7: Increases the amount of hallucinations.
          \ - Stealth 2: The virus mimics positive symptoms.." + Stealth 2: The virus mimics positive symptoms.." /datum/symptom/hallucigen/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm index 1f110621cfd8d..9ad68e754364a 100644 --- a/code/datums/diseases/advance/symptoms/headache.dm +++ b/code/datums/diseases/advance/symptoms/headache.dm @@ -31,8 +31,8 @@ BONUS symptom_delay_max = 30 bodies = list("Skull", "Migraine") threshold_desc = "Stage Speed 6: Headaches will cause severe pain, that weakens the host.
          \ - Stage Speed 9: Headaches become less frequent but far more intense, preventing any action from the host.
          \ - Stealth 4: Reduces headache frequency until later stages." + Stage Speed 9: Headaches become less frequent but far more intense, preventing any action from the host.
          \ + Stealth 4: Reduces headache frequency until later stages." /datum/symptom/headache/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index d5f73ba464c86..b27e10d7b5438 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -55,7 +55,7 @@ var/food_conversion = FALSE desc = "The virus rapidly breaks down any foreign chemicals in the bloodstream." threshold_desc = "Resistance 7: Increases chem removal speed.
          \ - Stage Speed 6: Consumed chemicals nourish the host." + Stage Speed 6: Consumed chemicals nourish the host." /datum/symptom/heal/chem/Start(datum/disease/advance/A) if(!..()) @@ -90,8 +90,8 @@ var/stabilize = FALSE var/active_coma = FALSE //to prevent multiple coma procs threshold_desc = "Stealth 2: Host appears to die when falling into a coma, triggering symptoms that activate on death.
          \ - Resistance 4: The virus also stabilizes the host while they are in critical condition.
          \ - Stage Speed 7: Increases healing speed." + Resistance 4: The virus also stabilizes the host while they are in critical condition.
          \ + Stage Speed 7: Increases healing speed." /datum/symptom/heal/coma/Start(datum/disease/advance/A) if(!..()) @@ -188,7 +188,7 @@ var/scarcounter = 0 threshold_desc = "Stage Speed 8: Doubles healing speed.
          \ - Resistance 10: Improves healing threshold." + Resistance 10: Improves healing threshold." /datum/symptom/heal/surface/Start(datum/disease/advance/A) if(!..()) @@ -238,9 +238,9 @@ var/triple_metabolism = FALSE var/reduced_hunger = FALSE desc = "The virus causes the host's metabolism to accelerate rapidly, making them process chemicals twice as fast,\ - but also causing increased hunger." + but also causing increased hunger." threshold_desc = "Stealth 3: Reduces hunger rate.
          \ - Stage Speed 10: Chemical metabolization is tripled instead of doubled." + Stage Speed 10: Chemical metabolization is tripled instead of doubled." /datum/symptom/heal/metabolism/Start(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/heartattack.dm b/code/datums/diseases/advance/symptoms/heartattack.dm index 04de86cdbbf32..8c5c12cba4153 100644 --- a/code/datums/diseases/advance/symptoms/heartattack.dm +++ b/code/datums/diseases/advance/symptoms/heartattack.dm @@ -30,7 +30,7 @@ Bonus bodies = list("Heart") var/heartattack = FALSE threshold_desc = "Transmission 10: When the victim has a heart attack, their heart will pop right out of their chest, and attack!.
          \ - Stealth 2: The disease is somewhat less noticeable to the host." + Stealth 2: The disease is somewhat less noticeable to the host." /datum/symptom/heartattack/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm index 747a7e2b96445..4864a0148db0e 100644 --- a/code/datums/diseases/advance/symptoms/itching.dm +++ b/code/datums/diseases/advance/symptoms/itching.dm @@ -32,7 +32,7 @@ BONUS bodies = list("Itch") var/scratch = FALSE threshold_desc = "Transmission 6: Increases frequency of itching.
          \ - Stage Speed 7: The host will scrath itself when itching, causing superficial damage." + Stage Speed 7: The host will scrath itself when itching, causing superficial damage." /datum/symptom/itching/Start(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/kitty.dm b/code/datums/diseases/advance/symptoms/kitty.dm index 3b6283f9448b7..95df15fba427d 100644 --- a/code/datums/diseases/advance/symptoms/kitty.dm +++ b/code/datums/diseases/advance/symptoms/kitty.dm @@ -15,7 +15,7 @@ var/uwu = FALSE var/dnacounter = 0 threshold_desc = "Transmission 4:The symptom mutates the language center of the host's brain, causing them to speak in an infuriating dialect. Known to drive hosts to suicide.
          \ - Stealth 4:Hosts are overcome with a dysmorphic mania, causing them to glorify the idea of becoming more catlike. May cause irrational behaviour, and, in extreme cases, major body restructuring." + Stealth 4:Hosts are overcome with a dysmorphic mania, causing them to glorify the idea of becoming more catlike. May cause irrational behaviour, and, in extreme cases, major body restructuring." /datum/symptom/toxoplasmosis/severityset(datum/disease/advance/A) . = ..() @@ -25,7 +25,7 @@ severity += 2 if(CONFIG_GET(flag/unconditional_symptom_thresholds)) threshold_desc = "Transmission 4:The symptom mutates the language center of the host's brain, causing them to speak in an infuriating dialect. Known to drive hosts to suicide.
          \ - Stealth 0:Hosts are overcome with a dysmorphic mania, causing them to glorify the idea of becoming more catlike. May cause irrational behaviour, and, in extreme cases, major body restructuring." + Stealth 0:Hosts are overcome with a dysmorphic mania, causing them to glorify the idea of becoming more catlike. May cause irrational behaviour, and, in extreme cases, major body restructuring." /datum/symptom/toxoplasmosis/Start(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/lubefeet.dm b/code/datums/diseases/advance/symptoms/lubefeet.dm index 194fdc83735d1..cdef60f53c6c1 100644 --- a/code/datums/diseases/advance/symptoms/lubefeet.dm +++ b/code/datums/diseases/advance/symptoms/lubefeet.dm @@ -14,7 +14,7 @@ var/morelube = FALSE var/clownshoes = FALSE threshold_desc = "Transmission 10: The host sweats even more profusely, lubing almost every tile they walk over
          \ - Resistance 14: The host's feet turn into a pair of clown shoes." + Resistance 14: The host's feet turn into a pair of clown shoes." /datum/symptom/lubefeet/severityset(datum/disease/advance/A) . = ..() @@ -22,7 +22,7 @@ severity += 1 if(CONFIG_GET(flag/unconditional_symptom_thresholds)) threshold_desc = "Transmission 8: The host sweats even more profusely, lubing almost every tile they walk over
          \ - Resistance 8: The host's feet turn into a pair of clown shoes." + Resistance 8: The host's feet turn into a pair of clown shoes." /datum/symptom/lubefeet/Start(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/macrophage.dm b/code/datums/diseases/advance/symptoms/macrophage.dm index a04a1552278ed..84be55a4c3c7e 100644 --- a/code/datums/diseases/advance/symptoms/macrophage.dm +++ b/code/datums/diseases/advance/symptoms/macrophage.dm @@ -15,9 +15,9 @@ var/netspeed = 0 var/phagecounter = 10 threshold_desc = "Stage Speed:The higher the stage speed, the more frequently phages will burst from the host.
          \ - Resistance:The higher the resistance, the more health phages will have, and the more damage they will do.
          \ - Transmission 10:Phages can be larger, more aggressive, and able to pierce thick clothing, with some effort.
          \ - Transmission 12:Phages will carry all diseases within the host, instead of only diseases containing their own symptom" + Resistance:The higher the resistance, the more health phages will have, and the more damage they will do.
          \ + Transmission 10:Phages can be larger, more aggressive, and able to pierce thick clothing, with some effort.
          \ + Transmission 12:Phages will carry all diseases within the host, instead of only diseases containing their own symptom" @@ -43,7 +43,7 @@ to_chat(M, "Your skin crawls.") if(4) M.visible_message("Lumps form on [M]'s skin!", \ - "You cringe in pain as lumps form and move around on your skin!") + "You cringe in pain as lumps form and move around on your skin!") if(5) phagecounter -= max(2, A.stage_rate) if(gigagerms && phagecounter <= 0) //only ever spawn one big germ @@ -76,5 +76,5 @@ continue phage.infections += D M.visible_message("A strange creature bursts out of [M]!", \ - "A slimy creature bursts forth from your flesh!") + "A slimy creature bursts forth from your flesh!") addtimer(CALLBACK(phage, TYPE_PROC_REF(/mob/living/simple_animal/hostile/macrophage, shrivel)), 3000) diff --git a/code/datums/diseases/advance/symptoms/nanites.dm b/code/datums/diseases/advance/symptoms/nanites.dm index 3a35cfc7c14c4..d0f9eba48c6c0 100644 --- a/code/datums/diseases/advance/symptoms/nanites.dm +++ b/code/datums/diseases/advance/symptoms/nanites.dm @@ -13,7 +13,7 @@ suffixes = list(" Silicophilia") var/reverse_boost = FALSE threshold_desc = "Transmission 5: Increases the virus' growth rate while nanites are present.
          \ - Stage Speed 7: Increases the replication boost." + Stage Speed 7: Increases the replication boost." /datum/symptom/nano_boost/Start(datum/disease/advance/A) if(!..()) @@ -54,7 +54,7 @@ suffixes = list(" Silicophobia") var/reverse_boost = FALSE threshold_desc = "Stage Speed 5: Increases the virus' growth rate while nanites are present.
          \ - Resistance 7: Severely increases the rate at which the nanites are destroyed." + Resistance 7: Severely increases the rate at which the nanites are destroyed." /datum/symptom/nano_destroy/Start(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/narcolepsy.dm b/code/datums/diseases/advance/symptoms/narcolepsy.dm index 20924228fab57..822adf9895714 100644 --- a/code/datums/diseases/advance/symptoms/narcolepsy.dm +++ b/code/datums/diseases/advance/symptoms/narcolepsy.dm @@ -29,7 +29,7 @@ Bonus var/sleepy_ticks = 0 var/stamina = FALSE threshold_desc = "Transmission 7: Also relaxes the muscles, weakening and slowing the host.
          \ - Resistance 10: Causes narcolepsy more often, increasing the chance of the host falling asleep." + Resistance 10: Causes narcolepsy more often, increasing the chance of the host falling asleep." /datum/symptom/narcolepsy/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/necropolis.dm b/code/datums/diseases/advance/symptoms/necropolis.dm index 333305ecfd5db..4d410a728b61f 100644 --- a/code/datums/diseases/advance/symptoms/necropolis.dm +++ b/code/datums/diseases/advance/symptoms/necropolis.dm @@ -16,8 +16,8 @@ prefixes = list("Lava ", "Lavaland ", "Eldritch ") bodies = list("Goliath", "Tentacle", "Carapace") threshold_desc = "Stealth 8: Upon death, the host's soul will solidify into an unholy artifact, rendering them utterly unrevivable in the process.
          \ - Transmission 6: The area near the host roils with paralyzing tendrils.
          \ - Resistance 20: Host becomes immune to heat, ash, and lava" + Transmission 6: The area near the host roils with paralyzing tendrils.
          \ + Resistance 20: Host becomes immune to heat, ash, and lava" var/list/cached_tentacle_turfs var/turf/last_location var/tentacle_recheck_cooldown = 100 @@ -30,8 +30,8 @@ severity -= 1 if(CONFIG_GET(flag/unconditional_symptom_thresholds)) threshold_desc = "Stealth 8: Upon death, the host's soul will solidify into an unholy artifact, rendering them utterly unrevivable in the process.
          \ - Transmission 6: The area near the host roils with paralyzing tendrils.
          \ - Resistance 12: Host becomes immune to heat, ash, and lava" + Transmission 6: The area near the host roils with paralyzing tendrils.
          \ + Resistance 12: Host becomes immune to heat, ash, and lava" /datum/symptom/necroseed/Start(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/organs.dm b/code/datums/diseases/advance/symptoms/organs.dm index 2884e9b09fdb8..85f64b361ab4c 100644 --- a/code/datums/diseases/advance/symptoms/organs.dm +++ b/code/datums/diseases/advance/symptoms/organs.dm @@ -14,8 +14,8 @@ var/trauma_heal_mild = FALSE var/trauma_heal_severe = FALSE threshold_desc = "Resistance 6: Heals minor brain traumas.
          \ - Resistance 9: Heals severe brain traumas.
          \ - Transmission 8: Purges alcohol in the bloodstream." + Resistance 9: Heals severe brain traumas.
          \ + Transmission 8: Purges alcohol in the bloodstream." /datum/symptom/mind_restoration/Start(datum/disease/advance/A) if(!..()) @@ -125,7 +125,7 @@ var/curing = FALSE var/regenorgans = FALSE threshold_desc = "Stealth 4: The host will regenerate missing organs over a long period of time.
          \ - Stage Speed 10: The virus causes the host's internal organs to gain some self-correcting behaviour, preventing heart attacks and appendicitis.
          " + Stage Speed 10: The virus causes the host's internal organs to gain some self-correcting behaviour, preventing heart attacks and appendicitis.
          " /datum/symptom/organ_restoration/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/pierrot.dm b/code/datums/diseases/advance/symptoms/pierrot.dm index 442bbc231b2c6..8b0c410e885e2 100644 --- a/code/datums/diseases/advance/symptoms/pierrot.dm +++ b/code/datums/diseases/advance/symptoms/pierrot.dm @@ -13,8 +13,8 @@ var/clownmask = FALSE var/clumsy = FALSE threshold_desc = "Transmission 10: There's a rare chance the disease is spread everytime the host honks.
          \ - Resistance 10: The host grows a peculiar clown mask.
          \ - Resistance 15: Host becomes clumsy, similar to a clown." + Resistance 10: The host grows a peculiar clown mask.
          \ + Resistance 15: Host becomes clumsy, similar to a clown." /datum/symptom/pierrot/severityset(datum/disease/advance/A) . = ..() @@ -26,8 +26,8 @@ severity += 2 if(CONFIG_GET(flag/unconditional_symptom_thresholds)) threshold_desc = "Transmission 10: There's a rare chance the disease is spread everytime the host honks.
          \ - Resistance 8: The host grows a peculiar clown mask.
          \ - Resistance 10: Host becomes clumsy, similar to a clown." + Resistance 8: The host grows a peculiar clown mask.
          \ + Resistance 10: Host becomes clumsy, similar to a clown." /datum/symptom/pierrot/Start(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/shivering.dm b/code/datums/diseases/advance/symptoms/shivering.dm index f55d3097f5a4a..bb6b4528720a2 100644 --- a/code/datums/diseases/advance/symptoms/shivering.dm +++ b/code/datums/diseases/advance/symptoms/shivering.dm @@ -30,7 +30,7 @@ Bonus suffixes = list(" Shivers") var/unsafe = FALSE //over the cold threshold threshold_desc = "Stage Speed 5: Increases cooling speed; the host can fall below safe temperature levels.
          \ - Stage Speed 10: Further increases cooling speed." + Stage Speed 10: Further increases cooling speed." /datum/symptom/shivering/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm index d1b390d400331..6d82c7e7d5a2a 100644 --- a/code/datums/diseases/advance/symptoms/skin.dm +++ b/code/datums/diseases/advance/symptoms/skin.dm @@ -198,8 +198,8 @@ Spiked Skin No transmission bonus Thresholds - transmission 6 Can give minor armour - resistance 6 Does more damage + transmission 6 Can give minor armour + resistance 6 Does more damage ////////////////////////////////////// */ @@ -220,7 +220,7 @@ Thresholds var/armor = 0 var/done = FALSE threshold_desc = "Transmission 6: Spikes deal more damage.
          \ - Resistance 6: Hard spines give the host armor, scaling with resistance." + Resistance 6: Hard spines give the host armor, scaling with resistance." /datum/symptom/spiked/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/sneeze.dm b/code/datums/diseases/advance/symptoms/sneeze.dm index ff02828df8210..3a2eb3c069f27 100644 --- a/code/datums/diseases/advance/symptoms/sneeze.dm +++ b/code/datums/diseases/advance/symptoms/sneeze.dm @@ -30,7 +30,7 @@ Bonus bodies = list("Cold") var/infective = FALSE threshold_desc = "Stealth 4: The symptom remains hidden until active.
          \ - Transmission 12: The host may spread the disease through sneezing." + Transmission 12: The host may spread the disease through sneezing." /datum/symptom/sneeze/Start(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/viral.dm b/code/datums/diseases/advance/symptoms/viral.dm index 63aa64707e5a6..4d4d9f9e90087 100644 --- a/code/datums/diseases/advance/symptoms/viral.dm +++ b/code/datums/diseases/advance/symptoms/viral.dm @@ -94,7 +94,7 @@ Bonus prefixes = list("Spontaneous ") var/time_to_cure threshold_desc = "Resistance/Stage Speed: Highest between these determines the amount of time before self-curing.
          \ - Stealth 4 Doubles the time before the virus self-cures" + Stealth 4 Doubles the time before the virus self-cures" /datum/symptom/viralreverse/Activate(datum/disease/advance/A) @@ -169,7 +169,7 @@ Bonus S.stopped = TRUE captives += S used = TRUE - + /* ////////////////////////////////////// @@ -195,10 +195,10 @@ Bonus prefixes = list("Super", "Mega", "Admin ") var/maxpower var/powerbudget - var/scramble = FALSE + var/scramble = FALSE var/used = FALSE threshold_desc = "Transmission 8: Constantly scrambles the power of all unneutered symptoms.
          \ - Stage Speed 8 Doubles the power boost" + Stage Speed 8 Doubles the power boost" /datum/symptom/viralpower/Start(datum/disease/advance/A) @@ -219,10 +219,10 @@ Bonus if(S == src) return S.power += power - maxpower += S.power + maxpower += S.power if(scramble) - powerbudget += power - maxpower += power + powerbudget += power + maxpower += power power = 0 used = TRUE if(scramble) diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm index cf462bc70dd96..8d60fa9126c17 100644 --- a/code/datums/diseases/advance/symptoms/vision.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -33,7 +33,7 @@ Bonus suffixes = list(" Blindness") var/remove_eyes = FALSE threshold_desc = "Resistance 12: Weakens extraocular muscles, eventually leading to complete detachment of the eyes.
          \ - Stealth 4: The symptom remains hidden until active." + Stealth 4: The symptom remains hidden until active." /datum/symptom/visionloss/severityset(datum/disease/advance/A) . = ..() @@ -41,7 +41,7 @@ Bonus severity += 1 if(CONFIG_GET(flag/unconditional_symptom_thresholds)) threshold_desc = "Resistance 8: Weakens extraocular muscles, eventually leading to complete detachment of the eyes.
          \ - Stealth 4: The symptom remains hidden until active." + Stealth 4: The symptom remains hidden until active." /datum/symptom/visionloss/Start(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm index d05dc68f9559c..313b34f13d3b6 100644 --- a/code/datums/diseases/advance/symptoms/voice_change.dm +++ b/code/datums/diseases/advance/symptoms/voice_change.dm @@ -32,8 +32,8 @@ Bonus var/scramble_language = FALSE var/datum/language/current_language threshold_desc = "Transmission 10: The host's language center of the brain is damaged, leading to complete inability to speak or understand any language.
          \ - Stage Speed 7: Changes voice more often.
          \ - Stealth 3: The symptom remains hidden until active." + Stage Speed 7: Changes voice more often.
          \ + Stealth 3: The symptom remains hidden until active." /datum/symptom/voice_change/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/diseases/advance/symptoms/vomit.dm b/code/datums/diseases/advance/symptoms/vomit.dm index 125d82865b85d..2c26cf044513f 100644 --- a/code/datums/diseases/advance/symptoms/vomit.dm +++ b/code/datums/diseases/advance/symptoms/vomit.dm @@ -38,8 +38,8 @@ Bonus var/vomit_blood = FALSE var/proj_vomit = 0 threshold_desc = "Stage Speed 5: Host will vomit blood, causing internal damage.
          \ - Transmission 6: Host will projectile vomit, increasing vomiting range.
          \ - Stealth 4: The symptom remains hidden until active." + Transmission 6: Host will projectile vomit, increasing vomiting range.
          \ + Stealth 4: The symptom remains hidden until active." /datum/symptom/vomit/Start(datum/disease/advance/A) if(!..()) diff --git a/code/datums/diseases/advance/symptoms/wizarditis.dm b/code/datums/diseases/advance/symptoms/wizarditis.dm index 7f59697857c3b..620cc913e6dd8 100644 --- a/code/datums/diseases/advance/symptoms/wizarditis.dm +++ b/code/datums/diseases/advance/symptoms/wizarditis.dm @@ -14,7 +14,7 @@ var/teleport = FALSE var/robes = FALSE threshold_desc = "Transmission 8: The host teleports occasionally.
          \ - Stage Speed 7: The host grows a set of wizard robes." + Stage Speed 7: The host grows a set of wizard robes." /datum/symptom/wizarditis/severityset(datum/disease/advance/A) . = ..() diff --git a/code/datums/elements/art.dm b/code/datums/elements/art.dm index ca28d0037e4e5..7a1b58c90aa0c 100644 --- a/code/datums/elements/art.dm +++ b/code/datums/elements/art.dm @@ -33,7 +33,7 @@ msg = "Wow, [source.p_they()] sucks." user.visible_message("[user] stops and looks intently at [source].", \ - "You appraise [source]... [msg]") + "You appraise [source]... [msg]") /datum/element/art/proc/on_examine(atom/source, mob/user, list/examine_texts) SIGNAL_HANDLER diff --git a/code/datums/elements/rust.dm b/code/datums/elements/rust.dm index f849f0288d4c5..46526ab89cdf3 100644 --- a/code/datums/elements/rust.dm +++ b/code/datums/elements/rust.dm @@ -14,7 +14,7 @@ return COMPONENT_INCOMPATIBLE if(!rust_overlay) rust_overlay = image(rust_icon, rust_icon_state) - ADD_TRAIT(target, TRAIT_RUSTY, src) + ADD_TRAIT(target, TRAIT_RUSTY, REF(src)) RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_rust_overlay)) RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(handle_examine)) RegisterSignals(target, list(COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), COMSIG_ATOM_TOOL_ACT(TOOL_RUSTSCRAPER)), PROC_REF(secondary_tool_act)) @@ -26,7 +26,7 @@ UnregisterSignal(source, COMSIG_ATOM_UPDATE_OVERLAYS) UnregisterSignal(source, COMSIG_PARENT_EXAMINE) UnregisterSignal(source, list(COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), COMSIG_ATOM_TOOL_ACT(TOOL_RUSTSCRAPER))) - REMOVE_TRAIT(source, TRAIT_RUSTY, src) + REMOVE_TRAIT(source, TRAIT_RUSTY, REF(src)) source.update_icon() /datum/element/rust/proc/handle_examine(datum/source, mob/user, list/examine_text) diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 9544973148459..09e74a3e7b511 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -1,6 +1,3 @@ -#define EMOTE_AUDIBLE (1<<0) -#define EMOTE_ANIMATED (1<<1) - /datum/emote var/key = "" //What calls the emote var/key_third_person = "" //This will also call the emote diff --git a/code/datums/greyscale/_greyscale_config.dm b/code/datums/greyscale/_greyscale_config.dm index 807187a048209..63cf01414fd63 100644 --- a/code/datums/greyscale/_greyscale_config.dm +++ b/code/datums/greyscale/_greyscale_config.dm @@ -281,8 +281,9 @@ for(var/datum/greyscale_layer/layer as anything in group) var/icon/layer_icon if(islist(layer)) + var/list/layer_list = layer layer_icon = GenerateLayerGroup(colors, layer, render_steps, new_icon || last_external_icon) - layer = layer[1] // When there are multiple layers in a group like this we use the first one's blend mode + layer = layer_list[1] // When there are multiple layers in a group like this we use the first one's blend mode else layer_icon = layer.Generate(colors, render_steps, new_icon || last_external_icon) @@ -328,12 +329,15 @@ /// Internal recursive proc to handle nested layer groups /datum/greyscale_config/proc/GenerateLayerGroup_entry(list/colors, list/group, datum/universal_icon/last_external_icon) var/datum/universal_icon/new_icon - for(var/datum/greyscale_layer/layer as anything in group) + for(var/layer_group as anything in group) var/datum/universal_icon/layer_icon - if(islist(layer)) + var/datum/greyscale_layer/layer + if(islist(layer_group)) layer_icon = GenerateLayerGroup_entry(colors, layer, new_icon || last_external_icon) - layer = layer[1] // When there are multiple layers in a group like this we use the first one's blend mode + var/list/layer_list = layer_group + layer = layer_list[1] // When there are multiple layers in a group like this we use the first one's blend mode else + layer = layer_group layer_icon = layer.Generate_entry(colors, new_icon || last_external_icon) if(!new_icon) diff --git a/code/datums/greyscale/json_reader.dm b/code/datums/greyscale/json_reader.dm index ffe143c28fc75..38286631fed49 100644 --- a/code/datums/greyscale/json_reader.dm +++ b/code/datums/greyscale/json_reader.dm @@ -63,7 +63,7 @@ ) /datum/json_reader/blend_mode/ReadJson(value) - var/new_value = blend_modes[lowertext(value)] + var/new_value = blend_modes[LOWER_TEXT(value)] if(isnull(new_value)) CRASH("Blend mode expected but got '[value]'") return new_value diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 44c73d4263386..2f88159ad3296 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -222,6 +222,8 @@ var/turf/destination var/has_hud_icon = FALSE +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/teleportation_wake) + /obj/effect/temp_visual/teleportation_wake/Initialize(mapload, turf/destination) // Replace any portals on the current turf for (var/obj/effect/temp_visual/teleportation_wake/conflicting_portal in loc) diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index d6457fc2fa0e9..9cb9736aa93fd 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -1,14 +1,3 @@ -#define HOLOPAD_MAX_DIAL_TIME 200 - -#define HOLORECORD_DELAY "delay" -#define HOLORECORD_SAY "say" -#define HOLORECORD_SOUND "sound" -#define HOLORECORD_LANGUAGE "lang" -#define HOLORECORD_PRESET "preset" -#define HOLORECORD_RENAME "rename" - -#define HOLORECORD_MAX_LENGTH 200 - /mob/camera/ai_eye/remote/holo/setLoc() . = ..() var/obj/machinery/holopad/H = origin diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index e6b094acc077b..2361303ae9416 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -40,6 +40,9 @@ /// Is night lighting allowed to occur on this station? var/allow_night_lighting = TRUE + /// List of unit tests that are skipped when running this map + var/list/skipped_tests + //====== // Starlight Settings //====== @@ -181,6 +184,16 @@ planet_mass = text2num(json["planet_mass"]) || planet_mass planet_radius = text2num(json["planet_radius"]) || planet_radius +#ifdef UNIT_TESTS + // Check for unit tests to skip, no reason to check these if we're not running tests + for(var/path_as_text in json["ignored_unit_tests"]) + var/path_real = text2path(path_as_text) + if(!ispath(path_real, /datum/unit_test)) + stack_trace("Invalid path in mapping config for ignored unit tests: \[[path_as_text]\]") + continue + LAZYADD(skipped_tests, path_real) +#endif + defaulted = FALSE return TRUE #undef CHECK_EXISTS diff --git a/code/datums/mapgen/JungleGenerator.dm b/code/datums/mapgen/JungleGenerator.dm index c64c6d91c4a3f..42dad9d14a39a 100644 --- a/code/datums/mapgen/JungleGenerator.dm +++ b/code/datums/mapgen/JungleGenerator.dm @@ -94,3 +94,5 @@ name = "planet generation area" dynamic_lighting = DYNAMIC_LIGHTING_DISABLED map_generator = /datum/map_generator/jungle_generator + +#undef BIOME_RANDOM_SQUARE_DRIFT diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index cc0a52c57e49d..2ce3ab44b724c 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -237,3 +237,9 @@ to_chat(usr, "Consecutive CQC: Disarm Disarm Harm. Mainly offensive move, huge damage and decent stamina damage.") to_chat(usr, "In addition, by having your throw mode on when being attacked, you enter an active defense mode where you have a chance to block and sometimes even counter attacks done to you.") + +#undef SLAM_COMBO +#undef KICK_COMBO +#undef RESTRAIN_COMBO +#undef PRESSURE_COMBO +#undef CONSECUTIVE_COMBO diff --git a/code/datums/martial/karate.dm b/code/datums/martial/karate.dm index e641e068b7bd4..34d4b93018307 100644 --- a/code/datums/martial/karate.dm +++ b/code/datums/martial/karate.dm @@ -121,3 +121,8 @@ to_chat(usr, "Jumping Knee: Harm Disarm Harm. Deals significant stamina damage and knocks your opponent down briefly.") to_chat(usr, "Karate Chop: Grab Harm Disarm. Very briefly confuses your opponent and blurs their vision.") to_chat(usr, "Floor Stomp: Harm Grab Harm. Deals brute and stamina damage if your opponent isn't standing up.") + +#undef CALF_KICK_COMBO +#undef FLOOR_KICK_COMBO +#undef JUMPING_KNEE_COMBO +#undef KARATE_CHOP_COMBO diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm index 095751cfe2f50..0e062e9598d07 100644 --- a/code/datums/martial/plasma_fist.dm +++ b/code/datums/martial/plasma_fist.dm @@ -92,3 +92,7 @@ to_chat(usr, "Tornado Sweep: Harm Harm Disarm. Repulses target and everyone back.") to_chat(usr, "Throwback: Disarm Harm Disarm. Throws the target and an item at them.") to_chat(usr, "The Plasma Fist: Harm Disarm Disarm Disarm Harm. Knocks the brain out of the opponent and gibs their body.") + +#undef TORNADO_COMBO +#undef THROWBACK_COMBO +#undef PLASMA_COMBO diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 789734e3213d9..5c41d07db1100 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -246,3 +246,9 @@ if(!ISWIELDED(src)) return ..() return 0 + +#undef WRIST_WRENCH_COMBO +#undef BACK_KICK_COMBO +#undef STOMACH_KNEE_COMBO +#undef HEAD_KICK_COMBO +#undef ELBOW_DROP_COMBO diff --git a/code/datums/martial/tribal_claw.dm b/code/datums/martial/tribal_claw.dm index f802024292e66..416ed11cb79d1 100644 --- a/code/datums/martial/tribal_claw.dm +++ b/code/datums/martial/tribal_claw.dm @@ -108,3 +108,8 @@ Deals 15 brute to head(reduced by armor) and causes a rapid bleeding effect simi to_chat(usr, "Face Scratch: Harm Disarm. Damages your target's head and confuses them for a short time.") to_chat(usr, "Jugular Cut: Harm Harm Grab. Causes your target to rapidly lose blood, works only if you grab your target by their neck, if they are sleeping, or in critical condition.") to_chat(usr, "Tail Grab: Disarm Harm Grab Grab. Grabs your target by their neck and makes them unable to talk for a short time.") + +#undef TAIL_SWEEP_COMBO +#undef FACE_SCRATCH_COMBO +#undef JUGULAR_CUT_COMBO +#undef TAIL_GRAB_COMBO diff --git a/code/datums/mutations/antenna.dm b/code/datums/mutations/antenna.dm index e58a85cb8d06b..237b1d64e372b 100644 --- a/code/datums/mutations/antenna.dm +++ b/code/datums/mutations/antenna.dm @@ -35,6 +35,6 @@ icon = 'icons/obj/radio.dmi'//maybe make a unique sprite later. not important icon_state = "walkietalkie" -/obj/item/implant/radio/antenna/Initialize() +/obj/item/implant/radio/antenna/Initialize(mapload) . = ..() radio.name = "internal antenna" diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm index 0af88b668e29c..67b4925fdfeed 100644 --- a/code/datums/mutations/sight.dm +++ b/code/datums/mutations/sight.dm @@ -34,7 +34,7 @@ /datum/mutation/thermal name = "Thermal Vision" - desc = "The mutation enables the growth of Heat Pits in the eyes, not unlike those of a reptile, which can visually percieve the unique infrared thermal signature of living creatures." + desc = "The mutation enables the growth of Heat Pits in the eyes, not unlike those of a reptile, which can visually perceive the unique infrared thermal signature of living creatures." quality = POSITIVE difficulty = 18 instability = 25 diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm index e9d1f11857ccd..ecc24b4e64555 100644 --- a/code/datums/progressbar.dm +++ b/code/datums/progressbar.dm @@ -135,6 +135,13 @@ QDEL_IN(src, PROGRESSBAR_ANIMATION_TIME) +///Progress bars are very generic, and what hangs a ref to them depends heavily on the context in which they're used +///So let's make hunting harddels easier yeah? +/datum/progressbar/dump_harddel_info() + if(harddel_deets_dumped) + return + harddel_deets_dumped = TRUE + return "Location type: [bar_loc.type], User type: [user.type]" #undef PROGRESSBAR_ANIMATION_TIME #undef PROGRESSBAR_HEIGHT diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm index c96a12ef23e1d..7d4bb9fc1487e 100644 --- a/code/datums/recipe.dm +++ b/code/datums/recipe.dm @@ -9,7 +9,7 @@ * * items are objects. Fruits, tools, circuit boards. * * result is type to create as new object * * time is optional parameter, you shall use in in your machine, - default /datum/recipe/ procs does not rely on this parameter. + default /datum/recipe/ procs does not rely on this parameter. * * Functions you need: * /datum/recipe/proc/make(var/obj/container as obj) diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index 9c599c255e935..8151b8b548ba3 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -121,3 +121,6 @@ /datum/station_trait/quick_shuttle/on_round_start() . = ..() SSshuttle.supply.callTime *= 0.5 + +#undef PARTY_COOLDOWN_LENGTH_MIN +#undef PARTY_COOLDOWN_LENGTH_MAX diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 49066989dbbc5..75f70585a4c3d 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1,5 +1,3 @@ -#define TRAIT_STATUS_EFFECT(effect_id) "[effect_id]-trait" - //Largely negative status effects go here, even if they have small benificial effects //STUN EFFECTS /datum/status_effect/incapacitating diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm index cc6e15cfa8574..637441f81718e 100644 --- a/code/datums/traits/_quirk.dm +++ b/code/datums/traits/_quirk.dm @@ -18,6 +18,7 @@ var/process = FALSE // Does this quirk use on_process()? var/datum/mind/quirk_holder // The mind that contains this quirk var/mob/living/quirk_target // The mob that will be affected by this quirk + var/abstract_parent_type = /datum/quirk /datum/quirk/New(datum/mind/quirk_mind, mob/living/quirk_mob, spawn_effects) ..() diff --git a/code/datums/traits/negative_quirk.dm b/code/datums/traits/negative_quirk.dm index e1ec8aa8e7132..d915ed9d07681 100644 --- a/code/datums/traits/negative_quirk.dm +++ b/code/datums/traits/negative_quirk.dm @@ -593,10 +593,10 @@ process = TRUE /datum/quirk/junkie/smoker/on_spawn() - drug_container_type = read_choice_preference(/datum/preference/choiced/quirk/smoker_cigarettes) - if(!drug_container_type) - drug_container_type = pick(GLOB.smoker_cigarettes) - . = ..() + drug_container_type = read_choice_preference(/datum/preference/choiced/quirk/smoker_cigarettes) + if(!drug_container_type) + drug_container_type = pick(GLOB.smoker_cigarettes) + . = ..() /datum/quirk/junkie/smoker/announce_drugs() to_chat(quirk_target, "There is a [initial(drug_container_type.name)] [where_drug], and a lighter [where_accessory]. Make sure you get your favorite brand when you run out.") @@ -626,7 +626,7 @@ var/drink_types = list(/obj/item/reagent_containers/food/drinks/bottle/ale, /obj/item/reagent_containers/food/drinks/bottle/beer, /obj/item/reagent_containers/food/drinks/bottle/gin, - /obj/item/reagent_containers/food/drinks/bottle/whiskey, + /obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/item/reagent_containers/food/drinks/bottle/vodka, /obj/item/reagent_containers/food/drinks/bottle/rum, /obj/item/reagent_containers/food/drinks/bottle/applejack) diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm index e8e708c0c225d..ab15cefb5386f 100644 --- a/code/datums/wires/_wires.dm +++ b/code/datums/wires/_wires.dm @@ -33,7 +33,7 @@ var/list/wire_to_colors = list() // Dictionary of colors to wire. var/list/assemblies = list() // List of attached assemblies. var/randomize = 0 // If every instance of these wires should be random. - // Prevents wires from showing up in station blueprints + // Prevents wires from showing up in station blueprints var/list/labelled_wires = list() // Associative List of wires that have labels. Key = wire, Value = Bool (Revealed) [To be refactored into skills] /datum/wires/New(atom/holder) diff --git a/code/datums/wires/airalarm.dm b/code/datums/wires/airalarm.dm index 6831d499c84cf..0b1c7ebff5e56 100644 --- a/code/datums/wires/airalarm.dm +++ b/code/datums/wires/airalarm.dm @@ -5,9 +5,9 @@ set_instance_vars(\ pixel_x = (dir & 3)? INSTANCE_VAR_DEFAULT : (dir == 4 ? -24 : 24),\ pixel_y = (dir & 3)? (dir == 1 ? -24 : 24) : INSTANCE_VAR_DEFAULT\ - ),\ + ),\ dir_amount = 4\ - ) + ) /datum/wires/airalarm/New(atom/holder) wires = list( diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index 211054172d68c..236d2bf0cb9e5 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -194,10 +194,10 @@ var/list/admins = list() for(var/client/admin in GLOB.admins) admins[++admins.len] = list("ckey" = admin.ckey, - "key" = admin.key, - "rank" = admin.holder.rank.name, - "stealth" = admin.holder.fakekey ? TRUE : FALSE, - "afk" = admin.is_afk()) + "key" = admin.key, + "rank" = admin.holder.rank.name, + "stealth" = admin.holder.fakekey ? TRUE : FALSE, + "afk" = admin.is_afk()) statuscode = 200 response = "Admin list fetched" data = admins diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 2de64b6e62c5b..5a22262f19fd8 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -61,7 +61,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/asteroid name = "Asteroid" icon_state = "asteroid" - requires_power = FALSE + always_unpowered = TRUE has_gravity = STANDARD_GRAVITY ambience_index = AMBIENCE_MINING sound_environment = SOUND_AREA_ASTEROID @@ -71,8 +71,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/asteroid/nearstation dynamic_lighting = DYNAMIC_LIGHTING_ENABLED ambience_index = AMBIENCE_RUINS - always_unpowered = FALSE - requires_power = TRUE area_flags = UNIQUE_AREA | BLOBS_ALLOWED /area/asteroid/nearstation/bomb_site @@ -1208,7 +1206,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/brig/medbay name = "Brig Bay" - + /area/security/brig/aft name = "Brig Aft" @@ -1463,7 +1461,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station sound_environment = SOUND_AREA_STANDARD_STATION airlock_hack_difficulty = AIRLOCK_WIRE_SECURITY_ADVANCED color_correction = /datum/client_colour/area_color/cold_ish - + /area/science/aft name = "Science Aft" @@ -1498,6 +1496,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station area_flags = BLOBS_ALLOWED | UNIQUE_AREA icon_state = "tox_test" lights_always_start_on = TRUE + always_unpowered = TRUE /area/science/mixing name = "Toxins Mixing Lab" diff --git a/code/game/area/area_color_correction.dm b/code/game/area/area_color_correction.dm index 63dd18fbda70d..2e76ecae4fae6 100644 --- a/code/game/area/area_color_correction.dm +++ b/code/game/area/area_color_correction.dm @@ -4,8 +4,7 @@ colour vs color */ -/mob - var/current_correction +/mob/var/current_correction /datum/client_colour/area_color colour = list(rgb(255, 0, 0), rgb(0, 255, 0), rgb(0, 0, 255)) diff --git a/code/game/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm index f3d86a10ef718..a5e04b3910ec2 100644 --- a/code/game/area/areas/holodeck.dm +++ b/code/game/area/areas/holodeck.dm @@ -3,7 +3,7 @@ icon_state = "holodeck" dynamic_lighting = DYNAMIC_LIGHTING_DISABLED flags_1 = NONE - area_flags = HIDDEN_STASH_LOCATION | VALID_TERRITORY | UNIQUE_AREA | HIDDEN_AREA + area_flags = HIDDEN_STASH_LOCATION | VALID_TERRITORY | UNIQUE_AREA | HIDDEN_AREA | REMOTE_APC sound_environment = SOUND_ENVIRONMENT_PADDED_CELL var/obj/machinery/computer/holodeck/linked diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 0deec87f6c61d..c8ae188439383 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -212,6 +212,8 @@ * * /turf/Initialize * * /turf/open/space/Initialize */ +CREATION_TEST_IGNORE_SUBTYPES(/atom) + /atom/proc/Initialize(mapload, ...) if(flags_1 & INITIALIZED_1) stack_trace("Warning: [src]([type]) initialized multiple times!") diff --git a/code/game/communications.dm b/code/game/communications.dm index 04948ae9b6bdd..041bfa2e005ec 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -1,63 +1,63 @@ /* - HOW IT WORKS - - The SSradio is a global object maintaining all radio transmissions, think about it as about "ether". - Note that walkie-talkie, intercoms and headsets handle transmission using nonstandard way. - procs: - - add_object(obj/device as obj, var/new_frequency as num, var/filter as text|null = null) - Adds listening object. - parameters: - device - device receiving signals, must have proc receive_signal (see description below). - one device may listen several frequencies, but not same frequency twice. - new_frequency - see possibly frequencies below; - filter - thing for optimization. Optional, but recommended. - All filters should be consolidated in this file, see defines later. - Device without listening filter will receive all signals (on specified frequency). - Device with filter will receive any signals sent without filter. - Device with filter will not receive any signals sent with different filter. - returns: - Reference to frequency object. - - remove_object (obj/device, old_frequency) - Obliviously, after calling this proc, device will not receive any signals on old_frequency. - Other frequencies will left unaffected. - - return_frequency(var/frequency as num) - returns: - Reference to frequency object. Use it if you need to send and do not need to listen. - - radio_frequency is a global object maintaining list of devices that listening specific frequency. - procs: - - post_signal(obj/source as obj|null, datum/signal/signal, var/filter as text|null = null, var/range as num|null = null) - Sends signal to all devices that wants such signal. - parameters: - source - object, emitted signal. Usually, devices will not receive their own signals. - signal - see description below. - filter - described above. - range - radius of regular byond's square circle on that z-level. null means everywhere, on all z-levels. - - obj/proc/receive_signal(datum/signal/signal, var/receive_method as num, var/receive_param) - Handler from received signals. By default does nothing. Define your own for your object. - Avoid of sending signals directly from this proc, use spawn(0). Do not use sleep() here please. - parameters: - signal - see description below. Extract all needed data from the signal before doing sleep(), spawn() or return! - receive_method - may be TRANSMISSION_WIRE or TRANSMISSION_RADIO. - TRANSMISSION_WIRE is currently unused. - receive_param - for TRANSMISSION_RADIO here comes frequency. - - datum/signal - vars: - source - an object that emitted signal. Used for debug and bearing. - data - list with transmitting data. Usual use pattern: - data["msg"] = "hello world" - encryption - Some number symbolizing "encryption key". - Note that game actually do not use any cryptography here. - If receiving object don't know right key, it must ignore encrypted signal in its receive_signal. + HOW IT WORKS + + The SSradio is a global object maintaining all radio transmissions, think about it as about "ether". + Note that walkie-talkie, intercoms and headsets handle transmission using nonstandard way. + procs: + + add_object(obj/device as obj, var/new_frequency as num, var/filter as text|null = null) + Adds listening object. + parameters: + device - device receiving signals, must have proc receive_signal (see description below). + one device may listen several frequencies, but not same frequency twice. + new_frequency - see possibly frequencies below; + filter - thing for optimization. Optional, but recommended. + All filters should be consolidated in this file, see defines later. + Device without listening filter will receive all signals (on specified frequency). + Device with filter will receive any signals sent without filter. + Device with filter will not receive any signals sent with different filter. + returns: + Reference to frequency object. + + remove_object (obj/device, old_frequency) + Obliviously, after calling this proc, device will not receive any signals on old_frequency. + Other frequencies will left unaffected. + + return_frequency(var/frequency as num) + returns: + Reference to frequency object. Use it if you need to send and do not need to listen. + + radio_frequency is a global object maintaining list of devices that listening specific frequency. + procs: + + post_signal(obj/source as obj|null, datum/signal/signal, var/filter as text|null = null, var/range as num|null = null) + Sends signal to all devices that wants such signal. + parameters: + source - object, emitted signal. Usually, devices will not receive their own signals. + signal - see description below. + filter - described above. + range - radius of regular byond's square circle on that z-level. null means everywhere, on all z-levels. + + obj/proc/receive_signal(datum/signal/signal, var/receive_method as num, var/receive_param) + Handler from received signals. By default does nothing. Define your own for your object. + Avoid of sending signals directly from this proc, use spawn(0). Do not use sleep() here please. + parameters: + signal - see description below. Extract all needed data from the signal before doing sleep(), spawn() or return! + receive_method - may be TRANSMISSION_WIRE or TRANSMISSION_RADIO. + TRANSMISSION_WIRE is currently unused. + receive_param - for TRANSMISSION_RADIO here comes frequency. + + datum/signal + vars: + source + an object that emitted signal. Used for debug and bearing. + data + list with transmitting data. Usual use pattern: + data["msg"] = "hello world" + encryption + Some number symbolizing "encryption key". + Note that game actually do not use any cryptography here. + If receiving object don't know right key, it must ignore encrypted signal in its receive_signal. */ /* the radio controller is a confusing piece of shit and didnt work diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 79698040fb0f7..ae1f16fa499db 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -83,7 +83,7 @@ */ /*********************************************** - Medical HUD! Basic mode needs suit sensors on. + * Medical HUD! Basic mode needs suit sensors on. ************************************************/ //HELPERS @@ -238,7 +238,7 @@ /*********************************************** - Security HUDs! Basic mode shows only the job. + * Security HUDs! Basic mode shows only the job. ************************************************/ //HOOKS @@ -309,7 +309,7 @@ holder.icon_state = null /*********************************************** - Diagnostic HUDs! + * Diagnostic HUDs! ************************************************/ /mob/living/proc/hud_set_nanite_indicator() diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index d49cf56acb87d..1856af0e379ea 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -1,5 +1,3 @@ -#define RULESET_STOP_PROCESSING 1 - #define FAKE_REPORT_CHANCE 8 #define REPORT_NEG_DIVERGENCE -15 #define REPORT_POS_DIVERGENCE 15 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets.dm b/code/game/gamemodes/dynamic/dynamic_rulesets.dm index 7503d747794d9..bc8aa3c44d3d6 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets.dm @@ -1,6 +1,3 @@ -#define REVOLUTION_VICTORY 1 -#define STATION_VICTORY 2 - /datum/dynamic_ruleset /// For admin logging and round end screen. // If you want to change this variable name, the force latejoin/midround rulesets diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index d6bf23d7f26bd..dce7441b2ebe0 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -524,7 +524,6 @@ // ABDUCTORS (GHOST) // // // ////////////////////////////////////////////// -#define ABDUCTOR_MAX_TEAMS 4 /datum/dynamic_ruleset/midround/from_ghosts/abductors name = "Abductors" @@ -551,8 +550,6 @@ var/datum/antagonist/abductor/agent/new_role = new new_character.mind.add_antag_datum(new_role, new_team) -#undef ABDUCTOR_MAX_TEAMS - ////////////////////////////////////////////// // // // REVENANT (GHOST) // diff --git a/code/game/gamemodes/gangs/dominator.dm b/code/game/gamemodes/gangs/dominator.dm deleted file mode 100644 index 7d9a88b0f97dd..0000000000000 --- a/code/game/gamemodes/gangs/dominator.dm +++ /dev/null @@ -1,241 +0,0 @@ -#define DOM_BLOCKED_SPAM_CAP 6 -#define DOM_REQUIRED_TURFS 30 -#define DOM_HULK_HITS_REQUIRED 10 - -/obj/machinery/dominator - name = "dominator" - desc = "A visibly sinister device. Looks like you can break it if you hit it enough." - icon = 'icons/obj/machines/dominator.dmi' - icon_state = "dominator" - density = TRUE - anchored = TRUE - layer = HIGH_OBJ_LAYER - max_integrity = 300 - max_hit_damage = 30 - integrity_failure = 0.33 - move_resist = INFINITY - armor = list(MELEE = 20, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 10, BIO = 100, RAD = 100, FIRE = 10, ACID = 70, STAMINA = 0, BLEED = 0) - var/datum/team/gang/gang - var/operating = FALSE //false=standby or broken, true=takeover - var/warned = FALSE //if this device has set off the warning at <3 minutes yet - var/spam_prevention = DOM_BLOCKED_SPAM_CAP //first message is immediate - var/datum/effect_system/spark_spread/spark_system - var/obj/effect/countdown/dominator/countdown - -/obj/machinery/dominator/Initialize(mapload) - . = ..() - set_light(2) - AddElement(/datum/element/point_of_interest) - spark_system = new - spark_system.set_up(5, TRUE, src) - countdown = new(src) - update_icon() - -/obj/machinery/dominator/Destroy() - if(!(stat & BROKEN)) - set_broken() - gang = null - QDEL_NULL(spark_system) - QDEL_NULL(countdown) - return ..() - -/obj/machinery/dominator/emp_act(severity) - take_damage(100, BURN, ENERGY, 0) - ..() - -/obj/machinery/dominator/hulk_damage() - return (max_integrity - integrity_failure) / DOM_HULK_HITS_REQUIRED - -/obj/machinery/dominator/tesla_act() - qdel(src) - -/obj/machinery/dominator/update_icon() - cut_overlays() - if(!(stat & BROKEN)) - icon_state = "dominator-active" - if(operating) - var/mutable_appearance/dominator_overlay = mutable_appearance('icons/obj/machines/dominator.dmi', "dominator-overlay") - if(gang) - dominator_overlay.color = gang.color - add_overlay(dominator_overlay) - else - icon_state = "dominator" - if(obj_integrity/max_integrity < 0.66) - add_overlay("damage") - else - icon_state = "dominator-broken" - -/obj/machinery/dominator/examine(mob/user) - ..() - if(stat & BROKEN) - return - - if(gang && gang.domination_time != NOT_DOMINATING) - if(gang.domination_time > world.time) - to_chat(user, "Hostile Takeover in progress. Estimated [gang.domination_time_remaining()] seconds remain.") - else - to_chat(user, "Hostile Takeover of [station_name()] successful. Have a great day.") - else - to_chat(user, "System on standby.") - to_chat(user, "System Integrity: [round((obj_integrity/max_integrity)*100,1)]%") - -/obj/machinery/dominator/process() - if(gang && gang.domination_time != NOT_DOMINATING) - var/time_remaining = gang.domination_time_remaining() - if(time_remaining > 0) - if(excessive_walls_check()) - gang.domination_time += 20 - playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0) - if(spam_prevention < DOM_BLOCKED_SPAM_CAP) - spam_prevention++ - else - gang.message_gangtools("Warning: There are too many walls around your gang's dominator, its signal is being blocked!") - say("Error: Takeover signal is currently blocked! There are too many walls within 3 standard units of this device.") - spam_prevention = 0 - return - . = TRUE - playsound(loc, 'sound/items/timer.ogg', 10, 0) - if(!warned && (time_remaining < 180)) - warned = TRUE - var/area/domloc = get_area(loc) - gang.message_gangtools("Less than 3 minutes remains in hostile takeover. Defend your dominator at [domloc.map_name]!") - for(var/G in GLOB.gangs) - var/datum/team/gang/tempgang = G - if(tempgang != gang) - tempgang.message_gangtools("WARNING: [gang.name] Gang takeover imminent. Their dominator at [domloc.map_name] must be destroyed!",1,1) - else - Cinematic(CINEMATIC_MALF,world) - gang.winner = TRUE - SSticker.force_ending = TRUE - - if(!.) - return PROCESS_KILL - -/obj/machinery/dominator/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) - switch(damage_type) - if(BRUTE) - if(damage_amount) - playsound(src, 'sound/effects/bang.ogg', 50, 1) - else - playsound(loc, 'sound/weapons/tap.ogg', 50, 1) - if(BURN) - playsound(src.loc, 'sound/items/welder.ogg', 100, 1) - -/obj/machinery/dominator/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1) - . = ..() - if(.) - if(obj_integrity/max_integrity > 0.66) - if(prob(damage_amount*2)) - spark_system.start() - else if(!(stat & BROKEN)) - spark_system.start() - update_icon() - - -/obj/machinery/dominator/obj_break(damage_flag) - if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) - set_broken() - -/obj/machinery/dominator/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) - if(!(stat & BROKEN)) - set_broken() - new /obj/item/stack/sheet/plasteel(src.loc) - qdel(src) - -/obj/machinery/dominator/attacked_by(obj/item/I, mob/living/user) - add_fingerprint(user) - ..() - -/obj/machinery/dominator/attack_hand(mob/user) - if(operating || (stat & BROKEN)) - examine(user) - return - - var/datum/team/gang/tempgang - - var/datum/antagonist/gang/GA = user.mind.has_antag_datum(/datum/antagonist/gang) - if(GA) - tempgang = GA.gang - if(!tempgang) - examine(user) - return - - if(tempgang.domination_time != NOT_DOMINATING) - to_chat(user, "Error: Hostile Takeover is already in progress.") - return - - if(!tempgang.dom_attempts) - to_chat(user, "Error: Unable to breach station network. Firewall has logged our signature and is blocking all further attempts.") - return - - var/time = round(tempgang.determine_domination_time()/60,0.1) - if(alert(user,"A takeover will require [time] minutes.\nYour gang will be unable to gain influence while it is active.\nThe entire station will likely be alerted to it once it starts.\nYou have [tempgang.dom_attempts] attempt(s) remaining. Are you ready?","Confirm","Ready","Later") == "Ready") - if((tempgang.domination_time != NOT_DOMINATING) || !tempgang.dom_attempts || !in_range(src, user) || !isturf(loc)) - return 0 - - var/area/A = get_area(loc) - var/locname = A.map_name - - gang = tempgang - gang.dom_attempts -- - priority_announce("Network breach detected in [locname]. The [gang.name] Gang is attempting to seize control of the station!", "Network Alert", SSstation.announcer.get_rand_alert_sound()) - gang.domination() - SSshuttle.registerHostileEnvironment(src) - name = "[gang.name] Gang [name]" - operating = TRUE - update_icon() - - countdown.color = gang.color - countdown.start() - - set_light(3) - START_PROCESSING(SSmachines, src) - - gang.message_gangtools("Hostile takeover in progress: Estimated [time] minutes until victory.[gang.dom_attempts ? "" : " This is your final attempt."]") - for(var/G in GLOB.gangs) - var/datum/team/gang/vagos = G - if(vagos != gang) - vagos.message_gangtools("Enemy takeover attempt detected in [locname]: Estimated [time] minutes until our defeat.",1,1) - -/obj/machinery/dominator/proc/excessive_walls_check() // why the fuck was this even a global proc... - var/open = FALSE - if(isclosedturf(loc)) - return TRUE - for(var/turf/open/T in view(3, src)) - open++ - if(open < DOM_REQUIRED_TURFS) - return TRUE - else - return FALSE - -/obj/machinery/dominator/proc/set_broken() - if(gang) - gang.domination_time = NOT_DOMINATING - - var/takeover_in_progress = FALSE - for(var/G in GLOB.gangs) - var/datum/team/gang/ballas = G - if(ballas.domination_time != NOT_DOMINATING) - takeover_in_progress = TRUE - break - if(!takeover_in_progress) - var/was_stranded = SSshuttle.emergency.mode == SHUTTLE_STRANDED - if(!was_stranded) - priority_announce("All hostile activity within station systems has ceased.","Network Alert", SSstation.announcer.get_rand_alert_sound()) - - if(get_security_level() == "delta") - SSsecurity_level.set_level(SEC_LEVEL_RED) - - SSshuttle.clearHostileEnvironment(src) - gang.message_gangtools("Hostile takeover cancelled: Dominator is no longer operational.[gang.dom_attempts ? " You have [gang.dom_attempts] attempt remaining." : " The station network will have likely blocked any more attempts by us."]",1,1) - - set_light(0) - operating = FALSE - stat |= BROKEN - update_icon() - STOP_PROCESSING(SSmachines, src) - -#undef DOM_BLOCKED_SPAM_CAP -#undef DOM_REQUIRED_TURFS -#undef DOM_HULK_HITS_REQUIRED diff --git a/code/game/gamemodes/gangs/gang_tags.dm b/code/game/gamemodes/gangs/gang_tags.dm index f0e2f7932cf19..5c2ab12bfb768 100644 --- a/code/game/gamemodes/gangs/gang_tags.dm +++ b/code/game/gamemodes/gangs/gang_tags.dm @@ -7,6 +7,8 @@ gender = NEUTER var/datum/team/gang/gang +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/decal/gang) + /obj/effect/decal/gang/Initialize(mapload, datum/team/gang/G, e_name = "gang tag", rotation = 0, mob/user) if(!G) qdel(src) diff --git a/code/game/gamemodes/gangs/implant_gang.dm b/code/game/gamemodes/gangs/implant_gang.dm index 25f32cf845208..0cab2aa4b9baf 100644 --- a/code/game/gamemodes/gangs/implant_gang.dm +++ b/code/game/gamemodes/gangs/implant_gang.dm @@ -4,6 +4,8 @@ activated = 0 var/datum/team/gang/gang +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/implant/gang) + /obj/item/implant/gang/Initialize(mapload, loc, setgang) ..() gang = setgang @@ -39,6 +41,8 @@ /obj/item/implanter/gang name = "implanter (gang)" +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/implanter/gang) + /obj/item/implanter/gang/Initialize(mapload, loc, gang) if(!gang) qdel(src) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 9efcba6ab33bf..167ea520fec95 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -4,13 +4,13 @@ GLOBAL_VAR_INIT(meteor_wave_delay, 625) //minimum wait between waves in tenths o //Meteors probability of spawning during a given wave GLOBAL_LIST_INIT(meteors_normal, list(/obj/effect/meteor/dust=3, /obj/effect/meteor/medium=8, /obj/effect/meteor/big=3, \ - /obj/effect/meteor/flaming=1, /obj/effect/meteor/irradiated=3)) //for normal meteor event + /obj/effect/meteor/flaming=1, /obj/effect/meteor/irradiated=3)) //for normal meteor event GLOBAL_LIST_INIT(meteors_threatening, list(/obj/effect/meteor/medium=4, /obj/effect/meteor/big=8, \ - /obj/effect/meteor/flaming=3, /obj/effect/meteor/irradiated=3)) //for threatening meteor event + /obj/effect/meteor/flaming=3, /obj/effect/meteor/irradiated=3)) //for threatening meteor event GLOBAL_LIST_INIT(meteors_catastrophic, list(/obj/effect/meteor/medium=5, /obj/effect/meteor/big=75, \ - /obj/effect/meteor/flaming=10, /obj/effect/meteor/irradiated=10, /obj/effect/meteor/tunguska = 1)) //for catastrophic meteor event + /obj/effect/meteor/flaming=10, /obj/effect/meteor/irradiated=10, /obj/effect/meteor/tunguska = 1)) //for catastrophic meteor event GLOBAL_LIST_INIT(meteorsB, list(/obj/effect/meteor/meaty=5, /obj/effect/meteor/meaty/xeno=1)) //for meaty ore event @@ -141,6 +141,8 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event var/lifetime = DEFAULT_METEOR_LIFETIME +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/meteor) + /obj/effect/meteor/Initialize(mapload, target) . = ..() z_original = z @@ -436,6 +438,8 @@ GLOBAL_LIST_INIT(meteorsSPOOKY, list(/obj/effect/meteor/pumpkin)) var/prefalltime = 8 SECONDS layer = METEOR_LAYER +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/falling_meteor) + /obj/effect/falling_meteor/Initialize(mapload, meteor_type) . = ..() if(!meteor_type) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index d637e46021bb4..c601d2943920c 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -196,3 +196,5 @@ round_credits += ..() return round_credits + +#undef FLUKEOPS_TIME_DELAY diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 187bcdbb04acf..4990b81131ab8 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -2,8 +2,8 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) -/mob - var/datum/hSB/sandbox = null +/mob/var/datum/hSB/sandbox = null + /mob/proc/CanBuild() sandbox = new/datum/hSB sandbox.owner = src.ckey diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index c8de830c096ed..6ae592b4ea064 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -1,81 +1,81 @@ /* Overview: - Used to create objects that need a per step proc call. Default definition of 'Initialize()' - stores a reference to src machine in global 'machines list'. Default definition - of 'Destroy' removes reference to src machine in global 'machines list'. + Used to create objects that need a per step proc call. Default definition of 'Initialize()' + stores a reference to src machine in global 'machines list'. Default definition + of 'Destroy' removes reference to src machine in global 'machines list'. Class Variables: - use_power (num) - current state of auto power use. - Possible Values: - NO_POWER_USE -- no auto power use - IDLE_POWER_USE -- machine is using power at its idle power level - ACTIVE_POWER_USE -- machine is using power at its active power level - - active_power_usage (num) - Value for the amount of power to use when in active power mode - - idle_power_usage (num) - Value for the amount of power to use when in idle power mode - - power_channel (num) - What channel to draw from when drawing power for power mode - Possible Values: - AREA_USAGE_EQUIP:0 -- Equipment Channel - AREA_USAGE_LIGHT:2 -- Lighting Channel - AREA_USAGE_ENVIRON:3 -- Environment Channel - - component_parts (list) - A list of component parts of machine used by frame based machines. - - machine_stat (bitflag) - Machine status bit flags. - Possible bit flags: - BROKEN -- Machine is broken - NOPOWER -- No power is being supplied to machine. - MAINT -- machine is currently under going maintenance. - EMPED -- temporary broken by EMP pulse + use_power (num) + current state of auto power use. + Possible Values: + NO_POWER_USE -- no auto power use + IDLE_POWER_USE -- machine is using power at its idle power level + ACTIVE_POWER_USE -- machine is using power at its active power level + + active_power_usage (num) + Value for the amount of power to use when in active power mode + + idle_power_usage (num) + Value for the amount of power to use when in idle power mode + + power_channel (num) + What channel to draw from when drawing power for power mode + Possible Values: + AREA_USAGE_EQUIP:0 -- Equipment Channel + AREA_USAGE_LIGHT:2 -- Lighting Channel + AREA_USAGE_ENVIRON:3 -- Environment Channel + + component_parts (list) + A list of component parts of machine used by frame based machines. + + machine_stat (bitflag) + Machine status bit flags. + Possible bit flags: + BROKEN -- Machine is broken + NOPOWER -- No power is being supplied to machine. + MAINT -- machine is currently under going maintenance. + EMPED -- temporary broken by EMP pulse Class Procs: - Initialize() 'game/machinery/machine.dm' + Initialize() 'game/machinery/machine.dm' - Destroy() 'game/machinery/machine.dm' + Destroy() 'game/machinery/machine.dm' - auto_use_power() 'game/machinery/machine.dm' - This proc determines how power mode power is deducted by the machine. - 'auto_use_power()' is called by the 'master_controller' game_controller every - tick. + auto_use_power() 'game/machinery/machine.dm' + This proc determines how power mode power is deducted by the machine. + 'auto_use_power()' is called by the 'master_controller' game_controller every + tick. - Return Value: - return:1 -- if object is powered - return:0 -- if object is not powered. + Return Value: + return:1 -- if object is powered + return:0 -- if object is not powered. - Default definition uses 'use_power', 'power_channel', 'active_power_usage', - 'idle_power_usage', 'powered()', and 'use_power()' implement behavior. + Default definition uses 'use_power', 'power_channel', 'active_power_usage', + 'idle_power_usage', 'powered()', and 'use_power()' implement behavior. - powered(chan = -1) 'modules/power/power.dm' - Checks to see if area that contains the object has power available for power - channel given in 'chan'. -1 defaults to power_channel + powered(chan = -1) 'modules/power/power.dm' + Checks to see if area that contains the object has power available for power + channel given in 'chan'. -1 defaults to power_channel - use_power(amount, chan=-1) 'modules/power/power.dm' - Deducts 'amount' from the power channel 'chan' of the area that contains the object. + use_power(amount, chan=-1) 'modules/power/power.dm' + Deducts 'amount' from the power channel 'chan' of the area that contains the object. - power_change() 'modules/power/power.dm' - Called by the area that contains the object when ever that area under goes a - power state change (area runs out of power, or area channel is turned off). + power_change() 'modules/power/power.dm' + Called by the area that contains the object when ever that area under goes a + power state change (area runs out of power, or area channel is turned off). - RefreshParts() 'game/machinery/machine.dm' - Called to refresh the variables in the machine that are contributed to by parts - contained in the component_parts list. (example: glass and material amounts for - the autolathe) + RefreshParts() 'game/machinery/machine.dm' + Called to refresh the variables in the machine that are contributed to by parts + contained in the component_parts list. (example: glass and material amounts for + the autolathe) - Default definition does nothing. + Default definition does nothing. - process() 'game/machinery/machine.dm' - Called by the 'machinery subsystem' once per machinery tick for each machine that is listed in its 'machines' list. + process() 'game/machinery/machine.dm' + Called by the 'machinery subsystem' once per machinery tick for each machine that is listed in its 'machines' list. - process_atmos() - Called by the 'air subsystem' once per atmos tick for each machine that is listed in its 'atmos_machines' list. + process_atmos() + Called by the 'air subsystem' once per atmos tick for each machine that is listed in its 'atmos_machines' list. Compiled by Aygar */ diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 2306df7bc7d2e..76100cebd76c3 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -160,3 +160,5 @@ /obj/machinery/airlock_sensor/Destroy() SSradio.remove_object(src,frequency) return ..() + +#undef AIRLOCK_CONTROL_RANGE diff --git a/code/game/machinery/airlock_cycle_control.dm b/code/game/machinery/airlock_cycle_control.dm index eac10a08fbc9f..817eca6e9aaa5 100644 --- a/code/game/machinery/airlock_cycle_control.dm +++ b/code/game/machinery/airlock_cycle_control.dm @@ -853,3 +853,18 @@ for(var/obj/machinery/door/airlock/A in T) if(A.aac) A.aac.update_docked_status(TRUE) + +#undef AIRLOCK_CYCLESTATE_INOPEN +#undef AIRLOCK_CYCLESTATE_INOPENING +#undef AIRLOCK_CYCLESTATE_INCLOSING +#undef AIRLOCK_CYCLESTATE_CLOSED +#undef AIRLOCK_CYCLESTATE_OUTCLOSING +#undef AIRLOCK_CYCLESTATE_OUTOPENING +#undef AIRLOCK_CYCLESTATE_OUTOPEN +#undef AIRLOCK_CYCLESTATE_DOCKED +#undef AIRLOCK_CYCLESTATE_ERROR + +#undef AIRLOCK_CYCLEROLE_INT_PRESSURIZE +#undef AIRLOCK_CYCLEROLE_INT_DEPRESSURIZE +#undef AIRLOCK_CYCLEROLE_EXT_PRESSURIZE +#undef AIRLOCK_CYCLEROLE_EXT_DEPRESSURIZE diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index 217860ccbbbb8..b4a41b00fae9f 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -15,8 +15,8 @@ . += "Alt-click to eject the limb." /obj/machinery/aug_manipulator/Initialize(mapload) - initial_icon_state = initial(icon_state) - return ..() + initial_icon_state = initial(icon_state) + return ..() /obj/machinery/aug_manipulator/update_icon() cut_overlays() diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 79f53e53dc643..e2f637ce90b3c 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -19,6 +19,8 @@ /obj/machinery/button/indestructible resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/button) + /obj/machinery/button/Initialize(mapload, ndir = 0, built = 0) . = ..() if(built) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 829dad51359f0..959996f8c79a1 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -1,7 +1,3 @@ -#define CAMERA_UPGRADE_XRAY 1 -#define CAMERA_UPGRADE_EMP_PROOF 2 -#define CAMERA_UPGRADE_MOTION 4 - /obj/machinery/camera name = "security camera" desc = "A wireless camera used to monitor rooms. It is powered by a long-life internal battery." @@ -72,11 +68,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0) light_range = 10 start_active = TRUE +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/camera) + /obj/machinery/camera/Initialize(mapload, obj/structure/camera_assembly/CA) . = ..() for(var/i in network) network -= i - network += lowertext(i) + network += LOWER_TEXT(i) var/obj/structure/camera_assembly/assembly if(CA) assembly = CA diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 5f5168f82169b..ee4636165587a 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -57,6 +57,8 @@ if(STATE_FINISHED) . += "You shouldn't be seeing this, tell a coder!" +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/camera_assembly) + /obj/structure/camera_assembly/Initialize(mapload, ndir, building) . = ..() if(building) @@ -188,7 +190,7 @@ return for(var/i in tempnetwork) tempnetwork -= i - tempnetwork += lowertext(i) + tempnetwork += LOWER_TEXT(i) state = STATE_FINISHED var/obj/machinery/camera/C = new(loc, src) forceMove(C) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 5b5afdc06a34e..2207b417ba41d 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -354,7 +354,7 @@ else if(mob_occupant && mob_occupant.cloneloss > (100 - heal_level)) mob_occupant.Unconscious(80) var/dmg_mult = CONFIG_GET(number/damage_multiplier) - //Slowly get that clone healed and finished. + //Slowly get that clone healed and finished. mob_occupant.adjustCloneLoss(-((speed_coeff / 2) * dmg_mult), TRUE, TRUE) if(reagents.has_reagent(/datum/reagent/medicine/synthflesh, fleshamnt)) reagents.remove_reagent(/datum/reagent/medicine/synthflesh, fleshamnt) @@ -421,7 +421,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/clonepod) to_chat(user, "-% Successfully stored [REF(src)] [name] in buffer %-") else return NONE - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED //Let's unlock this early I guess. Might be too early, needs tweaking. /obj/machinery/clonepod/attackby(obj/item/W, mob/user, params) diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 2cb0c5c1c178c..876a1a417104c 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -14,7 +14,7 @@ var/datum/techweb/linked_techweb light_color = LIGHT_COLOR_BLUE -/obj/machinery/computer/operating/Initialize() +/obj/machinery/computer/operating/Initialize(mapload) . = ..() linked_techweb = SSresearch.science_tech link_with_table() @@ -182,7 +182,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/operating) new_stasis_bed.op_computer = src sbed = new_stasis_bed to_chat(user, "You link \the [src] with \the [new_stasis_bed] to its [dir2text(get_dir(src, new_stasis_bed))].") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED #undef MENU_OPERATION #undef MENU_SURGERIES diff --git a/code/game/machinery/computer/arena.dm b/code/game/machinery/computer/arena.dm index 86312b24e4323..d13be687a01b4 100644 --- a/code/game/machinery/computer/arena.dm +++ b/code/game/machinery/computer/arena.dm @@ -62,6 +62,8 @@ var/start_sound = 'sound/items/airhorn2.ogg' var/start_sound_volume = 50 +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/computer/arena) + /obj/machinery/computer/arena/Initialize(mapload, obj/item/circuitboard/C) . = ..() LoadDefaultArenas() diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index f9c9ecfb78c54..3cb403dd20ae3 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -33,7 +33,7 @@ // Convert networks to lowercase for(var/i in network) network -= i - network += lowertext(i) + network += LOWER_TEXT(i) // Initialize map objects cam_screen = new cam_screen.name = "screen" diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index a0ba1bfae7ab6..2612e07c1f6f9 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -35,7 +35,7 @@ . = ..() for(var/i in networks) networks -= i - networks += lowertext(i) + networks += LOWER_TEXT(i) if(lock_override) if(lock_override & CAMERA_LOCK_STATION) z_lock |= SSmapping.levels_by_trait(ZTRAIT_STATION) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 1c5b455e1a9df..031b5df731bc0 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -897,7 +897,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) say("Insufficient access to create a new bank account.") return var/datum/bank_account/B = SSeconomy.get_budget_account(initial(target_paycheck)) - switch(alert("Would you like to open a new bank account?\nIt will cost 1,000 credits in [lowertext(initial(target_paycheck))] budget.","Open a new account","Yes","No")) + switch(alert("Would you like to open a new bank account?\nIt will cost 1,000 credits in [LOWER_TEXT(initial(target_paycheck))] budget.","Open a new account","Yes","No")) if("No") return if("Yes") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 156086840cc59..809e76965bef5 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -183,7 +183,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) else if (TRY_STORE_IN_BUFFER(buffer_parent, src)) to_chat(user, "-% Successfully stored [REF(src)] [name] in buffer %-") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED /obj/machinery/computer/cloning/AltClick(mob/user) . = ..() @@ -624,7 +624,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) R.fields["body_only"] = 0 if(!body_only || experimental && mob_occupant.stat != DEAD) - //Add an implant if needed + //Add an implant if needed var/obj/item/implant/health/imp for(var/obj/item/implant/health/HI in mob_occupant.implants) imp = HI @@ -658,3 +658,5 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning) circuit = /obj/item/circuitboard/computer/cloning/prototype clonepod_type = /obj/machinery/clonepod/experimental experimental = TRUE + +#undef AUTOCLONING_MINIMAL_LEVEL diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 3b6e335252130..c44799a9d85ae 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -16,6 +16,8 @@ light_color = LIGHT_COLOR_BLUE +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/computer/crew) + /obj/machinery/computer/crew/Initialize(mapload, obj/item/circuitboard/C) . = ..() AddComponent(/datum/component/usb_port, list( diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 17334db4e8ded..39175fd2bf73f 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -1732,7 +1732,7 @@ tgui_console_chromosomes.Cut() tgui_advinjector_mutations.Cut() - // ------------------------------------------------------------------------ // + // ------------------------------------------------------------------------ // // GUARD CHECK - Can we genetically modify the occupant? This check will have // previously included checks to make sure the DNA Scanner is still // operational diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm index e2d2c606fee4e..1dae52e03c040 100644 --- a/code/game/machinery/computer/launchpad_control.dm +++ b/code/game/machinery/computer/launchpad_control.dm @@ -28,7 +28,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/launchpad) to_chat(user, "You upload the data from the [buffer_parent.name]'s buffer.") else to_chat(user, "[src] cannot handle any more connections!") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED return NONE /obj/machinery/computer/launchpad/proc/launchpad_deleted(datum/source) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 546f54b2447fd..346d88f890581 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -498,9 +498,9 @@ return src.active1 = null src.active2 = null - t1 = lowertext(t1) + t1 = LOWER_TEXT(t1) for(var/datum/data/record/R in GLOB.data_core.medical) - if((lowertext(R.fields["name"]) == t1 || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["b_dna"]))) + if((LOWER_TEXT(R.fields["name"]) == t1 || t1 == LOWER_TEXT(R.fields["id"]) || t1 == LOWER_TEXT(R.fields["b_dna"]))) src.active2 = R else //Foreach continue //goto(3229) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 827960f17fb20..5cbb521bd69a8 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -19,6 +19,8 @@ var/order = 1 // -1 = Descending - 1 = Ascending light_color = LIGHT_COLOR_RED +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/computer/secure_data) + /obj/machinery/computer/secure_data/Initialize(mapload, obj/item/circuitboard/C) . = ..() AddComponent(/datum/component/usb_port, list( diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 17214114501de..a6e81d3cf8201 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -135,7 +135,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers) updateUsrDialog() return /* Should more cryos be buildable? - /obj/item/circuitboard/cryopodcontrol + /obj/item/circuitboard/cryopodcontrol name = "Circuit board (Cryogenic Oversight Console)" build_path = "/obj/machinery/computer/cryopod" origin_tech = "programming=1" diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 6fd03e5cc675a..5de9a5344e7f3 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -409,7 +409,7 @@ M.setDir(pick(GLOB.cardinals)) for(var/mob/living/carbon/NS in rangers) NS.set_resting(!NS.resting, TRUE, TRUE) - time-- + time-- /obj/machinery/jukebox/disco/proc/dance5(mob/living/M) animate(M, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0) diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index acb42123e8b20..258534256a3e4 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -17,7 +17,7 @@ var/breakout_time = 1200 var/ignore_id = FALSE -/obj/machinery/dna_scannernew/Initialize() +/obj/machinery/dna_scannernew/Initialize(mapload) . = ..() wires = new /datum/wires/dna_scanner(src) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index c946c241ddef8..ccbddf896fdd9 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1160,13 +1160,13 @@ user.Paralyze(60) return user.visible_message("[user] removes [charge] from [src].", \ - "You gently pry out [charge] from [src] and unhook its wires.") + "You gently pry out [charge] from [src] and unhook its wires.") charge.forceMove(get_turf(user)) charge = null return if(!security_level && (beingcrowbarred && panel_open && (density && welded && !operating && !hasPower() && !locked))) user.visible_message("[user] removes the electronics from the airlock assembly.", \ - "You start to remove electronics from the airlock assembly...") + "You start to remove electronics from the airlock assembly...") if(I.use_tool(src, user, 40, volume=100)) deconstruct(TRUE, user) return TRUE diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index b116e9250aa2b..278110a0b6331 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -104,7 +104,7 @@ user.changeNext_move(CLICK_CD_MELEE) user.visible_message("[user] bangs on \the [src].", - "You bang on \the [src].") + "You bang on \the [src].") playsound(loc, 'sound/effects/glassknock.ogg', 10, FALSE, frequency = 32000) /obj/machinery/door/firedoor/attackby(obj/item/C, mob/user, params) @@ -119,17 +119,17 @@ return C.play_tool_sound(src) user.visible_message("[user] starts undoing [src]'s bolts...", \ - "You start unfastening [src]'s floor bolts...") + "You start unfastening [src]'s floor bolts...") if(!C.use_tool(src, user, 50)) return playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) user.visible_message("[user] unfastens [src]'s bolts.", \ - "You undo [src]'s floor bolts.") + "You undo [src]'s floor bolts.") deconstruct(TRUE) return if(C.tool_behaviour == TOOL_SCREWDRIVER) user.visible_message("[user] [boltslocked ? "unlocks" : "locks"] [src]'s bolts.", \ - "You [boltslocked ? "unlock" : "lock"] [src]'s floor bolts.") + "You [boltslocked ? "unlock" : "lock"] [src]'s floor bolts.") C.play_tool_sound(src) boltslocked = !boltslocked return @@ -159,7 +159,7 @@ to_chat(user, "Access Denied, User not authorized to override alarms or pressure checks.") playsound(src, 'sound/machines/terminal_error.ogg', 50, 1) return - to_chat("You try to pull the card reader. Nothing happens.") + to_chat(user, "You try to pull the card reader. Nothing happens.") /obj/machinery/door/firedoor/proc/log_opening(obj/item/card/id/I, mob/user, safe) var/safestate = "UNK_STATE:" @@ -546,14 +546,14 @@ if(C.tool_behaviour == TOOL_CROWBAR) C.play_tool_sound(src) user.visible_message("[user] starts prying something out from [src]...", \ - "You begin prying out the wire cover...") + "You begin prying out the wire cover...") if(!C.use_tool(src, user, 50)) return if(constructionStep != CONSTRUCTION_PANEL_OPEN) return playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) user.visible_message("[user] pries out a metal plate from [src], exposing the wires.", \ - "You remove the cover plate from [src], exposing the wires.") + "You remove the cover plate from [src], exposing the wires.") constructionStep = CONSTRUCTION_WIRES_EXPOSED update_icon() return @@ -564,14 +564,14 @@ return C.play_tool_sound(src) user.visible_message("[user] starts bolting down [src]...", \ - "You begin bolting [src]...") + "You begin bolting [src]...") if(!C.use_tool(src, user, 30)) return var/obj/machinery/door/firedoor/D = locate(/obj/machinery/door/firedoor) in get_turf(src) if(D && D.dir == src.dir) return user.visible_message("[user] finishes the firelock.", \ - "You finish the firelock.") + "You finish the firelock.") playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) var/obj/machinery/door/firedoor/F = new firelock_type(get_turf(src)) F.dir = src.dir @@ -587,13 +587,13 @@ to_chat(user, "You need more plasteel to reinforce [src].") return user.visible_message("[user] begins reinforcing [src]...", \ - "You begin reinforcing [src]...") + "You begin reinforcing [src]...") playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) if(do_after(user, 60, target = src)) if(constructionStep != CONSTRUCTION_PANEL_OPEN || reinforced || P.get_amount() < 2 || !P) return user.visible_message("[user] reinforces [src].", \ - "You reinforce [src].") + "You reinforce [src].") playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) P.use(2) reinforced = TRUE @@ -604,13 +604,13 @@ if(C.tool_behaviour == TOOL_WIRECUTTER) C.play_tool_sound(src) user.visible_message("[user] starts cutting the wires from [src]...", \ - "You begin removing [src]'s wires...") + "You begin removing [src]'s wires...") if(!C.use_tool(src, user, 60)) return if(constructionStep != CONSTRUCTION_WIRES_EXPOSED) return user.visible_message("[user] removes the wires from [src].", \ - "You remove the wiring from [src], exposing the circuit board.") + "You remove the wiring from [src], exposing the circuit board.") new/obj/item/stack/cable_coil(get_turf(src), 5) constructionStep = CONSTRUCTION_GUTTED update_icon() @@ -618,27 +618,27 @@ if(C.tool_behaviour == TOOL_CROWBAR) C.play_tool_sound(src) user.visible_message("[user] starts prying a metal plate into [src]...", \ - "You begin prying the cover plate back onto [src]...") + "You begin prying the cover plate back onto [src]...") if(!C.use_tool(src, user, 80)) return if(constructionStep != CONSTRUCTION_WIRES_EXPOSED) return playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) user.visible_message("[user] pries the metal plate into [src].", \ - "You pry [src]'s cover plate into place, hiding the wires.") + "You pry [src]'s cover plate into place, hiding the wires.") constructionStep = CONSTRUCTION_PANEL_OPEN update_icon() return if(CONSTRUCTION_GUTTED) if(C.tool_behaviour == TOOL_CROWBAR) user.visible_message("[user] begins removing the circuit board from [src]...", \ - "You begin prying out the circuit board from [src]...") + "You begin prying out the circuit board from [src]...") if(!C.use_tool(src, user, 50, volume=50)) return if(constructionStep != CONSTRUCTION_GUTTED) return user.visible_message("[user] removes [src]'s circuit board.", \ - "You remove the circuit board from [src].") + "You remove the circuit board from [src].") new /obj/item/electronics/firelock(drop_location()) constructionStep = CONSTRUCTION_NOCIRCUIT update_icon() @@ -649,13 +649,13 @@ to_chat(user, "You need more wires to add wiring to [src].") return user.visible_message("[user] begins wiring [src]...", \ - "You begin adding wires to [src]...") + "You begin adding wires to [src]...") playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) if(do_after(user, 60, target = src)) if(constructionStep != CONSTRUCTION_GUTTED || B.get_amount() < 5 || !B) return user.visible_message("[user] adds wires to [src].", \ - "You wire [src].") + "You wire [src].") playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) B.use(5) constructionStep = CONSTRUCTION_WIRES_EXPOSED @@ -666,7 +666,7 @@ if(!C.tool_start_check(user, amount=1)) return user.visible_message("[user] begins cutting apart [src]'s frame...", \ - "You begin slicing [src] apart...") + "You begin slicing [src] apart...") if(C.use_tool(src, user, 40, volume=50, amount=1)) if(constructionStep != CONSTRUCTION_NOCIRCUIT) @@ -675,22 +675,22 @@ switch(firelock_type) if(/obj/machinery/door/firedoor/heavy) user.visible_message("[user] cuts apart [src]!", \ - "You cut [src] into iron and plasteel.") + "You cut [src] into iron and plasteel.") new /obj/item/stack/sheet/plasteel(T, 2) new /obj/item/stack/sheet/iron(T, 3) if(/obj/machinery/door/firedoor/window) user.visible_message("[user] cuts apart [src]!", \ - "You cut [src] into reinforced glass.") + "You cut [src] into reinforced glass.") new /obj/item/stack/sheet/rglass(T,2) else user.visible_message("[user] cuts apart [src]!", \ - "You cut [src] into iron.") + "You cut [src] into iron.") new /obj/item/stack/sheet/iron(T, 3) qdel(src) return if(istype(C, /obj/item/electronics/firelock)) user.visible_message("[user] starts adding [C] to [src]...", \ - "You begin adding a circuit board to [src]...") + "You begin adding a circuit board to [src]...") playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) if(!do_after(user, 40, target = src)) return @@ -698,7 +698,7 @@ return qdel(C) user.visible_message("[user] adds a circuit to [src].", \ - "You insert and secure [C].") + "You insert and secure [C].") playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) constructionStep = CONSTRUCTION_GUTTED update_icon() @@ -775,4 +775,5 @@ #undef CONSTRUCTION_GUTTED #undef CONSTRUCTION_NOCIRCUIT +#undef RECLOSE_DELAY #undef FIRE_ALARM diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index c531f9d1fe7e6..58bae417d81cd 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -25,6 +25,8 @@ var/rods = 2 var/cable = 1 +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/door/window) + /obj/machinery/door/window/Initialize(mapload, set_dir, unres_sides) . = ..() if(set_dir) @@ -284,7 +286,7 @@ if(I.tool_behaviour == TOOL_CROWBAR) if(panel_open && !density && !operating) user.visible_message("[user] removes the electronics from the [name].", \ - "You start to remove electronics from the [name]...") + "You start to remove electronics from the [name]...") if(I.use_tool(src, user, 40, volume=50)) if(panel_open && !density && !operating && loc) var/obj/structure/windoor_assembly/WA = new /obj/structure/windoor_assembly(loc) @@ -380,8 +382,8 @@ return // Handle received packet. - var/command = lowertext(data.data["data"]) - var/command_value = lowertext(data.data["data_secondary"]) + var/command = LOWER_TEXT(data.data["data"]) + var/command_value = LOWER_TEXT(data.data["data_secondary"]) switch(command) if("open") if(command_value == "on" && !density) @@ -496,7 +498,7 @@ if(I.tool_behaviour == TOOL_CROWBAR) if(panel_open && !density && !operating) user.visible_message("[user] begins to deconstruct [name].", \ - "You start to deconstruct from the [name]...") + "You start to deconstruct from the [name]...") if(I.use_tool(src, user, 40, volume=50)) if(panel_open && !density && !operating && loc) qdel(src) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 74f93e38794c2..3ca89e6e349fd 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -26,7 +26,7 @@ /obj/machinery/doppler_array/ComponentInitialize() . = ..() - AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE,null,null,CALLBACK(src,PROC_REF(rot_message))) + AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE,null,null,CALLBACK(src,PROC_REF(rot_message))) /datum/data/tachyon_record name = "Log Recording" @@ -96,6 +96,8 @@ /obj/item/paper/record_printout name = "paper - Log Recording" +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/paper/record_printout) + /obj/item/paper/record_printout/Initialize(mapload, datum/data/tachyon_record/record) . = ..() @@ -134,7 +136,7 @@ playsound(src, 'sound/items/screwdriver2.ogg', 50, 1) /obj/machinery/doppler_array/proc/sense_explosion(datum/source,turf/epicenter,devastation_range,heavy_impact_range,light_impact_range, - took,orig_dev_range,orig_heavy_range,orig_light_range) + took,orig_dev_range,orig_heavy_range,orig_light_range) SIGNAL_HANDLER if(machine_stat & NOPOWER) @@ -165,8 +167,8 @@ R.factual_radius["shockwave_radius"] = light_impact_range var/list/messages = list("Explosive disturbance detected.", - "Epicenter at: grid ([epicenter.x], [epicenter.y]). Temporal displacement of tachyons: [took] seconds.", - "Factual: Epicenter radius: [devastation_range]. Outer radius: [heavy_impact_range]. Shockwave radius: [light_impact_range].") + "Epicenter at: grid ([epicenter.x], [epicenter.y]). Temporal displacement of tachyons: [took] seconds.", + "Factual: Epicenter radius: [devastation_range]. Outer radius: [heavy_impact_range]. Shockwave radius: [light_impact_range].") // If the bomb was capped, say its theoretical size. if(devastation_range < orig_dev_range || heavy_impact_range < orig_heavy_range || light_impact_range < orig_light_range) diff --git a/code/game/machinery/ecto_sniffer.dm b/code/game/machinery/ecto_sniffer.dm index b148ea831c955..1634e54075e0e 100644 --- a/code/game/machinery/ecto_sniffer.dm +++ b/code/game/machinery/ecto_sniffer.dm @@ -18,7 +18,7 @@ ///Cooldown for radio, prevents spam COOLDOWN_DECLARE(radio_cooldown) -/obj/machinery/ecto_sniffer/Initialize() +/obj/machinery/ecto_sniffer/Initialize(mapload) . = ..() wires = new/datum/wires/ecto_sniffer(src) radio = new(src) diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index 35d8912b050b4..ae077f5a24374 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -312,3 +312,9 @@ [state_options]"} return output + +#undef AIRLOCK_STATE_INOPEN +#undef AIRLOCK_STATE_PRESSURIZE +#undef AIRLOCK_STATE_CLOSED +#undef AIRLOCK_STATE_DEPRESSURIZE +#undef AIRLOCK_STATE_OUTOPEN diff --git a/code/game/machinery/fabricators/modular_fabricator.dm b/code/game/machinery/fabricators/modular_fabricator.dm index 65ffd92b6f376..a2e3eb1461da4 100644 --- a/code/game/machinery/fabricators/modular_fabricator.dm +++ b/code/game/machinery/fabricators/modular_fabricator.dm @@ -513,3 +513,5 @@ /obj/machinery/modular_fabricator/proc/set_working_sprite() return + +#undef MODFAB_MAX_POWER_USE diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index d429b35023c00..820bf6fd17ff8 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -40,6 +40,8 @@ var/area/myarea = null var/locked = FALSE //Are we locked? +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) + /obj/machinery/firealarm/Initialize(mapload, dir, building) . = ..() if (!req_access) @@ -295,7 +297,7 @@ else if(W.tool_behaviour == TOOL_WRENCH) user.visible_message("[user] removes the fire alarm assembly from the wall.", \ - "You remove the fire alarm assembly from the wall.") + "You remove the fire alarm assembly from the wall.") var/obj/item/wallframe/firealarm/frame = new /obj/item/wallframe/firealarm() frame.forceMove(user.drop_location()) W.play_tool_sound(src) @@ -389,3 +391,5 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 26) if (!party_overlay) party_overlay = iconstate2appearance('icons/turf/areas.dmi', "party") A.add_overlay(party_overlay) + +#undef FIREALARM_COOLDOWN diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 50d8a0fc21d7f..39cd58f65a9ad 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -31,6 +31,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/flasher, 26) light_range = FLASH_LIGHT_RANGE light_on = FALSE +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/flasher) + /obj/machinery/flasher/Initialize(mapload, ndir = 0, built = 0) . = ..() // ..() is EXTREMELY IMPORTANT, never forget to add it if(!built) diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index 543213f2a6616..1c77d19629831 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -59,7 +59,7 @@ REGISTER_BUFFER_HANDLER(/obj/machinery/launchpad) DEFINE_BUFFER_HANDLER(/obj/machinery/launchpad) if (stationary && panel_open && TRY_STORE_IN_BUFFER(buffer_parent, src)) to_chat(user, "You save the data in the [buffer_parent.name]'s buffer.") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED return NONE /obj/machinery/launchpad/attackby(obj/item/I, mob/user, params) @@ -230,12 +230,14 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/launchpad) var/closed = TRUE var/obj/item/storage/briefcase/launchpad/briefcase +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/launchpad/briefcase) + /obj/machinery/launchpad/briefcase/Initialize(mapload, briefcase) - . = ..() - if(!briefcase) - log_game("[src] has been spawned without a briefcase.") - return INITIALIZE_HINT_QDEL - src.briefcase = briefcase + . = ..() + if(!briefcase) + log_game("[src] has been spawned without a briefcase.") + return INITIALIZE_HINT_QDEL + src.briefcase = briefcase /obj/machinery/launchpad/briefcase/Destroy() if(!QDELETED(briefcase)) @@ -334,6 +336,8 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/launchpad) //A weakref to our linked pad var/datum/weakref/pad +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/launchpad_remote) + /obj/item/launchpad_remote/Initialize(mapload, pad) //remote spawns linked to the briefcase pad . = ..() src.pad = WEAKREF(pad) diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 518ccc43997bb..2122eede48407 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -233,3 +233,7 @@ if((D.build_type & LIMBGROWER) && ("emagged" in D.category)) stored_research.add_design(D) to_chat(user, "A warning flashes onto the screen, stating that safety overrides have been deactivated!") + +#undef LIMBGROWER_MAIN_MENU +#undef LIMBGROWER_CATEGORY_MENU +#undef LIMBGROWER_CHEMICAL_MENU diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm index d6c1e98d6d477..04d4207fc0a84 100644 --- a/code/game/machinery/newscaster/newscaster_machine.dm +++ b/code/game/machinery/newscaster/newscaster_machine.dm @@ -59,6 +59,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30) +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/newscaster) + /obj/machinery/newscaster/Initialize(mapload, ndir, building) . = ..() GLOB.allCasters += src diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 66e32708181a7..dc911ee7c38f9 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -41,6 +41,8 @@ Buildable meters //Flipping handled manually due to custom handling for trinary pipes AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE) +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/pipe) + /obj/item/pipe/Initialize(mapload, _pipe_type, _dir, obj/machinery/atmospherics/make_from) if(make_from) make_from_existing(make_from) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index e6cee442b0401..26a7be1621543 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -336,7 +336,7 @@ REGISTER_BUFFER_HANDLER(/obj/machinery/porta_turret) DEFINE_BUFFER_HANDLER(/obj/machinery/porta_turret) if (TRY_STORE_IN_BUFFER(buffer_parent, src)) to_chat(user, "You add [src] to multitool buffer.") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED return NONE /obj/machinery/porta_turret/on_emag(mob/user) @@ -865,15 +865,17 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/porta_turret) var/lethal = FALSE /// Variable dictating if the panel is locked, preventing changes to turret settings var/locked = TRUE - /// An area in which linked turrets are located, it can be an area name, path or nothing + /// An area in which linked turrets are located, it can be an area name, path or nothing var/control_area = null - /// Silicons are unable to use this machine if set to TRUE + /// Silicons are unable to use this machine if set to TRUE var/ailock = FALSE /// Variable dictating if linked turrets will shoot cyborgs var/shoot_cyborgs = FALSE /// List of all linked turrets var/list/turrets = list() +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/turretid) + /obj/machinery/turretid/Initialize(mapload, ndir = 0, built = 0) . = ..() if(built) @@ -931,7 +933,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/turretid) if(buffer && istype(buffer, /obj/machinery/porta_turret)) turrets |= buffer to_chat(user, "You link \the [buffer] with \the [src]") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED return NONE /obj/machinery/turretid/on_emag(mob/user) @@ -1167,3 +1169,9 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/turretid) if(istype(P, /obj/projectile/beam/lasertag/bluetag)) toggle_on(FALSE) addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), 10 SECONDS) + +#undef TURRET_STUN +#undef TURRET_LETHAL + +#undef POPUP_ANIM_TIME +#undef POPDOWN_ANIM_TIME diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm index 163c46d1bb6ef..30f916b1c4574 100644 --- a/code/game/machinery/porta_turret/portable_turret_construct.dm +++ b/code/game/machinery/porta_turret/portable_turret_construct.dm @@ -187,3 +187,13 @@ /obj/machinery/porta_turret_construct/attack_ai() return + +#undef PTURRET_UNSECURED +#undef PTURRET_BOLTED +#undef PTURRET_START_INTERNAL_ARMOUR +#undef PTURRET_INTERNAL_ARMOUR_ON +#undef PTURRET_GUN_EQUIPPED +#undef PTURRET_SENSORS_ON +#undef PTURRET_CLOSED +#undef PTURRET_START_EXTERNAL_ARMOUR +#undef PTURRET_EXTERNAL_ARMOUR_ON diff --git a/code/game/machinery/porta_turret/portable_turret_cover.dm b/code/game/machinery/porta_turret/portable_turret_cover.dm index 14feee213eafd..4289aff7bf779 100644 --- a/code/game/machinery/porta_turret/portable_turret_cover.dm +++ b/code/game/machinery/porta_turret/portable_turret_cover.dm @@ -71,7 +71,7 @@ REGISTER_BUFFER_HANDLER(/obj/machinery/porta_turret_cover) DEFINE_BUFFER_HANDLER(/obj/machinery/porta_turret_cover) if (TRY_STORE_IN_BUFFER(buffer_parent, parent_turret)) to_chat(user, "You add [parent_turret] to multitool buffer.") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED return NONE /obj/machinery/porta_turret_cover/attacked_by(obj/item/I, mob/user) diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index 301dcd373b71a..aff449c638191 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -88,19 +88,19 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/quantumpad) if (panel_open) if (TRY_STORE_IN_BUFFER(buffer_parent, src)) to_chat(user, "You save the data in [buffer_parent]'s buffer. It can now be saved to pads with closed panels.") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED return NONE if(istype(buffer, /obj/machinery/quantumpad)) if(buffer == src) to_chat(user, "You cannot link a pad to itself!") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED else linked_pad = buffer to_chat(user, "You link [src] to the one in [buffer_parent]'s buffer.") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED else to_chat(user, "There is no quantum pad data saved in [buffer_parent]'s buffer!") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED /obj/machinery/quantumpad/interact(mob/user, obj/machinery/quantumpad/target_pad = linked_pad) if(!target_pad || QDELETED(target_pad)) diff --git a/code/game/machinery/scan_gate.dm b/code/game/machinery/scan_gate.dm index a4ba6c4804d44..048f2588fb97d 100644 --- a/code/game/machinery/scan_gate.dm +++ b/code/game/machinery/scan_gate.dm @@ -242,7 +242,7 @@ var/new_nutrition = params["new_nutrition"] var/nutrition_list = list( "Starving", - "Obese" + "Obese" ) if(new_nutrition && (new_nutrition in nutrition_list)) switch(new_nutrition) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 91609daabb065..a92709d21a5bb 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -212,6 +212,7 @@ #define ACTIVE_SETUPFIELDS 1 #define ACTIVE_HASFIELDS 2 + /obj/machinery/shieldwallgen name = "shield wall generator" desc = "A shield generator." @@ -402,6 +403,9 @@ playsound(src, "sparks", 100, 1) to_chat(user, "You short out the access controller.") +#undef ACTIVE_SETUPFIELDS +#undef ACTIVE_HASFIELDS + //////////////Containment Field START /obj/machinery/shieldwall name = "shield wall" @@ -416,6 +420,8 @@ var/obj/machinery/shieldwallgen/gen_primary var/obj/machinery/shieldwallgen/gen_secondary +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/shieldwall) + /obj/machinery/shieldwall/Initialize(mapload, obj/machinery/shieldwallgen/first_gen, obj/machinery/shieldwallgen/second_gen) . = ..() gen_primary = first_gen diff --git a/code/game/machinery/shuttle/shuttle_engine.dm b/code/game/machinery/shuttle/shuttle_engine.dm index 24d3af7b2e243..02c5de77af61c 100644 --- a/code/game/machinery/shuttle/shuttle_engine.dm +++ b/code/game/machinery/shuttle/shuttle_engine.dm @@ -137,3 +137,6 @@ if(default_deconstruction_crowbar(I)) return return ..() + +#undef ENGINE_HEAT_TARGET +#undef ENGINE_HEATING_POWER diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 85817d66f3e2a..bf0def3b63a52 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -350,11 +350,12 @@ return amount -#undef SEVEN -#undef SPIN_TIME -#undef JACKPOT -#undef BIG_PRIZE -#undef SMALL_PRIZE #undef SPIN_PRICE +#undef SMALL_PRIZE +#undef BIG_PRIZE +#undef JACKPOT +#undef SPIN_TIME +#undef REEL_DEACTIVATE_DELAY +#undef SEVEN #undef HOLOCHIP #undef COIN diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm index 0beaf9b54f289..fb20f6b958b2f 100644 --- a/code/game/machinery/stasis.dm +++ b/code/game/machinery/stasis.dm @@ -20,7 +20,7 @@ var/obj/machinery/computer/operating/op_computer // dir check for buckle_lying state -/obj/machinery/stasis/Initialize() +/obj/machinery/stasis/Initialize(mapload) RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(dir_changed)) dir_changed(new_dir = dir) . = ..() @@ -172,7 +172,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/stasis) if (TRY_STORE_IN_BUFFER(buffer_parent, src)) to_chat(user, "You store the linking data of \the [src] in \the [buffer_parent]'s buffer. Use it on an operating computer to complete linking.") balloon_alert(user, "saved in buffer") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED return NONE /obj/machinery/stasis/wrench_act(mob/living/user, obj/item/I) //We want to rotate, but we need to do it in 180 degree rotations. diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 3c0e11ff55ac8..1f24a5d136cb8 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -7,11 +7,6 @@ #define LINE1_Y -8 #define LINE2_Y -15 -#define SD_BLANK 0 // 0 = Blank -#define SD_EMERGENCY 1 // 1 = Emergency Shuttle timer -#define SD_MESSAGE 2 // 2 = Arbitrary message(s) -#define SD_PICTURE 3 // 3 = alert picture - /// Status display which can show images and scrolling text. /obj/machinery/status_display name = "status display" @@ -39,6 +34,8 @@ var/header_text_color = "#2CF" //makes it go on the wall when built +CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/status_display) + /obj/machinery/status_display/Initialize(mapload, ndir, building) . = ..() update_appearance() @@ -216,6 +213,8 @@ 5, 5, 5, 5, 4, 5, 4, 6, 4, 4, 4, 3, 2, 3, 4, ) +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/overlay/status_display_text) + /obj/effect/overlay/status_display_text/Initialize(mapload, yoffset, line, text_color, header_text_color) . = ..() diff --git a/code/game/machinery/teambuilder.dm b/code/game/machinery/teambuilder.dm index 34c5f6791acc8..0f610cfb5ba54 100644 --- a/code/game/machinery/teambuilder.dm +++ b/code/game/machinery/teambuilder.dm @@ -17,7 +17,7 @@ ///What radio station is your radio set to when crossed (And human)? var/team_radio = FREQ_COMMON -/obj/machinery/teambuilder/Initialize() +/obj/machinery/teambuilder/Initialize(mapload) . = ..() add_filter("teambuilder", 2, list("type" = "outline", "color" = team_color, "size" = 2)) var/static/list/loc_connections = list( diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 59485079462df..e0790ab8cea16 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -24,7 +24,7 @@ switch(screen) - // --- Main Menu --- + // --- Main Menu --- if(0) dat += "
          [temp]
          " @@ -40,7 +40,7 @@ dat += "
          No servers detected. Scan for servers: \[Scan\]" - // --- Viewing Server --- + // --- Viewing Server --- if(1) dat += "
          [temp]
          " diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm index 66a5f419eb3ae..a63b62fb27c2e 100644 --- a/code/game/machinery/telecomms/computers/message.dm +++ b/code/game/machinery/telecomms/computers/message.dm @@ -282,6 +282,8 @@ /obj/item/paper/monitorkey name = "monitor decryption key" +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/paper/monitorkey) + /obj/item/paper/monitorkey/Initialize(mapload, obj/machinery/telecomms/message_server/server) ..() if (server) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 62fc15fd0d93f..3fd2baed0fc38 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -189,7 +189,7 @@ GLOBAL_LIST_EMPTY(telecomms_list) send_data["efficiency"] = get_efficiency() send_data["overheated"] = (machine_stat & OVERHEATED) - ntnet_send(send_data, data["sender_id"]) + ntnet_send(send_data, data.data["sender_id"]) /obj/machinery/telecomms/update_icon() if(on) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index f703c91d3107c..ca7e0b588ad6c 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -183,7 +183,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/teleport/station) if(panel_open) if (TRY_STORE_IN_BUFFER(buffer_parent, src)) to_chat(user, "You download the data to the [buffer_parent.name]'s buffer.") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED else if(istype(buffer, /obj/machinery/teleport/station) && buffer != src) if(linked_stations.len < efficiency) @@ -192,7 +192,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/teleport/station) to_chat(user, "You upload the data from the [buffer_parent.name]'s buffer.") else to_chat(user, "This station can't hold more information, try to use better parts.") - return COMPONENT_BUFFER_RECIEVED + return COMPONENT_BUFFER_RECEIVED return NONE /obj/machinery/teleport/station/interact(mob/user) diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 737a712d92544..3f70156ec385a 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -95,7 +95,7 @@ var/mob/living/silicon/robot/R = H.Robotize() R.cell = new /obj/item/stock_parts/cell/upgraded/plus(R, robot_cell_charge) - // So he can't jump out the gate right away. + // So he can't jump out the gate right away. R.SetLockdown() if(masterAI) R.connected_ai = masterAI diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index d1520a6ad6f47..d7e77c26c4fd7 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -197,7 +197,7 @@ GLOBAL_LIST_INIT(dye_registry, list( var/max_wash_capacity = 5 var/datum/looping_sound/washing_machine/soundloop -/obj/machinery/washing_machine/Initialize() +/obj/machinery/washing_machine/Initialize(mapload) . = ..() soundloop = new(src, FALSE) @@ -320,9 +320,9 @@ GLOBAL_LIST_INIT(dye_registry, list( remove_atom_colour(WASHABLE_COLOUR_PRIORITY) if(WM.color_source) dye_item(WM.color_source.dye_color) - else - appearance_change(src) - src.desc = initial(src) + return + appearance_change(src) + desc = initial(desc) /obj/item/gun/energy/laser/practice/dye_item(dye_color, dye_key) . = ..() diff --git a/code/game/objects/effects/alien_acid.dm b/code/game/objects/effects/alien_acid.dm index 3f09a59d351d3..a9480662770c4 100644 --- a/code/game/objects/effects/alien_acid.dm +++ b/code/game/objects/effects/alien_acid.dm @@ -11,6 +11,8 @@ var/turf/target +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/acid) + /obj/effect/acid/Initialize(mapload, acid_pwr, acid_amt) . = ..() diff --git a/code/game/objects/effects/anomalies/_anomalies.dm b/code/game/objects/effects/anomalies/_anomalies.dm index de035db4da6d9..5a094416c945e 100644 --- a/code/game/objects/effects/anomalies/_anomalies.dm +++ b/code/game/objects/effects/anomalies/_anomalies.dm @@ -25,6 +25,8 @@ ///How many harvested pierced realities do we spawn on destruction var/max_spawned_faked = 2 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/anomaly) + /obj/effect/anomaly/Initialize(mapload, new_lifespan, spawned_fake_harvested) . = ..() diff --git a/code/game/objects/effects/anomalies/anomaly_flux.dm b/code/game/objects/effects/anomalies/anomaly_flux.dm index 5f4fdc9739807..20acff19cbe19 100644 --- a/code/game/objects/effects/anomalies/anomaly_flux.dm +++ b/code/game/objects/effects/anomalies/anomaly_flux.dm @@ -6,6 +6,8 @@ var/shockdamage = 20 var/explosive = ANOMALY_FLUX_EXPLOSIVE +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/anomaly/flux) + /obj/effect/anomaly/flux/Initialize(mapload, new_lifespan, drops_core = TRUE, explosive = ANOMALY_FLUX_EXPLOSIVE) . = ..() src.explosive = explosive diff --git a/code/game/objects/effects/anomalies/anomaly_gravity.dm b/code/game/objects/effects/anomalies/anomaly_gravity.dm index bc06bc3fba8ba..fdda56b57be9a 100644 --- a/code/game/objects/effects/anomalies/anomaly_gravity.dm +++ b/code/game/objects/effects/anomalies/anomaly_gravity.dm @@ -14,6 +14,8 @@ ///Warp effect holder for displacement filter to "pulse" the anomaly var/atom/movable/warp_effect/warp +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/anomaly/grav) + /obj/effect/anomaly/grav/Initialize(mapload, new_lifespan, drops_core) . = ..() var/static/list/loc_connections = list( @@ -76,6 +78,8 @@ /obj/effect/anomaly/grav/high var/grav_field +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/anomaly/grav/high) + /obj/effect/anomaly/grav/high/Initialize(mapload, new_lifespan) . = ..() setup_grav_field() diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 07c0d3f0c5d3b..4f75ae2673003 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -12,6 +12,8 @@ var/poster_type var/obj/structure/sign/poster/poster_structure +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/poster) + /obj/item/poster/Initialize(mapload, obj/structure/sign/poster/new_poster_structure) . = ..() poster_structure = new_poster_structure diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 5d1e841ae5026..59d70bfce96d8 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -9,6 +9,8 @@ ///The type of cleaning required to clean the decal, CLEAN_TYPE_LIGHT_DECAL can be cleaned with mops and soap, CLEAN_TYPE_HARD_DECAL can be cleaned by soap, see __DEFINES/cleaning.dm for the others var/clean_type = CLEAN_TYPE_LIGHT_DECAL +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/decal/cleanable) + /obj/effect/decal/cleanable/Initialize(mapload, list/datum/disease/diseases) . = ..() if (random_icon_states && (icon_state == initial(icon_state)) && length(random_icon_states) > 0) diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 5c37486b41ade..f92b63ee31a85 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -61,6 +61,8 @@ icon_state = "floor1-old" var/list/datum/disease/diseases = list() +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/decal/cleanable/blood/old) + /obj/effect/decal/cleanable/blood/old/Initialize(mapload, list/datum/disease/diseases) add_blood_DNA(list("Non-human DNA" = random_blood_type())) // Needs to happen before ..() . = ..() @@ -112,6 +114,8 @@ ///Information about the diseases our streaking spawns var/list/streak_diseases +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/decal/cleanable/blood/gibs) + /obj/effect/decal/cleanable/blood/gibs/Initialize(mapload, list/datum/disease/diseases) . = ..() reagents.add_reagent(/datum/reagent/liquidgibs, 5) @@ -205,6 +209,8 @@ drydesc = "Space Jesus, why didn't anyone clean this up? They smell terrible." var/list/datum/disease/diseases = list() +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/decal/cleanable/blood/gibs/old) + /obj/effect/decal/cleanable/blood/gibs/old/Initialize(mapload, list/datum/disease/diseases) . = ..() setDir(pick(1, 2, 4, 8)) diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index c5baa5696e985..57c65ecebcbc8 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -142,6 +142,8 @@ desc = "You try not to look at the chunks, and fail." var/list/datum/disease/diseases = list() +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/decal/cleanable/vomit/old) + /obj/effect/decal/cleanable/vomit/old/Initialize(mapload, list/datum/disease/diseases) . = ..() icon_state += "-old" diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm index 8ec6a6bef4f8d..29c77c690a919 100644 --- a/code/game/objects/effects/decals/cleanable/robots.dm +++ b/code/game/objects/effects/decals/cleanable/robots.dm @@ -13,7 +13,7 @@ //beauty = -50 clean_type = CLEAN_TYPE_BLOOD -/obj/effect/decal/cleanable/robot_debris/Initialize() +/obj/effect/decal/cleanable/robot_debris/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, PROC_REF(on_pipe_eject)) diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index 5e7e025fbcbd9..4fe8fb4ef0a0c 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -10,6 +10,8 @@ var/rotation = 0 var/paint_colour = "#FFFFFF" +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/decal/cleanable/crayon) + /obj/effect/decal/cleanable/crayon/Initialize(mapload, main, type, e_name, graf_rot, alt_icon = null) . = ..() if(e_name) diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index 91eb6e90109a3..1567d4e1c56d0 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -31,6 +31,8 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/turf_decal) + /obj/effect/turf_decal icon = 'icons/turf/decals.dmi' icon_state = "warningline" diff --git a/code/game/objects/effects/effect_system/effects_water.dm b/code/game/objects/effects/effect_system/effects_water.dm index d07b84ff8f262..ad084f5689e54 100644 --- a/code/game/objects/effects/effect_system/effects_water.dm +++ b/code/game/objects/effects/effect_system/effects_water.dm @@ -44,10 +44,10 @@ // will always spawn at the items location, even if it's moved. /* Example: - var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread() -- creates new system -steam.set_up(5, 0, mob.loc) -- sets up variables -OPTIONAL: steam.attach(mob) -steam.start() -- spawns the effect + * var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread() -- creates new system + * steam.set_up(5, 0, mob.loc) -- sets up variables + * OPTIONAL: steam.attach(mob) + * steam.start() -- spawns the effect */ ///////////////////////////////////////////// /obj/effect/particle_effect/steam diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm index bf7ae1fb93d37..fc8577bf8a700 100644 --- a/code/game/objects/effects/forcefields.dm +++ b/code/game/objects/effects/forcefields.dm @@ -9,6 +9,8 @@ z_flags = Z_BLOCK_IN_DOWN | Z_BLOCK_IN_UP var/timeleft = 300 //Set to 0 for permanent forcefields (ugh) +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/forcefield) + /obj/effect/forcefield/Initialize(mapload, ntimeleft) . = ..() if(isnum_safe(ntimeleft)) @@ -39,6 +41,8 @@ desc = "You're gonna be here awhile." timeleft = 600 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/forcefield/mime) + /obj/effect/forcefield/mime/Initialize(mapload, ntimeleft) . = ..() SSvis_overlays.add_obj_alpha(src, 'icons/turf/walls/snow_wall.dmi', "snow_wall-0") diff --git a/code/game/objects/effects/icons.dm b/code/game/objects/effects/icons.dm index d202ac5ff8fb6..01c8248303d27 100644 --- a/code/game/objects/effects/icons.dm +++ b/code/game/objects/effects/icons.dm @@ -4,10 +4,14 @@ name = "" mouse_opacity = MOUSE_OPACITY_TRANSPARENT +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/icon) + /obj/effect/icon/Initialize(mapload, icon/render_source) . = ..() overlays = list(render_source) +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/icon/temp) + /obj/effect/icon/temp/Initialize(mapload, icon/render_source, duration) . = ..() addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), src), duration, TIMER_STOPPABLE | TIMER_CLIENT_TIME) diff --git a/code/game/objects/effects/info.dm b/code/game/objects/effects/info.dm index 23f341c8a3c78..2f2feee80bb2d 100644 --- a/code/game/objects/effects/info.dm +++ b/code/game/objects/effects/info.dm @@ -7,6 +7,8 @@ /// What should the info button display when clicked? var/info_text +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/abstract/info) + /obj/effect/abstract/info/Initialize(mapload, info_text) . = ..() diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 6031d3bab396d..ccdb8b598f528 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -488,6 +488,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) /obj/effect/landmark/ruin var/datum/map_template/ruin/ruin_template +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/landmark/ruin) + /obj/effect/landmark/ruin/Initialize(mapload, my_ruin_template) . = ..() name = "ruin_[GLOB.ruin_landmarks.len + 1]" diff --git a/code/game/objects/effects/lighting.dm b/code/game/objects/effects/lighting.dm index a0838f6e840fa..4f054ba2044aa 100644 --- a/code/game/objects/effects/lighting.dm +++ b/code/game/objects/effects/lighting.dm @@ -14,6 +14,8 @@ //blocks_emissive = EMISSIVE_BLOCK_NONE mouse_opacity = MOUSE_OPACITY_TRANSPARENT +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/dummy/lighting_obj) + /obj/effect/dummy/lighting_obj/Initialize(mapload, range, power, color, duration) . = ..() if(!isnull(range)) @@ -28,6 +30,8 @@ /obj/effect/dummy/lighting_obj/moblight name = "mob" +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/dummy/lighting_obj/moblight) + /obj/effect/dummy/lighting_obj/moblight/Initialize(mapload, range, power, color, duration) . = ..() if(!ismob(loc)) diff --git a/code/game/objects/effects/mainttraps.dm b/code/game/objects/effects/mainttraps.dm index 66e992d356504..ebe1452606e1b 100644 --- a/code/game/objects/effects/mainttraps.dm +++ b/code/game/objects/effects/mainttraps.dm @@ -292,7 +292,7 @@ if(istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user)) SEND_SOUND(user,'sound/items/sheath.ogg') if(do_after(user, 15, target = src)) - to_chat(user, "It's not within your power to erase the [lowertext(cultist_name)].") + to_chat(user, "It's not within your power to erase the [LOWER_TEXT(cultist_name)].") else if(istype(I, /obj/item/nullrod)) user.say("BEGONE FOUL MAGIKS!!", forced = "nullrod") to_chat(user, "You try to disrupt the magic of [src] with the [I], and nothing happens to the crude crayon markings. You feel foolish.") diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index 472cb998b7797..2a9ac99c7d876 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -86,6 +86,8 @@ if(Adjacent(user)) teleport(user) +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/portal) + /obj/effect/portal/Initialize(mapload, _creator, _lifespan = 0, obj/effect/portal/_linked, automatic_link = FALSE, turf/hard_target_override, atmos_link_override) . = ..() GLOB.portals += src @@ -208,6 +210,8 @@ var/id // var edit or set id in map editor hardlinked = FALSE // dont qdel my portal nerd +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/portal/permanent) + /obj/effect/portal/permanent/Initialize(mapload, _creator, _lifespan = 0, obj/effect/portal/_linked, automatic_link = FALSE, turf/hard_target_override, atmos_link_override) . = ..() set_linked() diff --git a/code/game/objects/effects/proximity.dm b/code/game/objects/effects/proximity.dm index f7502f744b08d..dea082420fd05 100644 --- a/code/game/objects/effects/proximity.dm +++ b/code/game/objects/effects/proximity.dm @@ -100,6 +100,8 @@ anchored = TRUE var/datum/proximity_monitor/monitor +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/abstract/proximity_checker) + /obj/effect/abstract/proximity_checker/Initialize(mapload, datum/proximity_monitor/_monitor) . = ..() if(_monitor) diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm index 852b86dc7a865..6df5ff54ff243 100644 --- a/code/game/objects/effects/spawners/gibspawner.dm +++ b/code/game/objects/effects/spawners/gibspawner.dm @@ -9,6 +9,8 @@ var/list/gibamounts = list() //amount to spawn for each gib decal type we'll spawn. var/list/gibdirections = list() //of lists of possible directions to spread each gib decal type towards. +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/gibspawner) + /obj/effect/gibspawner/Initialize(mapload, mob/living/source_mob, list/datum/disease/diseases) . = ..() diff --git a/code/game/objects/effects/spawners/mailspawner.dm b/code/game/objects/effects/spawners/mailspawner.dm index d44ffe0ababc4..8a558d302785f 100644 --- a/code/game/objects/effects/spawners/mailspawner.dm +++ b/code/game/objects/effects/spawners/mailspawner.dm @@ -9,7 +9,7 @@ /obj/effect/spawner/mail/maintloot name = "\improper Random maintenance loot spawner" -/obj/effect/spawner/mail/maintloot/Initialize() +/obj/effect/spawner/mail/maintloot/Initialize(mapload) var/picked_item = pick_weight(GLOB.maintenance_loot) new picked_item(loc) return ..() @@ -17,7 +17,7 @@ /obj/effect/spawner/mail/organminor name = "\improper Random minor organs spawner" -/obj/effect/spawner/mail/organminor/Initialize() +/obj/effect/spawner/mail/organminor/Initialize(mapload) var/static/list/mail_organminor = pick( /obj/item/organ/tongue, /obj/item/organ/tongue/lizard, @@ -47,7 +47,7 @@ /obj/effect/spawner/mail/organmajor name = "\improper Random major organs spawner" -/obj/effect/spawner/mail/organmajor/Initialize() +/obj/effect/spawner/mail/organmajor/Initialize(mapload) var/static/list/mail_organmajor= pick( /obj/item/organ/adamantine_resonator, /obj/item/organ/ears/penguin, @@ -73,7 +73,7 @@ /obj/effect/spawner/mail/advmedtool name = "\improper Random advanced medical tool spawner" -/obj/effect/spawner/mail/advmedtool/Initialize() +/obj/effect/spawner/mail/advmedtool/Initialize(mapload) var/static/list/mail_advmedtool= pick( /obj/item/scalpel/advanced, /obj/item/retractor/advanced, @@ -84,7 +84,7 @@ /obj/effect/spawner/mail/ayymedtool name = "\improper Random alien medical tool spawner" -/obj/effect/spawner/mail/ayymedtool/Initialize() +/obj/effect/spawner/mail/ayymedtool/Initialize(mapload) var/static/list/mail_ayymedtool= pick( /obj/item/scalpel/alien, /obj/item/hemostat/alien, @@ -98,7 +98,7 @@ /obj/effect/spawner/mail/donut name = "\improper Random common donut spawner" -/obj/effect/spawner/mail/donut/Initialize() +/obj/effect/spawner/mail/donut/Initialize(mapload) var/static/list/mail_donut= pick( /obj/item/food/donut/berry, /obj/item/food/donut/apple, @@ -111,7 +111,7 @@ /obj/effect/spawner/mail/rdonut name = "\improper Random rare donut spawner" -/obj/effect/spawner/mail/rdonut/Initialize() +/obj/effect/spawner/mail/rdonut/Initialize(mapload) var/static/list/mail_rdonut= pick( /obj/item/food/donut/meat, /obj/item/food/donut/trumpet, @@ -124,7 +124,7 @@ /obj/effect/spawner/mail/genes name = "\improper Random genes spawner" -/obj/effect/spawner/mail/genes/Initialize() +/obj/effect/spawner/mail/genes/Initialize(mapload) var/static/list/mail_genes= pick( /obj/item/chromosome/energy, /obj/item/chromosome/power, @@ -137,7 +137,7 @@ /obj/effect/spawner/mail/science name = "\improper Random science junk spawner" -/obj/effect/spawner/mail/science/Initialize() +/obj/effect/spawner/mail/science/Initialize(mapload) var/static/list/mail_science= pick( /obj/item/laser_pointer, /obj/item/paicard, diff --git a/code/game/objects/effects/spawners/roomspawner.dm b/code/game/objects/effects/spawners/roomspawner.dm index 2444e6cf3aca1..435bbc8e4783b 100644 --- a/code/game/objects/effects/spawners/roomspawner.dm +++ b/code/game/objects/effects/spawners/roomspawner.dm @@ -1,41 +1,68 @@ //random room spawner. takes random rooms from their appropriate map file and places them. the room will spawn with the spawner in the bottom left corner /obj/effect/spawner/room - name = "random room spawner" - icon = 'icons/effects/landmarks_static.dmi' - icon_state = "random_room" - dir = NORTH - var/room_width = 0 - var/room_height = 0 - ///List of room IDs we want - var/list/rooms = list() + name = "random room spawner" + icon = 'icons/effects/landmarks_static.dmi' + icon_state = "random_room" + dir = NORTH + var/room_width = 0 + var/room_height = 0 + ///List of room IDs we want + var/list/rooms = list() /obj/effect/spawner/room/New(loc, ...) - . = ..() - if(!isnull(SSmapping.random_room_spawners)) - SSmapping.random_room_spawners += src + . = ..() +#ifndef UNIT_TESTS + if(!isnull(SSmapping.random_room_spawners)) + SSmapping.random_room_spawners += src +#endif /obj/effect/spawner/room/Initialize(mapload) - . = ..() - if(!length(SSmapping.random_room_templates)) - message_admins("Room spawner created with no templates available. This shouldn't happen.") - return INITIALIZE_HINT_QDEL - var/list/possibletemplates = list() - var/datum/map_template/random_room/candidate - shuffle_inplace(SSmapping.random_room_templates) - for(var/ID in SSmapping.random_room_templates) - candidate = SSmapping.random_room_templates[ID] - if((!rooms.len && candidate.spawned) || (!rooms.len && (room_height != candidate.template_height || room_width != candidate.template_width)) || (rooms.len && !(candidate.room_id in rooms))) - candidate = null - continue - possibletemplates[candidate] = candidate.weight - if(possibletemplates.len) - var/datum/map_template/random_room/template = pick_weight(possibletemplates) - template.stock -- - template.weight = (template.weight / 2) - if(template.stock <= 0) - template.spawned = TRUE - template.load(get_turf(src), centered = template.centerspawner) + . = ..() +#ifdef UNIT_TESTS + // These are far too flakey to be including in the tests + var/turf/main_room_turf = get_turf(src) + for (var/x in main_room_turf.x to main_room_turf.x + room_width - 1) + for (var/y in main_room_turf.y to main_room_turf.y + room_height - 1) + var/turf/fix_turf = locate(x, y, main_room_turf.z) + fix_turf.ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_IGNORE_AIR) + return INITIALIZE_HINT_QDEL +#else + if(!length(SSmapping.random_room_templates)) + message_admins("Room spawner created with no templates available. This shouldn't happen.") + return INITIALIZE_HINT_QDEL + var/list/possibletemplates = list() + var/datum/map_template/random_room/candidate + shuffle_inplace(SSmapping.random_room_templates) + for(var/ID in SSmapping.random_room_templates) + candidate = SSmapping.random_room_templates[ID] + if((!rooms.len && candidate.spawned) || (!rooms.len && (room_height != candidate.template_height || room_width != candidate.template_width)) || (rooms.len && !(candidate.room_id in rooms))) + candidate = null + continue + possibletemplates[candidate] = candidate.weight + if(possibletemplates.len) + var/datum/map_template/random_room/template = pick_weight(possibletemplates) + template.stock -- + template.weight = (template.weight / 2) + if(template.stock <= 0) + template.spawned = TRUE + var/datum/async_map_generator/map_place/generator = template.load(get_turf(src), centered = template.centerspawner) + generator.on_completion(CALLBACK(src, PROC_REF(after_place))) +#endif + +/obj/effect/spawner/room/proc/after_place(datum/async_map_generator/map_place/generator, turf/T, init_atmos, datum/parsed_map/parsed, finalize = TRUE, ...) + // Scan through the room and remove any wall fixtures that were not placed correctly + for (var/x in T.x to T.x + room_width - 1) + for (var/y in T.y to T.y + room_height - 1) + var/turf/current = locate(x, y, T.z) + for (var/obj/placed_object in current) + // Temporary hacky check to see if we contain a directional mapping helper + // I know its a normal variable, but this is explicitly accessed through reflection + if (!initial(placed_object._reflection_is_directional)) + continue + // Check to see if we correctly placed ourselves on a wall + if (!isclosedturf(get_step(placed_object, placed_object.dir))) + qdel(placed_object) /obj/effect/spawner/room/special/tenxfive_terrestrial name = "10x5 terrestrial room" diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index ffd84411841df..b938a189bae08 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -69,7 +69,7 @@ return if(immobilize) - ADD_TRAIT(AM, TRAIT_IMMOBILIZED, src) + ADD_TRAIT(AM, TRAIT_IMMOBILIZED, REF(src)) affecting[AM] = AM.dir var/datum/move_loop/loop = SSmove_manager.move(AM, direction, speed, tiles ? tiles * speed : INFINITY) diff --git a/code/game/objects/effects/temporary_visuals/clockwork.dm b/code/game/objects/effects/temporary_visuals/clockwork.dm index 65e700fd6d128..ffbac1b47be2e 100644 --- a/code/game/objects/effects/temporary_visuals/clockwork.dm +++ b/code/game/objects/effects/temporary_visuals/clockwork.dm @@ -109,6 +109,8 @@ pixel_x = -16 duration = 30 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/ratvar/prolonging_prism) + /obj/effect/temp_visual/ratvar/prolonging_prism/Initialize(mapload, set_appearance) . = ..() if(set_appearance) @@ -159,6 +161,8 @@ icon_state = "smoke" duration = 15 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/steam) + /obj/effect/temp_visual/steam/Initialize(mapload, steam_direction) . = ..() setDir(steam_direction) diff --git a/code/game/objects/effects/temporary_visuals/cult.dm b/code/game/objects/effects/temporary_visuals/cult.dm index 473405deded44..3461069224a61 100644 --- a/code/game/objects/effects/temporary_visuals/cult.dm +++ b/code/game/objects/effects/temporary_visuals/cult.dm @@ -72,6 +72,8 @@ alpha = 0 var/turnedness = 179 //179 turns counterclockwise, 181 turns clockwise +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/cult/rune_spawn) + /obj/effect/temp_visual/cult/rune_spawn/Initialize(mapload, set_duration, set_color) if(isnum_safe(set_duration)) duration = set_duration diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 94fbdfa71bb3d..1206d43824256 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -6,6 +6,8 @@ layer = BELOW_MOB_LAYER var/splatter_type = "splatter" +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/dir_setting/bloodsplatter) + /obj/effect/temp_visual/dir_setting/bloodsplatter/Initialize(mapload, set_dir) if(set_dir in GLOB.diagonals) icon_state = "[splatter_type][pick(1, 2, 6)]" @@ -129,11 +131,15 @@ /obj/effect/temp_visual/dir_setting/curse/long // Necro Sect Usage duration = 330 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/dir_setting/curse) + /obj/effect/temp_visual/dir_setting/curse/Initialize(mapload, set_dir) . = ..() if(fades) animate(src, alpha = 0, time = 32) +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/dir_setting/curse/long) + /obj/effect/temp_visual/dir_setting/curse/long/Initialize(mapload, set_dir) . = ..() if(fades) @@ -166,6 +172,8 @@ pixel_y = -16 duration = 50 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/bsa_splash) + /obj/effect/temp_visual/bsa_splash/Initialize(mapload, dir) . = ..() switch(dir) @@ -211,6 +219,8 @@ desc = "It's a decoy!" duration = 15 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/decoy) + /obj/effect/temp_visual/decoy/Initialize(mapload, atom/mimiced_atom) . = ..() alpha = initial(alpha) @@ -220,6 +230,8 @@ setDir(mimiced_atom.dir) mouse_opacity = MOUSE_OPACITY_TRANSPARENT +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/decoy/fading) + /obj/effect/temp_visual/decoy/fading/Initialize(mapload, atom/mimiced_atom) . = ..() animate(src, alpha = 0, time = duration) @@ -300,6 +312,8 @@ icon = 'icons/mob/mob.dmi' duration = 15 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/gib_animation) + /obj/effect/temp_visual/gib_animation/Initialize(mapload, gib_icon) icon_state = gib_icon // Needs to be before ..() so icon is correct . = ..() @@ -311,6 +325,8 @@ icon = 'icons/mob/mob.dmi' duration = 15 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/dust_animation) + /obj/effect/temp_visual/dust_animation/Initialize(mapload, dust_icon) icon_state = dust_icon // Before ..() so the correct icon is flick()'d . = ..() @@ -325,6 +341,8 @@ icon_state = "heal" duration = 15 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/heal) + /obj/effect/temp_visual/heal/Initialize(mapload, set_color) if(set_color) add_atom_colour(set_color, FIXED_COLOUR_PRIORITY) @@ -367,6 +385,8 @@ icon_state = "impact_bullet" duration = 5 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/impact_effect) + /obj/effect/temp_visual/impact_effect/Initialize(mapload, x, y) pixel_x = x pixel_y = y @@ -423,6 +443,8 @@ /obj/effect/temp_visual/love_heart/invisible icon_state = null +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/love_heart/invisible) + /obj/effect/temp_visual/love_heart/invisible/Initialize(mapload, mob/seer) . = ..() var/image/I = image(icon = 'icons/effects/effects.dmi', icon_state = "heart", layer = ABOVE_MOB_LAYER, loc = src) @@ -438,6 +460,8 @@ duration = 10 var/shrink = TRUE +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/bleed) + /obj/effect/temp_visual/bleed/Initialize(mapload, atom/size_calc_target) . = ..() var/size_matrix = matrix() @@ -462,6 +486,8 @@ duration = 5 var/outgoing = TRUE +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/warp_cube) + /obj/effect/temp_visual/warp_cube/Initialize(mapload, atom/teleporting_atom, warp_color, new_outgoing) . = ..() if(teleporting_atom) @@ -495,6 +521,8 @@ var/status = 0 var/delay = 0 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/constructing_effect) + /obj/effect/constructing_effect/Initialize(mapload, rcd_delay, rcd_status) . = ..() status = rcd_status @@ -537,6 +565,8 @@ icon_state = "smoke" duration = 15 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/steam) + /obj/effect/temp_visual/steam/Initialize(mapload, steam_direction) . = ..() setDir(steam_direction) @@ -580,6 +610,8 @@ icon_state = "shield" alpha = 0 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/launchpad) + /obj/effect/temp_visual/launchpad/Initialize(mapload, time) duration = time animate(src, time=time, alpha=255) diff --git a/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm b/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm index 27f49fd93bf77..fab895e04b713 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm @@ -55,6 +55,8 @@ /obj/effect/projectile_lighting var/owner +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/projectile_lighting) + /obj/effect/projectile_lighting/Initialize(mapload, color, range, intensity, owner_key) . = ..() set_light(range, intensity, color) diff --git a/code/game/objects/effects/temporary_visuals/temporary_visual.dm b/code/game/objects/effects/temporary_visuals/temporary_visual.dm index ec4c0b9a7db59..2b6699f0a140f 100644 --- a/code/game/objects/effects/temporary_visuals/temporary_visual.dm +++ b/code/game/objects/effects/temporary_visuals/temporary_visual.dm @@ -13,7 +13,7 @@ if(randomdir) setDir(pick(GLOB.cardinals)) - timerid = QDEL_IN(src, duration) + timerid = QDEL_IN_STOPPABLE(src, duration) /obj/effect/temp_visual/Destroy() . = ..() @@ -28,6 +28,8 @@ /obj/effect/temp_visual/dir_setting randomdir = FALSE +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/dir_setting) + /obj/effect/temp_visual/dir_setting/Initialize(mapload, set_dir) if(set_dir) setDir(set_dir) diff --git a/code/game/objects/effects/wanted_poster.dm b/code/game/objects/effects/wanted_poster.dm index 92f29bd14f302..bece7705b9c29 100644 --- a/code/game/objects/effects/wanted_poster.dm +++ b/code/game/objects/effects/wanted_poster.dm @@ -7,6 +7,8 @@ */ +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/poster/wanted) + /obj/item/poster/wanted icon_state = "rolled_poster" var/postHeaderText = "WANTED" // MAX 7 Characters @@ -21,6 +23,8 @@ postHeaderText = "MISSING" // MAX 7 Characters postHeaderColor = "#0000FF" +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/poster/wanted) + /obj/item/poster/wanted/Initialize(mapload, icon/person_icon, wanted_name, description, headerText) . = ..(mapload, new /obj/structure/sign/poster/wanted(src, person_icon, wanted_name, description, headerText, postHeaderColor, background, postName, postDesc)) name = "[postName] ([wanted_name])" @@ -34,6 +38,8 @@ var/posterHeaderText var/posterHeaderColor +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/sign/poster/wanted) + /obj/structure/sign/poster/wanted/Initialize(mapload, icon/person_icon, person_name, description, postHeaderText, postHeaderColor, background, pname, pdesc) . = ..() if(!person_icon) diff --git a/code/game/objects/effects/water_ripple.dm b/code/game/objects/effects/water_ripple.dm deleted file mode 100644 index f98810b8e066c..0000000000000 --- a/code/game/objects/effects/water_ripple.dm +++ /dev/null @@ -1,18 +0,0 @@ -/obj/effect/water_ripple - icon_state = "water_ripple" - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - blend_mode = BLEND_ADD - plane = FLOOR_PLANE - ///What color is our water? - This IS distinct for our color - var/water_color = "#fff" - -/obj/effect/water_ripple/blue - water_color = "#7cd5ff" - -/obj/effect/water_ripple/Initialize(mapload) - . = ..() - //Build color overlay - var/mutable_appearance/MA = mutable_appearance(icon, "solid") - MA.blend_mode = BLEND_MULTIPLY - MA.color = water_color - add_overlay(MA) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 396a55212e290..f6ddb377e1aac 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -1026,8 +1026,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) /obj/item/proc/grind_requirements(obj/machinery/reagentgrinder/R) //Used to check for extra requirements for grinding an object return TRUE - //Called BEFORE the object is ground up - use this to change grind results based on conditions - //Use "return -1" to prevent the grinding from occurring +//Called BEFORE the object is ground up - use this to change grind results based on conditions +//Use "return -1" to prevent the grinding from occurring /obj/item/proc/on_grind() /obj/item/proc/on_juice() diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 413c3f36b725b..d2afedcffb032 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -61,8 +61,8 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( new /datum/pipe_info/disposal("Bin", /obj/machinery/disposal/bin, PIPE_ONEDIR), new /datum/pipe_info/disposal("Outlet", /obj/structure/disposaloutlet), new /datum/pipe_info/disposal("Chute", /obj/machinery/disposal/deliveryChute), - new /datum/pipe_info/disposal("Multi-Z Trunk (Up)", /obj/structure/disposalpipe/trunk/multiz, PIPE_UNARY), - new /datum/pipe_info/disposal("Multi-Z Trunk (Down)", /obj/structure/disposalpipe/trunk/multiz/down, PIPE_UNARY), + new /datum/pipe_info/disposal("Multi-Z Trunk (Up)", /obj/structure/disposalpipe/multiz, PIPE_UNARY), + new /datum/pipe_info/disposal("Multi-Z Trunk (Down)", /obj/structure/disposalpipe/multiz/down, PIPE_UNARY), ) )) diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index 0d9861499279d..dcb8cb855d980 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -486,3 +486,7 @@ var/datum/universal_icon/floor = uni_icon(preview_floor_icon, preview_floor_state) floor.blend_icon(colored_icon, ICON_OVERLAY) insert_icon("[decal]_[dir]_[replacetext(color, "#", "")]", floor) + +#undef PAINTER_MOST +#undef PAINTER_MID +#undef PAINTER_LOW diff --git a/code/game/objects/items/bedsheets.dm b/code/game/objects/items/bedsheets.dm index a8f6885764605..b7be18731ff53 100644 --- a/code/game/objects/items/bedsheets.dm +++ b/code/game/objects/items/bedsheets.dm @@ -300,7 +300,7 @@ icon_state = "double_sheetwhite" dying_key = DYE_REGISTRY_DOUBLE_BEDSHEET -/obj/item/bedsheet/double/Initialize() +/obj/item/bedsheet/double/Initialize(mapload) . = ..() desc += " This one is double." @@ -498,7 +498,7 @@ desc = "If you're reading this description ingame, something has gone wrong twice! Honk!" item_flags = ABSTRACT -/obj/item/bedsheet/double/random/Initialize() +/obj/item/bedsheet/double/random/Initialize(mapload) ..() var/type = pick(typesof(/obj/item/bedsheet/double) - /obj/item/bedsheet/double/random) new type(loc) @@ -510,7 +510,7 @@ desc = "If you're reading this description ingame, something has gone wrong! Honk!" item_flags = ABSTRACT -/obj/item/bedsheet/double/dorms/Initialize() +/obj/item/bedsheet/double/dorms/Initialize(mapload) ..() var/type = pick_weight(list("Colors" = 80, "Special" = 20)) switch(type) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 6877e537a9e3e..e2724fe019481 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -235,3 +235,8 @@ for(var/obj/machinery/door/M in A) M.name = replacetext(M.name,oldtitle,title) //TODO: much much more. Unnamed airlocks, cameras, etc. + +#undef AREA_ERRNONE +#undef AREA_STATION +#undef AREA_SPACE +#undef AREA_SPECIAL diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index a743677e5141e..34cfa245b5d6f 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -1287,7 +1287,7 @@ update_label("John Doe", "Clowny") icon_state = "rawsecurity" hud_state = JOB_HUD_RAWSECURITY - // ---- ???? ---- +// ---- ???? ---- /obj/item/card/id/job/unknown name = "Job card - unassigned" icon_state = "id" diff --git a/code/game/objects/items/carp_lasso.dm b/code/game/objects/items/carp_lasso.dm index 09fe3a0a41ff5..c2fea3899e1de 100644 --- a/code/game/objects/items/carp_lasso.dm +++ b/code/game/objects/items/carp_lasso.dm @@ -28,7 +28,7 @@ /obj/item/mob_lasso/proc/init_whitelists() whitelist_mob_cache[type] = typecacheof(list(/mob/living/simple_animal/hostile/carp, /mob/living/simple_animal/hostile/carp/megacarp, /mob/living/simple_animal/hostile/carp/lia,\ - /mob/living/simple_animal/cow, /mob/living/simple_animal/hostile/retaliate/dolphin), only_root_path = TRUE) + /mob/living/simple_animal/cow, /mob/living/simple_animal/hostile/retaliate/dolphin), only_root_path = TRUE) /obj/item/mob_lasso/afterattack(atom/target, mob/user, proximity_flag, click_parameters) . = ..() diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm index e835909745a4f..01aa2723fba17 100644 --- a/code/game/objects/items/chrono_eraser.dm +++ b/code/game/objects/items/chrono_eraser.dm @@ -180,6 +180,8 @@ var/RPpos = null var/attached = TRUE //if the gun arg isn't included initially, then the chronofield will work without one +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/chrono_field) + /obj/structure/chrono_field/Initialize(mapload, mob/living/target, obj/item/gun/energy/chrono_gun/G) if(target && isliving(target)) if(!G) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index bd1597fe5942e..b5fde44df77be 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -881,6 +881,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM return (TOXLOSS|OXYLOSS) +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/clothing/mask/vape) + /obj/item/clothing/mask/vape/Initialize(mapload, param_color) . = ..() create_reagents(chem_volume, NO_REACT) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index be38d3ff63d34..cc63d49ef1d1a 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -480,6 +480,8 @@ /obj/machinery/smartfridge/disks = "disks") needs_anchored = FALSE +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge) + /obj/item/circuitboard/machine/smartfridge/Initialize(mapload, new_type) if(new_type) build_path = new_type diff --git a/code/game/objects/items/colorizers/clothing.dm b/code/game/objects/items/colorizers/clothing.dm index f539c1cc68939..f17afb6f5b4b9 100644 --- a/code/game/objects/items/colorizers/clothing.dm +++ b/code/game/objects/items/colorizers/clothing.dm @@ -1,18 +1,18 @@ /obj/item/colorizer/capcloakroyal - name = "Captain's Cloak Colorizer (Royal)" - allowed_targets = list(/obj/item/clothing/neck/cloak/cap) - apply_icon_state = "royalcapcloak" + name = "Captain's Cloak Colorizer (Royal)" + allowed_targets = list(/obj/item/clothing/neck/cloak/cap) + apply_icon_state = "royalcapcloak" /obj/item/colorizer/rdcloakroyal - name = "Research Director's Cloak Colorizer (Royal)" - allowed_targets = list(/obj/item/clothing/neck/cloak/rd) - apply_icon_state = "royalrdcloak" + name = "Research Director's Cloak Colorizer (Royal)" + allowed_targets = list(/obj/item/clothing/neck/cloak/rd) + apply_icon_state = "royalrdcloak" /obj/item/colorizer/hoscloakroyal - name = "Head of Security's Cloak Colorizer (Royal)" - allowed_targets = list(/obj/item/clothing/neck/cloak/hos) - apply_icon_state = "royalhoscloak" + name = "Head of Security's Cloak Colorizer (Royal)" + allowed_targets = list(/obj/item/clothing/neck/cloak/hos) + apply_icon_state = "royalhoscloak" /obj/item/colorizer/captain_military_uniform name = "Captain's Clothes Colouriser (Military)" diff --git a/code/game/objects/items/colorizers/colorizer.dm b/code/game/objects/items/colorizers/colorizer.dm index 60a9b2d9449c9..18648dd7793d6 100644 --- a/code/game/objects/items/colorizers/colorizer.dm +++ b/code/game/objects/items/colorizers/colorizer.dm @@ -1,23 +1,23 @@ /obj/item/colorizer - name = "ERROR Colorizer" - desc = "This colorizer will apply a new set of colors to an item." - icon = 'icons/obj/crayons.dmi' - icon_state = "rainbowcan" - var/uses_left = 1 - - var/list/allowed_targets = list() - var/list/forbidden_targets = list() - var/apply_icon = null - var/apply_icon_state = null - var/apply_item_state = null - var/apply_righthand_file = null - var/apply_lefthand_file = null + name = "ERROR Colorizer" + desc = "This colorizer will apply a new set of colors to an item." + icon = 'icons/obj/crayons.dmi' + icon_state = "rainbowcan" + var/uses_left = 1 + + var/list/allowed_targets = list() + var/list/forbidden_targets = list() + var/apply_icon = null + var/apply_icon_state = null + var/apply_item_state = null + var/apply_righthand_file = null + var/apply_lefthand_file = null /obj/item/colorizer/attack_self(mob/user) - var/obj/item/target_atom = user.get_inactive_held_item() - do_colorize(target_atom, user) - . = ..() + var/obj/item/target_atom = user.get_inactive_held_item() + do_colorize(target_atom, user) + . = ..() /obj/item/colorizer/proc/can_use(mob/user) if(!user || !ismob(user) || user.incapacitated()) @@ -25,33 +25,33 @@ return TRUE /obj/item/colorizer/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - if(proximity_flag && can_use(user)) - do_colorize(target, user) - . = ..() + if(proximity_flag && can_use(user)) + do_colorize(target, user) + . = ..() /obj/item/colorizer/proc/do_colorize(atom/to_be_colored, mob/user) - if(!to_be_colored) - return - if(!is_type_in_list(to_be_colored, allowed_targets) || is_type_in_list(to_be_colored, forbidden_targets)) - to_chat(user, "This colorizer is not compatible with that!") - return - - if(apply_icon) - to_be_colored.icon = apply_icon - if(apply_icon_state) - to_be_colored.icon_state = apply_icon_state - - var/obj/item/target_item = to_be_colored - if(istype(target_item)) - if(apply_item_state) - target_item.item_state = apply_item_state - if(apply_righthand_file) - target_item.righthand_file = apply_righthand_file - if(apply_lefthand_file) - target_item.righthand_file = apply_lefthand_file - - to_chat(user, "Color applied!") - playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 5) - uses_left -- - if(!uses_left) - qdel(src) + if(!to_be_colored) + return + if(!is_type_in_list(to_be_colored, allowed_targets) || is_type_in_list(to_be_colored, forbidden_targets)) + to_chat(user, "This colorizer is not compatible with that!") + return + + if(apply_icon) + to_be_colored.icon = apply_icon + if(apply_icon_state) + to_be_colored.icon_state = apply_icon_state + + var/obj/item/target_item = to_be_colored + if(istype(target_item)) + if(apply_item_state) + target_item.item_state = apply_item_state + if(apply_righthand_file) + target_item.righthand_file = apply_righthand_file + if(apply_lefthand_file) + target_item.righthand_file = apply_lefthand_file + + to_chat(user, "Color applied!") + playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 5) + uses_left -- + if(!uses_left) + qdel(src) diff --git a/code/game/objects/items/colorizers/mobs.dm b/code/game/objects/items/colorizers/mobs.dm index 761d3dd4521ad..c9590f7b42e20 100644 --- a/code/game/objects/items/colorizers/mobs.dm +++ b/code/game/objects/items/colorizers/mobs.dm @@ -1,7 +1,7 @@ /obj/item/colorizer/iandeathsquad - name = "Ian Colorizer (Death Squad)" - allowed_targets = list(/mob/living/simple_animal/pet/dog/corgi/Ian) - apply_icon_state = "deathsquad" - apply_icon = 'icons/mob/corgi_back.dmi' - + name = "Ian Colorizer (Death Squad)" + allowed_targets = list(/mob/living/simple_animal/pet/dog/corgi/Ian) + apply_icon_state = "deathsquad" + apply_icon = 'icons/mob/corgi_back.dmi' + diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index fbdf6d1d87cee..e91135a8c7db1 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -60,16 +60,16 @@ return if(H == user) user.visible_message("[user] does [user.p_their()] lips with \the [src].", \ - "You take a moment to apply \the [src]. Perfect!") + "You take a moment to apply \the [src]. Perfect!") H.lip_style = "lipstick" H.lip_color = colour H.update_body() else user.visible_message("[user] begins to do [H]'s lips with \the [src].", \ - "You begin to apply \the [src] on [H]'s lips...") + "You begin to apply \the [src] on [H]'s lips...") if(do_after(user, 20, target = H)) user.visible_message("[user] does [H]'s lips with \the [src].", \ - "You apply \the [src] on [H]'s lips.") + "You apply \the [src] on [H]'s lips.") H.lip_style = "lipstick" H.lip_color = colour H.update_body() @@ -90,10 +90,10 @@ H.update_body() else user.visible_message("[user] begins to wipe [H]'s lipstick off with \the [src].", \ - "You begin to wipe off [H]'s lipstick...") + "You begin to wipe off [H]'s lipstick...") if(do_after(user, 10, target = H)) user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \ - "You wipe off [H]'s lipstick.") + "You wipe off [H]'s lipstick.") H.lip_style = null H.update_body() else diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index 60b1769475811..bcdabad928023 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -51,6 +51,8 @@ var/player_modifier = 1 +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/checkoutmachine) + /obj/structure/checkoutmachine/Initialize(mapload, mob/living/user) bogdanoff = user add_overlay("flaps") @@ -258,6 +260,8 @@ var/obj/structure/checkoutmachine/dump var/mob/living/carbon/human/bogdanoff +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/dumpeetTarget) + /obj/effect/dumpeetTarget/Initialize(mapload, user) . = ..() bogdanoff = user diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 3a283f3b30cd0..d54ac8c5c523d 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -258,7 +258,7 @@ /obj/item/toy/crayon/proc/crayon_text_strip(text) var/static/regex/crayon_r = new /regex(@"[^\w!?,.=%#&+\/\-]") - return replacetext(lowertext(text), crayon_r, "") + return replacetext(LOWER_TEXT(text), crayon_r, "") /obj/item/toy/crayon/afterattack(atom/target, mob/user, proximity, params) . = ..() @@ -605,7 +605,7 @@ var/static/list/spraycan_touch_normally -/obj/item/toy/crayon/spraycan/Initialize() +/obj/item/toy/crayon/spraycan/Initialize(mapload) . = ..() if(!spraycan_touch_normally) spraycan_touch_normally = typecacheof(list(/obj/machinery/modular_fabricator/autolathe, /obj/structure/closet, /obj/machinery/disposal)) @@ -896,6 +896,8 @@ pre_noise = FALSE post_noise = TRUE +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/toy/crayon/spraycan/gang) + /obj/item/toy/crayon/spraycan/gang/Initialize(mapload, loc, datum/team/gang/G) .=..() if(G) @@ -919,3 +921,7 @@ #undef RANDOM_ORIENTED #undef RANDOM_RUNE #undef RANDOM_ANY + +#undef PAINT_NORMAL +#undef PAINT_LARGE_HORIZONTAL +#undef PAINT_LARGE_HORIZONTAL_ICON diff --git a/code/game/objects/items/credit_holochip.dm b/code/game/objects/items/credit_holochip.dm index 55939bd4604eb..04f927c1a13a1 100644 --- a/code/game/objects/items/credit_holochip.dm +++ b/code/game/objects/items/credit_holochip.dm @@ -8,6 +8,8 @@ w_class = WEIGHT_CLASS_TINY var/credits = 0 +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/holochip) + /obj/item/holochip/Initialize(mapload, amount) . = ..() credits = amount diff --git a/code/game/objects/items/cursed_necklace.dm b/code/game/objects/items/cursed_necklace.dm index c154307ae7462..4219c21c41f7e 100644 --- a/code/game/objects/items/cursed_necklace.dm +++ b/code/game/objects/items/cursed_necklace.dm @@ -1,30 +1,30 @@ /obj/item/clothing/neck/necklace/dope/cursed - var/linked_ckey - var/hostage_ckey - var/mob/current_body = null + var/linked_ckey + var/hostage_ckey + var/mob/current_body = null /obj/item/clothing/neck/necklace/dope/cursed/attack_self(mob/user) - . = ..() - if(!user.ckey) - return 0 - if(!linked_ckey && user.ckey) - linked_ckey = user.ckey - current_body = user - to_chat(user, "You have achieved immortality") + . = ..() + if(!user.ckey) + return 0 + if(!linked_ckey && user.ckey) + linked_ckey = user.ckey + current_body = user + to_chat(user, "You have achieved immortality") /obj/item/clothing/neck/necklace/dope/cursed/equipped(mob/user, slot) - . = ..() - if(slot == ITEM_SLOT_NECK && linked_ckey && user.ckey != linked_ckey) - if(user.ckey && user.ckey == linked_ckey) - hostage_ckey = user.ckey - user.ghostize(FALSE,SENTIENCE_ERASE) - user.ckey = linked_ckey - current_body = user + . = ..() + if(slot == ITEM_SLOT_NECK && linked_ckey && user.ckey != linked_ckey) + if(user.ckey && user.ckey == linked_ckey) + hostage_ckey = user.ckey + user.ghostize(FALSE,SENTIENCE_ERASE) + user.ckey = linked_ckey + current_body = user /obj/item/clothing/neck/necklace/dope/cursed/dropped(mob/user) - ..() - if(hostage_ckey) - if(user.ckey) - user.ghostize(FALSE,SENTIENCE_ERASE) - user.ckey = hostage_ckey - current_body = null + ..() + if(hostage_ckey) + if(user.ckey) + user.ghostize(FALSE,SENTIENCE_ERASE) + user.ckey = hostage_ckey + current_body = null diff --git a/code/game/objects/items/debug_items.dm b/code/game/objects/items/debug_items.dm index dd9f63ee12241..dd8637c868b59 100644 --- a/code/game/objects/items/debug_items.dm +++ b/code/game/objects/items/debug_items.dm @@ -397,7 +397,7 @@ mappath = '_maps/map_files/debug/multidir_sprite_debug.dmm' // friendly warning setter -/obj/item/map_template_diver/Initialize() +/obj/item/map_template_diver/Initialize(mapload) . = ..() #ifndef DEBUG live_server_warning = TRUE diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 6aa2ee923e4d4..d2aa8aeea28c3 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -205,6 +205,8 @@ icon_state = "medi_holo" duration = 30 +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/medical_holosign) + /obj/effect/temp_visual/medical_holosign/Initialize(mapload, creator) . = ..() playsound(loc, 'sound/machines/ping.ogg', 50, FALSE) //make some noise! @@ -604,6 +606,8 @@ var/base_light_range = 4 +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/flashlight/spotlight) + /obj/item/flashlight/spotlight/Initialize(mapload, _light_range, _light_power, _light_color) . = ..() if(!isnull(_light_range)) diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm index 7c6d8c1798069..8f93c94e7dc9f 100644 --- a/code/game/objects/items/devices/forcefieldprojector.dm +++ b/code/game/objects/items/devices/forcefieldprojector.dm @@ -90,6 +90,8 @@ armor = list(MELEE = 0, BULLET = 25, LASER = 50, ENERGY = 50, BOMB = 25, BIO = 100, RAD = 100, FIRE = 100, ACID = 100, STAMINA = 0, BLEED = 0) var/obj/item/forcefield_projector/generator +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/projected_forcefield) + /obj/structure/projected_forcefield/Initialize(mapload, obj/item/forcefield_projector/origin) . = ..() generator = origin diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 25e2e1663a094..98593e67104d8 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -168,3 +168,7 @@ icon = 'icons/obj/abductor.dmi' icon_state = "multitool" toolspeed = 0.1 + +#undef PROXIMITY_NONE +#undef PROXIMITY_ON_SCREEN +#undef PROXIMITY_NEAR diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 3ce6ee18b3e54..94b3228fc842c 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -20,7 +20,7 @@ if(LAZYLEN(channels)) var/list/examine_text_list = list() for(var/i in channels) - examine_text_list += "[GLOB.channel_tokens[i]] - [lowertext(i)]" + examine_text_list += "[GLOB.channel_tokens[i]] - [LOWER_TEXT(i)]" . += "It can access the following channels; [jointext(examine_text_list, ", ")]." diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 0c8205c248871..828e9786de3b9 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -47,9 +47,9 @@ GLOBAL_LIST_INIT(channel_tokens, list( if(length(channels)) for(var/i in 1 to length(channels)) if(i == 1) - avail_chans += "use [MODE_TOKEN_DEPARTMENT] or [GLOB.channel_tokens[channels[i]]] for [lowertext(channels[i])]" + avail_chans += "use [MODE_TOKEN_DEPARTMENT] or [GLOB.channel_tokens[channels[i]]] for [LOWER_TEXT(channels[i])]" else - avail_chans += "use [GLOB.channel_tokens[channels[i]]] for [lowertext(channels[i])]" + avail_chans += "use [GLOB.channel_tokens[channels[i]]] for [LOWER_TEXT(channels[i])]" . += "A small screen on the headset displays the following available frequencies:\n[english_list(avail_chans)]." if(command) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index fe6f1f5c34c79..be51cd20bcecb 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -12,6 +12,8 @@ /obj/item/radio/intercom/unscrewed unscrewed = TRUE +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/radio/intercom) + /obj/item/radio/intercom/Initialize(mapload, ndir, building) . = ..() var/area/current_area = get_area(src) @@ -160,6 +162,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom, 26) name = "Confessional intercom" anonymize = TRUE +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/radio/intercom/chapel) + /obj/item/radio/intercom/chapel/Initialize(mapload, ndir, building) . = ..() set_frequency(1481) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index e6ceb83e751dd..75ca46dabf00f 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -572,6 +572,8 @@ /obj/item/radio/off // Station bounced radios, their only difference is spawning with the speakers off, this was made to help the lag. dog_fashion = /datum/dog_fashion/back -/obj/item/radio/off/Initialize() +/obj/item/radio/off/Initialize(mapload) . = ..() set_listening(FALSE) + +#undef FREQ_LISTENING diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index d702c879b1213..912ae6c2c49a7 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -1035,6 +1035,8 @@ GENE SCANNER /// Cooldown for when the extrapolator can be used next. COOLDOWN_DECLARE(usage_cooldown) +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/extrapolator) + /obj/item/extrapolator/Initialize(mapload, obj/item/stock_parts/scanning_module/starting_scanner) . = ..() starting_scanner = starting_scanner || default_scanning_module diff --git a/code/game/objects/items/devices/sound_synth.dm b/code/game/objects/items/devices/sound_synth.dm index 11d4109470486..a96d92f127936 100644 --- a/code/game/objects/items/devices/sound_synth.dm +++ b/code/game/objects/items/devices/sound_synth.dm @@ -68,7 +68,7 @@ volume = sound_info["volume"] SSblackbox.record_feedback("tally", "synth_sound_selected", 1, selected_sound_name) -/obj/item/soundsynth/Initialize() +/obj/item/soundsynth/Initialize(mapload) . = ..() if(!length(sounds) || !length(sound_filenames)) for(var/sound_name in sound_list) diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm index c78c84c598f45..702ee620d17c9 100644 --- a/code/game/objects/items/dice.dm +++ b/code/game/objects/items/dice.dm @@ -213,8 +213,8 @@ result = special_faces[result] if(user != null) //Dice was rolled in someone's hand user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \ - "You throw [src]. It lands on [result]. [comment]", \ - "You hear [src] rolling, it sounds like a [fake_result].") + "You throw [src]. It lands on [result]. [comment]", \ + "You hear [src] rolling, it sounds like a [fake_result].") else if(!src.throwing) //Dice was thrown and is coming to rest visible_message("[src] rolls to a stop, landing on [result]. [comment]") diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm index 9976848bdfc46..0ad1308f364f7 100644 --- a/code/game/objects/items/documents.dm +++ b/code/game/objects/items/documents.dm @@ -37,6 +37,8 @@ var/forgedseal = 0 var/copy_type = null +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/documents/photocopy) + /obj/item/documents/photocopy/Initialize(mapload, obj/item/documents/copy=null) . = ..() if(copy) diff --git a/code/game/objects/items/food/bread.dm b/code/game/objects/items/food/bread.dm index eb5dfd32eb23d..32d3196e7d740 100644 --- a/code/game/objects/items/food/bread.dm +++ b/code/game/objects/items/food/bread.dm @@ -31,7 +31,7 @@ eat_time = 0.5 SECONDS w_class = WEIGHT_CLASS_SMALL -/obj/item/food/breadslice/Initialize() +/obj/item/food/breadslice/Initialize(mapload) . = ..() AddElement(/datum/element/dunkable, 10) diff --git a/code/game/objects/items/food/donkpockets.dm b/code/game/objects/items/food/donkpockets.dm index 693d2450107c7..655de843e320c 100644 --- a/code/game/objects/items/food/donkpockets.dm +++ b/code/game/objects/items/food/donkpockets.dm @@ -6,7 +6,7 @@ desc = "The food of choice for the seasoned coder (if you see this, contact DonkCo. as soon as possible)." food_reagents = list(/datum/reagent/consumable/nutriment = 3)// immediately gets overwritten. This exists to not set off the edibility unit test. -/obj/item/food/donkpocket/random/Initialize() +/obj/item/food/donkpocket/random/Initialize(mapload) var/list/donkblock = list( /obj/item/food/donkpocket/warm, /obj/item/food/donkpocket/warm/spicy, diff --git a/code/game/objects/items/food/donuts.dm b/code/game/objects/items/food/donuts.dm index 7e7470b0a0f01..e5be041d230c2 100644 --- a/code/game/objects/items/food/donuts.dm +++ b/code/game/objects/items/food/donuts.dm @@ -226,7 +226,7 @@ /obj/item/food/donut/jelly/in_box_sprite() return "[replacetext(icon_state, "jelly", "donut")]_inbox" -/obj/item/food/donut/jelly/Initialize() +/obj/item/food/donut/jelly/Initialize(mapload) . = ..() if(extra_reagent) reagents.add_reagent(extra_reagent, 3) diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index 675e3e9b23748..41b4692a2d694 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -59,7 +59,7 @@ foodtypes = GROSS w_class = WEIGHT_CLASS_SMALL -/obj/item/food/badrecipe/Initialize() +/obj/item/food/badrecipe/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_ITEM_GRILLED, PROC_REF(OnGrill)) diff --git a/code/game/objects/items/food/salad.dm b/code/game/objects/items/food/salad.dm index c60fc22e285a3..bd9cd3a9ead89 100644 --- a/code/game/objects/items/food/salad.dm +++ b/code/game/objects/items/food/salad.dm @@ -155,7 +155,7 @@ w_class = WEIGHT_CLASS_NORMAL custom_price = PAYCHECK_EASY * 0.6 -/obj/item/reagent_containers/glass/bowl/Initialize() +/obj/item/reagent_containers/glass/bowl/Initialize(mapload) . = ..() AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/salad/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 6) diff --git a/code/game/objects/items/food/spaghetti.dm b/code/game/objects/items/food/spaghetti.dm index 727fcc097de07..cfcd7518150aa 100644 --- a/code/game/objects/items/food/spaghetti.dm +++ b/code/game/objects/items/food/spaghetti.dm @@ -6,7 +6,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) foodtypes = GRAIN -/obj/item/food/spaghetti/Initialize() +/obj/item/food/spaghetti/Initialize(mapload) . = ..() if(!microwaved_type) // This isn't cooked, why would you put uncooked spaghetti in your pocket? var/list/display_message = list( diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm index 08ce67d0e3b1b..1720082bfade3 100644 --- a/code/game/objects/items/grenades/clusterbuster.dm +++ b/code/game/objects/items/grenades/clusterbuster.dm @@ -44,6 +44,8 @@ icon_state = "clusterbang_segment" base_state = "clusterbang_segment" +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/grenade/clusterbuster/segment) + /obj/item/grenade/clusterbuster/segment/Initialize(mapload, obj/item/grenade/clusterbuster/base) . = ..() if(base) @@ -74,6 +76,8 @@ ////////////////////////////////// //The payload spawner effect ///////////////////////////////// +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/payload_spawner) + /obj/effect/payload_spawner/Initialize(mapload, type, numspawned) ..() spawn_payload(type, numspawned) diff --git a/code/game/objects/items/grenades/discogrenade.dm b/code/game/objects/items/grenades/discogrenade.dm index 5e6d1caaadac9..f5d1729f0317b 100644 --- a/code/game/objects/items/grenades/discogrenade.dm +++ b/code/game/objects/items/grenades/discogrenade.dm @@ -47,6 +47,8 @@ var/range = 5 var/power = 3 +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/grenade/discogrenade/subgrenade) + /obj/item/grenade/discogrenade/subgrenade/Initialize(mapload, duplicate = FALSE) . = ..() active = TRUE diff --git a/code/game/objects/items/implants/implant_track.dm b/code/game/objects/items/implants/implant_track.dm index 1a222cfcc960b..c5dbe1f0471b0 100644 --- a/code/game/objects/items/implants/implant_track.dm +++ b/code/game/objects/items/implants/implant_track.dm @@ -17,7 +17,7 @@ /obj/item/implant/tracking/c38/Initialize(mapload) . = ..() - timerid = QDEL_IN(src, lifespan) + timerid = QDEL_IN_STOPPABLE(src, lifespan) /obj/item/implant/tracking/c38/Destroy() deltimer(timerid) diff --git a/code/game/objects/items/implants/implantuplink.dm b/code/game/objects/items/implants/implantuplink.dm index f80782c77efc6..20db68c4925ba 100644 --- a/code/game/objects/items/implants/implantuplink.dm +++ b/code/game/objects/items/implants/implantuplink.dm @@ -9,6 +9,8 @@ /// The uplink flags of the implant uplink inside, only checked during initialisation so modifying it after initialisation will do nothing var/uplink_flag = UPLINK_TRAITORS +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/implant/uplink) + /obj/item/implant/uplink/Initialize(mapload, owner, uplink_flag) . = ..() AddComponent(/datum/component/uplink, _owner = owner, _lockable = TRUE, _enabled = FALSE, uplink_flag = uplink_flag, starting_tc = starting_tc) @@ -29,6 +31,8 @@ name = "implanter (uplink)" imp_type = /obj/item/implant/uplink +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/implanter/uplink) + /obj/item/implanter/uplink/Initialize(mapload, uplink_flag = UPLINK_TRAITORS) imp = new imp_type(src, null, uplink_flag) . = ..() diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm index c6dee35c68a1f..c5e7248c6dd7d 100644 --- a/code/game/objects/items/mail.dm +++ b/code/game/objects/items/mail.dm @@ -91,7 +91,7 @@ . += "\n[msg]" -/obj/item/mail/Initialize() +/obj/item/mail/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposal_handling)) AddElement(/datum/element/item_scaling, 0.75, 1) @@ -224,10 +224,10 @@ )) var/static/list/junk_names = list( - /obj/item/paper/pamphlet/gateway = "[initial(name)] for [pick(GLOB.adjectives)] adventurers", - /obj/item/paper/pamphlet/violent_video_games = "[initial(name)] for the truth about the arcade centcom doesn't want to hear", - /obj/item/paper/fluff/junkmail_redpill = "[initial(name)] for those feeling [pick(GLOB.adjectives)] working at Nanotrasen", - /obj/item/paper/fluff/nice_argument = "[initial(name)] with INCREDIBLY IMPORTANT ARTIFACT- DELIVER TO SCIENCE DIVISION. HANDLE WITH CARE.", + /obj/item/paper/pamphlet/gateway = "mail for [pick(GLOB.adjectives)] adventurers", + /obj/item/paper/pamphlet/violent_video_games = "mail for the truth about the arcade centcom doesn't want to hear", + /obj/item/paper/fluff/junkmail_redpill = "mail for those feeling [pick(GLOB.adjectives)] working at Nanotrasen", + /obj/item/paper/fluff/nice_argument = "mail with INCREDIBLY IMPORTANT ARTIFACT- DELIVER TO SCIENCE DIVISION. HANDLE WITH CARE.", ) //better spam mail names instead of being "IMPORTANT MAIL", courtesy of Monkestation @@ -254,7 +254,7 @@ disposal_holder.destinationTag = sort_tag // Subtype that's always junkmail -/obj/item/mail/junkmail/Initialize() +/obj/item/mail/junkmail/Initialize(mapload) . = ..() junk_mail() @@ -304,7 +304,7 @@ update_icon() /// Crate for mail that automatically depletes the economy subsystem's pending mail counter. -/obj/structure/closet/crate/mail/economy/Initialize() +/obj/structure/closet/crate/mail/economy/Initialize(mapload) . = ..() populate(SSeconomy.mail_waiting) SSeconomy.mail_waiting = 0 @@ -314,7 +314,7 @@ name = "brimming mail crate" desc = "A certified post crate from CentCom. Looks stuffed to the gills." -/obj/structure/closet/crate/mail/full/Initialize() +/obj/structure/closet/crate/mail/full/Initialize(mapload) . = ..() populate(null) @@ -329,12 +329,12 @@ icon_state = "paper" show_written_words = FALSE -/obj/item/paper/fluff/nice_argument/Initialize() +/obj/item/paper/fluff/nice_argument/Initialize(mapload) . = ..() var/station_name = station_name() add_raw_text("Nice argument, however there's a small detail...
          IP: '[rand(0,10)].[rand(0,255)].[rand(0,255)].[rand(0,255)]'
          Station name: '[station_name]'
          ") -/obj/item/paper/fluff/junkmail_redpill/Initialize() +/obj/item/paper/fluff/junkmail_redpill/Initialize(mapload) // 1 in 1000 chance of getting 2 random nuke code characters. if(!prob(nuclear_option_odds)) add_raw_text("You need to escape the simulation. Don't forget the numbers, they help you remember: '[random_code(4)]...'") @@ -363,6 +363,6 @@ icon_state = "paper_spam" color = "#FFCCFF" -/obj/item/paper/fluff/junkmail_generic/Initialize() +/obj/item/paper/fluff/junkmail_generic/Initialize(mapload) default_raw_text = pick(GLOB.junkmail_messages) return ..() diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 6d4c517ea8efe..7b54ef206b615 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -1017,7 +1017,7 @@ return if(is_type_in_typecache(target, ovens)) if(held_sausage && held_sausage.roasted) - to_chat("Your [held_sausage] has already been cooked.") + to_chat(user, "Your [held_sausage] has already been cooked.") return if(istype(target, /obj/anomaly) && get_dist(user, target) < 10) to_chat(user, "You send [held_sausage] towards [target].") diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index a953561b53fbb..5c2164e3d10b4 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -177,10 +177,10 @@ info_text = "Sword Saint, Wandering Vagabond - 1600's. \nComes with a replica katana" /obj/item/storage/box/hero/ronin/PopulateContents() - new /obj/item/clothing/under/costume/kamishimo(src) - new /obj/item/clothing/head/costume/rice_hat(src) - new /obj/item/katana/weak/curator(src) - new /obj/item/clothing/shoes/sandal(src) + new /obj/item/clothing/under/costume/kamishimo(src) + new /obj/item/clothing/head/costume/rice_hat(src) + new /obj/item/katana/weak/curator(src) + new /obj/item/clothing/shoes/sandal(src) /obj/item/choice_beacon/augments name = "augment beacon" diff --git a/code/game/objects/items/mjolnir.dm b/code/game/objects/items/mjolnir.dm index 279edbcbe96b3..bf1fd1b30b28f 100644 --- a/code/game/objects/items/mjolnir.dm +++ b/code/game/objects/items/mjolnir.dm @@ -84,6 +84,8 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF var/obj/item/mjolnir/contained +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/anchored_mjolnir) + /obj/structure/anchored_mjolnir/Initialize(mapload, obj/item/mjolnir/god_hammer) . = ..() //Put the hammer inside of ourselves @@ -139,6 +141,8 @@ speed = 0.3 var/obj/item/mjolnir/contained +CREATION_TEST_IGNORE_SUBTYPES(/obj/projectile/mjolnir) + /obj/projectile/mjolnir/Initialize(mapload, obj/item/mjolnir/contained_hammer) . = ..() contained = contained_hammer diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index b9e279e84ab4c..220523f93ba8f 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -587,7 +587,7 @@ desc = "An undefined slime plushie. It looks like but isn't a normal slime plushie! (if you see this, contact an upper being as soon as possible)." item_flags = ABSTRACT -/obj/item/toy/plush/slimeplushie/random/Initialize() +/obj/item/toy/plush/slimeplushie/random/Initialize(mapload) var sloime_type = pick(subtypesof(/obj/item/toy/plush/slimeplushie) - /obj/item/toy/plush/slimeplushie/random/) new sloime_type(loc) return INITIALIZE_HINT_QDEL @@ -676,7 +676,7 @@ desc = "An undefined mothperson plushie. It's a debuggable bug! (if you see this, contact an upper beign as soon as possible)." item_flags = ABSTRACT -/obj/item/toy/plush/moth/random/Initialize() +/obj/item/toy/plush/moth/random/Initialize(mapload) var moff_type = pick(subtypesof(/obj/item/toy/plush/moth) - /obj/item/toy/plush/moth/random/) new moff_type(loc) return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 55fe304b9fa8d..9b47f6b89cce0 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -2,6 +2,7 @@ #define PCANNON_FIREALL 1 #define PCANNON_FILO 2 #define PCANNON_FIFO 3 + /obj/item/pneumatic_cannon name = "pneumatic cannon" desc = "A gas-powered cannon that can fire any object loaded into it." @@ -165,7 +166,7 @@ discharge = 1 if(!discharge) user.visible_message("[user] fires \the [src]!", \ - "You fire \the [src]!") + "You fire \the [src]!") log_combat(user, target, "fired at", src) var/turf/T = get_target(target, get_turf(src)) playsound(src, fire_sound, 50, 1) @@ -344,3 +345,7 @@ /obj/item/storage/backpack/magspear_quiver/PopulateContents() for(var/i in 1 to 30) new /obj/item/throwing_star/magspear(src) + +#undef PCANNON_FIREALL +#undef PCANNON_FILO +#undef PCANNON_FIFO diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index ec62cb221aa5b..eed38a704e5b2 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -1052,3 +1052,5 @@ if(stored) . += "You are currently holding [stored]." . += "Alt-click will drop the currently stored [stored]." + +#undef PKBORG_DAMPEN_CYCLE_DELAY diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index ae7aaa4f2a6aa..8393847756968 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -65,6 +65,8 @@ icon_state = "spearbomb0" var/obj/item/grenade/explosive = null +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/spear/explosive) + /obj/item/spear/explosive/Initialize(mapload, obj/item/grenade/G) . = ..() set_explosive(G) diff --git a/code/game/objects/items/stacks/cash.dm b/code/game/objects/items/stacks/cash.dm index c1faa1abc1218..c21543c32940a 100644 --- a/code/game/objects/items/stacks/cash.dm +++ b/code/game/objects/items/stacks/cash.dm @@ -13,6 +13,8 @@ resistance_flags = FLAMMABLE var/value = 0 +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/stack/spacecash) + /obj/item/stack/spacecash/Initialize(mapload, new_amount, merge = TRUE, mob/user = null) . = ..() update_desc() diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 91fd05087eeda..7813df163a3f0 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -29,6 +29,8 @@ ///How long does it take to apply on yourself? var/self_delay = 2 SECONDS +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/stack/medical) + /obj/item/stack/medical/Initialize(mapload, new_amount, merge, mob/user) . = ..() if(reagent) @@ -127,7 +129,7 @@ valid = TRUE if (!valid) - to_chat("[message]") + to_chat(user, "[message]") C.balloon_alert(user, message) return @@ -242,3 +244,5 @@ /obj/item/stack/medical/gauze/adv/one amount = 1 + +#undef REAGENT_AMOUNT_PER_ITEM diff --git a/code/game/objects/items/stacks/ores/ore.dm b/code/game/objects/items/stacks/ores/ore.dm index 555c7db17fc5f..dd43a2a626487 100644 --- a/code/game/objects/items/stacks/ores/ore.dm +++ b/code/game/objects/items/stacks/ores/ore.dm @@ -61,6 +61,8 @@ new refined_type(drop_location(),amountrefined) qdel(src) +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/stack/ore) + /obj/item/stack/ore/Initialize(mapload, new_amount, merge = TRUE, mob/user = null) . = ..() pixel_x = base_pixel_x + rand(0,16) - 8 diff --git a/code/game/objects/items/stacks/rods/rods.dm b/code/game/objects/items/stacks/rods/rods.dm index 4ade958ee737a..8e340d86cc923 100644 --- a/code/game/objects/items/stacks/rods/rods.dm +++ b/code/game/objects/items/stacks/rods/rods.dm @@ -26,6 +26,8 @@ user.visible_message("[user] begins to stuff \the [src] down [user.p_their()] throat! It looks like [user.p_theyre()] trying to commit suicide!")//it looks like theyre ur mum return BRUTELOSS +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/stack/rods) + /obj/item/stack/rods/Initialize(mapload, new_amount, merge = TRUE, mob/user = null) . = ..() if(QDELETED(src)) // we can be deleted during merge, check before doing stuff @@ -58,8 +60,8 @@ if(W.use_tool(src, user, 0, volume=40)) var/obj/item/stack/sheet/iron/new_item = new(usr.loc) user.visible_message("[user.name] shaped [src] into iron with [W].", \ - "You shape [src] into iron with [W].", \ - "You hear welding.") + "You shape [src] into iron with [W].", \ + "You hear welding.") var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_held_item()==R) diff --git a/code/game/objects/items/stacks/sheets/mineral/metals.dm b/code/game/objects/items/stacks/sheets/mineral/metals.dm index cdcb2c53bd51d..288e00ed5f055 100644 --- a/code/game/objects/items/stacks/sheets/mineral/metals.dm +++ b/code/game/objects/items/stacks/sheets/mineral/metals.dm @@ -133,6 +133,8 @@ Metals Sheets /obj/item/stack/sheet/brass/get_recipes() return GLOB.brass_recipes +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/stack/sheet/brass) + /obj/item/stack/sheet/brass/Initialize(mapload, new_amount, merge = TRUE) . = ..() pixel_x = 0 @@ -165,6 +167,8 @@ Metals Sheets /obj/item/stack/sheet/bronze/get_recipes() return GLOB.bronze_recipes +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/stack/sheet/bronze) + /obj/item/stack/sheet/bronze/Initialize(mapload, new_amount, merge = TRUE) . = ..() pixel_x = 0 diff --git a/code/game/objects/items/stacks/sheets/organic/leather.dm b/code/game/objects/items/stacks/sheets/organic/leather.dm index 92b2e83b53e15..fdd63ac72fbc9 100644 --- a/code/game/objects/items/stacks/sheets/organic/leather.dm +++ b/code/game/objects/items/stacks/sheets/organic/leather.dm @@ -32,6 +32,8 @@ var/wetness = 30 //Reduced when exposed to high temperautres var/drying_threshold_temperature = 500 //Kelvin to start drying +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/stack/sheet/leather/wetleather) + /obj/item/stack/sheet/leather/wetleather/Initialize(mapload, new_amount, merge) . = ..() AddElement(/datum/element/dryable, /obj/item/stack/sheet/leather) diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index 6a5ee9649457a..aa9d0e5be76b8 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -17,6 +17,8 @@ ///What type of wall does this sheet spawn var/walltype +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/stack/sheet) + /obj/item/stack/sheet/Initialize(mapload, new_amount, merge) . = ..() pixel_x = rand(-4, 4) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 656598bb82fd2..d1aed8425f457 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -46,6 +46,8 @@ /// Amount of matter for RCD var/matter_amount = 0 +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/stack) + /obj/item/stack/Initialize(mapload, new_amount, merge = TRUE, mob/user = null) if(new_amount != null) amount = new_amount diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index 0fe25744382a5..c5745f6165898 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -47,6 +47,8 @@ var/state = 0 merge_type = /obj/item/stack/tile/light +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/stack/tile/light) + /obj/item/stack/tile/light/Initialize(mapload, new_amount, merge = TRUE) . = ..() if(prob(5)) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index e2dd4821b73b2..c5c0babf017cc 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -29,6 +29,8 @@ /// Allows us to replace the plating we are attacking if our baseturfs are the same. var/replace_plating = FALSE +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/stack/tile) + /obj/item/stack/tile/Initialize(mapload, new_amount, merge = TRUE, mob/user = null) . = ..() pixel_x = rand(-3, 3) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index cf574c3db3b5d..738f84b630de7 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -526,8 +526,8 @@ /obj/item/storage/box/donkpockets /obj/item/storage/box/donkpockets/PopulateContents() - for(var/i in 1 to 6) - new donktype(src) + for(var/i in 1 to 6) + new donktype(src) /obj/item/storage/box/donkpockets name = "box of donk-pockets" diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 58cfd2010c330..94b3617f03de1 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -157,6 +157,15 @@ for(var/i in 1 to STR.max_items - 2) new /obj/item/stack/spacecash/c1000(src) +/obj/item/storage/secure/briefcase/hitman/PopulateContents() + ..() + new /obj/item/clothing/suit/armor/vest(src) + new /obj/item/gun/ballistic/automatic/pistol(src) + new /obj/item/suppressor(src) + new /obj/item/melee/classic_baton/police/telescopic(src) + new /obj/item/clothing/mask/balaclava(src) + new /obj/item/bodybag(src) + new /obj/item/soap/nanotrasen(src) // ----------------------------- // Secure Safe diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index ec9d47cfe22a4..16cdba633ad81 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -405,3 +405,6 @@ /obj/effect/temp_visual/teleport_abductor/syndi_teleporter duration = 5 + +#undef SOURCE_PORTAL +#undef DESTINATION_PORTAL diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index ca8b19517367a..ee342362a003f 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -241,7 +241,7 @@ src.bullets-- user.visible_message("[user] fires [src] at [target]!", \ "You fire [src] at [target]!", \ - "You hear a gunshot!") + "You hear a gunshot!") /obj/item/toy/ammo/gun name = "capgun ammo" @@ -950,22 +950,22 @@ return ..() /obj/item/toy/cards/deck/MouseDrop(atom/over_object) - . = ..() - var/mob/living/M = usr - if(!istype(M) || !(M.mobility_flags & MOBILITY_PICKUP)) - return - if(Adjacent(usr)) - if(over_object == M && loc != M) - M.put_in_hands(src) - to_chat(usr, "You pick up the deck.") - - else if(istype(over_object, /atom/movable/screen/inventory/hand)) - var/atom/movable/screen/inventory/hand/H = over_object - if(M.putItemFromInventoryInHandIfPossible(src, H.held_index)) - to_chat(usr, "You pick up the deck.") - - else - to_chat(usr, "You can't reach it from here!") + . = ..() + var/mob/living/M = usr + if(!istype(M) || !(M.mobility_flags & MOBILITY_PICKUP)) + return + if(Adjacent(usr)) + if(over_object == M && loc != M) + M.put_in_hands(src) + to_chat(usr, "You pick up the deck.") + + else if(istype(over_object, /atom/movable/screen/inventory/hand)) + var/atom/movable/screen/inventory/hand/H = over_object + if(M.putItemFromInventoryInHandIfPossible(src, H.held_index)) + to_chat(usr, "You pick up the deck.") + + else + to_chat(usr, "You can't reach it from here!") diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index b2613c87ab729..f0cee5f78010a 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -1,3 +1,5 @@ +CREATION_TEST_IGNORE_SELF(/obj) + /obj animate_movement = SLIDE_STEPS speech_span = SPAN_ROBOT @@ -302,14 +304,14 @@ if (result["button"] != 2) // If the user pressed the cancel button // text2num conveniently returns a null on invalid values armor = armor.setRating(melee = text2num(result["values"][MELEE]),\ - bullet = text2num(result["values"][BULLET]),\ - laser = text2num(result["values"][LASER]),\ - energy = text2num(result["values"][ENERGY]),\ - bomb = text2num(result["values"][BOMB]),\ - bio = text2num(result["values"][BIO]),\ - rad = text2num(result["values"][RAD]),\ - fire = text2num(result["values"][FIRE]),\ - acid = text2num(result["values"][ACID])) + bullet = text2num(result["values"][BULLET]),\ + laser = text2num(result["values"][LASER]),\ + energy = text2num(result["values"][ENERGY]),\ + bomb = text2num(result["values"][BOMB]),\ + bio = text2num(result["values"][BIO]),\ + rad = text2num(result["values"][RAD]),\ + fire = text2num(result["values"][FIRE]),\ + acid = text2num(result["values"][ACID])) log_admin("[key_name(usr)] modified the armor on [src] ([type]) to melee: [armor.melee], bullet: [armor.bullet], laser: [armor.laser], energy: [armor.energy], bomb: [armor.bomb], bio: [armor.bio], rad: [armor.rad], fire: [armor.fire], acid: [armor.acid]") message_admins("[key_name_admin(usr)] modified the armor on [src] ([type]) to melee: [armor.melee], bullet: [armor.bullet], laser: [armor.laser], energy: [armor.energy], bomb: [armor.bomb], bio: [armor.bio], rad: [armor.rad], fire: [armor.fire], acid: [armor.acid]") if(href_list[VV_HK_MASS_DEL_TYPE]) diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index 82ca8fbdf6a2d..f920e6c74e346 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -321,7 +321,7 @@ That prevents a few funky behaviors. /obj/structure/AIcore/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card) if(state != AI_READY_CORE || !..()) return - //Transferring a carded AI to a core. + //Transferring a carded AI to a core. if(interaction == AI_TRANS_FROM_CARD) AI.control_disabled = FALSE AI.radio_enabled = TRUE diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 87c427363bd59..e7f1c86086950 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -258,6 +258,8 @@ var/desc_with_canvas var/persistence_id +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/sign/painting) + /obj/structure/sign/painting/Initialize(mapload, dir, building) . = ..() SSpersistence.painting_frames += src @@ -381,7 +383,7 @@ if(!current_canvas.painting_name) current_canvas.painting_name = "Untitled Artwork" var/data = current_canvas.get_data_string() - var/md5 = md5(lowertext(data)) + var/md5 = md5(LOWER_TEXT(data)) var/list/current = SSpersistence.paintings[persistence_id] if(!current) current = list() @@ -434,7 +436,7 @@ if(!persistence_id || !current_canvas) to_chat(user,"This is not a persistent painting.") return - var/md5 = md5(lowertext(current_canvas.get_data_string())) + var/md5 = md5(LOWER_TEXT(current_canvas.get_data_string())) var/author = current_canvas.author_ckey var/list/current = SSpersistence.paintings[persistence_id] if(current) diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index 5b0a29f6d04fb..2cfe1b38f99d6 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -24,7 +24,7 @@ var/bolts = TRUE // dir check for buckle_lying state -/obj/structure/bed/Initialize() +/obj/structure/bed/Initialize(mapload) RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(dir_changed)) dir_changed(new_dir = dir) . = ..() diff --git a/code/game/objects/structures/bot_elevator.dm b/code/game/objects/structures/bot_elevator.dm index fc4505cb69a8e..4b67869fd924d 100644 --- a/code/game/objects/structures/bot_elevator.dm +++ b/code/game/objects/structures/bot_elevator.dm @@ -8,6 +8,8 @@ var/obj/structure/bot_elevator/up max_integrity = 100 +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/bot_elevator) + /obj/structure/bot_elevator/Initialize(mapload, obj/structure/bot_elevator/up, obj/structure/bot_elevator/down) ..() GLOB.bot_elevator += src diff --git a/code/game/objects/structures/crates_lockers/closets/infinite.dm b/code/game/objects/structures/crates_lockers/closets/infinite.dm index 601e157450972..e159eec1071f0 100644 --- a/code/game/objects/structures/crates_lockers/closets/infinite.dm +++ b/code/game/objects/structures/crates_lockers/closets/infinite.dm @@ -26,7 +26,7 @@ /obj/structure/closet/infinite/open() . = ..() if(. && auto_close_time) - addtimer(CALLBACK(src, PROC_REF(close_on_my_own)), auto_close_time, TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(close_on_my_own)), auto_close_time, TIMER_OVERRIDE | TIMER_UNIQUE) /obj/structure/closet/infinite/proc/close_on_my_own() if(close()) diff --git a/code/game/objects/structures/crates_lockers/crates/large.dm b/code/game/objects/structures/crates_lockers/crates/large.dm index e9bd2e1b47d1a..b2166db10b646 100644 --- a/code/game/objects/structures/crates_lockers/crates/large.dm +++ b/code/game/objects/structures/crates_lockers/crates/large.dm @@ -26,8 +26,8 @@ tear_manifest(user) user.visible_message("[user] pries \the [src] open.", \ - "You pry open \the [src].", \ - "You hear splitting wood.") + "You pry open \the [src].", \ + "You hear splitting wood.") playsound(src.loc, 'sound/weapons/slashmiss.ogg', 75, 1) var/turf/T = get_turf(src) diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm index a3b28f10edaf0..8bde41cb2b41a 100644 --- a/code/game/objects/structures/crates_lockers/crates/secure.dm +++ b/code/game/objects/structures/crates_lockers/crates/secure.dm @@ -83,6 +83,8 @@ . = ..() . += "It's locked with a privacy lock, and can only be unlocked by the buyer's ID with required access." +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/closet/crate/secure/owned) + /obj/structure/closet/crate/secure/owned/Initialize(mapload, datum/bank_account/_buyer_account) . = ..() buyer_account = _buyer_account diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index a2d071256fd45..9fece4d8b7fe8 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -214,7 +214,7 @@ add_fingerprint(user) return else - //prevents remote "kicks" with TK + //prevents remote "kicks" with TK if (!Adjacent(user)) return if (user.a_intent == INTENT_HELP) @@ -403,6 +403,8 @@ /obj/item/showpiece_dummy name = "Cheap replica" +CREATION_TEST_IGNORE_SUBTYPES(/obj/item/showpiece_dummy) + /obj/item/showpiece_dummy/Initialize(mapload, path) . = ..() var/obj/item/I = path diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 82dd2f68be0aa..379e302873dd1 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -99,8 +99,8 @@ if(door_check) user.visible_message("[user] secures the airlock assembly to the floor.", \ - "You start to secure the airlock assembly to the floor...", \ - "You hear wrenching.") + "You start to secure the airlock assembly to the floor...", \ + "You hear wrenching.") if(W.use_tool(src, user, 40, volume=100)) if(anchored) @@ -113,8 +113,8 @@ else user.visible_message("[user] unsecures the airlock assembly from the floor.", \ - "You start to unsecure the airlock assembly from the floor...", \ - "You hear wrenching.") + "You start to unsecure the airlock assembly from the floor...", \ + "You hear wrenching.") if(W.use_tool(src, user, 40, volume=100)) if(!anchored) return @@ -234,7 +234,7 @@ if(G.get_amount() >= 2) playsound(src, 'sound/items/crowbar.ogg', 100, 1) user.visible_message("[user] adds [G.name] to the airlock assembly.", \ - "You start to install [G.name] into the airlock assembly...") + "You start to install [G.name] into the airlock assembly...") if(do_after(user, 40, target = src)) if(G.get_amount() < 2 || mineral) return @@ -252,7 +252,7 @@ else if((W.tool_behaviour == TOOL_SCREWDRIVER) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) user.visible_message("[user] finishes the airlock.", \ - "You start finishing the airlock...") + "You start finishing the airlock...") if(W.use_tool(src, user, 40, volume=100)) if(loc && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index ece0c709fbcad..27089c6c0b6f8 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -13,6 +13,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/extinguisher_cabinet, 29) +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/extinguisher_cabinet) + /obj/structure/extinguisher_cabinet/Initialize(mapload, ndir, building) . = ..() if(building) diff --git a/code/game/objects/structures/fireplace.dm b/code/game/objects/structures/fireplace.dm index 6b610992d9aa6..fcf9f2a246412 100644 --- a/code/game/objects/structures/fireplace.dm +++ b/code/game/objects/structures/fireplace.dm @@ -150,3 +150,7 @@ update_appearance() adjust_light() desc = initial(desc) + +#undef LOG_BURN_TIMER +#undef PAPER_BURN_TIMER +#undef MAXIMUM_BURN_TIMER diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index a8ec76f3e1844..418374583223a 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -68,6 +68,8 @@ H.update_body() H.fully_replace_character_name(null, H.dna.species.random_name(gender)) +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/mob_spawn/human/ash_walker) + /obj/effect/mob_spawn/human/ash_walker/Initialize(mapload, datum/team/ashwalkers/ashteam) . = ..() var/area/A = get_area(src) @@ -102,6 +104,8 @@ golems, so that no golem may ever be forced to serve again." banType = ROLE_FREE_GOLEM +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/mob_spawn/human/golem) + /obj/effect/mob_spawn/human/golem/Initialize(mapload, datum/species/golem/species = null, mob/creator = null) if(species) //spawners list uses object name to register so this goes before ..() name += " ([initial(species.prefix)])" @@ -355,6 +359,8 @@ assignedrole = "SuperFriend" banType = ROLE_DEMONIC_FRIEND +CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/mob_spawn/human/demonic_friend) + /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 diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 753abd9bc564d..23cdc4cc5c25e 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -195,13 +195,13 @@ W.play_tool_sound(src, 100) set_anchored(!anchored) user.visible_message("[user] [anchored ? "fastens" : "unfastens"] [src].", \ - "You [anchored ? "fasten [src] to" : "unfasten [src] from"] the floor.") + "You [anchored ? "fasten [src] to" : "unfasten [src] from"] the floor.") return else if(istype(W, /obj/item/stack/rods) && broken) var/obj/item/stack/rods/R = W if(!shock(user, 90 * W.siemens_coefficient)) user.visible_message("[user] rebuilds the broken grille.", \ - "You rebuild the broken grille.") + "You rebuild the broken grille.") repair_grille() R.use(1) return @@ -372,7 +372,7 @@ device.id = id initialized_device = 1 -/obj/structure/grille/prison/Initialize() +/obj/structure/grille/prison/Initialize(mapload) . = ..() if(!initialized_device) setup_device() @@ -399,3 +399,5 @@ /obj/structure/grille/prison/Destroy() QDEL_NULL(device) return ..() + +#undef CLEAR_TILE_MOVE_LIMIT diff --git a/code/game/objects/structures/gym/exercise_status.dm b/code/game/objects/structures/gym/exercise_status.dm index 4f3bb5913fdf2..cf2f300a6cd94 100644 --- a/code/game/objects/structures/gym/exercise_status.dm +++ b/code/game/objects/structures/gym/exercise_status.dm @@ -63,3 +63,8 @@ name = "Exercised" desc = "You have worked out recently, making you stronger and more resistant to being brought down by stunning weapons." icon_state = "weights" + +#undef EXERCISE_INCREMENT +#undef EXERCISE_LIMIT +#undef EXERCISE_STEP +#undef EXERCISE_VISUAL_DELTA diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index ac810ddd96bf2..4f93719186a0d 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -10,6 +10,8 @@ max_integrity = 100 z_flags = Z_BLOCK_OUT_DOWN +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/ladder) + /obj/structure/ladder/Initialize(mapload, obj/structure/ladder/up, obj/structure/ladder/down) ..() if (up) @@ -165,7 +167,7 @@ to_chat(user, "You begin cutting [src]...") if(I.use_tool(src, user, 50, volume=100)) user.visible_message("[user] cuts [src].", \ - "You cut [src].") + "You cut [src].") I.play_tool_sound(src, 100) var/drop_loc = drop_location() var/obj/R = new /obj/item/stack/rods(drop_loc, 10) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index a154713a4ddf6..5f7c20babfaaa 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -14,6 +14,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28) +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/mirror) + /obj/structure/mirror/Initialize(mapload, dir, building) . = ..() if(icon_state == "mirror_broke" && !broken) diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm index a2a5becf77e27..62987b94c02d6 100644 --- a/code/game/objects/structures/petrified_statue.dm +++ b/code/game/objects/structures/petrified_statue.dm @@ -8,6 +8,8 @@ var/timer = 480 //eventually the person will be freed var/mob/living/petrified_mob +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/statue/petrified) + /obj/structure/statue/petrified/Initialize(mapload, mob/living/L, statue_timer) . = ..() if(statue_timer) diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm index 038134f41c3d5..f27f77492969c 100644 --- a/code/game/objects/structures/showcase.dm +++ b/code/game/objects/structures/showcase.dm @@ -140,3 +140,6 @@ . += "The showcase has its screws loosened." else . += "If you see this, something is wrong." + +#undef SHOWCASE_CONSTRUCTED +#undef SHOWCASE_SCREWDRIVERED diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 63fb24346264a..861513b38718e 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -175,3 +175,7 @@ layer = FLY_LAYER anchored = TRUE mouse_opacity = MOUSE_OPACITY_TRANSPARENT + +#undef SHOWER_FREEZING +#undef SHOWER_NORMAL +#undef SHOWER_BOILING diff --git a/code/game/objects/structures/signs/_signs.dm b/code/game/objects/structures/signs/_signs.dm index 64077859247e6..f19ed74a5b570 100644 --- a/code/game/objects/structures/signs/_signs.dm +++ b/code/game/objects/structures/signs/_signs.dm @@ -27,12 +27,12 @@ /obj/structure/sign/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WRENCH && buildable_sign) user.visible_message("[user] starts removing [src]...", \ - "You start unfastening [src].") + "You start unfastening [src].") I.play_tool_sound(src) if(I.use_tool(src, user, 40)) playsound(src, 'sound/items/deconstruct.ogg', 50, 1) user.visible_message("[user] unfastens [src].", \ - "You unfasten [src].") + "You unfasten [src].") var/obj/item/sign_backing/SB = new (get_turf(user)) SB.icon_state = icon_state SB.sign_path = type @@ -104,7 +104,7 @@ if(isturf(target) && proximity) var/turf/T = target user.visible_message("[user] fastens [src] to [T].", \ - "You attach the sign to [T].") + "You attach the sign to [T].") playsound(T, 'sound/items/deconstruct.ogg', 50, 1) var/obj/structure/sign/S = new sign_path(T) S.setDir(dir) diff --git a/code/game/objects/structures/stairs.dm b/code/game/objects/structures/stairs.dm index 8c0b477da1fed..3f3fb2c0d3360 100644 --- a/code/game/objects/structures/stairs.dm +++ b/code/game/objects/structures/stairs.dm @@ -138,3 +138,7 @@ /obj/structure/stairs/attack_ghost(mob/user) stair_ascend(user) + +#undef STAIR_TERMINATOR_AUTOMATIC +#undef STAIR_TERMINATOR_NO +#undef STAIR_TERMINATOR_YES diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 02ef5068fb26c..fd1aa3564fc91 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -268,9 +268,9 @@ icon_state = "snowman" /obj/structure/statue/snow/snowlegion - name = "snowlegion" - desc = "Looks like that weird kid with the tiger plushie has been round here again." - icon_state = "snowlegion" + name = "snowlegion" + desc = "Looks like that weird kid with the tiger plushie has been round here again." + icon_state = "snowlegion" //////////////////////////copper/////////////////////////////////////// diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index ccd47398717ab..14e084ffe5e05 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -39,6 +39,8 @@ max_integrity = 100 integrity_failure = 0.33 +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/table) + /obj/structure/table/Initialize(mapload, _buildstack) . = ..() if(_buildstack) @@ -566,7 +568,7 @@ var/mob/living/carbon/human/patient = null var/obj/machinery/computer/operating/computer = null -/obj/structure/table/optable/Initialize() +/obj/structure/table/optable/Initialize(mapload) . = ..() initial_link() diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index b082356aa00a3..8bd3f81253726 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -207,3 +207,5 @@ ..() boarding_dir = dir +#undef OPEN_DURATION +#undef CLOSE_DURATION diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm index c21ce6df8de6a..c4971671b324b 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube.dm @@ -13,6 +13,8 @@ var/exit_delay = 1 var/enter_delay = 0 +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/transit_tube) + /obj/structure/transit_tube/Initialize(mapload, newdirection) . = ..() if(newdirection) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index f78f7986502a4..ec5c105466509 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -469,13 +469,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32) alpha = 255 /obj/structure/curtain/proc/toggle(mob/M) - if (check(M)) - open = !open - playsound(loc, 'sound/effects/curtain.ogg', 50, 1) - update_appearance() + if (check(M)) + open = !open + playsound(loc, 'sound/effects/curtain.ogg', 50, 1) + update_appearance() /obj/structure/curtain/proc/check(mob/M) - return TRUE + return TRUE /obj/structure/curtain/directional icon_type = "bounty" diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 3467296faf16a..71687e38f612c 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -31,6 +31,8 @@ var/state = "01" //How far the door assembly has progressed +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/windoor_assembly) + /obj/structure/windoor_assembly/Initialize(mapload, loc, set_dir) . = ..() if(set_dir) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index d4e0708538617..7c791af59dd82 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -50,6 +50,8 @@ else . += "The window is unscrewed from the floor, and could be deconstructed by wrenching." +CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) + /obj/structure/window/Initialize(mapload, direct) . = ..() if(direct) diff --git a/code/game/say.dm b/code/game/say.dm index c2bf41f9c50ea..2d22f4a42dd86 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -1,5 +1,5 @@ /* - Miauw's big Say() rewrite. + Miauw's big Say() rewrite. This file has the basic atom/movable level speech procs. And the base of the send_speech() proc, which is the core of saycode. */ @@ -223,6 +223,8 @@ GLOBAL_LIST_INIT(freqtospan, list( var/obj/item/radio/radio INITIALIZE_IMMEDIATE(/atom/movable/virtualspeaker) +CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/virtualspeaker) + /atom/movable/virtualspeaker/Initialize(mapload, atom/movable/M, _radio) . = ..() radio = _radio diff --git a/code/game/sound.dm b/code/game/sound.dm index 0f318b629485f..117cdcf9149b9 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -60,7 +60,7 @@ falloff_distance - Distance at which falloff begins. Sound is at peak volume (in //allocate a channel if necessary now so its the same for everyone channel = channel || SSsounds.random_available_channel() - // Looping through the player list has the added bonus of working for mobs inside containers + // Looping through the player list has the added bonus of working for mobs inside containers var/sound/S = sound(get_sfx(soundin)) var/list/listeners = SSmobs.clients_by_zlevel[source_z].Copy() /// Everyone that actually heard the sound @@ -84,7 +84,7 @@ falloff_distance - Distance at which falloff begins. Sound is at peak volume (in if(below_turf && istransparentturf(turf_source)) listeners += get_hearers_in_view(maxdistance, below_turf) - + for(var/mob/listening_mob in listeners | SSmobs.dead_players_by_zlevel[source_z])//observers always hear through walls if(get_dist(listening_mob, turf_source) <= maxdistance) listening_mob.playsound_local(turf_source, soundin, vol, vary, frequency, falloff_exponent, channel, pressure_affected, S, maxdistance, falloff_distance, 1, use_reverb) diff --git a/code/game/turfs/baseturf_skipover.dm b/code/game/turfs/baseturf_skipover.dm index b90b79af2940e..7031e11bcc8f5 100644 --- a/code/game/turfs/baseturf_skipover.dm +++ b/code/game/turfs/baseturf_skipover.dm @@ -1,3 +1,5 @@ +CREATION_TEST_IGNORE_SUBTYPES(/turf/baseturf_skipover) + // This is a typepath to just sit in baseturfs and act as a marker for other things. /turf/baseturf_skipover name = "Baseturf skipover placeholder" @@ -13,6 +15,8 @@ name = "Shuttle baseturf skipover" desc = "Acts as the bottom of the shuttle, if this isn't here the shuttle floor is broken through." +CREATION_TEST_IGNORE_SUBTYPES(/turf/baseturf_bottom) + /turf/baseturf_bottom name = "Z-level baseturf placeholder" desc = "Marker for z-level baseturf, usually resolves to space." diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm index 739d65c64f941..d5c58225c5352 100644 --- a/code/game/turfs/closed/_closed.dm +++ b/code/game/turfs/closed/_closed.dm @@ -1,3 +1,5 @@ +CREATION_TEST_IGNORE_SELF(/turf/closed) + /turf/closed layer = CLOSED_TURF_LAYER opacity = TRUE diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index 9f33454d776b7..92ae1a410434b 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -1,3 +1,5 @@ +CREATION_TEST_IGNORE_SELF(/turf/open) + /turf/open plane = FLOOR_PLANE can_hit = FALSE diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm index eeb9afba4ebae..fb4e463d83fad 100644 --- a/code/game/turfs/open/floor/fancy_floor.dm +++ b/code/game/turfs/open/floor/fancy_floor.dm @@ -433,16 +433,16 @@ A.narsie_act() /turf/open/floor/carpet/break_tile() - broken = TRUE - make_plating() - if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) - QUEUE_SMOOTH_NEIGHBORS(src) + broken = TRUE + make_plating() + if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) + QUEUE_SMOOTH_NEIGHBORS(src) /turf/open/floor/carpet/burn_tile() - burnt = TRUE - make_plating() - if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) - QUEUE_SMOOTH_NEIGHBORS(src) + burnt = TRUE + make_plating() + if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) + QUEUE_SMOOTH_NEIGHBORS(src) /turf/open/floor/carpet/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) return FALSE diff --git a/code/game/turfs/open/floor/plating/asteroid.dm b/code/game/turfs/open/floor/plating/asteroid.dm index 4e785acdaa08c..99c6a4fd910fc 100644 --- a/code/game/turfs/open/floor/plating/asteroid.dm +++ b/code/game/turfs/open/floor/plating/asteroid.dm @@ -90,7 +90,7 @@ /turf/open/floor/plating/asteroid/planetary var/static/datum/gas_mixture/immutable/planetary/GM -/turf/open/floor/plating/asteroid/planetary/Initialize() +/turf/open/floor/plating/asteroid/planetary/Initialize(mapload) if(!GM) GM = new . = ..() @@ -148,7 +148,7 @@ resistance_flags = INDESTRUCTIBLE var/static/datum/gas_mixture/immutable/planetary/GM -/turf/open/floor/plating/asteroid/basalt/planetary/Initialize() +/turf/open/floor/plating/asteroid/basalt/planetary/Initialize(mapload) if(!GM) GM = new . = ..() @@ -161,10 +161,6 @@ baseturfs = /turf/open/floor/plating/asteroid/airless turf_type = /turf/open/floor/plating/asteroid/airless -// / Breathing types. Lungs can access either by these or by a string, which will be considered a gas ID. -#define BREATH_OXY /datum/breathing_class/oxygen -#define BREATH_PLASMA /datum/breathing_class/plasma - /turf/open/floor/plating/asteroid/snow gender = PLURAL name = "snow" diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm index 821f628207fcc..9b5051e161135 100644 --- a/code/game/turfs/open/floor/plating/misc_plating.dm +++ b/code/game/turfs/open/floor/plating/misc_plating.dm @@ -127,7 +127,7 @@ resistance_flags = INDESTRUCTIBLE var/static/datum/gas_mixture/immutable/planetary/GM -/turf/open/floor/plating/grass/Initialize() +/turf/open/floor/plating/grass/Initialize(mapload) if(!GM) GM = new . = ..() @@ -225,7 +225,7 @@ . = ..() if(user != dropping) dropping.visible_message("[user] starts to lower [dropping] down into [src].", \ - "You start to lower [dropping] down into [src].") + "You start to lower [dropping] down into [src].") else to_chat(user, "You start climbing down into [src]...") if(do_after(user, 4 SECONDS, target = dropping)) diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm index caa997873b427..4cef4cfdf32af 100644 --- a/code/game/turfs/open/openspace.dm +++ b/code/game/turfs/open/openspace.dm @@ -1,3 +1,5 @@ +CREATION_TEST_IGNORE_SUBTYPES(/turf/open/openspace) + /turf/open/openspace name = "open space" desc = "Watch your step!" diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 031d6392a9fb5..2a1875a7ad17d 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -1,5 +1,8 @@ GLOBAL_LIST_EMPTY(station_turfs) GLOBAL_LIST_EMPTY(created_baseturf_lists) + +CREATION_TEST_IGNORE_SELF(/turf) + /turf icon = 'icons/turf/floors.dmi' vis_flags = VIS_INHERIT_ID|VIS_INHERIT_PLANE // Important for interaction with and visualization of openspace. diff --git a/code/game/turfs/turf_texture.dm b/code/game/turfs/turf_texture.dm index a413cd92573ec..25cfdcccef721 100644 --- a/code/game/turfs/turf_texture.dm +++ b/code/game/turfs/turf_texture.dm @@ -27,6 +27,8 @@ ///Associated texture var/datum/turf_texture/parent_texture +CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/turf_texture) + /atom/movable/turf_texture/Initialize(mapload, datum/turf_texture/_texture) . = ..() var/datum/turf_texture/texture = new _texture() diff --git a/code/game/world.dm b/code/game/world.dm index 3e3d765fa1148..1ab3064883a49 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -163,7 +163,7 @@ GLOBAL_VAR(restart_counter) GLOB.tgui_log = "[GLOB.log_directory]/tgui.log" GLOB.prefs_log = "[GLOB.log_directory]/preferences.log" -#ifdef UNIT_TESTS +#if defined(UNIT_TESTS) || defined(SPACEMAN_DMM) GLOB.test_log = file("[GLOB.log_directory]/tests.log") start_log(GLOB.test_log) #endif @@ -321,7 +321,7 @@ GLOBAL_VAR(restart_counter) #ifdef UNIT_TESTS FinishTestRun() return - #endif + #else if(TgsAvailable()) var/do_hard_reboot @@ -348,6 +348,7 @@ GLOBAL_VAR(restart_counter) shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss. AUXTOOLS_SHUTDOWN(AUXMOS) ..() + #endif /world/Del() shutdown_logging() // makes sure the thread is closed before end, else we terminate @@ -483,3 +484,5 @@ GLOBAL_VAR(restart_counter) var/init_result = LIBCALL(library, "init")("block") if (init_result != "0") CRASH("Error initializing byond-tracy: [init_result]") + +#undef RESTART_COUNTER_PATH diff --git a/code/modules/NTNet/network.dm b/code/modules/NTNet/network.dm index 61fc997a0b6eb..7b459bd804304 100644 --- a/code/modules/NTNet/network.dm +++ b/code/modules/NTNet/network.dm @@ -112,7 +112,10 @@ var/list/devices = list() var/list/queue = list(src) // add ourselves while(queue.len) - var/datum/ntnet/net = queue[queue.len--] + var/datum/ntnet/net = queue[queue.len] + queue.len-- + if (net == null) + continue if(net.children.len > 0) for(var/net_id in net.children) queue += networks[net_id] diff --git a/code/modules/admin/battle_royale.dm b/code/modules/admin/battle_royale.dm index 8b3548d0a79f0..a6fdcab189448 100644 --- a/code/modules/admin/battle_royale.dm +++ b/code/modules/admin/battle_royale.dm @@ -461,3 +461,5 @@ GLOBAL_DATUM(battle_royale, /datum/battle_royale_controller) // ===== /obj/item/organ/regenerative_core/battle_royale preserved = TRUE + +#undef BATTLE_ROYALE_AVERBS diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm index d3139c0030322..7a1047b5d0409 100644 --- a/code/modules/admin/chat_commands.dm +++ b/code/modules/admin/chat_commands.dm @@ -121,3 +121,5 @@ GLOBAL_LIST(round_end_notifiees) set waitfor = FALSE load_admins() **/ + +#undef IRC_STATUS_THROTTLE diff --git a/code/modules/admin/create_poll.dm b/code/modules/admin/create_poll.dm deleted file mode 100644 index 73af3da700519..0000000000000 --- a/code/modules/admin/create_poll.dm +++ /dev/null @@ -1,143 +0,0 @@ -/client/proc/create_poll() - set name = "Create Poll" - set category = "Adminbus" - if(!check_rights(R_POLL)) - return - if(!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") - return - var/polltype = input("Choose poll type.","Poll Type") as null|anything in list("Single Option","Text Reply","Rating","Multiple Choice", "Instant Runoff Voting") - var/choice_amount = 0 - switch(polltype) - if("Single Option") - polltype = POLLTYPE_OPTION - if("Text Reply") - polltype = POLLTYPE_TEXT - if("Rating") - polltype = POLLTYPE_RATING - if("Multiple Choice") - polltype = POLLTYPE_MULTI - choice_amount = input("How many choices should be allowed?","Select choice amount") as num|null - switch(choice_amount) - if(0) - to_chat(src, "Multiple choice poll must have at least one choice allowed.") - return - if(1) - polltype = POLLTYPE_OPTION - if(null) - return - if ("Instant Runoff Voting") - polltype = POLLTYPE_IRV - else - return 0 - var/starttime = SQLtime() - var/endtime = capped_input(usr, "Set end time for poll as format YYYY-MM-DD HH:MM:SS. All times in server time. HH:MM:SS is optional and 24-hour. Must be later than starting time for obvious reasons.", "Set end time", SQLtime()) - if(!endtime) - return - var/datum/db_query/query_validate_time = SSdbcore.NewQuery("SELECT IF(STR_TO_DATE('[endtime]','%Y-%c-%d %T') > NOW(), STR_TO_DATE('[endtime]','%Y-%c-%d %T'), 0)") - if(!query_validate_time.warn_execute() || QDELETED(usr) || !src) - qdel(query_validate_time) - return - if(query_validate_time.NextRow()) - var/checktime = text2num(query_validate_time.item[1]) - if(!checktime) - to_chat(src, "Datetime entered is improperly formatted or not later than current server time.") - qdel(query_validate_time) - return - endtime = query_validate_time.item[1] - qdel(query_validate_time) - var/adminonly - switch(alert("Admin only poll?",,"Yes","No","Cancel")) - if("Yes") - adminonly = 1 - if("No") - adminonly = 0 - else - return - var/dontshow - switch(alert("Hide poll results from tracking until completed?",,"Yes","No","Cancel")) - if("Yes") - dontshow = 1 - if("No") - dontshow = 0 - else - return - var/sql_ckey = sanitizeSQL(ckey) - var/question = capped_multiline_input(usr, "Write your question","Question") - if(!question) - return - var/list/sql_option_list = list() - if(polltype != POLLTYPE_TEXT) - var/add_option = 1 - while(add_option) - var/option = capped_multiline_input(usr, "Write your option","Option") - if(!option) - return - var/default_percentage_calc = 0 - if(polltype != POLLTYPE_IRV) - switch(alert("Should this option be included by default when poll result percentages are generated?",,"Yes","No","Cancel")) - if("Yes") - default_percentage_calc = 1 - if("No") - default_percentage_calc = 0 - else - return - var/minval = 0 - var/maxval = 0 - var/descmin = "" - var/descmid = "" - var/descmax = "" - if(polltype == POLLTYPE_RATING) - minval = input("Set minimum rating value.","Minimum rating") as num|null - if(minval == null) - return - maxval = input("Set maximum rating value.","Maximum rating") as num|null - if(minval >= maxval) - to_chat(src, "Maximum rating value can't be less than or equal to minimum rating value") - continue - else if(maxval == null) - return - descmin = capped_multiline_input(src, "Optional: Set description for minimum rating","Minimum rating description") - if(descmin == null) - return - descmid = capped_multiline_input(src, "Optional: Set description for median rating","Median rating description") - if(descmid == null) - return - descmax = capped_multiline_input(src, "Optional: Set description for maximum rating","Maximum rating description") - if(descmax == null) - return - sql_option_list += list(list("text" = "'[option]'", "minval" = "'[minval]'", "maxval" = "'[maxval]'", "descmin" = "'[descmin]'", "descmid" = "'[descmid]'", "descmax" = "'[descmax]'", "default_percentage_calc" = "'[default_percentage_calc]'")) - switch(alert(" ",,"Add option","Finish", "Cancel")) - if("Add option") - add_option = 1 - if("Finish") - add_option = 0 - else - return 0 - - var/minimum_player_playtime = input("Minimum player playtime to vote (in hours)","Minimum playtime") as num|null - if (minimum_player_playtime == null) - minimum_player_playtime = 0 - minimum_player_playtime = min(minimum_player_playtime, 100) //max 100 hours - - var/m1 = "[key_name(usr)] has created a new server poll. Poll type: [polltype] - Admin Only: [adminonly ? "Yes" : "No"] - Question: [question]" - var/m2 = "[key_name_admin(usr)] has created a new server poll. Poll type: [polltype] - Admin Only: [adminonly ? "Yes" : "No"]
          Question: [question]" - var/datum/db_query/query_polladd_question = SSdbcore.NewQuery("INSERT INTO [format_table_name("poll_question")] (polltype, starttime, endtime, question, adminonly, multiplechoiceoptions, createdby_ckey, createdby_ip, dontshow, minimumplaytime) VALUES ('[polltype]', '[starttime]', '[endtime]', '[question]', '[adminonly]', '[choice_amount]', '[sql_ckey]', INET_ATON('[address]'), '[dontshow]', '[minimum_player_playtime]')") - if(!query_polladd_question.warn_execute()) - qdel(query_polladd_question) - return - qdel(query_polladd_question) - if(polltype != POLLTYPE_TEXT) - var/pollid = 0 - var/datum/db_query/query_get_id = SSdbcore.NewQuery("SELECT LAST_INSERT_ID()") - if(!query_get_id.warn_execute()) - qdel(query_get_id) - return - if(query_get_id.NextRow()) - pollid = query_get_id.item[1] - qdel(query_get_id) - for(var/list/i in sql_option_list) - i |= list("pollid" = "'[pollid]'") - SSdbcore.MassInsert(format_table_name("poll_option"), sql_option_list, warn = 1) - log_admin(m1) - message_admins(m2) diff --git a/code/modules/admin/greyscale_modify_menu.dm b/code/modules/admin/greyscale_modify_menu.dm index 47a6f637d589d..4f919364500a7 100644 --- a/code/modules/admin/greyscale_modify_menu.dm +++ b/code/modules/admin/greyscale_modify_menu.dm @@ -135,13 +135,13 @@ if("recolor") var/index = text2num(params["color_index"]) - var/new_color = lowertext(params["new_color"]) + var/new_color = LOWER_TEXT(params["new_color"]) if(split_colors[index] != new_color) split_colors[index] = new_color queue_refresh() if("recolor_from_string") - var/full_color_string = lowertext(params["color_string"]) + var/full_color_string = LOWER_TEXT(params["color_string"]) if(full_color_string != split_colors.Join()) ReadColorsFromString(full_color_string) queue_refresh() diff --git a/code/modules/admin/ipintel.dm b/code/modules/admin/ipintel.dm index ef8eecc6789c9..d123049d0b678 100644 --- a/code/modules/admin/ipintel.dm +++ b/code/modules/admin/ipintel.dm @@ -93,7 +93,7 @@ sleep(25) return .(ip, 1) else if(results.status_code == 200) - var/response = json_decode(results["body"]) + var/response = json_decode(results.body) if (response) if (response["status"] == "success") var/intelnum = text2num(response["result"]) diff --git a/code/modules/admin/poll_management.dm b/code/modules/admin/poll_management.dm index 353c60a5fe953..f037f07c466b2 100644 --- a/code/modules/admin/poll_management.dm +++ b/code/modules/admin/poll_management.dm @@ -604,7 +604,7 @@ SELECT p.text, pv.rating, COUNT(*) Maximum Value
          -
          +
          diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index 200f76590cce2..70f5b921c6652 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -116,7 +116,7 @@ /// Gets the ban cache of the passed in client /// If the cache has not been generated, we start off a query -/// If we still have a query going for this request, we just sleep until it's recieved back +/// If we still have a query going for this request, we just sleep until it's received back /proc/retrieve_ban_cache(client/player_client) if(QDELETED(player_client)) return @@ -622,7 +622,7 @@ duration = text2num(duration) if (!(interval in list("SECOND", "MINUTE", "HOUR", "DAY", "WEEK", "MONTH", "YEAR"))) interval = "MINUTE" - var/time_message = "[duration] [lowertext(interval)]" //no DisplayTimeText because our duration is of variable interval type + var/time_message = "[duration] [LOWER_TEXT(interval)]" //no DisplayTimeText because our duration is of variable interval type if(duration > 1) //pluralize the interval if necessary time_message += "s" var/note_reason = "Banned from [roles_to_ban[1] == "Server" ? "the server" : " Roles: [roles_to_ban.Join(", ")]"] [isnull(duration) ? "permanently" : "for [time_message]"] - [reason]" @@ -1310,3 +1310,6 @@ output += "" panel.set_content(jointext(output, "")) panel.open() + +#undef MAX_ADMINBANS_PER_ADMIN +#undef MAX_ADMINBANS_PER_HEADMIN diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm index 98f38d2d69bbd..843df13f5b09e 100644 --- a/code/modules/admin/sql_message_system.dm +++ b/code/modules/admin/sql_message_system.dm @@ -513,7 +513,7 @@ alphatext = "filter: alpha(opacity=[alpha]); opacity: [alpha/100];" var/list/data = list("

          ") if(severity) - data += " " + data += " " data += "[timestamp] | [server_name] | [admin_key][secret ? " | - Secret" : ""] | [get_exp_format(text2num(playtime))] Living Playtime" if(expire_timestamp) data += " | Expires [expire_timestamp]" diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 4a64f05f3cc0a..631ce2b60840d 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -164,37 +164,6 @@ */ - -#define SDQL2_STATE_ERROR 0 -#define SDQL2_STATE_IDLE 1 -#define SDQL2_STATE_PRESEARCH 2 -#define SDQL2_STATE_SEARCHING 3 -#define SDQL2_STATE_EXECUTING 4 -#define SDQL2_STATE_SWITCHING 5 -#define SDQL2_STATE_HALTING 6 - -#define SDQL2_VALID_OPTION_TYPES list("proccall", "select", "priority", "autogc" , "sequential") -#define SDQL2_VALID_OPTION_VALUES list("async", "blocking", "force_nulls", "skip_nulls", "high", "normal", "keep_alive" , "true") - -#define SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS (1<<0) -#define SDQL2_OPTION_BLOCKING_CALLS (1<<1) -#define SDQL2_OPTION_HIGH_PRIORITY (1<<2) //High priority SDQL query, allow using almost all of the tick. -#define SDQL2_OPTION_DO_NOT_AUTOGC (1<<3) - -#define SDQL2_OPTIONS_DEFAULT (SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS) - -#define SDQL2_IS_RUNNING (state == SDQL2_STATE_EXECUTING || state == SDQL2_STATE_SEARCHING || state == SDQL2_STATE_SWITCHING || state == SDQL2_STATE_PRESEARCH) -#define SDQL2_HALT_CHECK if(!SDQL2_IS_RUNNING) {state = SDQL2_STATE_HALTING; return FALSE;}; - -#define SDQL2_TICK_CHECK ((options & SDQL2_OPTION_HIGH_PRIORITY)? CHECK_TICK_HIGH_PRIORITY : CHECK_TICK) - -#define SDQL2_STAGE_SWITCH_CHECK if(state != SDQL2_STATE_SWITCHING){\ - if(state == SDQL2_STATE_HALTING){\ - state = SDQL2_STATE_IDLE;\ - return FALSE}\ - state = SDQL2_STATE_ERROR;\ - CRASH("SDQL2 fatal error");}; - /client/proc/SDQL2_query(requested_query as message) set category = "Debug" if(!check_rights(R_DEBUG)) //Shouldn't happen... but just to be safe. @@ -1024,7 +993,7 @@ GLOBAL_LIST_INIT(sdql2_queries, GLOB.sdql2_queries || list()) return null else if(expression [start] == "{" && long) - if(lowertext(copytext(expression[start + 1], 1, 3)) != "0x") //3 == length("0x") + 1 + if(LOWER_TEXT(copytext(expression[start + 1], 1, 3)) != "0x") //3 == length("0x") + 1 to_chat(usr, "Invalid pointer syntax: [expression[start + 1]]") return null v = locate("\[[expression[start + 1]]]") @@ -1212,3 +1181,5 @@ GLOBAL_LIST_INIT(sdql2_queries, GLOB.sdql2_queries || list()) for(var/datum/SDQL2_query/query as anything in GLOB.sdql2_queries) if(query.id == id) return query + +#undef SDQL_qdel_datum diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index 254821ec0e66d..ed30ab20da3d3 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -90,7 +90,7 @@ return null /datum/SDQL_parser/proc/tokenl(i) - return lowertext(token(i)) + return LOWER_TEXT(token(i)) /datum/SDQL_parser/proc/query_options(i, list/node) var/list/options = list() @@ -605,7 +605,7 @@ node += "null" i++ - else if(lowertext(copytext(token(i), 1, 3)) == "0x" && isnum_safe(hex2num(copytext(token(i), 3))))//3 == length("0x") + 1 + else if(LOWER_TEXT(copytext(token(i), 1, 3)) == "0x" && isnum_safe(hex2num(copytext(token(i), 3))))//3 == length("0x") + 1 node += hex2num(copytext(token(i), 3)) i++ diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm index f4fd1f9051b61..ed3c30dd369d2 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm @@ -69,8 +69,8 @@ /proc/_log(X, Y) return log(X, Y) -/proc/_lowertext(T) - return lowertext(T) +/proc/_LOWER_TEXT(T) + return LOWER_TEXT(T) /proc/_matrix(a, b, c, d, e, f) return matrix(a, b, c, d, e, f) diff --git a/code/modules/admin/verbs/_help.dm b/code/modules/admin/verbs/_help.dm index 527e18933f716..6c5b3eb44d034 100644 --- a/code/modules/admin/verbs/_help.dm +++ b/code/modules/admin/verbs/_help.dm @@ -882,10 +882,10 @@ if(found.mind?.special_role) is_antag = 1 founds[++founds.len] = list("name" = found.name, - "real_name" = found.real_name, - "ckey" = found.ckey, - "key" = found.key, - "antag" = is_antag) + "real_name" = found.real_name, + "ckey" = found.ckey, + "key" = found.key, + "antag" = is_antag) msg += "[original_word](?|F) " continue msg += "[original_word] " diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index e0bc62fa62601..65bd7975a1123 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -251,7 +251,7 @@ var/client/C = GLOB.directory[target] var/datum/help_ticket/ticket = C ? C.current_adminhelp_ticket : GLOB.ahelp_tickets.CKey2ActiveTicket(target) - var/compliant_msg = trim(lowertext(msg)) + var/compliant_msg = trim(LOWER_TEXT(msg)) var/tgs_tagged = "[sender](TGS/External)" var/list/splits = splittext(compliant_msg, " ") if(splits.len && splits[1] == "ticket") @@ -352,3 +352,5 @@ return stealth #undef EXTERNALREPLYCOUNT + +#undef TGS_AHELP_USAGE diff --git a/code/modules/admin/verbs/beakerpanel.dm b/code/modules/admin/verbs/beakerpanel.dm index 9aa7070e2e890..3becfcf5a80df 100644 --- a/code/modules/admin/verbs/beakerpanel.dm +++ b/code/modules/admin/verbs/beakerpanel.dm @@ -86,15 +86,15 @@ .select2-selection { border-radius: 0px !important; } ul { - list-style-type: none; /* Remove bullets */ - padding: 0; /* Remove padding */ - margin: 0; /* Remove margins */ + list-style-type: none; /* Remove bullets */ + padding: 0; /* Remove padding */ + margin: 0; /* Remove margins */ } ul li { - margin-top: -1px; /* Prevent double borders */ - padding: 12px; /* Add some padding */ - color: #ffffff; + margin-top: -1px; /* Prevent double borders */ + padding: 12px; /* Add some padding */ + color: #ffffff; text-decoration: none; background: #40628a; border: 1px solid #161616; @@ -103,23 +103,23 @@ } .remove-reagent { - background-color: #d03000; + background-color: #d03000; } .container-control { - width: 48%; - float: left; - padding-right: 10px; + width: 48%; + float: left; + padding-right: 10px; } .reagent > div, .reagent-div { float: right; width: 200px; } input.reagent { - width: 50%; + width: 50%; } .grenade-data { - display: inline-block; + display: inline-block; }