From 1bfb6b6e39573d455086bae9fda5e7fee7603314 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 25 Jul 2023 00:42:28 +0000 Subject: [PATCH 01/69] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-21934.yml | 4 -- html/changelogs/AutoChangeLog-pr-22397.yml | 4 -- html/changelogs/AutoChangeLog-pr-22623.yml | 4 -- html/changelogs/AutoChangeLog-pr-22633.yml | 4 -- html/changelogs/AutoChangeLog-pr-22640.yml | 4 -- html/changelogs/AutoChangeLog-pr-22641.yml | 4 -- html/changelogs/AutoChangeLog-pr-22648.yml | 8 ---- html/changelogs/AutoChangeLog-pr-22649.yml | 4 -- html/changelogs/AutoChangeLog-pr-22650.yml | 4 -- html/changelogs/AutoChangeLog-pr-22652.yml | 8 ---- html/changelogs/AutoChangeLog-pr-22653.yml | 4 -- html/changelogs/AutoChangeLog-pr-22654.yml | 4 -- html/changelogs/AutoChangeLog-pr-22655.yml | 4 -- html/changelogs/AutoChangeLog-pr-22656.yml | 6 --- html/changelogs/AutoChangeLog-pr-22657.yml | 4 -- html/changelogs/AutoChangeLog-pr-22658.yml | 6 --- html/changelogs/AutoChangeLog-pr-22659.yml | 4 -- html/changelogs/AutoChangeLog-pr-22660.yml | 4 -- html/changelogs/archive/2023-07.yml | 55 ++++++++++++++++++++++ 19 files changed, 55 insertions(+), 84 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-21934.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22397.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22623.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22633.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22640.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22641.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22648.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22649.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22650.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22652.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22653.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22654.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22655.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22656.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22657.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22658.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22659.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22660.yml diff --git a/html/changelogs/AutoChangeLog-pr-21934.yml b/html/changelogs/AutoChangeLog-pr-21934.yml deleted file mode 100644 index b0121595c98..00000000000 --- a/html/changelogs/AutoChangeLog-pr-21934.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - balance: "Base material costs for ammunition have been sharply reduced across the board, because a single 9mm casing or equivalent costing half a sheet was egregious. This mainly only applies to the ammo bench; lathe recipes are their own system and remain untouched." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22397.yml b/html/changelogs/AutoChangeLog-pr-22397.yml deleted file mode 100644 index b00132485cf..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22397.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "LT3" -delete-after: True -changes: - - bugfix: "Autotransfer calls votes based on actual round time, not server initialization time" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22623.yml b/html/changelogs/AutoChangeLog-pr-22623.yml deleted file mode 100644 index 4cb9aed18bd..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22623.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - image: "walking on water will now immerse you in it... visually, at least." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22633.yml b/html/changelogs/AutoChangeLog-pr-22633.yml deleted file mode 100644 index c44fd3ae275..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22633.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - qol: "The TTS and TTS Blips option is now one choiced preference." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22640.yml b/html/changelogs/AutoChangeLog-pr-22640.yml deleted file mode 100644 index d21657b0957..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22640.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "vinylspiders" -delete-after: True -changes: - - bugfix: "fixes a bug that was causing some types of ammo boxes to spawn empty" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22641.yml b/html/changelogs/AutoChangeLog-pr-22641.yml deleted file mode 100644 index 455da43acba..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22641.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "vinylspiders" -delete-after: True -changes: - - bugfix: "the pda item name will now match alt job titles" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22648.yml b/html/changelogs/AutoChangeLog-pr-22648.yml deleted file mode 100644 index eea0388d161..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22648.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - rscadd: "Bounty pads can now be upgraded, to reduce the time until you can pick a new bounty" - - rscadd: "Sunglasses can now be bought from cargo if you have security access." - - balance: "Gripper gloves single-pack is now gorilla gloves singlepack" - - rscdel: "Removed shady jims bounty" - - qol: "Bounty pads can now be screwdrivered/crowbarred with left click like every other machine" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22649.yml b/html/changelogs/AutoChangeLog-pr-22649.yml deleted file mode 100644 index 7b3b2fb7989..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22649.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "vinylspiders" -delete-after: True -changes: - - bugfix: "the IRS have found their missing shuttle and will now be able to spawn properly. the station will have to find a new way to commit tax evasion from here on out" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22650.yml b/html/changelogs/AutoChangeLog-pr-22650.yml deleted file mode 100644 index 57af4956cbe..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22650.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - balance: "Changes some cooldowns and upgrades of spells." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22652.yml b/html/changelogs/AutoChangeLog-pr-22652.yml deleted file mode 100644 index 87d1a18262c..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22652.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - balance: "the bee now can fly over the machines so its easy for him to go to the hydroponics machine" - - bugfix: "player bees now will not be stuck inside the hive if he entered it, they can now leave it" - - bugfix: "fixed a har deleted when the hive is deleted all the bees still have a refence to the hive now its fixed" - - bugfix: "now when a player interacted with the bee hive the bees will now leave the hive to defend the hive (it was glitched)" - - refactor: "the bees now are a basic insect." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22653.yml b/html/changelogs/AutoChangeLog-pr-22653.yml deleted file mode 100644 index 709705981d3..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22653.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Thebleh" -delete-after: True -changes: - - bugfix: "South Bronx Paradise Bars are once again the best weight loss aid on station" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22654.yml b/html/changelogs/AutoChangeLog-pr-22654.yml deleted file mode 100644 index 3e2499a9b9b..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22654.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Dish drive no longer spams the bar/kitchen/etc when its idle with empty messages." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22655.yml b/html/changelogs/AutoChangeLog-pr-22655.yml deleted file mode 100644 index 1bd96a9f5a4..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22655.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "fixed possessed sword spirits summoned during destruction of the sword spawning in the error room. those fellas are in godmode, and y'all don't need an immortal spirit haunting your station, m'kay?" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22656.yml b/html/changelogs/AutoChangeLog-pr-22656.yml deleted file mode 100644 index 28b9a7ceaa0..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22656.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - qol: "Ice cream vats now count as elevated surfaces for preventing germs from getting onto germ-sensitive items (food)." - - qol: "Ice cream vats now dispense cones into your hands first, if possible." - - bugfix: "Germ-sensitive items that fail to be placed in-hand now check for all elevated surfaces, not just tables." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22657.yml b/html/changelogs/AutoChangeLog-pr-22657.yml deleted file mode 100644 index 01322e07a63..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22657.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - qol: "ID cards tooltips now show how to assign a new account." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22658.yml b/html/changelogs/AutoChangeLog-pr-22658.yml deleted file mode 100644 index 176596185d8..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22658.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Removed duplicate and incorrect Yaki Imo recipe" - - qol: "Swapped out the flour in Ælosterrmæsch with two dough slices, to avoid competing reactions while preparing or cooking" - - spellcheck: "Chicken nugget will have a description in the craft menu, and fiesta skewers will have a description in general" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22659.yml b/html/changelogs/AutoChangeLog-pr-22659.yml deleted file mode 100644 index 0853b41c698..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22659.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - image: "Railing ends now exist." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22660.yml b/html/changelogs/AutoChangeLog-pr-22660.yml deleted file mode 100644 index aea3fc5b8cc..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22660.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - rscdel: "removed floating light fixture from the Deltastation security hallway" \ No newline at end of file diff --git a/html/changelogs/archive/2023-07.yml b/html/changelogs/archive/2023-07.yml index eaa9212c634..045c72cfe76 100644 --- a/html/changelogs/archive/2023-07.yml +++ b/html/changelogs/archive/2023-07.yml @@ -1135,3 +1135,58 @@ straight through eachother as if they weren't even there. - spellcheck: Added more variance to item throwing text. - refactor: Mob density has been refactored +2023-07-25: + Hatterhat: + - balance: Base material costs for ammunition have been sharply reduced across the + board, because a single 9mm casing or equivalent costing half a sheet was egregious. + This mainly only applies to the ammo bench; lathe recipes are their own system + and remain untouched. + LT3: + - bugfix: Autotransfer calls votes based on actual round time, not server initialization + time + SkyratBot: + - bugfix: Dish drive no longer spams the bar/kitchen/etc when its idle with empty + messages. + - qol: Ice cream vats now count as elevated surfaces for preventing germs from getting + onto germ-sensitive items (food). + - qol: Ice cream vats now dispense cones into your hands first, if possible. + - bugfix: Germ-sensitive items that fail to be placed in-hand now check for all + elevated surfaces, not just tables. + - image: Railing ends now exist. + - rscdel: removed floating light fixture from the Deltastation security hallway + - qol: ID cards tooltips now show how to assign a new account. + - image: walking on water will now immerse you in it... visually, at least. + - bugfix: fixed possessed sword spirits summoned during destruction of the sword + spawning in the error room. those fellas are in godmode, and y'all don't need + an immortal spirit haunting your station, m'kay? + - qol: The TTS and TTS Blips option is now one choiced preference. + - bugfix: Removed duplicate and incorrect Yaki Imo recipe + - qol: "Swapped out the flour in \xC6losterrm\xE6sch with two dough slices, to avoid\ + \ competing reactions while preparing or cooking" + - spellcheck: Chicken nugget will have a description in the craft menu, and fiesta + skewers will have a description in general + - rscadd: Bounty pads can now be upgraded, to reduce the time until you can pick + a new bounty + - rscadd: Sunglasses can now be bought from cargo if you have security access. + - balance: Gripper gloves single-pack is now gorilla gloves singlepack + - rscdel: Removed shady jims bounty + - qol: Bounty pads can now be screwdrivered/crowbarred with left click like every + other machine + - balance: Changes some cooldowns and upgrades of spells. + - balance: the bee now can fly over the machines so its easy for him to go to the + hydroponics machine + - bugfix: player bees now will not be stuck inside the hive if he entered it, they + can now leave it + - bugfix: fixed a har deleted when the hive is deleted all the bees still have a + refence to the hive now its fixed + - bugfix: now when a player interacted with the bee hive the bees will now leave + the hive to defend the hive (it was glitched) + - refactor: the bees now are a basic insect. + Thebleh: + - bugfix: South Bronx Paradise Bars are once again the best weight loss aid on station + vinylspiders: + - bugfix: the IRS have found their missing shuttle and will now be able to spawn + properly. the station will have to find a new way to commit tax evasion from + here on out + - bugfix: the pda item name will now match alt job titles + - bugfix: fixes a bug that was causing some types of ammo boxes to spawn empty From 34dd1a2a3c292c6bad7a53bd8a62ee8da40ed97c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 04:30:32 +0200 Subject: [PATCH 02/69] [MIRROR] Climbing on crates no longer stun you [MDB IGNORE] (#22665) * Climbing on crates no longer stun you (#77049) ## About The Pull Request Removes the stun from climbing on crates by fixing the climbable Element. This has been a bug for years and I just noticed it now lol. ## Why It's Good For The Game Climbing on crates now work as God intended. ## Changelog :cl: fix: Crates no longer stun you when you climb onto them. /:cl: * Climbing on crates no longer stun you --------- Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> --- code/datums/elements/climbable.dm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/code/datums/elements/climbable.dm b/code/datums/elements/climbable.dm index 17833e4d432..64bb61e89ce 100644 --- a/code/datums/elements/climbable.dm +++ b/code/datums/elements/climbable.dm @@ -2,21 +2,23 @@ element_flags = ELEMENT_BESPOKE | ELEMENT_DETACH_ON_HOST_DESTROY // Detach for turfs argument_hash_start_idx = 2 ///Time it takes to climb onto the object - var/climb_time = (2 SECONDS) + var/climb_time ///Stun duration for when you get onto the object - var/climb_stun = (2 SECONDS) + var/climb_stun ///Assoc list of object being climbed on - climbers. This allows us to check who needs to be shoved off a climbable object when its clicked on. var/list/current_climbers -/datum/element/climbable/Attach(datum/target, climb_time, climb_stun) +/datum/element/climbable/Attach( + datum/target, + climb_time = 2 SECONDS, + climb_stun = 2 SECONDS, +) . = ..() if(!isatom(target) || isarea(target)) return ELEMENT_INCOMPATIBLE - if(climb_time) - src.climb_time = climb_time - if(climb_stun) - src.climb_stun = climb_stun + src.climb_time = climb_time + src.climb_stun = climb_stun RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, PROC_REF(attack_hand)) RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) From 5b6e3ffe76b6a4bab26246686070862f548f00c9 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 04:30:59 +0200 Subject: [PATCH 03/69] Automatic changelog for PR #22665 [ci skip] --- html/changelogs/AutoChangeLog-pr-22665.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22665.yml diff --git a/html/changelogs/AutoChangeLog-pr-22665.yml b/html/changelogs/AutoChangeLog-pr-22665.yml new file mode 100644 index 00000000000..8c7087ff985 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22665.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "Crates no longer stun you when you climb onto them." \ No newline at end of file From 385fc4ad9a3031640aeb50fa5ef6d293118b7a17 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 08:23:27 +0200 Subject: [PATCH 04/69] [MIRROR] [NO-GBP] Space IRS fixes and rebalances [MDB IGNORE] (#22670) * [NO-GBP] Space IRS fixes and rebalances (#77031) ## About The Pull Request Fixes the following things: 1. Fire alarms so pirates don't get stuck in their own ship 2. Fixes turret control starts out as unlocked 3. Adds more clarity to their armor to indicate their lack of space worthiness Also re-balances their vest to be bulky. ## Why It's Good For The Game fixes the issues I saw appeared when I observed them. simple as. the sample size is a mind-boggling 2 (two) so please point out any more issues that you know of. Also changed the suit weight class to bulky to encourage them using it from the start ## Changelog :cl: fix: some fixes to spess IRS pirates. balance: IRS armor is now bulky /:cl: * [NO-GBP] Space IRS fixes and rebalances --------- Co-authored-by: Singul0 <127663818+Singul0@users.noreply.github.com> --- _maps/shuttles/pirate_irs.dmm | 534 +++++++++--------- .../antagonists/pirate/pirate_outfits.dm | 1 - code/modules/clothing/head/helmet.dm | 2 +- code/modules/clothing/suits/armor.dm | 3 +- 4 files changed, 285 insertions(+), 255 deletions(-) diff --git a/_maps/shuttles/pirate_irs.dmm b/_maps/shuttles/pirate_irs.dmm index 444e15e2a4e..23e28743c0d 100644 --- a/_maps/shuttles/pirate_irs.dmm +++ b/_maps/shuttles/pirate_irs.dmm @@ -6,38 +6,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, /turf/open/floor/pod/light, /area/shuttle/pirate) -"af" = ( -/obj/structure/rack, -/obj/item/storage/box/flashbangs, -/obj/structure/window/reinforced/tinted/spawner/directional/south, -/obj/structure/window/reinforced/tinted/spawner/directional/west, -/obj/item/grenade/smokebomb{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/grenade/smokebomb{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/item/grenade/smokebomb{ - pixel_x = 9; - pixel_y = 5 - }, -/obj/item/grenade/smokebomb{ - pixel_x = 9 - }, -/obj/item/grenade/smokebomb{ - pixel_x = 2 - }, -/obj/item/grenade/smokebomb{ - pixel_x = -5 - }, -/obj/item/gun/grenadelauncher{ - pixel_y = 7 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/smooth, -/area/shuttle/pirate) "az" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 @@ -71,27 +39,6 @@ /obj/item/reagent_containers/cup/rag, /turf/open/floor/iron/kitchen, /area/shuttle/pirate) -"bA" = ( -/obj/effect/mob_spawn/ghost_role/human/pirate/irs, -/obj/machinery/light/small/directional/north, -/turf/open/floor/mineral/plastitanium, -/area/shuttle/pirate) -"bO" = ( -/obj/machinery/door/window/brigdoor/right/directional/east{ - req_access = list("syndicate") - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/turretid{ - icon_state = "control_kill"; - lethal = 1; - locked = 0; - pixel_y = -24; - req_access = null - }, -/turf/open/floor/iron/white, -/area/shuttle/pirate) "bT" = ( /obj/structure/sink/kitchen/directional/east, /obj/machinery/button/door/directional/south{ @@ -124,17 +71,6 @@ }, /turf/open/floor/iron, /area/shuttle/pirate) -"cV" = ( -/obj/effect/turf_decal/stripes{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/ammobox/wt550m9{ - pixel_y = 6 - }, -/obj/item/storage/toolbox/ammobox/wt550m9ap, -/turf/open/floor/iron/smooth, -/area/shuttle/pirate) "dl" = ( /obj/structure/sign/calendar/directional/north, /turf/open/floor/glass, @@ -176,18 +112,6 @@ /obj/machinery/power/port_gen/pacman/pre_loaded, /turf/open/floor/pod/dark, /area/shuttle/pirate) -"ej" = ( -/obj/effect/turf_decal/stripes, -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/full, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/obj/effect/mapping_helpers/apc/cut_AI_wire, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, -/turf/open/floor/pod/dark, -/area/shuttle/pirate) "ev" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -206,6 +130,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate) +"fb" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood, +/area/shuttle/pirate) +"fe" = ( +/obj/machinery/computer/apc_control, +/turf/open/floor/iron, +/area/shuttle/pirate) "fm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -256,26 +188,6 @@ "hK" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/pirate) -"hO" = ( -/obj/structure/sign/departments/vault/directional/north, -/obj/effect/turf_decal/trimline/dark_blue/filled/end{ - dir = 8 - }, -/obj/structure/railing{ - dir = 10 - }, -/obj/machinery/shower/directional/south{ - layer = 4 - }, -/obj/effect/turf_decal/box, -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/turf/open/floor/iron/dark, -/area/shuttle/pirate) "hS" = ( /obj/effect/mob_spawn/ghost_role/human/pirate/irs/auditor{ dir = 4 @@ -313,6 +225,24 @@ }, /turf/open/floor/iron/kitchen, /area/shuttle/pirate) +"iG" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/structure/fluff{ + density = 1; + desc = "Ill-gotten gains of the Space IRS"; + icon = 'icons/obj/stack_objects.dmi'; + icon_state = "sheet-gold_3"; + name = "recouped gold" + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/machinery/door/window/brigdoor/right/directional/north{ + req_access = list("syndicate") + }, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) "iZ" = ( /obj/effect/turf_decal/tile/dark/full, /obj/structure/rack, @@ -358,10 +288,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/pod/light, /area/shuttle/pirate) -"kG" = ( -/obj/machinery/computer/apc_control, -/turf/open/floor/iron, -/area/shuttle/pirate) "kK" = ( /obj/structure/rack, /obj/structure/window/reinforced/tinted/spawner/directional/east, @@ -450,24 +376,10 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/shuttle/pirate) -"mG" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/north, -/turf/open/floor/pod/dark, -/area/shuttle/pirate) "mN" = ( /obj/machinery/loot_locator, /turf/open/floor/pod/dark, /area/shuttle/pirate) -"mQ" = ( -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 4 - }, -/obj/machinery/iv_drip, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/shuttle/pirate) "nk" = ( /obj/effect/turf_decal/tile/dark_blue/half{ dir = 8 @@ -515,6 +427,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, /turf/open/floor/pod/light, /area/shuttle/pirate) +"nP" = ( +/obj/effect/turf_decal/tile/dark/full, +/obj/effect/decal/cleanable/blood/splatter, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/pod/light, +/area/shuttle/pirate) "od" = ( /obj/effect/turf_decal/tile/dark_blue/half{ dir = 8 @@ -526,6 +444,30 @@ dir = 8 }, /area/shuttle/pirate) +"oo" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/pirate) +"oH" = ( +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/ammobox/wt550m9{ + pixel_y = 6 + }, +/obj/item/storage/toolbox/ammobox/wt550m9ap, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) "oJ" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp{ @@ -619,6 +561,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/shuttle/pirate) +"rN" = ( +/obj/machinery/computer/records/medical/syndie, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/shuttle/pirate) "sb" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line, /obj/structure/table/glass, @@ -634,6 +583,17 @@ }, /turf/open/floor/wood, /area/shuttle/pirate) +"sg" = ( +/obj/effect/turf_decal/siding/thinplating_new/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) "sr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -694,16 +654,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, /turf/open/floor/pod/dark, /area/shuttle/pirate) -"tC" = ( +"tF" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/light/floor, /turf/open/floor/iron, /area/shuttle/pirate) -"tP" = ( -/obj/structure/table/reinforced, -/obj/machinery/light/small/directional/north, -/turf/open/floor/pod/dark, -/area/shuttle/pirate) "uc" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -785,10 +740,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/smooth, /area/shuttle/pirate) -"vC" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/wood, -/area/shuttle/pirate) "vF" = ( /obj/effect/turf_decal/stripes, /obj/effect/turf_decal/stripes{ @@ -816,17 +767,6 @@ }, /turf/open/floor/pod/dark, /area/shuttle/pirate) -"wm" = ( -/obj/effect/turf_decal/tile/dark_blue/half{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/edge{ - dir = 8 - }, -/area/shuttle/pirate) "ww" = ( /obj/item/documents, /obj/structure/filingcabinet, @@ -838,6 +778,11 @@ }, /turf/open/floor/iron/dark, /area/shuttle/pirate) +"xo" = ( +/obj/effect/mob_spawn/ghost_role/human/pirate/irs, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/pirate) "xv" = ( /obj/machinery/computer/crew{ dir = 4 @@ -855,24 +800,6 @@ /obj/structure/curtain, /turf/open/floor/iron/dark, /area/shuttle/pirate) -"xE" = ( -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/structure/fluff{ - density = 1; - desc = "Ill-gotten gains of the Space IRS"; - icon = 'icons/obj/stack_objects.dmi'; - icon_state = "sheet-gold_3"; - name = "recouped gold" - }, -/obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/obj/machinery/door/window/brigdoor/right/directional/north{ - req_access = list("syndicate") - }, -/turf/open/floor/iron/smooth, -/area/shuttle/pirate) "xQ" = ( /obj/effect/turf_decal/tile/dark/full, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -880,6 +807,11 @@ }, /turf/open/floor/pod/light, /area/shuttle/pirate) +"yg" = ( +/obj/structure/chair/stool/directional/east, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/wood, +/area/shuttle/pirate) "yl" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 @@ -944,6 +876,20 @@ dir = 1 }, /area/shuttle/pirate) +"Aw" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/structure/table/reinforced, +/obj/item/crowbar/red{ + pixel_y = 5 + }, +/obj/item/multitool{ + pixel_x = 3 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/shuttle/pirate) "AB" = ( /obj/effect/turf_decal/trimline/dark_blue/arrow_cw, /turf/open/floor/plating/airless, @@ -990,6 +936,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate) +"BY" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/pirate) "Cf" = ( /obj/machinery/vending/autodrobe{ onstation = 0 @@ -1010,6 +967,14 @@ }, /turf/open/floor/iron/kitchen, /area/shuttle/pirate) +"Cr" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 4 + }, +/obj/machinery/iv_drip, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) "Cx" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line, /obj/structure/table/optable, @@ -1056,13 +1021,38 @@ /obj/structure/curtain, /turf/open/floor/iron/dark, /area/shuttle/pirate) +"Dr" = ( +/obj/structure/sign/departments/vault/directional/north, +/obj/effect/turf_decal/trimline/dark_blue/filled/end{ + dir = 8 + }, +/obj/structure/railing{ + dir = 10 + }, +/obj/machinery/shower/directional/south{ + layer = 4 + }, +/obj/effect/turf_decal/box, +/obj/structure/fluff{ + desc = "What, you think the water just magically soaks into the metallic flooring?"; + icon = 'icons/obj/mining_zones/survival_pod.dmi'; + icon_state = "fan_tiny"; + name = "shower drain" + }, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) "Dy" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron/white, /area/shuttle/pirate) -"DT" = ( -/obj/effect/mob_spawn/ghost_role/human/pirate/irs, -/turf/open/floor/mineral/plastitanium, +"DK" = ( +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/turf/open/floor/iron/smooth, /area/shuttle/pirate) "DV" = ( /obj/effect/turf_decal/trimline/dark_blue/arrow_ccw{ @@ -1077,11 +1067,22 @@ }, /turf/open/floor/pod/dark, /area/shuttle/pirate) +"Eq" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/bot, +/obj/machinery/light/small/directional/north, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) "Et" = ( /obj/machinery/power/shuttle_engine/large, /obj/effect/turf_decal/trimline/dark_blue/arrow_ccw, /turf/open/floor/plating/airless, /area/shuttle/pirate) +"EJ" = ( +/obj/structure/table/reinforced, +/obj/machinery/light/small/directional/north, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) "Fn" = ( /obj/structure/chair/office{ dir = 4 @@ -1104,22 +1105,10 @@ /obj/item/healthanalyzer, /turf/open/floor/iron/dark, /area/shuttle/pirate) -"FT" = ( -/obj/effect/turf_decal/tile/dark/full, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/pod/light, -/area/shuttle/pirate) "FU" = ( /obj/machinery/power/shuttle_engine/propulsion/burst, /turf/open/floor/plating/airless, /area/shuttle/pirate) -"FY" = ( -/obj/machinery/computer/records/medical/syndie, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/shuttle/pirate) "Gt" = ( /obj/structure/table, /obj/effect/turf_decal/siding/dark_green{ @@ -1145,17 +1134,6 @@ /obj/item/gun/ballistic/revolver/mateba, /turf/open/floor/iron/smooth, /area/shuttle/pirate) -"Hf" = ( -/obj/effect/turf_decal/tile/dark_blue/half{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/edge{ - dir = 8 - }, -/area/shuttle/pirate) "Hg" = ( /obj/effect/turf_decal/siding/dark/end{ dir = 4 @@ -1205,6 +1183,11 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/pirate) +"Ic" = ( +/obj/effect/mob_spawn/ghost_role/human/pirate/irs, +/obj/machinery/light/small/directional/north, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/pirate) "If" = ( /obj/effect/turf_decal/tile/dark_blue/half{ dir = 4 @@ -1241,6 +1224,17 @@ }, /turf/open/floor/iron/dark, /area/shuttle/pirate) +"IS" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/shuttle/pirate) "IU" = ( /obj/structure/table/wood/poker, /obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6/directional/north, @@ -1283,19 +1277,6 @@ dir = 1 }, /area/shuttle/pirate) -"Jv" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, -/obj/structure/table/reinforced, -/obj/item/crowbar/red{ - pixel_y = 5 - }, -/obj/item/multitool{ - pixel_x = 3 - }, -/turf/open/floor/iron, -/area/shuttle/pirate) "Jx" = ( /obj/machinery/porta_turret/syndicate/irs{ dir = 8 @@ -1356,6 +1337,66 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron, /area/shuttle/pirate) +"KJ" = ( +/obj/structure/rack, +/obj/item/storage/box/flashbangs, +/obj/structure/window/reinforced/tinted/spawner/directional/south, +/obj/structure/window/reinforced/tinted/spawner/directional/west, +/obj/item/grenade/smokebomb{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/grenade/smokebomb{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/grenade/smokebomb{ + pixel_x = 9; + pixel_y = 5 + }, +/obj/item/grenade/smokebomb{ + pixel_x = 9 + }, +/obj/item/grenade/smokebomb{ + pixel_x = 2 + }, +/obj/item/grenade/smokebomb{ + pixel_x = -5 + }, +/obj/item/gun/grenadelauncher{ + pixel_y = 7 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/smooth, +/area/shuttle/pirate) +"KO" = ( +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) +"KZ" = ( +/obj/machinery/door/window/brigdoor/right/directional/east{ + req_access = list("syndicate") + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/turretid{ + icon_state = "control_kill"; + lethal = 1; + pixel_y = -24; + req_access = list("syndicate") + }, +/turf/open/floor/iron/white, +/area/shuttle/pirate) "Lf" = ( /turf/open/floor/pod/dark, /area/shuttle/pirate) @@ -1374,6 +1415,17 @@ /obj/effect/turf_decal/trimline/dark_blue/arrow_cw, /turf/open/floor/plating/airless, /area/shuttle/pirate) +"LR" = ( +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/shuttle/pirate) "LV" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -1488,10 +1540,6 @@ /obj/effect/turf_decal/siding/dark_green, /turf/open/floor/wood, /area/shuttle/pirate) -"Of" = ( -/obj/structure/chair/stool/directional/east, -/turf/open/floor/wood, -/area/shuttle/pirate) "Og" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -1625,15 +1673,6 @@ }, /turf/open/floor/iron/white, /area/shuttle/pirate) -"RB" = ( -/obj/effect/turf_decal/stripes{ - dir = 8 - }, -/obj/effect/turf_decal/stripes{ - dir = 4 - }, -/turf/open/floor/iron/smooth, -/area/shuttle/pirate) "RC" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, @@ -1656,20 +1695,6 @@ dir = 8 }, /area/shuttle/pirate) -"Se" = ( -/obj/machinery/photocopier/gratis, -/turf/open/floor/iron/white, -/area/shuttle/pirate) -"Ss" = ( -/obj/effect/turf_decal/siding/thinplating_new/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/pod/dark, -/area/shuttle/pirate) "SA" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 10 @@ -1701,6 +1726,16 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/pod/dark, /area/shuttle/pirate) +"SM" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/shuttle/pirate) +"SQ" = ( +/obj/machinery/photocopier/gratis, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/white, +/area/shuttle/pirate) "Tg" = ( /obj/effect/turf_decal/stripes{ dir = 5 @@ -1902,11 +1937,6 @@ dir = 4 }, /area/shuttle/pirate) -"Zb" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/shuttle/pirate) "ZE" = ( /obj/item/reagent_containers/cup/glass/bottle/ritual_wine{ pixel_y = 14; @@ -2008,7 +2038,7 @@ hf hK hK mv -ej +KO Yf hK hK @@ -2049,7 +2079,7 @@ hK hK ZE hS -Se +SQ hK Ni lE @@ -2099,7 +2129,7 @@ hK oJ Rv NW -bO +KZ hK Cf lE @@ -2126,11 +2156,11 @@ kO kO IZ hK -Of +yg fm RF se -vC +fb hK Ae BG @@ -2143,7 +2173,7 @@ Og WR hK hK -FY +rN KA hK IZ @@ -2157,7 +2187,7 @@ Tu rf QQ hK -mG +Eq HO gd gd @@ -2169,7 +2199,7 @@ WR Rh Qv sE -Zb +SM hK Ka IZ @@ -2195,7 +2225,7 @@ Rh RC LB zh -hK +gd WA Xr hK @@ -2207,7 +2237,7 @@ vo WA hK gd -Ss +sg BG lf ig @@ -2223,13 +2253,13 @@ zy Jn nk RX -wm +IS nk od -Hf +BY nk YE -fO +oo fO Jq tv @@ -2247,7 +2277,7 @@ mA pO YJ sH -sH +LR sH sH Vf @@ -2270,7 +2300,7 @@ Rh gl nA nE -hK +gd hK hK Uk @@ -2292,16 +2322,16 @@ WR (15,1,1) = {" WR Rh -Jv +Aw uc -tC +tF hK ba -af +KJ BG GN hK -DT +xo bo Qi ie @@ -2318,21 +2348,21 @@ WR WR hK hK -kG +fe KI hK -RB +DK My BG -xE +iG hK -bA +Ic bo Qi yl Cx hK -tP +EJ sr gd gd @@ -2396,12 +2426,12 @@ WR WR WR hK -cV +oH OC Mu OC hK -hO +Dr BG XX wM @@ -2452,12 +2482,12 @@ hK hK hK xy -mQ +Cr CM az yP hK -FT +nP Mv nq Yu diff --git a/code/modules/antagonists/pirate/pirate_outfits.dm b/code/modules/antagonists/pirate/pirate_outfits.dm index ceefbc73509..d2f648bb1fd 100644 --- a/code/modules/antagonists/pirate/pirate_outfits.dm +++ b/code/modules/antagonists/pirate/pirate_outfits.dm @@ -113,7 +113,6 @@ gloves = null head = /obj/item/clothing/head/costume/irs shoes = /obj/item/clothing/shoes/laceup - ears = /obj/item/radio/headset/syndicate ears = /obj/item/radio/headset/syndicate/alt /datum/outfit/pirate/irs/auditor diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 41314158586..7c0b53fc7a6 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -122,7 +122,7 @@ /obj/item/clothing/head/helmet/marine/pmc icon_state = "marine" - desc = "A tactical black helmet, designed to protect one's head and not much else." + desc = "A tactical black helmet, designed to protect one's head from various injuries sustained in operations. Its stellar survivability making up is for it's lack of space worthiness" min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT clothing_flags = null diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 04366123ddc..af0f22904d4 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -93,10 +93,11 @@ body_parts_covered = CHEST|GROIN /obj/item/clothing/suit/armor/vest/marine/pmc - desc = "A set of the finest mass produced, stamped plasteel armor plates, for an all-around door-kicking and ass-smashing." + desc = "A set of the finest mass produced, stamped plasteel armor plates, for an all-around door-kicking and ass-smashing. Its stellar survivability making up is for it's lack of space worthiness" min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT clothing_flags = THICKMATERIAL + w_class = WEIGHT_CLASS_BULKY armor_type = /datum/armor/pmc /obj/item/clothing/suit/armor/vest/old From 011a78cd11cdbf71ba55b338160bbf66ce672eb8 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 08:23:53 +0200 Subject: [PATCH 05/69] Automatic changelog for PR #22670 [ci skip] --- html/changelogs/AutoChangeLog-pr-22670.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22670.yml diff --git a/html/changelogs/AutoChangeLog-pr-22670.yml b/html/changelogs/AutoChangeLog-pr-22670.yml new file mode 100644 index 00000000000..f5392c0a633 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22670.yml @@ -0,0 +1,5 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "some fixes to spess IRS pirates." + - balance: "IRS armor is now bulky" \ No newline at end of file From 9d13eac9a0358b3ac37dc5bb29ea3137cde31e2c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 08:24:51 +0200 Subject: [PATCH 06/69] [MIRROR] Assorted changes to mafia map closet contents [MDB IGNORE] (#22669) * Assorted changes to mafia map closet contents (#77008) ## About The Pull Request This changes the contents of some lockers on various mafia maps. **Lavaland Excursion:** The spare mining uniforms in each locker have been replaced with a pickaxe and shovel. **Snowdin:** The rooms containing closets now have alternate (mining) winter coats instead of the standard ones you already spawn with. **Mothership Zeta:** All closets now contain a gizmo. Wow! **Syndicate Megastation:** The closets now contain one random piece of syndie clothing, instead of another tacticool turtleneck. ## Why It's Good For The Game Some of the gear in the closets kind of became redundant when the map outfits were added and I just forgot to remove them. Gives some more stuff for people to fidget with during mafia downtime. For the maps not touched, they either already had closet contents or were intentionally left empty. I'm all but certain the items provided in the closets have no way of endangering the controlled environment of a mafia game, so that shouldn't be an issue. ## Changelog :cl: Rhials qol: Modifies the contents of some Mafia lockers. Go check 'em out! /:cl: * Assorted changes to mafia map closet contents --------- Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com> --- _maps/map_files/Mafia/mafia_ayylmao.dmm | 2 + _maps/map_files/Mafia/mafia_lavaland.dmm | 95 ++++++------------------ _maps/map_files/Mafia/mafia_snow.dmm | 4 +- _maps/map_files/Mafia/mafia_syndie.dmm | 54 ++++++-------- 4 files changed, 45 insertions(+), 110 deletions(-) diff --git a/_maps/map_files/Mafia/mafia_ayylmao.dmm b/_maps/map_files/Mafia/mafia_ayylmao.dmm index d4c42cec0f7..0f0a9c0e433 100644 --- a/_maps/map_files/Mafia/mafia_ayylmao.dmm +++ b/_maps/map_files/Mafia/mafia_ayylmao.dmm @@ -28,6 +28,7 @@ /area/centcom/mafia) "l" = ( /obj/structure/closet/abductor, +/obj/item/abductor/gizmo, /turf/open/floor/plating/abductor, /area/centcom/mafia) "m" = ( @@ -42,6 +43,7 @@ /area/centcom/mafia) "o" = ( /obj/structure/closet/abductor, +/obj/item/abductor/gizmo, /turf/open/floor/plating/abductor2, /area/centcom/mafia) "p" = ( diff --git a/_maps/map_files/Mafia/mafia_lavaland.dmm b/_maps/map_files/Mafia/mafia_lavaland.dmm index 41e2a152438..a3729fe8a6e 100644 --- a/_maps/map_files/Mafia/mafia_lavaland.dmm +++ b/_maps/map_files/Mafia/mafia_lavaland.dmm @@ -50,12 +50,9 @@ /turf/open/floor/plating, /area/centcom/mafia) "al" = ( -/obj/structure/closet{ - desc = "It's a storage unit. For mining stuff. Y'know."; - icon_state = "mining"; - name = "miner equipment locker" - }, -/obj/item/clothing/under/rank/cargo/miner/lavaland, +/obj/item/shovel, +/obj/item/pickaxe, +/obj/structure/closet/secure_closet/miner/unlocked, /turf/open/floor/fakebasalt, /area/centcom/mafia) "am" = ( @@ -74,12 +71,9 @@ /obj/effect/turf_decal/trimline/brown/filled/end{ dir = 4 }, -/obj/structure/closet{ - desc = "It's a storage unit. For mining stuff. Y'know."; - icon_state = "mining"; - name = "miner equipment locker" - }, -/obj/item/clothing/under/rank/cargo/miner/lavaland, +/obj/item/shovel, +/obj/item/pickaxe, +/obj/structure/closet/secure_closet/miner/unlocked, /turf/open/floor/iron, /area/centcom/mafia) "ap" = ( @@ -98,12 +92,9 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 9 }, -/obj/structure/closet{ - desc = "It's a storage unit. For mining stuff. Y'know."; - icon_state = "mining"; - name = "miner equipment locker" - }, -/obj/item/clothing/under/rank/cargo/miner/lavaland, +/obj/item/shovel, +/obj/item/pickaxe, +/obj/structure/closet/secure_closet/miner/unlocked, /turf/open/floor/iron, /area/centcom/mafia) "as" = ( @@ -112,20 +103,6 @@ }, /turf/open/floor/iron, /area/centcom/mafia) -"at" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/centcom/mafia) -"au" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron/dark, -/area/centcom/mafia) "av" = ( /obj/mafia_game_board, /obj/effect/mapping_helpers/burnt_floor, @@ -155,12 +132,9 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 5 }, -/obj/structure/closet{ - desc = "It's a storage unit. For mining stuff. Y'know."; - icon_state = "mining"; - name = "miner equipment locker" - }, -/obj/item/clothing/under/rank/cargo/miner/lavaland, +/obj/item/shovel, +/obj/item/pickaxe, +/obj/structure/closet/secure_closet/miner/unlocked, /turf/open/floor/iron, /area/centcom/mafia) "aA" = ( @@ -220,24 +194,18 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 10 }, -/obj/structure/closet{ - desc = "It's a storage unit. For mining stuff. Y'know."; - icon_state = "mining"; - name = "miner equipment locker" - }, -/obj/item/clothing/under/rank/cargo/miner/lavaland, +/obj/item/shovel, +/obj/item/pickaxe, +/obj/structure/closet/secure_closet/miner/unlocked, /turf/open/floor/iron, /area/centcom/mafia) "aI" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 6 }, -/obj/structure/closet{ - desc = "It's a storage unit. For mining stuff. Y'know."; - icon_state = "mining"; - name = "miner equipment locker" - }, -/obj/item/clothing/under/rank/cargo/miner/lavaland, +/obj/item/shovel, +/obj/item/pickaxe, +/obj/structure/closet/secure_closet/miner/unlocked, /turf/open/floor/iron, /area/centcom/mafia) "aJ" = ( @@ -254,12 +222,9 @@ /obj/effect/turf_decal/trimline/brown/filled/end{ dir = 8 }, -/obj/structure/closet{ - desc = "It's a storage unit. For mining stuff. Y'know."; - icon_state = "mining"; - name = "miner equipment locker" - }, -/obj/item/clothing/under/rank/cargo/miner/lavaland, +/obj/item/shovel, +/obj/item/pickaxe, +/obj/structure/closet/secure_closet/miner/unlocked, /turf/open/floor/iron, /area/centcom/mafia) "aL" = ( @@ -334,24 +299,6 @@ }, /turf/open/floor/iron, /area/centcom/mafia) -"aW" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/centcom/mafia) -"aX" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/centcom/mafia) "aY" = ( /turf/closed/indestructible/reinforced, /area/centcom/mafia) diff --git a/_maps/map_files/Mafia/mafia_snow.dmm b/_maps/map_files/Mafia/mafia_snow.dmm index ad20d97371c..0a4001a6b0f 100644 --- a/_maps/map_files/Mafia/mafia_snow.dmm +++ b/_maps/map_files/Mafia/mafia_snow.dmm @@ -144,15 +144,13 @@ /area/centcom/mafia) "D" = ( /obj/structure/closet/crate/science, -/obj/item/clothing/suit/hooded/wintercoat, -/obj/item/clothing/shoes/winterboots, +/obj/item/clothing/suit/hooded/wintercoat/miner, /turf/open/floor/holofloor/snow, /area/centcom/mafia) "E" = ( /obj/structure/lattice/catwalk, /obj/structure/closet/crate/critter, /obj/item/clothing/suit/hooded/wintercoat/miner, -/obj/item/clothing/shoes/winterboots, /turf/open/lava/plasma/mafia, /area/centcom/mafia) "F" = ( diff --git a/_maps/map_files/Mafia/mafia_syndie.dmm b/_maps/map_files/Mafia/mafia_syndie.dmm index fee565ed19a..e8e49e65c10 100644 --- a/_maps/map_files/Mafia/mafia_syndie.dmm +++ b/_maps/map_files/Mafia/mafia_syndie.dmm @@ -7,8 +7,7 @@ desc = "A storage closet for syndicate conflict resolution operatives."; name = "red closet" }, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/under/syndicate/tacticool/skirt, +/obj/effect/spawner/random/clothing/syndie, /turf/open/floor/mineral/plastitanium, /area/centcom/mafia) "c" = ( @@ -46,16 +45,6 @@ /obj/mafia_game_board, /turf/open/floor/plating, /area/centcom/mafia) -"m" = ( -/obj/structure/closet/syndicate{ - desc = "A storage closet for syndicate conflict resolution operatives."; - name = "red closet" - }, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/under/syndicate/tacticool/skirt, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/mafia) "n" = ( /obj/effect/landmark/mafia, /turf/open/floor/mineral/plastitanium, @@ -84,12 +73,6 @@ "r" = ( /turf/open/floor/mineral/plastitanium, /area/centcom/mafia) -"s" = ( -/turf/open/floor/mineral/plastitanium/red, -/area/centcom/mafia) -"t" = ( -/turf/open/floor/circuit/red, -/area/centcom/mafia) "u" = ( /obj/effect/baseturf_helper/asteroid, /obj/effect/landmark/mafia/town_center, @@ -155,13 +138,12 @@ /turf/open/floor/mineral/plastitanium, /area/centcom/mafia) "G" = ( -/obj/item/clothing/under/syndicate/tacticool, /obj/structure/closet/syndicate{ desc = "A storage closet for syndicate conflict resolution operatives."; name = "red closet" }, -/obj/item/clothing/under/syndicate/tacticool/skirt, /obj/effect/turf_decal/tile/red/fourcorners, +/obj/effect/spawner/random/clothing/syndie, /turf/open/floor/iron/dark, /area/centcom/mafia) "H" = ( @@ -169,6 +151,12 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/dark, /area/centcom/mafia) +"Q" = ( +/turf/open/floor/circuit/red, +/area/centcom/mafia) +"S" = ( +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/mafia) (1,1,1) = {" a @@ -309,7 +297,7 @@ b r w o -m +G w j w @@ -327,7 +315,7 @@ c c d w -m +G o p n @@ -413,7 +401,7 @@ p p w p -m +G w d c @@ -431,9 +419,9 @@ r r y p -s -t -s +S +Q +S p q o @@ -456,9 +444,9 @@ p w p p -t +Q u -t +Q p p w @@ -481,9 +469,9 @@ o o z p -s -t -s +S +Q +S p E r @@ -501,7 +489,7 @@ w c d w -m +G p w p @@ -605,7 +593,7 @@ w w j w -m +G o w r From c70043425fc311176bdb2f0b6efe6222318e5828 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 08:25:05 +0200 Subject: [PATCH 07/69] [MIRROR] Metastation Medbay Lighting Tweaks [MDB IGNORE] (#22668) * Metastation Medbay Lighting Tweaks (#77012) ## About The Pull Request Adjusts some of the lights in metastation medbay to improve overall theming of specific rooms. Rooms changed: - Morgue - Medbay Hallway - Cold Storage - Chem Storage - Break Room - Clinic - Primary Surgical Theatre - Psychiatrists Office This makes use of a new preset, Dim Cold Lights, and also implements a Dim Warm Light counterpart. ## Why It's Good For The Game More presets for mappers to use for lights, and subtle changes to the lights in medbay to make each light feel more impactful, darkening the rooms more when lights break and improving the overall theme of specific rooms via the use of color temperature and intensity. ## Changelog :cl:Senefi add: Some Metastation Medbay lights have been moved and adjusted. /:cl: * Metastation Medbay Lighting Tweaks --------- Co-authored-by: Senefi <20830349+Peliex@users.noreply.github.com> --- _maps/map_files/MetaStation/MetaStation.dmm | 14801 ++++++++-------- code/_globalvars/lighting.dm | 10 + .../power/lighting/light_mapping_helpers.dm | 14 + 3 files changed, 7425 insertions(+), 7400 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index baad6a12b1c..77f9c1e799e 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -6,12 +6,6 @@ /obj/effect/landmark/carpspawn, /turf/open/space, /area/space) -"aad" = ( -/obj/machinery/vending/clothing, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/dark, -/area/station/commons/locker) "aaf" = ( /obj/structure/lattice, /turf/open/space, @@ -53,6 +47,16 @@ "aav" = ( /turf/open/space, /area/space) +"aaz" = ( +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) "aaD" = ( /obj/effect/spawner/random/entertainment/arcade, /obj/effect/decal/cleanable/dirt, @@ -106,18 +110,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) -"aco" = ( -/obj/structure/table, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/mask/surgical, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -10; - pixel_y = -1 - }, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) "acr" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -141,17 +133,22 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/station/service/library) -"ado" = ( -/obj/machinery/button/flasher{ - id = "IsolationFlash"; - pixel_x = -23; - pixel_y = 8 - }, +"acU" = ( +/obj/effect/turf_decal/stripes/line, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/requests_console/directional/south{ + department = "Engineering"; + name = "Engineering Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/engineering/main) "adp" = ( /turf/closed/wall, /area/station/hallway/primary/starboard) @@ -187,6 +184,9 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"aec" = ( +/turf/closed/wall, +/area/station/medical/chem_storage) "aef" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -361,6 +361,15 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"ahe" = ( +/obj/machinery/airalarm/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) "ahg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/machinery/duct, @@ -460,6 +469,14 @@ /obj/structure/window/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"aix" = ( +/obj/machinery/suit_storage_unit/cmo, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) "aja" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -513,6 +530,24 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) +"akT" = ( +/obj/structure/table, +/obj/item/storage/box/bodybags{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/pen, +/obj/item/storage/box/prisoner, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Prison Hallway Port"; + network = list("ss13","prison") + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "akZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 @@ -526,19 +561,6 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) -"alp" = ( -/obj/machinery/disposal/bin, -/obj/machinery/camera/directional/east{ - c_tag = "Garden" - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "alE" = ( /turf/open/floor/iron, /area/station/security/courtroom) @@ -631,14 +653,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"amF" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/meter, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "amV" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -665,12 +679,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/ai_monitored/security/armory) -"anA" = ( -/obj/effect/landmark/secequipment, -/obj/effect/turf_decal/bot, -/obj/machinery/light/directional/north, +"anv" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/east, +/obj/machinery/skill_station, +/turf/open/floor/wood, +/area/station/service/library) +"anE" = ( +/obj/machinery/vending/clothing, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, -/area/station/security/office) +/area/station/commons/locker) "anL" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -700,6 +719,21 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"anW" = ( +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/station/construction/storage_wing) +"aoj" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "aok" = ( /turf/open/floor/iron, /area/station/cargo/storage) @@ -707,6 +741,11 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"aoL" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) "apg" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, @@ -753,6 +792,17 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"apO" = ( +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/machinery/light/cold/dim/directional/south, +/turf/open/floor/iron/kitchen_coldroom, +/area/station/medical/coldroom) "apS" = ( /obj/structure/sink/directional/east, /obj/effect/turf_decal/stripes/line{ @@ -784,6 +834,14 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) +"aqa" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/commons/locker) "aqh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -877,6 +935,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) +"asi" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/lights/mixed, +/obj/item/stack/sheet/iron{ + amount = 30 + }, +/obj/item/radio{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/stack/cable_coil, +/obj/structure/sign/poster/random/directional/east, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "asm" = ( /obj/effect/turf_decal/siding/white, /obj/effect/turf_decal/trimline/brown/warning, @@ -886,13 +958,6 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron, /area/station/medical/medbay/lobby) -"ass" = ( -/obj/structure/table, -/obj/machinery/microwave, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron, -/area/station/science/research) "asz" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty, @@ -948,6 +1013,10 @@ }, /turf/open/floor/iron, /area/station/security/office) +"auc" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "auh" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -971,19 +1040,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"auu" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/computer/security, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/machinery/requests_console/directional/north{ - department = "Security"; - name = "Security Requests Console" - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/customs) "auw" = ( /obj/machinery/door/airlock{ id_tag = "Cabin7"; @@ -1010,6 +1066,12 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"auO" = ( +/obj/machinery/light_switch/directional/east, +/obj/structure/cable, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/cargo/storage) "ava" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/item/storage/box/lights/mixed, @@ -1023,6 +1085,14 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/command/gateway) +"ave" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "avq" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -1039,6 +1109,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"avx" = ( +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/science/xenobiology) "avA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, @@ -1067,14 +1148,6 @@ /obj/item/pillow/random, /turf/open/floor/carpet, /area/station/commons/dorms) -"awu" = ( -/obj/machinery/power/smes{ - charge = 5e+006 - }, -/obj/structure/cable, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/engineering/gravity_generator) "awy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1082,16 +1155,6 @@ /obj/structure/sign/warning/test_chamber/directional/south, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) -"awK" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/entry) "awO" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -1159,18 +1222,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison) -"axR" = ( -/obj/machinery/light_switch/directional/east, -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/machinery/fax{ - fax_name = "Psychology Office"; - name = "Psychology Office Fax Machine" - }, -/turf/open/floor/wood/parquet, -/area/station/medical/psychology) "axW" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -1236,6 +1287,44 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"azF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) +"azZ" = ( +/obj/structure/closet/crate, +/obj/item/reagent_containers/cup/bowl, +/obj/effect/spawner/random/contraband/prison, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/kitchen/fork/plastic, +/obj/item/kitchen/fork/plastic, +/obj/item/kitchen/fork/plastic, +/obj/item/storage/box/drinkingglasses, +/obj/item/kitchen/spoon/plastic, +/obj/item/kitchen/spoon/plastic, +/obj/item/kitchen/spoon/plastic, +/obj/item/knife/plastic, +/obj/item/knife/plastic, +/obj/item/knife/plastic, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/box/drinkingglasses, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "aAg" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral, @@ -1279,6 +1368,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/command/gateway) +"aAS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/light/small/directional/north, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "aAT" = ( /obj/machinery/firealarm/directional/east, /obj/machinery/camera/directional/east{ @@ -1289,17 +1387,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"aBu" = ( -/obj/structure/table/wood, -/obj/item/staff/broom, -/obj/item/wrench, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/obj/structure/sign/poster/random/directional/north, -/turf/open/floor/wood/large, -/area/station/service/theater) "aBw" = ( /obj/structure/cable, /obj/effect/landmark/event_spawn, @@ -1390,6 +1477,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"aCM" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/duct, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "aCQ" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -1411,16 +1504,6 @@ "aDb" = ( /turf/closed/wall, /area/station/construction/mining/aux_base) -"aDd" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/research{ - name = "Chemical Storage" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/pharmacy, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/turf/open/floor/iron/textured, -/area/station/medical/chem_storage) "aDl" = ( /obj/effect/spawner/random/maintenance, /obj/structure/cable, @@ -1472,15 +1555,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"aEe" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 8 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/station/engineering/atmos/storage/gas) "aEj" = ( /obj/structure/table, /obj/item/poster/random_official{ @@ -1504,6 +1578,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"aEA" = ( +/obj/structure/table/wood, +/obj/item/staff/broom, +/obj/item/wrench, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/wood/large, +/area/station/service/theater) "aEH" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -1538,20 +1623,6 @@ /obj/effect/spawner/random/bureaucracy/paper, /turf/open/floor/wood, /area/station/commons/dorms) -"aFw" = ( -/obj/machinery/camera/autoname{ - dir = 5 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/landmark/start/depsec/engineering, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/station/security/checkpoint/engineering) "aFW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/mirror/directional/west, @@ -1636,6 +1707,16 @@ }, /turf/open/floor/iron/dark/airless, /area/station/science/ordnance/freezerchamber) +"aHr" = ( +/obj/machinery/light_switch/directional/west, +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Detective's Office"; + name = "Detective's Fax Machine" + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) "aHt" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -1673,6 +1754,14 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron, /area/station/science/research) +"aHN" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/bot, +/obj/effect/landmark/event_spawn, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) "aHR" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, @@ -1910,11 +1999,26 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) +"aLx" = ( +/obj/structure/mop_bucket, +/obj/item/mop, +/obj/machinery/light/small/dim/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "aLA" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central) +"aLF" = ( +/obj/machinery/disposal/bin, +/obj/machinery/firealarm/directional/south, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/iron/white, +/area/station/science/lobby) "aMb" = ( /obj/structure/table, /obj/item/cultivator, @@ -1985,6 +2089,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"aNu" = ( +/obj/structure/bed, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/mask/muzzle, +/turf/open/floor/iron/dark, +/area/station/security/holding_cell) "aNB" = ( /obj/machinery/camera/directional/east{ c_tag = "Atmospherics Tank - Mix" @@ -2036,11 +2147,6 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/cargo/sorting) -"aOi" = ( -/obj/machinery/recharge_station, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/science/robotics/mechbay) "aOo" = ( /obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -2059,6 +2165,13 @@ /obj/effect/turf_decal/trimline/brown/warning, /turf/open/floor/iron/white, /area/station/science/lobby) +"aOC" = ( +/obj/effect/turf_decal/trimline/red/filled/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/security/brig) "aOH" = ( /obj/structure/table, /obj/item/clothing/mask/gas/sechailer{ @@ -2136,16 +2249,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"aQl" = ( -/obj/item/storage/bag/plants/portaseeder, -/obj/structure/table, -/obj/item/plant_analyzer, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "aQE" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2235,32 +2338,36 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/cryo) +"aSk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "aSm" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"aSs" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/yellow{ +"aSQ" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"aSx" = ( -/obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/structure/table, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/security/office) +/area/station/security/checkpoint/customs) "aST" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -2294,13 +2401,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"aTr" = ( -/obj/structure/chair/comfy{ - dir = 4 - }, -/obj/machinery/light/small/red/directional/west, -/turf/open/floor/plating/airless, -/area/space/nearstation) "aTD" = ( /obj/machinery/vending/coffee, /obj/item/radio/intercom/directional/south, @@ -2315,10 +2415,6 @@ "aTV" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai) -"aTY" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "aUj" = ( /obj/structure/closet/crate/preopen, /obj/item/stack/package_wrap, @@ -2363,15 +2459,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"aUw" = ( -/obj/machinery/portable_atmospherics/scrubber, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/engineering/atmos) "aUx" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai_upload_foyer) @@ -2407,17 +2494,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) -"aVj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics) "aVl" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -2440,6 +2516,14 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"aVv" = ( +/obj/machinery/suit_storage_unit/atmos, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/engineering/atmos) "aVX" = ( /obj/machinery/door/airlock/hatch{ name = "Telecomms Server Room" @@ -2522,13 +2606,6 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) -"aWU" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "aXa" = ( /turf/closed/wall, /area/station/security/prison/mess) @@ -2597,6 +2674,31 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) +"aYl" = ( +/obj/structure/table, +/obj/item/assembly/igniter{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/assembly/igniter{ + pixel_x = 5; + pixel_y = -4 + }, +/obj/item/assembly/igniter{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/assembly/igniter{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Xenobiology Lab - Test Chamber"; + network = list("ss13","rd","xeno") + }, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/engine, +/area/station/science/xenobiology) "aYw" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three"; @@ -2638,6 +2740,10 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/station/solars/port/fore) +"aYP" = ( +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "aYT" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -2712,14 +2818,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -"aZE" = ( -/obj/structure/filingcabinet, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 8 +"aZA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/button/door/directional/south{ + id = "PermaLockdown"; + name = "Panic Button"; + req_access = list("brig") }, -/obj/machinery/light/small/directional/north, /turf/open/floor/iron, -/area/station/security/checkpoint/supply) +/area/station/security/execution/transfer) "aZL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2736,6 +2845,27 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central) +"bar" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 10 + }, +/obj/item/flashlight/lamp{ + on = 0; + pixel_x = -7; + pixel_y = 18 + }, +/obj/item/kitchen/rollingpin{ + pixel_x = -4 + }, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"bas" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/chapel, +/area/station/service/chapel) "bau" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -2777,13 +2907,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"baR" = ( -/obj/effect/turf_decal/trimline/red/filled/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/security/brig) "baW" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -2824,15 +2947,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"bbz" = ( -/obj/item/radio/intercom/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/atmos/storage/gas) "bbT" = ( /obj/structure/closet/crate, /obj/item/stack/cable_coil, @@ -2863,6 +2977,26 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"bcw" = ( +/obj/structure/cable, +/obj/structure/sign/poster/official/random/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"bcx" = ( +/obj/structure/table, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/south, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) "bcT" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; @@ -3001,14 +3135,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"bfx" = ( -/obj/machinery/flasher/portable, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/station/security/lockers) "bfM" = ( /obj/machinery/door/airlock/public/glass{ name = "Art Storage" @@ -3193,6 +3319,22 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"bjl" = ( +/obj/machinery/rnd/production/techfab/department/service, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 6 + }, +/obj/effect/turf_decal/box, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "bjs" = ( /obj/structure/closet{ anchored = 1; @@ -3214,6 +3356,13 @@ }, /turf/closed/wall, /area/station/security/courtroom) +"bjF" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "bjH" = ( /obj/machinery/modular_computer/preset/cargochat/engineering, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -3248,15 +3397,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/warden) -"bkq" = ( -/obj/machinery/newscaster/directional/north, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/toolbox/mechanical, -/obj/machinery/camera/directional/north, -/obj/structure/cable, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "bkF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3271,16 +3411,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/engine, /area/station/science/explab) -"bkN" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/service/bar) "bkO" = ( /obj/machinery/iv_drip, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -3296,6 +3426,11 @@ }, /turf/open/floor/plating, /area/station/medical/treatment_center) +"bkZ" = ( +/obj/structure/filingcabinet, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) "bla" = ( /obj/effect/spawner/random/vending/snackvend, /turf/open/floor/wood, @@ -3348,14 +3483,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) -"bmP" = ( -/obj/structure/chair/sofa/corp/right, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/station/medical/break_room) "bmV" = ( /obj/machinery/door/airlock/command{ name = "Emergency Escape" @@ -3371,15 +3498,16 @@ /obj/effect/mapping_helpers/airlock/access/any/command/captain, /turf/open/floor/plating, /area/station/maintenance/central) -"bnk" = ( -/obj/effect/turf_decal/siding/wood{ +"bnl" = ( +/obj/structure/sign/departments/chemistry/pharmacy/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/structure/sign/poster/random/directional/east, -/obj/structure/table/wood, -/obj/item/food/pie/cream, -/turf/open/floor/wood/large, -/area/station/service/theater) +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) "bno" = ( /obj/structure/transit_tube/diagonal, /turf/open/space, @@ -3504,14 +3632,6 @@ /obj/machinery/smartfridge/drinks, /turf/open/floor/iron, /area/station/service/bar) -"bnN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/security/prison) "bnO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, @@ -3570,6 +3690,18 @@ /obj/machinery/rnd/production/circuit_imprinter/department/science, /turf/open/floor/iron/dark, /area/station/science/lab) +"bpB" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/structure/table, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/security/office) "bpG" = ( /obj/machinery/firealarm/directional/east, /obj/item/kirbyplants/organic/plant10, @@ -3586,6 +3718,14 @@ /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/wood, /area/station/service/theater) +"bqg" = ( +/obj/structure/cable, +/obj/structure/sign/poster/official/random/directional/east, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) "bqk" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -3594,6 +3734,11 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) +"bqC" = ( +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/pipe, +/turf/open/floor/wood, +/area/station/commons/lounge) "bqJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3606,13 +3751,6 @@ "bqX" = ( /turf/closed/wall/r_wall, /area/station/medical/chemistry) -"bqY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "brc" = ( /obj/structure/table/wood, /obj/item/paper, @@ -3758,16 +3896,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) -"btF" = ( -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/machinery/camera/directional/south{ - c_tag = "Prison Cell Block 1"; - network = list("ss13","prison") - }, -/obj/machinery/light_switch/directional/south, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/white, -/area/station/security/prison) "btG" = ( /obj/structure/window/spawner/directional/west, /obj/structure/table, @@ -3850,6 +3978,29 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +"buE" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/window/spawner/directional/west, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 8 + }, +/obj/effect/turf_decal/arrows/red{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/commons/fitness) +"buF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) "buH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3890,14 +4041,6 @@ /obj/item/stock_parts/servo, /turf/open/floor/iron, /area/station/science/lab) -"buY" = ( -/obj/structure/bodycontainer/crematorium{ - dir = 1; - id = "crematoriumChapel" - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/dark, -/area/station/service/chapel/office) "bvb" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -3927,6 +4070,15 @@ }, /turf/open/floor/iron/white, /area/station/science/explab) +"bwh" = ( +/obj/machinery/light_switch/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Chapel Office" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) "bwr" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -3960,23 +4112,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"bxi" = ( -/obj/structure/table/wood/fancy/royalblue, -/obj/machinery/door/window{ - dir = 8; - name = "Secure Art Exhibition"; - req_access = list("library") - }, -/obj/machinery/light/directional/east, -/obj/structure/sign/painting/library_secure{ - pixel_x = 32 - }, -/obj/effect/spawner/random/decoration/statue{ - spawn_loot_chance = 50 - }, -/obj/structure/window/spawner/directional/south, -/turf/open/floor/carpet/royalblue, -/area/station/service/library) "bxj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/camera/directional/west{ @@ -4053,6 +4188,16 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"byQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "byR" = ( /obj/structure/sign/warning/secure_area/directional/north, /obj/structure/cable, @@ -4065,23 +4210,11 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) -"byS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/wood, -/area/station/service/bar/backroom) "byW" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/service/hydroponics) -"bzd" = ( -/obj/machinery/light/small/dim/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "bzv" = ( /obj/effect/spawner/random/entertainment/arcade, /obj/structure/cable, @@ -4195,21 +4328,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"bCm" = ( -/obj/structure/table, -/obj/item/stack/cable_coil{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/stack/cable_coil, -/obj/item/stock_parts/cell/high, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tech) "bCo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"bCr" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood, +/area/station/service/library) "bCt" = ( /obj/machinery/status_display/evac/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4312,6 +4442,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/office) +"bEh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "bEv" = ( /obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{ name = "Burn Chamber Exterior Airlock" @@ -4320,6 +4458,17 @@ /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) +"bEC" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "bER" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -4328,15 +4477,18 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"bEU" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/gloves/latex/nitrile, -/obj/item/clothing/gloves/latex/nitrile, -/obj/item/clothing/gloves/latex/nitrile, -/obj/item/clothing/gloves/latex/nitrile, -/obj/item/wrench/medical, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +"bEW" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Customs Checkpoint" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/modular_computer/preset/id, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) "bFr" = ( /obj/item/paper_bin{ pixel_x = -2; @@ -4354,6 +4506,22 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/engineering/break_room) +"bFH" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/trunk, +/obj/structure/cable, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"bFK" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) "bFN" = ( /obj/machinery/chem_dispenser{ layer = 2.7 @@ -4367,11 +4535,13 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron/white, /area/station/medical/pharmacy) -"bFX" = ( -/obj/machinery/iv_drip, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) +"bGo" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/spawner/random/structure/crate_loot, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "bGt" = ( /obj/machinery/newscaster/directional/east, /turf/open/floor/iron, @@ -4379,15 +4549,6 @@ "bGC" = ( /turf/closed/wall, /area/station/hallway/primary/central) -"bGD" = ( -/obj/machinery/stasis{ - dir = 4 - }, -/obj/machinery/defibrillator_mount/directional/north, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "bGJ" = ( /obj/structure/chair/stool/bar/directional/south, /obj/effect/decal/cleanable/dirt, @@ -4416,14 +4577,6 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"bGT" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/grimy, -/area/station/service/chapel/office) "bHb" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -4460,6 +4613,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"bHN" = ( +/obj/item/radio/intercom/directional/south, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) "bHQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/sorting/mail{ @@ -4471,22 +4631,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"bHU" = ( -/obj/machinery/button/door/directional/west{ - id = "Engineering"; - name = "Engineering Lockdown"; - pixel_y = -6; - req_access = list("engineering") - }, -/obj/machinery/button/door/directional/west{ - id = "atmos"; - name = "Atmospherics Lockdown"; - pixel_y = 6; - req_access = list("atmospherics") - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "bIa" = ( /obj/structure/sign/poster/random/directional/east, /turf/open/floor/plating, @@ -4528,17 +4672,6 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/storage) -"bIY" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/structure/cable, -/obj/machinery/camera/directional/east{ - c_tag = "Security Post - Research Division"; - network = list("ss13","rd") - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "bJc" = ( /obj/structure/table/wood, /obj/item/food/grown/harebell, @@ -4556,6 +4689,19 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"bJp" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "bJq" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -4563,6 +4709,16 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"bJG" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) "bJQ" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/bot, @@ -4613,19 +4769,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"bKJ" = ( -/obj/machinery/portable_atmospherics/pump/lil_pump, -/obj/effect/turf_decal/siding/purple{ - dir = 5 - }, -/obj/machinery/airalarm/directional/east, -/obj/machinery/button/door/directional/north{ - id = "rdordnance"; - name = "Ordnance Containment Control"; - req_access = list("rd") - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/storage) "bKT" = ( /obj/machinery/door/airlock/grunge{ name = "Prison Forestry" @@ -4720,6 +4863,14 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"bMq" = ( +/obj/structure/closet{ + name = "janitorial supplies" + }, +/obj/item/storage/box/bodybags, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "bMA" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -4746,6 +4897,21 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"bMS" = ( +/obj/structure/table/glass, +/obj/item/scalpel{ + pixel_y = 12 + }, +/obj/item/circular_saw, +/obj/item/blood_filter, +/obj/item/bonesetter, +/obj/machinery/button/door/directional/south{ + id = "main_surgery"; + name = "privacy shutters control" + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "bMY" = ( /turf/closed/wall, /area/station/medical/office) @@ -4828,6 +4994,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"bPa" = ( +/obj/machinery/computer/security/qm{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/command/heads_quarters/qm) "bPi" = ( /obj/structure/chair/office{ dir = 8 @@ -4876,6 +5049,11 @@ /obj/item/bodypart/arm/left, /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) +"bQN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) "bQO" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/camera/directional/north{ @@ -4894,32 +5072,15 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron, /area/station/science/xenobiology) -"bQR" = ( -/obj/machinery/vending/wardrobe/chef_wardrobe, -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 6 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/light_switch/directional/south{ - pixel_x = -6 - }, -/obj/machinery/button/door/directional/south{ - id = "kitchen_service"; - name = "Service Shutter Control"; - pixel_x = 6; - req_access = list("kitchen") - }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "bRb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/scientist, /turf/open/floor/engine, /area/station/science/explab) +"bRF" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/security/brig) "bRG" = ( /obj/machinery/shower/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -4974,12 +5135,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"bSl" = ( -/obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/servingdish, -/obj/effect/turf_decal/tile/red/opposingcorners, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "bSm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4995,19 +5150,30 @@ dir = 8 }, /area/station/commons/fitness) -"bSH" = ( -/obj/structure/table, -/obj/structure/reagent_dispensers/wall/peppertank/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 5 +"bSs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/obj/item/clothing/mask/balaclava, -/obj/item/storage/backpack/duffelbag/sec/surgery{ - pixel_y = 5 +/obj/structure/table/glass, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/screwdriver{ + pixel_x = -2; + pixel_y = 6 }, -/turf/open/floor/iron/dark, -/area/station/security/execution/education) +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/requests_console/directional/west{ + department = "Pharmacy"; + name = "Pharmacy Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/ore_update, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "bSY" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -5030,6 +5196,20 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/commons/lounge) +"bTm" = ( +/obj/structure/table/reinforced, +/obj/item/wheelchair{ + pixel_y = -3 + }, +/obj/item/wheelchair, +/obj/item/wheelchair{ + pixel_y = 3 + }, +/obj/structure/window/spawner/directional/north, +/obj/structure/window/spawner/directional/west, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/medical/office) "bTq" = ( /obj/machinery/camera/motion/directional/south{ c_tag = "AI Upload Chamber - Port"; @@ -5071,6 +5251,27 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"bUo" = ( +/obj/structure/table/reinforced, +/obj/item/stack/sheet/plasteel{ + amount = 15 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/structure/fireaxecabinet/mechremoval/directional/east, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/science/robotics/lab) +"bUt" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/item/radio/intercom/directional/west, +/obj/item/pinpointer/nuke, +/obj/item/disk/nuclear, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) "bUC" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -5096,6 +5297,18 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, /area/station/commons/storage/primary) +"bVp" = ( +/obj/machinery/light_switch/directional/north, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/table/wood, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) "bVs" = ( /obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/tile/blue, @@ -5186,6 +5399,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +"bWw" = ( +/obj/structure/chair/stool/directional/south, +/obj/machinery/computer/pod/old/mass_driver_controller/trash{ + pixel_x = -24 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "bWM" = ( /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/tile/blue, @@ -5262,6 +5482,11 @@ name = "hyper-reinforced wall" }, /area/station/science/ordnance/bomb) +"bXQ" = ( +/obj/structure/bookcase/random/nonfiction, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/station/service/library) "bXX" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -5278,6 +5503,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/virology) +"bYn" = ( +/obj/structure/sign/warning/secure_area/directional/south, +/obj/structure/table/reinforced, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) "bYo" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -5305,11 +5540,6 @@ "bYz" = ( /turf/open/floor/circuit, /area/station/maintenance/port/aft) -"bYM" = ( -/obj/machinery/suit_storage_unit/hos, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hos) "bYN" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron, @@ -5327,15 +5557,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron, /area/station/science/xenobiology) -"bZh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/light/cold/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/transit_tube) "bZq" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/stripes/line{ @@ -5394,6 +5615,14 @@ }, /turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) +"caO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "cbg" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -5413,12 +5642,6 @@ "cbz" = ( /turf/closed/wall, /area/station/cargo/storage) -"ccl" = ( -/obj/effect/landmark/start/assistant, -/obj/structure/chair/comfy/black, -/obj/machinery/light/small/directional/north, -/turf/open/floor/wood, -/area/station/service/library) "ccD" = ( /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, @@ -5429,11 +5652,15 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"cdu" = ( -/obj/machinery/vending/hydronutrients, -/obj/effect/turf_decal/stripes/line, +"ccP" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, /turf/open/floor/iron, -/area/station/service/hydroponics) +/area/station/hallway/primary/port) "cdv" = ( /obj/machinery/door/airlock{ id_tag = "AuxToilet1"; @@ -5541,10 +5768,6 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/commons/dorms) -"cft" = ( -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "cfv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/preopen, @@ -5605,34 +5828,6 @@ /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, /area/station/science/ordnance/freezerchamber) -"chn" = ( -/obj/structure/sign/warning/secure_area/directional/south, -/obj/structure/table/reinforced, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/break_room) -"chD" = ( -/obj/item/seeds/wheat, -/obj/item/seeds/sugarcane, -/obj/item/seeds/potato, -/obj/item/seeds/apple, -/obj/item/grown/corncob, -/obj/item/food/grown/carrot, -/obj/item/food/grown/wheat, -/obj/item/food/grown/pumpkin{ - pixel_y = 5 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/table/glass, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/service/hydroponics) "chH" = ( /obj/structure/chair/stool/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5677,14 +5872,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, /area/space/nearstation) -"ciY" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, -/obj/effect/turf_decal/box, -/turf/open/floor/iron, -/area/station/science/xenobiology) "cji" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -5710,19 +5897,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/maintenance/fore) -"cjA" = ( -/obj/machinery/light_switch/directional/west, -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Detective's Office"; - name = "Detective's Fax Machine" - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/grimy, -/area/station/security/detectives_office) "cjJ" = ( /turf/open/floor/carpet/red, /area/station/command/heads_quarters/qm) +"cky" = ( +/obj/machinery/power/shieldwallgen, +/obj/machinery/light/cold/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) "ckz" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -5752,35 +5936,16 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"ckY" = ( -/obj/structure/rack, -/obj/item/clothing/glasses/hud/security/sunglasses/gars{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/clothing/glasses/hud/security/sunglasses/gars{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/clothing/glasses/hud/security/sunglasses{ - pixel_x = -3; - pixel_y = -2 - }, -/obj/item/clothing/glasses/hud/security/sunglasses{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/machinery/airalarm/directional/west, -/obj/machinery/camera/motion/directional/west{ - c_tag = "Armory - Internal" - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "clj" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"cln" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/science/research) "clp" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -5788,43 +5953,14 @@ "clq" = ( /turf/open/floor/carpet, /area/station/security/detectives_office) -"clw" = ( -/obj/machinery/seed_extractor, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 1 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/security/prison/garden) "clA" = ( /obj/structure/sign/departments/cargo, /turf/closed/wall, /area/station/cargo/warehouse) -"clC" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "clE" = ( /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"clM" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "clO" = ( /obj/machinery/door/window/left/directional/north{ name = "Inner Pipe Access"; @@ -5973,10 +6109,14 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/wood, /area/station/maintenance/port/aft) -"cpa" = ( -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/security/brig) +"cpb" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "cpi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/circuit/green{ @@ -6014,20 +6154,6 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"cps" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/gloves{ - pixel_y = 9; - pixel_x = 2 - }, -/obj/item/assembly/igniter{ - pixel_y = -3 - }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/dark/textured_edge{ - dir = 4 - }, -/area/station/medical/chem_storage) "cpH" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon/yellow, @@ -6056,6 +6182,28 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"cqd" = ( +/obj/structure/rack, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/security/holding_cell) "cqk" = ( /obj/structure/cable, /turf/open/floor/plating/airless, @@ -6162,36 +6310,6 @@ }, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms) -"crM" = ( -/obj/structure/closet/crate, -/obj/item/reagent_containers/cup/bowl, -/obj/effect/spawner/random/contraband/prison, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/kitchen/fork/plastic, -/obj/item/kitchen/fork/plastic, -/obj/item/kitchen/fork/plastic, -/obj/item/storage/box/drinkingglasses, -/obj/item/kitchen/spoon/plastic, -/obj/item/kitchen/spoon/plastic, -/obj/item/kitchen/spoon/plastic, -/obj/item/knife/plastic, -/obj/item/knife/plastic, -/obj/item/knife/plastic, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/box/drinkingglasses, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "csb" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -6199,6 +6317,13 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/station/security/prison) +"css" = ( +/obj/structure/chair/comfy{ + dir = 4 + }, +/obj/machinery/light/small/red/directional/west, +/turf/open/floor/plating/airless, +/area/space/nearstation) "cst" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Foyer" @@ -6227,6 +6352,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +"csH" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/wrench/medical, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "csQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -6276,19 +6410,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"cua" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave{ - pixel_y = 6 - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/checker, -/area/station/engineering/storage_shared) "cuc" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -6308,6 +6429,22 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"cuM" = ( +/obj/machinery/chem_master/condimaster{ + name = "CondiMaster Neo" + }, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "cuO" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -6351,6 +6488,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/open/floor/engine, /area/station/science/cytology) +"cvs" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/lockers) "cvt" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -6358,6 +6503,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"cvw" = ( +/obj/machinery/recharge_station, +/turf/open/floor/iron/dark, +/area/station/security/lockers) +"cvy" = ( +/obj/item/storage/crayons, +/obj/structure/table/wood, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) "cvE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6370,31 +6525,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"cvG" = ( -/obj/structure/table, -/obj/item/assembly/igniter{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/assembly/igniter{ - pixel_x = 5; - pixel_y = -4 - }, -/obj/item/assembly/igniter{ - pixel_x = 2; - pixel_y = 6 - }, -/obj/item/assembly/igniter{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Lab - Test Chamber"; - network = list("ss13","rd","xeno") - }, -/obj/machinery/light/cold/directional/east, -/turf/open/floor/engine, -/area/station/science/xenobiology) "cvL" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -6489,16 +6619,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/commons/toilet/auxiliary) -"cwm" = ( -/obj/machinery/microwave{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/structure/table, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/office) "cwq" = ( /obj/structure/chair/office{ dir = 8 @@ -6513,6 +6633,13 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) +"cwK" = ( +/obj/structure/closet/wardrobe/grey, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/commons/locker) "cwM" = ( /obj/structure/chair/stool/directional/east, /obj/effect/turf_decal/trimline/red/warning{ @@ -6599,15 +6726,11 @@ "cxz" = ( /turf/closed/wall, /area/station/science/ordnance/bomb) -"cxI" = ( -/obj/machinery/computer/camera_advanced/xenobio{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/iron, -/area/station/science/xenobiology) +"cxC" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/wood, +/area/station/service/library) "cxU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -6627,12 +6750,15 @@ }, /turf/open/floor/wood, /area/station/service/library) -"cyB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible/layer5, -/obj/structure/sign/poster/official/wtf_is_co2/directional/south, -/obj/machinery/door/firedoor/heavy, +"cyp" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/siding/purple{ + dir = 6 + }, +/obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/area/station/science/ordnance/storage) "cyG" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -6683,6 +6809,14 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"czt" = ( +/obj/machinery/flasher/portable, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/lockers) "czG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6763,18 +6897,28 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"cBo" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/obj/item/kirbyplants/organic/plant3, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/commons/locker) "cBy" = ( /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/locker) +"cBV" = ( +/obj/machinery/mech_bay_recharge_port{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/science/robotics/mechbay) +"cCx" = ( +/obj/machinery/modular_computer/preset/cargochat/science{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/explab) "cCM" = ( /obj/structure/lattice/catwalk, /obj/item/reagent_containers/cup/glass/bottle/rum{ @@ -6878,6 +7022,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"cEx" = ( +/obj/structure/dresser, +/turf/open/floor/wood, +/area/station/service/theater) "cFa" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 @@ -6902,18 +7050,19 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -"cFn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/white, -/area/station/science/research) "cFp" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/commons/storage/primary) +"cFr" = ( +/obj/structure/table, +/obj/machinery/status_display/evac/directional/east, +/obj/machinery/flasher/directional/south{ + id = "AI" + }, +/obj/effect/spawner/round_default_module, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) "cFu" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -6940,21 +7089,25 @@ /obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) +"cGX" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Central Primary Hallway - Aft-Starboard Corner" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "cHb" = ( /obj/structure/filingcabinet{ pixel_x = 3 }, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) -"cHl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/entry) "cHE" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -6984,35 +7137,6 @@ }, /turf/open/floor/plating, /area/station/science/genetics) -"cIv" = ( -/obj/effect/landmark/generic_maintenance_landmark, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -"cIw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Custodial Closet" - }, -/obj/machinery/light_switch/directional/west, -/obj/machinery/requests_console/directional/north{ - department = "Janitorial"; - name = "Janitorial Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/assistance, -/turf/open/floor/iron, -/area/station/service/janitor) "cIK" = ( /obj/machinery/smartfridge/chemistry/preloaded, /obj/effect/turf_decal/tile/yellow/fourcorners, @@ -7189,16 +7313,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/plating, /area/station/cargo/drone_bay) -"cLP" = ( -/obj/structure/rack, -/obj/item/gun/energy/e_gun/dragnet, -/obj/item/gun/energy/e_gun/dragnet, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "cMb" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -7209,41 +7323,19 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"cMu" = ( -/obj/machinery/defibrillator_mount/directional/south, -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - dir = 4; - name = "medical bed" +"cMg" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/cold/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) "cMG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness) -"cMK" = ( -/obj/structure/table, -/obj/item/storage/box/bodybags{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/pen, -/obj/item/storage/box/prisoner, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Prison Hallway Port"; - network = list("ss13","prison") - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "cML" = ( /obj/structure/cable, /turf/closed/wall/r_wall, @@ -7268,17 +7360,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/psychology) -"cMZ" = ( -/obj/structure/closet/toolcloset, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/storage_shared) "cNk" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -7396,6 +7477,12 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/station/science/ordnance/office) +"cPU" = ( +/obj/item/cigbutt, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) "cQc" = ( /obj/machinery/door/airlock/public/glass{ name = "Space Bridge Access" @@ -7435,13 +7522,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"cQT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 - }, -/turf/open/floor/iron, -/area/station/security/prison) "cQV" = ( /obj/machinery/door/window{ base_state = "right"; @@ -7466,24 +7546,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"cRB" = ( -/obj/machinery/pdapainter{ - pixel_y = 2 +"cRU" = ( +/obj/structure/bed, +/obj/item/bedsheet/captain, +/obj/effect/landmark/start/captain, +/obj/machinery/camera/directional/east{ + c_tag = "Captain's Quarters" }, -/obj/machinery/requests_console/directional/north{ - department = "Head of Personnel's Desk"; - name = "Head of Personnel's Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/announcement, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/machinery/light/small/directional/north, +/obj/machinery/light/small/directional/east, /turf/open/floor/wood, -/area/station/command/heads_quarters/hop) -"cRM" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/freezer, -/area/station/security/prison/shower) +/area/station/command/heads_quarters/captain/private) "cSb" = ( /obj/structure/plasticflaps, /obj/machinery/disposal/delivery_chute, @@ -7609,6 +7681,14 @@ }, /turf/open/floor/engine, /area/station/science/cytology) +"cTA" = ( +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/spawner/random/armory/riot_armor, +/obj/effect/spawner/random/armory/bulletproof_armor, +/obj/structure/rack, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "cTC" = ( /obj/structure/chair, /obj/effect/landmark/start/assistant, @@ -7646,6 +7726,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison) +"cUk" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/wood, +/area/station/security/office) "cUw" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -7715,19 +7802,16 @@ /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"cWj" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Starboard Primary Hallway - Engineering" +"cWk" = ( +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/siding/purple{ + dir = 4 }, -/obj/structure/sign/directions/engineering{ - dir = 4; - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/requests_console/directional/east, +/obj/effect/mapping_helpers/requests_console/supplies, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "cWr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7796,6 +7880,11 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/service/hydroponics) +"cXg" = ( +/obj/machinery/recharge_station, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) "cXw" = ( /obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -7991,6 +8080,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"dbD" = ( +/obj/machinery/disposal/bin, +/obj/machinery/status_display/ai/directional/east, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) "dbX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8097,19 +8199,6 @@ /obj/item/wrench, /turf/open/floor/iron, /area/station/commons/storage/primary) -"ddW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/directional/north{ - c_tag = "Brig - Hallway - Port" - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/security/brig) "deb" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, @@ -8143,6 +8232,30 @@ /obj/machinery/vending/wardrobe/law_wardrobe, /turf/open/floor/wood, /area/station/service/lawoffice) +"deH" = ( +/obj/machinery/button/door/directional/south{ + id = "roboticsprivacy2"; + name = "Robotics Privacy Control"; + req_access = list("robotics") + }, +/obj/item/mod/core/standard{ + pixel_x = -4 + }, +/obj/item/mod/core/standard{ + pixel_x = 4 + }, +/obj/item/mod/core/standard{ + pixel_y = 4 + }, +/obj/structure/closet/crate/science{ + name = "MOD core crate" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) "deO" = ( /obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment{ @@ -8333,6 +8446,14 @@ "dgD" = ( /turf/closed/wall, /area/station/security/range) +"dgN" = ( +/obj/structure/bodycontainer/crematorium{ + dir = 1; + id = "crematoriumChapel" + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) "dgS" = ( /obj/machinery/rnd/production/techfab/department/security, /turf/open/floor/iron/dark, @@ -8406,14 +8527,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/range) -"dhR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/light/floor, -/turf/open/floor/iron/white, -/area/station/science/xenobiology/hallway) "dhU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -8452,13 +8565,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"dic" = ( -/obj/item/radio/intercom/directional/south, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/grimy, -/area/station/security/detectives_office) "diq" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/left/directional/south{ @@ -8486,18 +8592,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"diJ" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) "diX" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) -"diY" = ( -/obj/structure/sign/warning/cold_temp/directional/north{ - name = "\improper CRYOGENICS" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/iron/dark/textured, -/area/station/medical/cryo) "dji" = ( /obj/structure/lattice, /obj/structure/sign/warning/electric_shock/directional/south, @@ -8509,12 +8612,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"djK" = ( -/obj/item/hand_labeler_refill, -/obj/structure/rack, -/obj/machinery/light/small/dim/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "dka" = ( /obj/effect/turf_decal/arrows/red{ dir = 4 @@ -8526,13 +8623,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"dky" = ( -/obj/structure/sign/warning/radiation/rad_area/directional/north, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) "dkC" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -8595,23 +8685,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"dlM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) -"dmn" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/entry) "dmJ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -8665,6 +8738,18 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos) +"don" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/closet/secure_closet/security/med, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/requests_console/directional/north{ + department = "Security"; + name = "Security Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) "dox" = ( /obj/structure/rack, /obj/item/screwdriver{ @@ -8727,19 +8812,30 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"dpu" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4 +"dpx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/cryo) +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/commons/locker) "dpN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"dpU" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics - Central Aft" + }, +/obj/machinery/light/no_nightlight/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "dqc" = ( /obj/machinery/door/airlock/security/glass{ name = "N2O Storage" @@ -8747,6 +8843,19 @@ /obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) +"dqg" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/structure/sign/departments/psychology/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "dqo" = ( /obj/machinery/conveyor{ dir = 1; @@ -8758,10 +8867,36 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"dqu" = ( +/obj/item/book/manual/wiki/security_space_law{ + name = "space law"; + pixel_y = 2 + }, +/obj/item/toy/gun, +/obj/item/restraints/handcuffs, +/obj/structure/table/wood, +/obj/item/clothing/head/collectable/hos{ + name = "novelty HoS hat" + }, +/obj/machinery/firealarm/directional/east, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) "dqx" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"dqE" = ( +/obj/structure/closet/toolcloset, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/storage_shared) "dqI" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/cigarette, @@ -8878,10 +9013,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"dsN" = ( -/obj/machinery/computer/security/wooden_tv, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain/private) "dsQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -8924,14 +9055,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"dtF" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "dtY" = ( /obj/machinery/meter/monitored/waste_loop, /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ @@ -8946,6 +9069,10 @@ dir = 1 }, /area/station/engineering/atmos/pumproom) +"duk" = ( +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) "duu" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -8960,34 +9087,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) -"duy" = ( -/mob/living/basic/pet/penguin/baby/permanent{ - dir = 8 - }, -/turf/open/floor/grass, -/area/station/science/research) -"duz" = ( -/obj/structure/table, -/obj/item/folder/red{ - pixel_x = 3 - }, -/obj/item/folder/white{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/restraints/handcuffs, -/obj/item/radio/off, -/obj/machinery/requests_console/directional/east{ - department = "Security"; - name = "Security Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "duI" = ( /turf/closed/wall, /area/station/command/bridge) @@ -9000,16 +9099,6 @@ }, /turf/open/floor/wood/parquet, /area/station/medical/psychology) -"dvo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/machinery/status_display/evac/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "dvJ" = ( /obj/structure/tank_dispenser, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -9073,14 +9162,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"dwE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/white/line{ - dir = 6 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, -/area/station/security/prison) "dwJ" = ( /obj/structure/lattice, /obj/effect/spawner/random/structure/grille, @@ -9139,14 +9220,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"dyh" = ( -/obj/machinery/light_switch/directional/north, -/obj/structure/closet{ - name = "janitorial supplies" - }, -/obj/item/storage/box/bodybags, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "dyr" = ( /obj/machinery/status_display/door_timer{ id = "Cell 3"; @@ -9171,16 +9244,6 @@ }, /turf/open/floor/plating, /area/station/science/lab) -"dzl" = ( -/obj/item/book/bible, -/obj/machinery/newscaster/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Chapel - Fore" - }, -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/service/chapel) "dzw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -9238,6 +9301,18 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron, /area/station/science/research) +"dBv" = ( +/obj/machinery/disposal/bin, +/obj/machinery/airalarm/directional/east, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/cargo/storage) "dBV" = ( /obj/docking_port/stationary/escape_pod{ dir = 4 @@ -9306,30 +9381,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"dDn" = ( -/obj/structure/table, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/obj/item/radio/headset/headset_medsci{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/storage/box/monkeycubes{ - pixel_x = 6; - pixel_y = 9 - }, -/obj/item/storage/box/gloves{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/storage/box/monkeycubes{ - pixel_x = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "dDo" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, @@ -9341,17 +9392,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) -"dDu" = ( -/obj/machinery/camera/motion/directional/south{ - c_tag = "Vault"; - network = list("vault") - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/nuke_storage) "dDx" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -9434,6 +9474,14 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) +"dEF" = ( +/obj/machinery/atmospherics/components/binary/pump/on, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) "dEH" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -9441,6 +9489,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"dEM" = ( +/obj/machinery/vending/medical, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "dEV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -9448,14 +9501,6 @@ /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/white, /area/station/science/research) -"dEW" = ( -/obj/machinery/suit_storage_unit/cmo, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) "dEX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ @@ -9488,6 +9533,15 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) +"dFW" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Brig - Hallway - Entrance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/security/brig) "dGa" = ( /obj/structure/flora/bush/pale/style_random, /obj/structure/flora/bush/ferny/style_random, @@ -9497,12 +9551,6 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/grass, /area/station/science/research) -"dGi" = ( -/obj/structure/bodycontainer/morgue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "dGq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/stairs/left{ @@ -9536,6 +9584,10 @@ /obj/effect/turf_decal/trimline/green/filled/corner, /turf/open/floor/iron, /area/station/hallway/primary/central) +"dGQ" = ( +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) "dGW" = ( /obj/machinery/holopad, /obj/effect/decal/cleanable/dirt, @@ -9645,6 +9697,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"dIS" = ( +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "dIV" = ( /obj/machinery/door/window/right/directional/west, /turf/open/floor/wood, @@ -9660,6 +9716,15 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/dark, /area/station/science/ordnance/freezerchamber) +"dJk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/chem_master, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "dJo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -9702,13 +9767,6 @@ /obj/structure/sign/warning/pods, /turf/closed/wall/r_wall, /area/station/maintenance/department/engine) -"dKv" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/beakers{ - pixel_y = 7 - }, -/turf/open/floor/iron/dark/textured, -/area/station/medical/chem_storage) "dKC" = ( /turf/closed/wall, /area/station/maintenance/aft/lesser) @@ -9872,6 +9930,13 @@ }, /turf/open/floor/iron/dark, /area/station/medical/storage) +"dMO" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) "dMY" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -9907,12 +9972,6 @@ }, /turf/open/floor/iron, /area/station/security/office) -"dOi" = ( -/obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/brig) "dOs" = ( /obj/structure/sign/warning/no_smoking, /turf/closed/wall/r_wall, @@ -9970,16 +10029,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) -"dPv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/bluespace_vendor/directional/north, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "dPy" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -10088,17 +10137,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"dQV" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/lockers) +"dRj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "dRp" = ( /obj/machinery/holopad, /obj/effect/spawner/random/engineering/tracking_beacon, @@ -10140,6 +10183,27 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/port) +"dRL" = ( +/obj/structure/table/reinforced, +/obj/item/tank/internals/anesthetic{ + pixel_x = 3 + }, +/obj/item/tank/internals/anesthetic, +/obj/item/tank/internals/anesthetic{ + pixel_x = -3 + }, +/obj/item/clothing/mask/breath/medical{ + pixel_y = -3 + }, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/mask/breath/medical{ + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "dRN" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -10172,16 +10236,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) -"dSj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "dSB" = ( /obj/machinery/door/airlock/grunge{ name = "Cell 3" @@ -10190,6 +10244,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/prison/safe) +"dSE" = ( +/obj/structure/table/wood, +/obj/machinery/newscaster/directional/north, +/obj/effect/spawner/random/entertainment/lighter, +/turf/open/floor/wood, +/area/station/commons/dorms) "dSF" = ( /obj/structure/punching_bag, /obj/effect/turf_decal/trimline/dark_red, @@ -10200,6 +10260,11 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"dSJ" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/wood/large, +/area/station/service/theater) "dTi" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -10245,12 +10310,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/commons/locker) -"dTx" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/small/directional/east, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain/private) "dTQ" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 4 @@ -10265,6 +10324,19 @@ /obj/structure/reagent_dispensers/wall/peppertank/directional/east, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) +"dTV" = ( +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/structure/table/glass, +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "dTX" = ( /obj/effect/landmark/start/chemist, /turf/open/floor/iron/white, @@ -10275,6 +10347,14 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"dUo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) "dUB" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10396,6 +10476,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) +"dWI" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "dWN" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ dir = 4 @@ -10442,6 +10526,11 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/station/security/prison) +"dXp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/turn_off_lights_with_lightswitch, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "dXA" = ( /obj/structure/closet/crate/trashcart, /obj/effect/spawner/random/contraband/prison, @@ -10522,18 +10611,6 @@ }, /turf/open/floor/iron, /area/station/cargo/drone_bay) -"dYj" = ( -/obj/structure/sign/poster/random/directional/east, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/closet/secure_closet/freezer/kitchen, -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 10 - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "dYl" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -10606,12 +10683,6 @@ }, /turf/open/floor/plating, /area/station/cargo/storage) -"dZJ" = ( -/obj/structure/table/wood, -/obj/machinery/newscaster/directional/north, -/obj/effect/spawner/random/entertainment/lighter, -/turf/open/floor/wood, -/area/station/commons/dorms) "dZU" = ( /obj/machinery/door/poddoor/preopen{ id = "medsecprivacy"; @@ -10629,6 +10700,13 @@ /obj/item/paper, /turf/open/floor/plating, /area/station/security/checkpoint/medical) +"eaa" = ( +/obj/structure/sign/painting/library{ + pixel_y = -32 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood, +/area/station/service/library) "eal" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law{ @@ -10675,11 +10753,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) -"ebe" = ( -/obj/machinery/vending/wardrobe/atmos_wardrobe, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "ebr" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=0-SecurityDesk"; @@ -10799,17 +10872,6 @@ "ecO" = ( /turf/open/floor/carpet, /area/station/service/library) -"edh" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/security/office) "edl" = ( /obj/docking_port/stationary/escape_pod, /turf/open/space/basic, @@ -10822,6 +10884,15 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +"edq" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/station/commons/dorms) "edu" = ( /turf/closed/wall/r_wall, /area/station/maintenance/solars/starboard/aft) @@ -10905,11 +10976,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"eeA" = ( -/obj/machinery/libraryscanner, -/obj/machinery/light_switch/directional/south, -/turf/open/floor/wood, -/area/station/service/library) "efa" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, @@ -10930,15 +10996,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/lockers) -"efu" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/trunk, -/obj/structure/cable, -/obj/machinery/newscaster/directional/east, -/turf/open/floor/iron, -/area/station/science/robotics/lab) "efC" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -10949,6 +11006,17 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"efN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/button/door/directional/east{ + id = "atmoshfr"; + name = "Radiation Shutters Control"; + req_access = list("atmospherics") + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/light/no_nightlight/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) "efY" = ( /obj/structure/chair/office{ dir = 1 @@ -10977,6 +11045,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"ege" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) "egg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -11006,13 +11083,6 @@ /obj/structure/rack, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"egy" = ( -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/white, -/area/station/security/prison) "egF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -11037,6 +11107,11 @@ }, /turf/open/floor/plating, /area/station/medical/abandoned) +"egS" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "egZ" = ( /obj/machinery/camera/directional/west{ c_tag = "Medbay Main Hallway - South"; @@ -11078,6 +11153,13 @@ }, /turf/open/floor/plating, /area/station/security/execution/education) +"ehE" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/photocopier, +/turf/open/floor/iron/white, +/area/station/medical/office) "ehG" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/effect/decal/cleanable/blood/old, @@ -11097,12 +11179,6 @@ dir = 8 }, /area/station/service/chapel) -"ehK" = ( -/obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/duct, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "ehX" = ( /turf/open/floor/iron/dark, /area/station/medical/storage) @@ -11207,6 +11283,19 @@ /obj/effect/turf_decal/tile/purple/fourcorners, /turf/open/floor/iron/white, /area/station/science/research) +"ejL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/structure/cable, +/obj/item/kirbyplants/random, +/obj/machinery/camera/directional/east{ + c_tag = "Science Server Room"; + name = "science camera"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/server) "ejP" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -11243,6 +11332,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"eks" = ( +/obj/effect/decal/cleanable/oil, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "ekB" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -11261,11 +11355,6 @@ /obj/structure/broken_flooring/singular/directional/south, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"ekK" = ( -/obj/machinery/firealarm/directional/west, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/wood, -/area/station/service/library) "ekP" = ( /obj/machinery/door/window/brigdoor/security/cell{ id = "Cell 2"; @@ -11287,6 +11376,12 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"ekR" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/turf/open/floor/iron, +/area/station/commons/lounge) "ekV" = ( /obj/machinery/mass_driver/ordnance, /turf/open/floor/plating, @@ -11395,15 +11490,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"eml" = ( -/obj/machinery/light_switch/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Chapel Office" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/grimy, -/area/station/service/chapel/office) "emN" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -11430,6 +11516,17 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) +"enF" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/structure/cable, +/obj/machinery/camera/directional/east{ + c_tag = "Security Post - Research Division"; + network = list("ss13","rd") + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "enK" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -11580,6 +11677,11 @@ /obj/structure/cable, /turf/open/space/basic, /area/station/solars/port/fore) +"eqn" = ( +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "eqt" = ( /obj/effect/spawner/random/maintenance, /obj/structure/cable, @@ -11690,6 +11792,17 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/wood, /area/station/service/library) +"erU" = ( +/obj/machinery/chem_master, +/obj/structure/noticeboard/directional/south, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/button/door/directional/south{ + id = "pharmacy_shutters_2"; + name = "pharmacy shutters control"; + req_access = list("pharmacy") + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "esd" = ( /obj/item/reagent_containers/cup/glass/drinkingglass{ pixel_x = 4; @@ -11721,26 +11834,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/prison/garden) -"esf" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/radio/intercom/directional/north, -/obj/machinery/firealarm/directional/west, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/white, -/area/station/science/explab) -"esg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/firealarm/directional/north, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron, -/area/station/service/hydroponics) "esk" = ( /turf/closed/wall/r_wall, /area/station/engineering/storage/tcomms) @@ -11756,6 +11849,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) +"esK" = ( +/obj/machinery/firealarm/directional/east, +/obj/structure/cable, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) "esR" = ( /obj/machinery/button/flasher{ id = "secentranceflasher"; @@ -11775,6 +11874,14 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron, /area/station/security/brig) +"esT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/white, +/area/station/science/research) "etn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11790,6 +11897,24 @@ "ets" = ( /turf/open/floor/engine/n2o, /area/station/engineering/atmos) +"ett" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/acidic_buffer{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/basic_buffer{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/formaldehyde{ + pixel_x = 1 + }, +/obj/structure/sign/warning/chem_diamond/directional/north, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) "etv" = ( /obj/item/kirbyplants/random, /obj/structure/light_construct/small/directional/east, @@ -11803,6 +11928,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"etC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/bed/roller, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "etK" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 @@ -11816,6 +11948,15 @@ dir = 1 }, /area/station/engineering/atmos) +"etV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/chem_heater/withbuffer, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "euj" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/light_switch/directional/north, @@ -11851,6 +11992,11 @@ "eut" = ( /turf/closed/wall, /area/station/science/robotics/lab) +"euL" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "euQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11904,18 +12050,6 @@ /obj/effect/landmark/start/depsec/medical, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) -"ewb" = ( -/obj/structure/fireaxecabinet/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Atmospherics - Port" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/atmos) "ewf" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -12048,19 +12182,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) -"eyg" = ( -/obj/structure/bodycontainer/morgue{ - dir = 1 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Morgue"; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "eyl" = ( /obj/structure/closet/crate/freezer/surplus_limbs, /obj/machinery/firealarm/directional/south, @@ -12080,11 +12201,6 @@ /obj/structure/window/reinforced/plasma/spawner/directional/south, /turf/open/floor/engine, /area/station/engineering/supermatter) -"eyQ" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron, -/area/station/security/office) "eyX" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -12104,6 +12220,22 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"ezP" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching output from station security cameras."; + name = "Security Camera Monitor"; + network = list("ss13"); + pixel_y = 30 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "ezT" = ( /obj/machinery/door/airlock/research{ name = "Research Division Access" @@ -12128,33 +12260,26 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/service/bar) +"eAq" = ( +/obj/structure/closet/wardrobe/white, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/commons/locker) +"eAr" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/mob/living/basic/pet/dog/corgi/puppy/void{ + dir = 4 + }, +/turf/open/floor/grass, +/area/station/science/research) "eAL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"eBg" = ( -/obj/structure/table, -/obj/item/crowbar/red, -/obj/item/wrench, -/obj/item/clothing/mask/gas, -/obj/item/storage/box{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/storage/box, -/obj/machinery/requests_console/directional/west{ - department = "Atmospherics"; - name = "Atmospherics Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/atmos/storage/gas) "eBn" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance/two, @@ -12204,14 +12329,6 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/fore) -"eCs" = ( -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/white, -/area/station/science/research) "eCB" = ( /obj/machinery/door/airlock/silver{ name = "Bathroom" @@ -12250,18 +12367,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) -"eDg" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Foyer - Shared Storage" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/storage_shared) "eDC" = ( /obj/structure/table/wood, /obj/effect/spawner/random/entertainment/deck, @@ -12274,13 +12379,13 @@ }, /turf/closed/wall/r_wall, /area/station/command/heads_quarters/captain/private) -"eDN" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 8 +"eDX" = ( +/obj/structure/sign/departments/science/directional/east, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/turf/open/floor/iron, +/area/station/hallway/primary/aft) "eEb" = ( /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, @@ -12298,6 +12403,11 @@ }, /turf/open/floor/wood, /area/station/service/bar/backroom) +"eEn" = ( +/obj/structure/closet/crate/coffin, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/station/service/chapel/funeral) "eEx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, @@ -12314,6 +12424,10 @@ /obj/effect/mapping_helpers/airlock/access/any/command/maintenance, /turf/open/floor/plating, /area/station/maintenance/central) +"eEP" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "eER" = ( /obj/structure/rack, /obj/item/storage/box/gloves{ @@ -12329,16 +12443,19 @@ /obj/item/clothing/mask/breath/medical, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"eEV" = ( -/obj/effect/turf_decal/box/white{ - color = "#52B4E9" - }, -/obj/machinery/portable_atmospherics/canister/anesthetic_mix, -/obj/effect/turf_decal/siding/white{ +"eFC" = ( +/obj/machinery/bluespace_vendor/directional/south, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/locker) +"eFJ" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/kirbyplants/organic/plant3, +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/iron/kitchen_coldroom, -/area/station/medical/coldroom) +/turf/open/floor/iron, +/area/station/commons/locker) "eFR" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -12351,6 +12468,16 @@ /obj/structure/chair/sofa/left/brown, /turf/open/floor/carpet, /area/station/medical/psychology) +"eFX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) "eGd" = ( /obj/machinery/door/window{ dir = 1; @@ -12394,17 +12521,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) -"eGM" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/mecha_part_fabricator{ - dir = 4 - }, -/obj/structure/noticeboard/directional/west, -/turf/open/floor/iron, -/area/station/science/robotics/lab) "eGV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -12413,11 +12529,6 @@ /obj/effect/spawner/random/vending/colavend, /turf/open/floor/iron, /area/station/hallway/primary/port) -"eHE" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/station/science/xenobiology) "eHR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12438,6 +12549,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/lounge) +"eIr" = ( +/obj/machinery/light_switch/directional/east, +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/machinery/fax{ + fax_name = "Psychology Office"; + name = "Psychology Office Fax Machine" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) "eIy" = ( /obj/structure/cable, /obj/machinery/photocopier, @@ -12446,6 +12570,17 @@ "eIO" = ( /turf/closed/wall, /area/station/maintenance/department/medical/central) +"eIV" = ( +/obj/effect/turf_decal/siding/purple/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/purple/line, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) "eJo" = ( /obj/machinery/firealarm/directional/east, /obj/structure/table/wood, @@ -12482,22 +12617,6 @@ }, /turf/open/floor/plating, /area/station/science/research) -"eJH" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, -/obj/machinery/light_switch/directional/south{ - pixel_x = 8 - }, -/obj/machinery/button/door/directional/south{ - id = "chapel_shutters_space"; - name = "chapel shutters control"; - pixel_x = -6 - }, -/turf/open/floor/iron/chapel{ - dir = 4 - }, -/area/station/service/chapel) "eJM" = ( /obj/machinery/camera/directional/east{ c_tag = "Atmospherics Tank - CO2" @@ -12530,24 +12649,17 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) -"eKy" = ( -/obj/structure/rack, -/obj/machinery/airalarm/directional/west, -/obj/item/reagent_containers/cup/bottle/mercury{ - pixel_x = -5; - pixel_y = 3 +"eKw" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/modular_computer/preset/civilian{ + dir = 8 }, -/obj/item/reagent_containers/cup/bottle/nitrogen{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bottle/oxygen{ - pixel_x = 1 - }, -/turf/open/floor/iron/dark/textured_edge{ +/obj/structure/sign/poster/official/random/directional/east, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/area/station/medical/chem_storage) +/turf/open/floor/iron/dark/corner, +/area/station/engineering/storage_shared) "eKA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12721,14 +12833,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"eNi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, -/area/station/service/bar) "eNk" = ( /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance" @@ -12747,6 +12851,14 @@ "eNR" = ( /turf/closed/wall, /area/station/ai_monitored/aisat/exterior) +"eNU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "eNV" = ( /obj/effect/turf_decal/delivery, /obj/effect/spawner/random/structure/crate, @@ -12759,6 +12871,28 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"eOo" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 8 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/button/door/directional/east{ + id = "rdgene"; + name = "Primary Genetics Shutters Control"; + pixel_y = 6; + req_access = list("science") + }, +/obj/machinery/button/door/directional/east{ + id = "rdgene2"; + name = "Secondary Genetics Shutters Control"; + pixel_y = -6; + req_access = list("science") + }, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "eOs" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -12770,16 +12904,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, /area/station/security/brig) -"eOw" = ( -/obj/machinery/chem_dispenser/drinks/beer{ - dir = 1 - }, -/obj/structure/table, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/light/small/directional/south, -/obj/machinery/digital_clock/directional/south, -/turf/open/floor/iron, -/area/station/service/bar) "eOJ" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -12824,6 +12948,16 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"ePN" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "ePX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -12875,6 +13009,10 @@ dir = 1 }, /area/station/engineering/atmos/pumproom) +"eQL" = ( +/obj/machinery/camera/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "eQO" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -12904,14 +13042,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, /area/station/medical/cryo) -"eRm" = ( -/obj/machinery/light/directional/north, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "eRn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, @@ -12998,6 +13128,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"eTI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "eTU" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -13005,13 +13141,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"eTZ" = ( -/obj/structure/urinal/directional/north, -/obj/structure/cable, -/obj/machinery/duct, -/obj/machinery/light/floor, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "eUe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line{ @@ -13136,6 +13265,19 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) +"eWu" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Air to External Air Ports" + }, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) "eWy" = ( /obj/item/reagent_containers/cup/bucket, /obj/structure/reagent_dispensers/watertank, @@ -13171,29 +13313,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"eXh" = ( -/obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/computer/cargo{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) "eXj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) -"eXu" = ( -/obj/machinery/recharge_station, -/obj/machinery/light_switch/directional/west, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/science/robotics/mechbay) "eXx" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -13224,15 +13348,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"eXW" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Telecomms - Server Room - Aft-Port"; - network = list("ss13","tcomms") - }, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/tlv_no_checks, -/turf/open/floor/iron/dark/telecomms, -/area/station/tcommsat/server) "eYe" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -13246,11 +13361,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"eYr" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/grimy, -/area/station/service/chapel/office) "eYu" = ( /obj/structure/table/glass, /obj/effect/turf_decal/stripes/line{ @@ -13308,6 +13418,19 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +"eYT" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/structure/cable, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/lockers) "eZb" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -13321,6 +13444,11 @@ /obj/machinery/restaurant_portal/bar, /turf/open/floor/wood, /area/station/commons/lounge) +"eZf" = ( +/obj/machinery/libraryscanner, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/wood, +/area/station/service/library) "eZz" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13411,29 +13539,38 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) -"fbn" = ( -/obj/machinery/recharger{ - pixel_y = 4 +"fbl" = ( +/mob/living/basic/pet/penguin/baby/permanent{ + dir = 8 }, -/obj/machinery/camera/directional/north{ - c_tag = "Security Post - Medbay"; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/light/small/directional/north, -/obj/structure/table/reinforced, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/medical) -"fbq" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain/private) +/turf/open/floor/grass, +/area/station/science/research) "fbs" = ( /obj/structure/chair{ dir = 8 }, /turf/open/floor/wood, /area/station/service/lawoffice) +"fbE" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/structure/table{ + name = "Jim Norton's Quebecois Coffee table" + }, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = -3; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = 5; + pixel_y = 12 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/item/modular_computer/laptop/preset/civilian, +/turf/open/floor/wood, +/area/station/service/cafeteria) "fbI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/holopad, @@ -13454,6 +13591,16 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron, /area/station/security/prison/garden) +"fck" = ( +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "fcq" = ( /turf/closed/wall, /area/station/maintenance/port/greater) @@ -13489,25 +13636,16 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron/white, /area/station/security/prison/mess) -"fdy" = ( -/obj/structure/rack, -/obj/effect/spawner/random/clothing/costume, -/obj/effect/spawner/random/clothing/costume, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "fdH" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 }, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"fdS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) +"fdI" = ( +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "fdX" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -13617,6 +13755,13 @@ /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) +"fgJ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/light/small/dim/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/central) "fgN" = ( /obj/structure/chair/stool/directional/east, /obj/effect/decal/cleanable/blood/old, @@ -13751,6 +13896,11 @@ /obj/effect/mapping_helpers/airlock/access/any/command/minisat, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +"fii" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/office) "fip" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -13833,6 +13983,14 @@ /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/port) +"fjv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/light/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "fjD" = ( /turf/closed/wall, /area/station/commons/toilet/auxiliary) @@ -13876,20 +14034,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"fkq" = ( -/obj/structure/sign/departments/chemistry/pharmacy/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "fkr" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"fky" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/courtroom) "fkC" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -14001,6 +14155,23 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"flE" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "flN" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /turf/open/floor/plating, @@ -14065,17 +14236,6 @@ /obj/structure/table/wood, /turf/open/floor/carpet, /area/station/service/chapel/funeral) -"fmH" = ( -/obj/effect/turf_decal/siding/purple{ - dir = 6 - }, -/obj/structure/table, -/obj/item/clipboard, -/obj/item/holosign_creator/atmos, -/obj/item/holosign_creator/atmos, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/white, -/area/station/science/ordnance/office) "fmJ" = ( /obj/structure/rack, /obj/item/circuitboard/machine/telecomms/bus, @@ -14106,6 +14266,13 @@ }, /turf/closed/wall, /area/station/medical/medbay/lobby) +"fmX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "fnc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white/smooth_large, @@ -14121,26 +14288,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"fnD" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/structure/table{ - name = "Jim Norton's Quebecois Coffee table" - }, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = -3; - pixel_y = 9 - }, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = 5; - pixel_y = 12 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/item/modular_computer/laptop/preset/civilian, -/turf/open/floor/wood, -/area/station/service/cafeteria) "fnE" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -14161,13 +14308,29 @@ /obj/effect/spawner/random/armory/e_gun, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"foj" = ( -/obj/effect/turf_decal/stripes/corner{ +"fnT" = ( +/obj/structure/table, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/clothing/mask/gas, +/obj/item/storage/box{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/box, +/obj/machinery/requests_console/directional/west{ + department = "Atmospherics"; + name = "Atmospherics Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ dir = 1 }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/central) +/area/station/engineering/atmos/storage/gas) "foP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14178,14 +14341,6 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/storage) -"foQ" = ( -/obj/effect/landmark/generic_maintenance_landmark, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet, -/area/station/commons/dorms) "fpd" = ( /obj/machinery/door/window{ base_state = "right"; @@ -14238,13 +14393,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/disposal) -"fqv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/structure/cable, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "fqB" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, @@ -14297,6 +14445,15 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/medical/abandoned) +"frE" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) "frH" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -14383,14 +14540,17 @@ /obj/structure/sign/warning/pods, /turf/closed/wall, /area/station/commons/locker) +"fuc" = ( +/obj/structure/frame/machine{ + anchored = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/circuit/green/off, +/area/station/science/research) "fuu" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmospherics_engine) -"fuv" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/security/courtroom) "fuA" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -14403,12 +14563,6 @@ "fvE" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/medical/central) -"fvI" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/brig) "fvK" = ( /obj/structure/table, /obj/item/transfer_valve{ @@ -14426,21 +14580,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) -"fvX" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/obj/effect/turf_decal/delivery, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/engineering/main) -"fws" = ( -/obj/machinery/vending/wardrobe/cargo_wardrobe, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/cargo/storage) "fwz" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, @@ -14477,15 +14616,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/break_room) -"fxb" = ( -/obj/machinery/reagentgrinder, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/obj/structure/table/glass, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "fxj" = ( /obj/machinery/door/airlock/security{ name = "Court Cell" @@ -14494,20 +14624,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/iron/dark, /area/station/security/holding_cell) -"fxp" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/structure/bed, -/obj/item/bedsheet/dorms, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/button/door/directional/west{ - id = "Cabin4"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/carpet, -/area/station/commons/dorms) "fxr" = ( /obj/structure/lattice/catwalk, /obj/item/instrument/musicalmoth{ @@ -14567,6 +14683,15 @@ }, /turf/open/floor/plating, /area/station/cargo/storage) +"fyJ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "fyY" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; @@ -14633,15 +14758,24 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) -"fAu" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Engineering Supermatter Aft"; - network = list("ss13","engine") +"fAt" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) +"fAE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "fAI" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/decal/cleanable/dirt, @@ -14656,6 +14790,15 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) +"fBe" = ( +/obj/structure/sign/departments/chemistry/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Medbay Main Hallway - Virology Junction"; + network = list("ss13","medbay") + }, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "fBi" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/effect/decal/cleanable/dirt, @@ -14748,6 +14891,11 @@ /obj/effect/turf_decal/tile/green/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central) +"fCO" = ( +/obj/structure/cable, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/construction/storage_wing) "fDc" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -14775,23 +14923,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) -"fDZ" = ( -/obj/machinery/airalarm/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/commons/dorms) -"fEa" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/table/wood, -/obj/effect/spawner/random/trash/soap, -/obj/structure/sign/poster/random/directional/east, -/obj/machinery/light/small/directional/east, -/turf/open/floor/wood/large, -/area/station/service/theater) "fEg" = ( /obj/machinery/door/airlock{ name = "Service Hall" @@ -14812,6 +14943,20 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) +"fEC" = ( +/obj/structure/table/wood, +/obj/item/cigbutt/cigarbutt{ + pixel_x = 5; + pixel_y = -1 + }, +/obj/item/radio/intercom/directional/north, +/obj/item/reagent_containers/cup/glass/mug{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) "fEK" = ( /turf/closed/wall, /area/station/medical/medbay/central) @@ -14823,6 +14968,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +"fEO" = ( +/obj/structure/cable, +/turf/open/floor/circuit/red, +/area/station/ai_monitored/turret_protected/ai_upload) "fEW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14911,13 +15060,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) -"fFX" = ( -/obj/machinery/airalarm/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Brig - Hallway - Starboard" - }, -/turf/open/floor/iron, -/area/station/security/brig) "fGp" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -14927,6 +15069,20 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"fGs" = ( +/obj/machinery/pdapainter{ + pixel_y = 2 + }, +/obj/machinery/requests_console/directional/north{ + department = "Head of Personnel's Desk"; + name = "Head of Personnel's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "fGv" = ( /obj/structure/cable, /obj/effect/landmark/start/scientist, @@ -15060,14 +15216,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/gateway) -"fIr" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) "fIE" = ( /obj/machinery/telecomms/server/presets/supply, /turf/open/floor/circuit/telecomms/mainframe, @@ -15119,16 +15267,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/station/engineering/supermatter) -"fJK" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/clothing/under/misc/assistantformal, -/obj/item/clothing/suit/hooded/wintercoat, -/obj/item/clothing/shoes/winterboots, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/commons/dorms) "fJP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, @@ -15152,6 +15290,11 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"fKv" = ( +/obj/machinery/light_switch/directional/south, +/obj/machinery/light/no_nightlight/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "fKG" = ( /obj/effect/landmark/blobstart, /turf/open/floor/engine/cult, @@ -15172,13 +15315,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"fKW" = ( -/obj/effect/turf_decal/siding, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/newscaster/directional/west, -/turf/open/floor/iron, -/area/station/science/lab) "fKZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -15222,19 +15358,9 @@ /obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"fLC" = ( -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/structure/table/glass, -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/command/bridge) +"fLz" = ( +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "fLI" = ( /obj/structure/chair{ name = "Bailiff" @@ -15324,6 +15450,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) +"fNE" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/obj/item/radio/intercom/directional/north, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/white, +/area/station/science/explab) "fNH" = ( /obj/machinery/door/airlock/maintenance{ name = "Mining Dock Maintenance" @@ -15407,18 +15542,6 @@ }, /turf/open/floor/grass, /area/station/medical/virology) -"fOV" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "fPh" = ( /obj/machinery/gateway/centerstation, /turf/open/floor/iron/dark, @@ -15430,17 +15553,6 @@ "fPD" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"fQb" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/modular_computer/preset/civilian{ - dir = 8 - }, -/obj/structure/sign/poster/official/random/directional/east, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/storage_shared) "fQj" = ( /obj/docking_port/stationary{ dir = 2; @@ -15523,6 +15635,17 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/commons/toilet/auxiliary) +"fRP" = ( +/obj/structure/sign/poster/official/anniversary_vintage_reprint/directional/north, +/obj/machinery/light/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "fRS" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -15541,13 +15664,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/fore) -"fRY" = ( -/obj/machinery/chem_master, -/obj/structure/noticeboard/directional/east, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "fRZ" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -15663,6 +15779,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) +"fVc" = ( +/obj/effect/spawner/random/structure/crate, +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "fVt" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -15711,6 +15832,14 @@ /obj/structure/closet/secure_closet/chemical, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"fWl" = ( +/obj/machinery/restaurant_portal/restaurant, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/wood, +/area/station/commons/lounge) "fWm" = ( /obj/item/toy/plush/beeplushie{ desc = "Maybe hugging this will make you feel better about yourself."; @@ -15795,15 +15924,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/prison) -"fXM" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "fYb" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -15850,6 +15970,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"fYC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "fYI" = ( /obj/structure/table/glass, /obj/item/clothing/accessory/armband/hydro, @@ -15880,6 +16007,18 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/service/library) +"fZw" = ( +/obj/structure/table, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/mask/surgical, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -10; + pixel_y = -1 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) "fZL" = ( /obj/machinery/door/airlock/highsecurity{ name = "Gravity Generator Room" @@ -15901,10 +16040,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/lounge) -"fZZ" = ( -/obj/machinery/status_display/evac/directional/west, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "gae" = ( /obj/effect/spawner/xmastree, /turf/open/floor/wood, @@ -15960,15 +16095,6 @@ }, /turf/closed/wall, /area/station/security/courtroom) -"gbd" = ( -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Quartermaster's Office"; - name = "Quartermaster's Fax Machine" - }, -/obj/machinery/light/directional/west, -/turf/open/floor/wood, -/area/station/command/heads_quarters/qm) "gbf" = ( /obj/machinery/duct, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -16140,11 +16266,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) -"gfo" = ( -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "gfD" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -16170,14 +16291,28 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"ggg" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/commons/locker) "ggj" = ( /turf/closed/wall, /area/station/security/evidence) +"ggq" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"ggw" = ( +/obj/structure/filingcabinet, +/obj/machinery/computer/security/telescreen/minisat{ + dir = 8; + pixel_x = 26 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/engineering) "ggH" = ( /obj/effect/spawner/random/structure/chair_maintenance, /turf/open/floor/iron/checker, @@ -16223,13 +16358,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"ghx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "ghK" = ( /obj/structure/rack, /obj/item/tank/internals/oxygen, @@ -16262,6 +16390,15 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) +"gip" = ( +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Quartermaster's Office"; + name = "Quartermaster's Fax Machine" + }, +/obj/machinery/light/directional/west, +/turf/open/floor/wood, +/area/station/command/heads_quarters/qm) "giz" = ( /obj/machinery/conveyor/inverted{ dir = 10; @@ -16280,6 +16417,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/main) +"giR" = ( +/obj/machinery/computer/security/telescreen/minisat{ + dir = 1; + pixel_y = -29 + }, +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) "giT" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance/two, @@ -16350,14 +16496,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/execution/transfer) -"gkw" = ( -/obj/machinery/status_display/door_timer{ - id = "Cell 1"; - name = "Cell 1"; - pixel_y = -32 - }, -/turf/open/floor/iron, -/area/station/security/brig) "gkx" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16390,6 +16528,18 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"gkM" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "gkS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16511,14 +16661,6 @@ }, /turf/open/floor/carpet, /area/station/service/chapel) -"gnb" = ( -/obj/structure/sign/warning/secure_area/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/engineering/main) "gnc" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/stripes/line, @@ -16650,15 +16792,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) -"gps" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/textured, -/area/station/medical/chem_storage) "gpv" = ( /obj/structure/cable, /obj/machinery/door/airlock{ @@ -16689,16 +16822,6 @@ dir = 4 }, /area/station/commons/fitness) -"gpI" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Port Primary Hallway - Mining Shuttle" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "gpQ" = ( /turf/open/floor/iron/stairs/medium{ dir = 1 @@ -16710,6 +16833,13 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) +"gqa" = ( +/obj/structure/frame/machine{ + anchored = 1 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/circuit/green/off, +/area/station/science/research) "gqj" = ( /obj/structure/sink/directional/west, /obj/machinery/light_switch/directional/east, @@ -16749,16 +16879,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port) -"gqU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "gqV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16932,13 +17052,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"gui" = ( -/obj/structure/bodycontainer/morgue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "guo" = ( /obj/machinery/door/poddoor/incinerator_atmos_main, /turf/open/floor/engine, @@ -17042,6 +17155,16 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/commons/lounge) +"gvC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/white, +/area/station/security/medical) "gvG" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres, @@ -17065,11 +17188,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/locker) -"gvW" = ( -/obj/effect/turf_decal/tile/purple, -/obj/machinery/light/directional/east, +"gvS" = ( +/obj/machinery/bci_implanter, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/science/explab) "gwc" = ( /obj/structure/chair/stool/bar/directional/south, /obj/effect/turf_decal/siding/wood{ @@ -17087,10 +17210,6 @@ "gwf" = ( /turf/open/floor/glass/reinforced, /area/station/science/research) -"gww" = ( -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron, -/area/station/security/office) "gwK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17116,12 +17235,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) -"gxp" = ( -/obj/item/radio/intercom/directional/west, -/obj/structure/closet/secure_closet/security/science, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "gxx" = ( /obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Monitoring" @@ -17152,12 +17265,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"gys" = ( -/obj/effect/turf_decal/siding/purple, -/obj/item/kirbyplants/random, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/white, -/area/station/science/ordnance/office) "gyG" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -17186,6 +17293,22 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology) +"gyJ" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics - Crystallizer" + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/light/no_nightlight/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) "gyK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/engine, @@ -17226,18 +17349,6 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) -"gzV" = ( -/obj/structure/table/wood, -/obj/item/lipstick{ - pixel_y = 5 - }, -/obj/effect/spawner/random/entertainment/musical_instrument, -/obj/structure/sign/poster/random/directional/east, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood/large, -/area/station/service/theater) "gzW" = ( /obj/structure/chair/office{ dir = 8 @@ -17292,15 +17403,19 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) -"gAF" = ( -/obj/effect/turf_decal/siding/purple{ - dir = 10 +"gAH" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/west, -/obj/machinery/dna_scannernew, -/turf/open/floor/iron/dark, -/area/station/science/genetics) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "gAT" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/closed/wall/r_wall, @@ -17311,23 +17426,6 @@ /obj/item/ai_module/reset, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"gBb" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/item/radio/intercom/directional/south, -/obj/item/stack/sheet/glass, -/obj/item/assembly/flash/handheld, -/obj/item/assembly/signaler, -/obj/item/assembly/timer{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/white, -/area/station/science/lobby) "gBe" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -17390,15 +17488,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/central) +"gCU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/dim/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/abandoned) "gCW" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/wood, /area/station/commons/vacant_room/office) -"gDb" = ( -/obj/machinery/firealarm/directional/east, -/turf/closed/wall, -/area/station/security/checkpoint/customs) "gDv" = ( /obj/item/kirbyplants, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -17468,6 +17567,14 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"gEN" = ( +/obj/machinery/light/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "gES" = ( /obj/machinery/computer/shuttle/labor{ dir = 4 @@ -17516,6 +17623,10 @@ "gFi" = ( /turf/open/floor/iron, /area/station/hallway/primary/fore) +"gFy" = ( +/obj/machinery/rnd/production/protolathe/department/science, +/turf/open/floor/iron/dark, +/area/station/science/lab) "gFD" = ( /obj/structure/table, /obj/item/book/manual/hydroponics_pod_people, @@ -17555,15 +17666,6 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron, /area/station/security/brig) -"gFU" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/effect/turf_decal/siding/purple{ - dir = 6 - }, -/obj/machinery/airalarm/directional/east, -/obj/effect/mapping_helpers/airalarm/mixingchamber_access, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/burnchamber) "gGa" = ( /obj/effect/turf_decal/plaque{ icon_state = "L5" @@ -17573,6 +17675,11 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/central) +"gGf" = ( +/obj/structure/sign/poster/official/random/directional/south, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "gGh" = ( /obj/structure/closet/crate/coffin, /turf/open/floor/plating, @@ -17586,6 +17693,17 @@ "gGy" = ( /turf/open/floor/iron/dark, /area/station/command/bridge) +"gGK" = ( +/obj/machinery/computer/operating, +/obj/machinery/camera/directional/west{ + c_tag = "Medbay Primary Surgery"; + name = "medical camera"; + network = list("ss13","medical") + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "gHo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -17601,6 +17719,15 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) +"gHA" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/spawner/random/armory/shotgun, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "gHC" = ( /obj/structure/table/wood, /obj/machinery/light_switch/directional/west, @@ -17646,16 +17773,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) -"gIh" = ( -/obj/machinery/defibrillator_mount/directional/south, -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - name = "medical bed" - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/cold/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "gIi" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -17711,13 +17828,6 @@ /obj/machinery/computer/communications, /turf/open/floor/iron/dark, /area/station/command/bridge) -"gIP" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/light_switch/directional/south, -/turf/open/floor/wood/large, -/area/station/service/theater) "gIS" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -17744,6 +17854,11 @@ /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/iron, /area/station/security/prison) +"gJl" = ( +/obj/effect/turf_decal/siding/purple, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) "gJm" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 @@ -17805,16 +17920,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"gKI" = ( -/obj/structure/closet/emcloset, -/obj/structure/sign/warning/pods{ - pixel_y = 30 - }, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "gKK" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -17845,22 +17950,12 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) -"gLg" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Atmospherics - Crystallizer" - }, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/machinery/light/no_nightlight/directional/west, -/turf/open/floor/iron, -/area/station/engineering/atmos) +"gLm" = ( +/obj/effect/decal/cleanable/oil, +/obj/effect/spawner/random/engineering/tank, +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "gLo" = ( /obj/machinery/power/terminal, /obj/structure/extinguisher_cabinet/directional/west, @@ -17870,15 +17965,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) -"gLs" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 +"gLr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/photocopier, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hos) +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) "gLF" = ( /obj/structure/sink/kitchen/directional/west, /mob/living/simple_animal/hostile/retaliate/goat{ @@ -17910,16 +18004,6 @@ /obj/item/stock_parts/micro_laser, /turf/open/floor/iron, /area/station/science/lab) -"gLW" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Arrivals - Fore Arm" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/entry) "gMg" = ( /obj/structure/table, /obj/item/storage/medkit/regular, @@ -17945,10 +18029,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"gMC" = ( -/obj/machinery/telecomms/server/presets/service, -/turf/open/floor/circuit/telecomms/mainframe, -/area/station/tcommsat/server) "gMG" = ( /obj/machinery/status_display/evac/directional/north, /obj/machinery/camera/directional/north{ @@ -17958,17 +18038,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/main) -"gMJ" = ( -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 10 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "gMQ" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18004,6 +18073,24 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/storage) +"gNr" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/ethanol{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/carbon{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/chlorine{ + pixel_x = 1 + }, +/obj/machinery/light/cold/dim/directional/east, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) "gNy" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -18168,25 +18255,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"gRM" = ( -/obj/machinery/status_display/door_timer{ - id = "Cell 2"; - name = "Cell 2"; - pixel_y = -32 - }, -/turf/open/floor/iron, -/area/station/security/brig) -"gSm" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 10 - }, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "gSn" = ( /obj/item/wrench, /turf/open/floor/iron, @@ -18246,16 +18314,6 @@ /obj/item/crowbar, /turf/open/floor/iron, /area/station/engineering/atmos) -"gTH" = ( -/obj/structure/disposaloutlet{ - dir = 1 - }, -/obj/structure/disposalpipe/trunk, -/obj/structure/window/spawner/directional/east, -/obj/structure/window/spawner/directional/west, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating, -/area/station/cargo/sorting) "gTP" = ( /obj/machinery/light/directional/south, /obj/structure/cable, @@ -18341,12 +18399,12 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"gVm" = ( -/obj/machinery/firealarm/directional/south, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral, +"gVl" = ( +/obj/machinery/recharge_station, +/obj/machinery/light_switch/directional/west, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron, -/area/station/hallway/secondary/command) +/area/station/science/robotics/mechbay) "gVn" = ( /obj/effect/turf_decal/siding/white{ dir = 6 @@ -18420,10 +18478,6 @@ /obj/structure/bed/roller, /turf/open/floor/iron/white, /area/station/security/medical) -"gWU" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/holding_cell) "gXd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -18499,12 +18553,6 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"gXM" = ( -/obj/machinery/light_switch/directional/east, -/obj/structure/cable, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/cargo/storage) "gXW" = ( /obj/machinery/light_switch/directional/north, /obj/machinery/pipedispenser/disposal, @@ -18582,16 +18630,6 @@ /obj/effect/mapping_helpers/mail_sorting/service/kitchen, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) -"gZp" = ( -/obj/machinery/computer/security/mining{ - dir = 4 - }, -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "gZu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -18611,15 +18649,6 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron, /area/station/engineering/main) -"gZL" = ( -/obj/structure/table/glass, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/white, -/area/station/science/research) "gZM" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/north, @@ -18642,14 +18671,6 @@ }, /turf/open/floor/wood/large, /area/station/commons/lounge) -"gZZ" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/spawner/random/armory/riot_armor, -/obj/effect/spawner/random/armory/bulletproof_armor, -/obj/structure/rack, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "haa" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/bot{ @@ -18677,13 +18698,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/cargo/sorting) -"hau" = ( -/obj/structure/closet/toolcloset, -/obj/effect/turf_decal/delivery, -/obj/item/clothing/glasses/meson/engine, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/station/engineering/main) "hav" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -18723,18 +18737,6 @@ "hbv" = ( /turf/closed/wall/r_wall, /area/station/medical/coldroom) -"hbI" = ( -/obj/structure/closet/secure_closet{ - name = "contraband locker"; - req_access = list("armory") - }, -/obj/effect/spawner/random/maintenance/three, -/obj/effect/spawner/random/contraband/armory, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "hbK" = ( /turf/closed/wall, /area/station/maintenance/department/science/xenobiology) @@ -18765,15 +18767,14 @@ }, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/storage/gas) -"hcj" = ( -/obj/machinery/status_display/evac/directional/north, -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 +"hcc" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain/private) +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) "hcl" = ( /obj/item/target, /obj/effect/turf_decal/stripes/line{ @@ -18899,6 +18900,13 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) +"hei" = ( +/obj/item/stack/sheet/cardboard{ + amount = 14 + }, +/obj/item/stack/package_wrap, +/turf/open/floor/iron, +/area/station/security/prison/work) "hen" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18987,6 +18995,17 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"hgu" = ( +/obj/machinery/defibrillator_mount/directional/south, +/obj/structure/bed/pod{ + desc = "An old medical bed, just waiting for replacement with something up to date."; + dir = 4; + name = "medical bed" + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "hgA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -19012,13 +19031,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"hhj" = ( -/obj/machinery/computer/security/telescreen/entertainment/directional/south, -/obj/machinery/suit_storage_unit/ce, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "hhl" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/table, @@ -19049,18 +19061,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/commons/lounge) -"hhU" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 8 - }, -/obj/structure/sign/departments/psychology/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "hio" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -19322,20 +19322,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark, /area/station/command/bridge) -"hmu" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/lights/mixed, -/obj/item/stack/sheet/iron{ - amount = 30 - }, -/obj/item/radio{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/stack/cable_coil, -/obj/structure/sign/poster/random/directional/east, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "hmy" = ( /obj/machinery/door/window/left/directional/south{ name = "Permabrig Kitchen" @@ -19343,14 +19329,14 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) -"hmQ" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/wood{ - dir = 1 +"hmI" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 8 }, -/obj/machinery/light/floor, -/turf/open/floor/wood/large, -/area/station/commons/lounge) +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/service/hydroponics) "hnn" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 @@ -19398,13 +19384,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/storage) -"hot" = ( -/obj/structure/closet/wardrobe/grey, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/dark, -/area/station/commons/locker) "hoE" = ( /obj/structure/sign/map/left{ 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)."; @@ -19487,6 +19466,17 @@ }, /turf/open/floor/iron, /area/station/science/robotics/mechbay) +"hpM" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics) "hqb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/burnt_floor, @@ -19534,11 +19524,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"hrf" = ( -/obj/effect/spawner/random/structure/crate, -/obj/machinery/light/small/dim/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) "hrh" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2, /turf/open/floor/iron/dark/airless, @@ -19631,15 +19616,6 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/station/maintenance/port/aft) -"htt" = ( -/obj/item/storage/secure/safe/hos{ - pixel_x = 36; - pixel_y = 28 - }, -/obj/machinery/status_display/evac/directional/north, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hos) "htD" = ( /obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 @@ -19692,22 +19668,6 @@ dir = 1 }, /area/station/engineering/atmos) -"hug" = ( -/obj/machinery/chem_master/condimaster{ - name = "CondiMaster Neo" - }, -/obj/machinery/newscaster/directional/south, -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "huj" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, @@ -19738,13 +19698,6 @@ "huG" = ( /turf/closed/wall, /area/station/service/kitchen/coldroom) -"huN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/bed/roller, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "huZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -19758,6 +19711,14 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/plating, /area/station/security/checkpoint/customs) +"hvo" = ( +/obj/structure/filingcabinet, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "hvr" = ( /obj/machinery/camera/directional/south{ c_tag = "Central Primary Hallway - Fore - Courtroom" @@ -19784,17 +19745,6 @@ /obj/effect/turf_decal/trimline/brown/filled/warning, /turf/open/floor/iron, /area/station/cargo/sorting) -"hvG" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Prison Sanitarium" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "hvI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19846,13 +19796,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"hwp" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/bluespace_vendor/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "hwt" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -19878,15 +19821,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"hwN" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "hwZ" = ( /obj/structure/chair/stool/directional/north, /obj/structure/cable, @@ -20093,43 +20027,35 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/cytology) -"hzY" = ( -/obj/structure/table, -/obj/effect/turf_decal/delivery, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/storage/belt/utility, -/obj/item/storage/belt/utility, -/obj/item/storage/belt/utility, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/engineering/main) "hAk" = ( /obj/structure/cable, /obj/effect/landmark/start/hangover, /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) +"hAq" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "hAu" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/locker) -"hAA" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - dir = 8; - initialize_directions = 4; - name = "euthanization chamber freezer" +"hAF" = ( +/obj/machinery/camera/directional/south{ + c_tag = "MiniSat Exterior Access"; + network = list("minisat") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron, -/area/station/science/xenobiology) +/turf/open/floor/iron/dark, +/area/station/ai_monitored/aisat/exterior) "hAL" = ( /obj/machinery/door/poddoor/shutters{ dir = 4; @@ -20156,13 +20082,6 @@ }, /turf/open/floor/engine, /area/station/command/heads_quarters/rd) -"hBe" = ( -/obj/structure/table, -/obj/item/electronics/apc, -/obj/item/electronics/airlock, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tech) "hBh" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -20205,6 +20124,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"hBH" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/space/basic, +/area/space/nearstation) "hBI" = ( /obj/structure/table, /obj/effect/turf_decal/bot, @@ -20261,11 +20184,15 @@ /turf/open/floor/iron/white, /area/station/medical/pharmacy) "hCG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/wood, -/area/station/command/corporate_showroom) +/obj/machinery/camera/directional/south{ + c_tag = "Port Primary Hallway - Mining Shuttle" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "hCK" = ( /obj/effect/decal/cleanable/oil/slippery, /obj/effect/turf_decal/siding/purple{ @@ -20275,6 +20202,15 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/white, /area/station/science/research) +"hCT" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/box/red, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "hDa" = ( /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow{ @@ -20287,14 +20223,6 @@ /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) -"hDi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "hDj" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -20316,6 +20244,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"hDE" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/turf/open/floor/iron/white, +/area/station/security/prison) "hDX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -20390,14 +20322,6 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"hFJ" = ( -/obj/machinery/restaurant_portal/restaurant, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/wood, -/area/station/commons/lounge) "hGi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -20445,33 +20369,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"hGR" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/computer/department_orders/medical{ - dir = 1 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/medbay/central) -"hHc" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 10 - }, -/obj/item/flashlight/lamp{ - on = 0; - pixel_x = -7; - pixel_y = 18 - }, -/obj/item/kitchen/rollingpin{ - pixel_x = -4 - }, -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/light/small/dim/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "hHd" = ( /obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20555,6 +20452,15 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"hJi" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering Supermatter Aft"; + network = list("ss13","engine") + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "hJv" = ( /obj/structure/chair/stool/directional/south, /obj/structure/disposalpipe/segment{ @@ -20731,13 +20637,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"hMh" = ( -/obj/structure/sign/painting/library{ - pixel_y = -32 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/wood, -/area/station/service/library) "hMn" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -20800,18 +20699,16 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"hMZ" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "hNb" = ( /obj/structure/cable, /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/security/office) +"hNn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/floor, +/turf/open/floor/wood, +/area/station/commons/lounge) "hNz" = ( /obj/structure/chair, /obj/effect/landmark/start/depsec/science, @@ -20861,17 +20758,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"hOK" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/effect/spawner/random/armory/disablers, -/obj/machinery/requests_console/directional/west, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/assistance, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "hOR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/spawner/random/trash/soap{ @@ -20886,6 +20772,16 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/engineering/break_room) +"hPv" = ( +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/structure/table/wood, +/obj/structure/noticeboard/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel) "hPK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/duct, @@ -21041,6 +20937,17 @@ }, /turf/open/floor/wood, /area/station/service/cafeteria) +"hSl" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/obj/structure/sign/poster/official/moth_piping/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "hSr" = ( /obj/machinery/holopad/secure, /obj/structure/window/reinforced/spawner/directional/west, @@ -21078,14 +20985,6 @@ /obj/structure/sign/warning/vacuum/external/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"hTf" = ( -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "hTn" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -21163,6 +21062,11 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) +"hUB" = ( +/obj/machinery/suit_storage_unit/hos, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hos) "hUN" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -21178,6 +21082,11 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"hVg" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) "hVn" = ( /obj/machinery/door/window/left/directional/north{ dir = 4; @@ -21186,13 +21095,6 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) -"hVr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "hVE" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -21337,16 +21239,6 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) -"hXz" = ( -/obj/structure/table, -/obj/item/folder, -/obj/item/pen, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/photo_album/prison, -/obj/item/camera, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/prison) "hXC" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -21371,6 +21263,16 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"hYd" = ( +/obj/machinery/microwave{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/structure/table, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/office) "hYr" = ( /obj/machinery/holopad, /obj/structure/cable, @@ -21458,14 +21360,14 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) -"hZu" = ( +"hZn" = ( /obj/structure/cable, -/obj/structure/sign/poster/official/random/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/wood/large, +/area/station/commons/lounge) "hZO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21487,6 +21389,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"iam" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) "iar" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -21499,6 +21408,11 @@ /obj/machinery/seed_extractor, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"iaK" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "iaQ" = ( /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/delivery, @@ -21540,11 +21454,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"ibD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/turn_off_lights_with_lightswitch, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "ibH" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -21562,6 +21471,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"ica" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/chapel{ + dir = 1 + }, +/area/station/service/chapel) "icb" = ( /obj/machinery/door/window/brigdoor{ name = "Justice Chamber"; @@ -21597,14 +21512,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/central) -"ico" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/lockers) "icC" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -21634,13 +21541,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"icT" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "idr" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -21693,6 +21593,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"ieI" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/pumproom) "ieV" = ( /turf/closed/wall/r_wall, /area/station/security/holding_cell) @@ -21754,6 +21661,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/command/gateway) +"igi" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) "ign" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -21844,17 +21756,6 @@ "ihb" = ( /turf/closed/wall, /area/station/security/prison/shower) -"ihh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "ihq" = ( /turf/closed/wall/r_wall, /area/station/hallway/primary/central) @@ -21865,14 +21766,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"ihw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "ihx" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -21961,18 +21854,16 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"iiX" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/light/floor, -/turf/open/floor/wood/large, -/area/station/commons/lounge) "ije" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"iji" = ( +/obj/machinery/vending/hydronutrients, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/service/hydroponics) "ijv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21987,11 +21878,35 @@ "ikb" = ( /turf/open/floor/iron, /area/station/commons/dorms) -"ikh" = ( -/obj/structure/cable, -/obj/machinery/light/small/directional/south, -/turf/open/floor/wood, -/area/station/service/library) +"iki" = ( +/obj/structure/table, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 5 + }, +/obj/item/clothing/mask/balaclava, +/obj/item/storage/backpack/duffelbag/sec/surgery{ + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) +"ikr" = ( +/obj/structure/closet/emcloset, +/obj/machinery/camera/directional/south{ + c_tag = "Science Entry"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/checker, +/area/station/science/research) "iks" = ( /obj/effect/landmark/start/clown, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22171,14 +22086,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/cargo/warehouse) -"imf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/light/floor, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "imw" = ( /obj/machinery/door/window/left/directional/north{ dir = 8; @@ -22195,6 +22102,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"ina" = ( +/obj/machinery/stasis{ + dir = 4 + }, +/obj/machinery/defibrillator_mount/directional/north, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "inw" = ( /obj/machinery/disposal/bin{ desc = "A pneumatic waste disposal unit. This one leads into space!"; @@ -22227,11 +22143,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"inO" = ( -/obj/effect/turf_decal/siding/wood, -/obj/structure/sign/poster/random/directional/north, -/turf/open/floor/wood/large, -/area/station/service/theater) "inQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -22294,16 +22205,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/sorting) -"ioO" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Central Primary Hallway - Starboard - Art Storage" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "ioZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22670,6 +22571,14 @@ /obj/effect/spawner/random/food_or_drink/donkpockets, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"iuE" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/drinkingglass, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "iva" = ( /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance" @@ -22703,14 +22612,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) -"ivv" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/rnd/production/circuit_imprinter/department/science, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/science/robotics/lab) "ivx" = ( /obj/effect/spawner/random/structure/chair_maintenance{ dir = 8 @@ -22788,17 +22689,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"iwT" = ( -/obj/machinery/computer/operating, -/obj/machinery/camera/directional/west{ - c_tag = "Medbay Primary Surgery"; - name = "medical camera"; - network = list("ss13","medical") - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) "ixd" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -22808,22 +22698,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"ixh" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/iv_drip, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/white, -/area/station/security/medical) "ixm" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -22857,14 +22731,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"ixD" = ( -/obj/structure/cable, -/obj/structure/sign/poster/official/random/directional/east, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/entry) "ixP" = ( /obj/machinery/firealarm/directional/south, /obj/structure/cable, @@ -22921,6 +22787,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"iyv" = ( +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Cargo Office"; + name = "Cargo Office Fax Machine" + }, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/cargo/sorting) "iyy" = ( /obj/structure/table, /obj/item/folder/white{ @@ -22957,13 +22833,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/virology) -"iyT" = ( -/obj/structure/bed, -/obj/item/clothing/suit/jacket/straight_jacket, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/mask/muzzle, -/turf/open/floor/iron/dark, -/area/station/security/holding_cell) "iyV" = ( /obj/structure/disposalpipe/segment, /obj/machinery/navbeacon{ @@ -23047,6 +22916,18 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"izX" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/camera/directional/north{ + c_tag = "Science Research Office"; + network = list("ss13","rd") + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/lab) "izZ" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -23104,6 +22985,11 @@ /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) +"iAu" = ( +/obj/machinery/iv_drip, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) "iAA" = ( /obj/item/toy/beach_ball/branded{ pixel_y = 7 @@ -23175,6 +23061,14 @@ /obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"iCr" = ( +/obj/structure/rack, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/spawner/random/armory/riot_helmet, +/obj/effect/spawner/random/armory/bulletproof_helmet, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "iCz" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/vault{ @@ -23282,19 +23176,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"iEY" = ( -/obj/structure/table/reinforced, -/obj/item/stack/sheet/plasteel{ - amount = 15 - }, -/obj/item/assembly/prox_sensor{ - pixel_x = 5; - pixel_y = 7 - }, -/obj/structure/fireaxecabinet/mechremoval/directional/east, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/science/robotics/lab) "iEZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -23335,6 +23216,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) +"iFI" = ( +/obj/item/radio/intercom/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) "iFR" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 @@ -23346,29 +23234,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) -"iGg" = ( -/obj/structure/chair/wood{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/wood, -/area/station/commons/dorms) "iGj" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, /turf/open/floor/iron, /area/station/security/office) -"iGk" = ( -/obj/structure/sign/departments/chemistry/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Medbay Main Hallway - Virology Junction"; - network = list("ss13","medbay") - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "iGq" = ( /obj/structure/lattice, /obj/item/broken_bottle, @@ -23381,6 +23252,14 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"iGy" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood, +/area/station/commons/dorms) "iGA" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/turf_decal/siding/purple, @@ -23431,32 +23310,26 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/engine, /area/station/science/xenobiology) -"iIe" = ( -/obj/structure/closet{ - name = "evidence closet 5" +"iIf" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Locker Room Entrance" }, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 +/obj/structure/cable, +/obj/structure/sign/departments/lawyer/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/security/evidence) +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/commons/locker) "iIq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/chapel{ dir = 8 }, /area/station/service/chapel) -"iIz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "iIP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23509,22 +23382,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) -"iJu" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - initialize_directions = 8 - }, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "iJx" = ( /obj/structure/cable, /obj/structure/table, @@ -23553,18 +23410,6 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron, /area/station/security/execution/transfer) -"iJA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "iJB" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -23597,25 +23442,19 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"iKg" = ( -/obj/structure/closet/wardrobe/white, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/iron/dark, -/area/station/commons/locker) -"iKC" = ( -/obj/structure/table/glass, -/obj/machinery/reagentgrinder{ - pixel_y = 8 +"iKj" = ( +/obj/machinery/photocopier{ + pixel_y = 3 }, -/obj/item/toy/figure/virologist{ - pixel_x = -8 +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 }, -/obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/light/small/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/virology) +/turf/open/floor/iron/dark, +/area/station/security/brig) "iKL" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -23786,6 +23625,24 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/gateway) +"iMF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Custodial Closet" + }, +/obj/machinery/light_switch/directional/west, +/obj/machinery/requests_console/directional/north{ + department = "Janitorial"; + name = "Janitorial Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/iron, +/area/station/service/janitor) "iMG" = ( /obj/structure/chair/stool/directional/south, /obj/structure/disposalpipe/junction/flip{ @@ -23933,6 +23790,18 @@ "iOr" = ( /turf/closed/wall/r_wall, /area/station/security/prison/garden) +"iOt" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 8 + }, +/obj/item/toy/figure/virologist{ + pixel_x = -8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/virology) "iOD" = ( /obj/machinery/atmospherics/components/binary/tank_compressor{ dir = 8 @@ -23946,18 +23815,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"iOR" = ( -/obj/machinery/light/small/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Customs Checkpoint" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/machinery/modular_computer/preset/id, -/turf/open/floor/iron, -/area/station/security/checkpoint/customs) "iOS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23965,20 +23822,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/station/security/detectives_office) -"iOU" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Medbay Break Room"; - network = list("ss13","medbay") - }, -/obj/item/radio/intercom/directional/west, -/obj/machinery/vending/coffee, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/obj/machinery/light/cold/directional/west, -/turf/open/floor/iron/dark, -/area/station/medical/break_room) "iPb" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -24038,6 +23881,10 @@ }, /turf/open/floor/iron/white, /area/station/medical/office) +"iPT" = ( +/obj/machinery/light/floor, +/turf/open/floor/wood, +/area/station/commons/lounge) "iPX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/brig{ @@ -24128,6 +23975,17 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"iRc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/white, +/area/station/science/research) "iRg" = ( /obj/structure/chair/stool/directional/west, /obj/effect/mapping_helpers/broken_floor, @@ -24227,10 +24085,6 @@ }, /turf/open/floor/iron/white/smooth_half, /area/station/commons/fitness) -"iSx" = ( -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "iSI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -24309,6 +24163,18 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) +"iUe" = ( +/obj/structure/table/wood, +/obj/item/lipstick{ + pixel_y = 5 + }, +/obj/effect/spawner/random/entertainment/musical_instrument, +/obj/structure/sign/poster/random/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/large, +/area/station/service/theater) "iUf" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24423,12 +24289,38 @@ }, /turf/open/floor/iron, /area/station/security/office) +"iWk" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = 8 + }, +/obj/machinery/button/door/directional/south{ + id = "chapel_shutters_space"; + name = "chapel shutters control"; + pixel_x = -6 + }, +/turf/open/floor/iron/chapel{ + dir = 4 + }, +/area/station/service/chapel) "iWy" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) +"iWB" = ( +/obj/structure/rack{ + icon = 'icons/obj/fluff/general.dmi'; + icon_state = "minibar"; + name = "skeletal minibar" + }, +/obj/item/storage/fancy/candle_box, +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine/cult, +/area/station/service/library) "iWD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -24442,6 +24334,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"iWT" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 6 + }, +/obj/structure/table, +/obj/item/clipboard, +/obj/item/holosign_creator/atmos, +/obj/item/holosign_creator/atmos, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) "iWU" = ( /turf/closed/wall/r_wall, /area/station/engineering/break_room) @@ -24469,6 +24372,14 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/station/hallway/primary/central) +"iXC" = ( +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/machinery/light/small/dim/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port) "iXT" = ( /obj/structure/cable, /obj/machinery/door/airlock{ @@ -24513,6 +24424,15 @@ }, /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) +"iYE" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/siding/purple{ + dir = 6 + }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/burnchamber) "iYG" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral{ @@ -24520,15 +24440,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"iYJ" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Engineering Supermatter Fore"; - network = list("ss13","engine") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) "iYO" = ( /obj/structure/table, /obj/item/circular_saw, @@ -24568,15 +24479,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/service/chapel) -"iZj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Entrance" - }, -/turf/open/floor/iron, -/area/station/engineering/main) "iZm" = ( /obj/machinery/shower/directional/south{ name = "emergency shower" @@ -24615,12 +24517,26 @@ /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /turf/open/floor/iron/dark, /area/station/medical/cryo) +"jaj" = ( +/obj/structure/chair, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood, +/area/station/security/office) "jaq" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 }, /turf/open/floor/iron, /area/station/engineering/atmos) +"jas" = ( +/obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/med/surgery, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "jay" = ( /obj/structure/chair{ dir = 4 @@ -24685,15 +24601,6 @@ /obj/item/shard, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"jbL" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/siding/purple{ - dir = 6 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/storage) "jcc" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -24719,25 +24626,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"jcC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/button/door/directional/east{ - id = "atmoshfr"; - name = "Radiation Shutters Control"; - req_access = list("atmospherics") - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/machinery/light/no_nightlight/directional/east, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/atmos) -"jcI" = ( -/obj/machinery/status_display/evac/directional/west, -/obj/structure/closet/secure_closet/psychology, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood/parquet, -/area/station/medical/psychology) "jcJ" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -24773,6 +24661,12 @@ }, /turf/open/floor/iron, /area/station/construction/storage_wing) +"jdv" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/east, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) "jdB" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -24787,6 +24681,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/fore) +"jdX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/telecomms, +/area/station/science/server) "jdZ" = ( /obj/docking_port/stationary/random{ dir = 4; @@ -24795,22 +24700,6 @@ }, /turf/open/space, /area/space) -"jed" = ( -/obj/machinery/rnd/production/techfab/department/service, -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 6 - }, -/obj/effect/turf_decal/box, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "jef" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -25009,11 +24898,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"jgN" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/structure/window/spawner/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "jgQ" = ( /obj/structure/table, /obj/item/stack/wrapping_paper, @@ -25162,6 +25046,13 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"jjv" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "jjy" = ( /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/dark, @@ -25177,6 +25068,17 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) +"jjG" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Recreation Area - Fore" + }, +/obj/machinery/airalarm/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "jjM" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/green/filled/line, @@ -25203,6 +25105,14 @@ }, /turf/open/floor/iron, /area/station/security/office) +"jku" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) "jkG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25256,18 +25166,6 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"jlB" = ( -/obj/machinery/bci_implanter, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/station/science/explab) -"jlE" = ( -/obj/item/stack/sheet/cardboard{ - amount = 14 - }, -/obj/item/stack/package_wrap, -/turf/open/floor/iron, -/area/station/security/prison/work) "jlJ" = ( /obj/effect/spawner/random/entertainment/arcade, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -25278,19 +25176,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"jlQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Science Research"; - network = list("ss13","rd") - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/science/lab) "jlU" = ( /turf/closed/wall/r_wall, /area/station/science/xenobiology) @@ -25355,12 +25240,31 @@ }, /turf/open/floor/plating, /area/station/maintenance/port) +"jmN" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Port Primary Hallway - Middle" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "jmR" = ( /obj/structure/closet/secure_closet/security/cargo, /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +"jmT" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "jmY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -25459,6 +25363,20 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) +"joP" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/wood, +/area/station/commons/lounge) +"jpj" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/brig) "jpr" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/command_all, @@ -25488,6 +25406,19 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"jpI" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/deck, +/obj/effect/spawner/random/entertainment/cigarette_pack{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "jpO" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -25497,6 +25428,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"jpX" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/holding_cell) "jpY" = ( /obj/machinery/smartfridge/chemistry/preloaded, /obj/machinery/door/poddoor/shutters/preopen{ @@ -25513,6 +25448,13 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"jqd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "jql" = ( /obj/machinery/door/airlock{ id_tag = "AuxToilet2"; @@ -25526,21 +25468,16 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/port) -"jqN" = ( -/obj/structure/table/glass, -/obj/item/scalpel{ - pixel_y = 12 +"jqr" = ( +/obj/machinery/computer/security/mining{ + dir = 4 }, -/obj/item/circular_saw, -/obj/item/blood_filter, -/obj/item/bonesetter, -/obj/machinery/button/door/directional/south{ - id = "main_surgery"; - name = "privacy shutters control" +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "jqQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -25565,13 +25502,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"jro" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/modular_computer/preset/curator{ - dir = 8 - }, -/turf/open/floor/wood, -/area/station/service/library) "jrL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25630,11 +25560,6 @@ }, /turf/open/floor/iron/white, /area/station/science/cytology) -"jsl" = ( -/obj/structure/cable, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "jso" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -25682,14 +25607,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"jte" = ( -/obj/machinery/portable_atmospherics/pump, -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/commons/locker) "jtf" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -25697,13 +25614,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"jtj" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "jtl" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/white, @@ -25713,29 +25623,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"jtr" = ( -/obj/machinery/door/window/right/directional/south{ - dir = 1; - name = "First Aid Supplies"; - req_access = list("medical") +"jty" = ( +/obj/machinery/vending/wardrobe/cargo_wardrobe, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 }, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/medkit/toxin{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/toxin, -/obj/item/storage/medkit/toxin{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/table/reinforced, -/obj/structure/window/spawner/directional/west, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/cargo/storage) "jtA" = ( /obj/structure/table/glass, /obj/effect/turf_decal/siding/white{ @@ -25809,16 +25704,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"juD" = ( -/obj/structure/rack{ - icon = 'icons/obj/fluff/general.dmi'; - icon_state = "minibar"; - name = "skeletal minibar" - }, -/obj/item/storage/fancy/candle_box, -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine/cult, -/area/station/service/library) "juH" = ( /obj/item/kirbyplants/random, /obj/machinery/firealarm/directional/west{ @@ -25881,6 +25766,14 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +"jvu" = ( +/obj/machinery/newscaster/directional/west, +/obj/structure/filingcabinet, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) "jvv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25931,6 +25824,12 @@ /obj/machinery/shower/directional/north, /turf/open/floor/iron, /area/station/science/xenobiology) +"jwd" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/mannequin/skeleton, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "jwg" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -25979,6 +25878,20 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/cryo) +"jws" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "jwv" = ( /obj/structure/toilet{ pixel_y = 8 @@ -26008,6 +25921,11 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"jwE" = ( +/obj/structure/cable, +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood, +/area/station/service/library) "jwP" = ( /obj/structure/table, /obj/item/paper_bin, @@ -26072,6 +25990,24 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"jxM" = ( +/obj/item/radio/intercom/directional/west{ + pixel_y = -10 + }, +/obj/machinery/light_switch/directional/west{ + pixel_y = 6 + }, +/obj/structure/table/reinforced, +/obj/machinery/fax{ + fax_name = "Engineering Lobby"; + name = "Engineering Lobby Fax Machine" + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/engineering/break_room) "jxS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line{ @@ -26149,17 +26085,6 @@ }, /turf/open/floor/iron, /area/station/security/office) -"jyP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/station/commons/locker) "jyQ" = ( /obj/machinery/computer/records/medical{ dir = 8 @@ -26189,22 +26114,6 @@ "jzN" = ( /turf/closed/wall/r_wall, /area/station/command/corporate_showroom) -"jzS" = ( -/obj/structure/table/wood, -/obj/item/poster/random_official, -/obj/item/poster/random_official, -/obj/item/poster/random_official, -/obj/item/poster/random_official, -/obj/item/poster/random_official, -/obj/structure/cable, -/obj/machinery/button/door/directional/east{ - id = "corporate_privacy"; - name = "corporate showroom shutters control"; - req_access = list("command") - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/carpet, -/area/station/command/corporate_showroom) "jzT" = ( /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) @@ -26243,6 +26152,11 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/science/robotics/lab) +"jAN" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/office) "jAO" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -26304,12 +26218,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/service/hydroponics/garden) -"jCe" = ( -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/computer/security/telescreen/entertainment/directional/north, -/turf/open/floor/iron, -/area/station/commons/lounge) "jCj" = ( /obj/item/toy/basketball, /turf/open/floor/plating, @@ -26342,6 +26250,13 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"jCF" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "jCM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, @@ -26357,11 +26272,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/iron, /area/station/cargo/warehouse) -"jDp" = ( -/obj/structure/easel, -/obj/machinery/light/small/dim/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "jDB" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -26388,10 +26298,6 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"jEj" = ( -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "jEr" = ( /obj/machinery/holopad/secure, /obj/machinery/flasher/directional/west{ @@ -26465,14 +26371,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"jFD" = ( -/obj/structure/table/optable, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/machinery/light/cold/directional/east, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) "jFK" = ( /obj/machinery/washing_machine, /obj/effect/decal/cleanable/dirt, @@ -26486,13 +26384,13 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) -"jFU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/light/directional/east, +"jFZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/item/radio/intercom/directional/east, /turf/open/floor/iron, -/area/station/hallway/primary/port) +/area/station/hallway/secondary/exit/departure_lounge) "jGa" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -26502,20 +26400,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"jGh" = ( -/obj/structure/table/reinforced, -/obj/item/wheelchair{ - pixel_y = -3 - }, -/obj/item/wheelchair, -/obj/item/wheelchair{ - pixel_y = 3 - }, -/obj/structure/window/spawner/directional/north, -/obj/structure/window/spawner/directional/west, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark, -/area/station/medical/office) "jGl" = ( /obj/effect/landmark/secequipment, /obj/effect/turf_decal/bot, @@ -26530,6 +26414,14 @@ "jGr" = ( /turf/closed/wall/r_wall, /area/station/tcommsat/server) +"jGt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "jGv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26563,6 +26455,13 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/treatment_center) +"jGO" = ( +/obj/machinery/hydroponics/soil, +/obj/item/cultivator, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, +/turf/open/floor/grass, +/area/station/security/prison/garden) "jHg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26693,12 +26592,29 @@ /obj/effect/spawner/random/maintenance/three, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"jJl" = ( +/obj/structure/table/reinforced, +/obj/structure/reagent_dispensers/servingdish, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "jJm" = ( /obj/effect/spawner/random/trash/garbage{ spawn_scatter_radius = 1 }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"jJp" = ( +/obj/machinery/button/flasher{ + id = "IsolationFlash"; + pixel_x = -23; + pixel_y = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "jJC" = ( /obj/structure/disposalpipe/segment, /obj/structure/lattice/catwalk, @@ -26718,6 +26634,13 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) +"jJY" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/beakers{ + pixel_y = 7 + }, +/turf/open/floor/iron/dark/textured, +/area/station/medical/chem_storage) "jKa" = ( /obj/machinery/door/airlock/research{ name = "Testing Labs" @@ -26804,14 +26727,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/engineering/main) -"jLr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "jLw" = ( /obj/structure/marker_beacon/burgundy, /obj/structure/lattice/catwalk, @@ -26856,6 +26771,22 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/detectives_office) +"jMJ" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_y = 6 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Prison Sanitarium"; + network = list("ss13","prison") + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white, +/area/station/security/execution/transfer) "jML" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -26869,15 +26800,6 @@ }, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/storage/gas) -"jMU" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Telecomms - Server Room - Aft-Starboard"; - network = list("ss13","tcomms") - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/turf/open/floor/iron/dark/telecomms, -/area/station/tcommsat/server) "jMY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -26902,18 +26824,17 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"jNl" = ( -/obj/structure/table, -/obj/machinery/light/directional/south, -/obj/item/storage/medkit/regular{ - pixel_x = 4; - pixel_y = 4 +"jNm" = ( +/obj/effect/landmark/blobstart, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Evidence Storage" }, -/obj/item/storage/medkit/regular, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/obj/item/storage/secure/safe/directional/north{ + name = "evidence safe" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/evidence) "jNo" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -26928,13 +26849,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) -"jNy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "jNN" = ( /obj/item/storage/box/lights/mixed, /turf/open/floor/plating, @@ -26948,6 +26862,15 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"jNZ" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Telecomms - Server Room - Aft-Port"; + network = list("ss13","tcomms") + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) "jOb" = ( /obj/docking_port/stationary/mining_home/common{ dir = 2 @@ -27027,6 +26950,19 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/main) +"jPf" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Starboard Primary Hallway - Engineering" + }, +/obj/structure/sign/directions/engineering{ + dir = 4; + pixel_y = -24 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "jPi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -27035,10 +26971,29 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +"jPm" = ( +/obj/machinery/atmospherics/components/tank/air, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) "jPo" = ( /obj/structure/closet/firecloset, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"jPp" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "jPE" = ( /obj/structure/sign/map/left{ 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)."; @@ -27129,11 +27084,6 @@ "jRg" = ( /turf/open/floor/engine/co2, /area/station/engineering/atmos) -"jRp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/l3closet/janitor, -/turf/open/floor/iron, -/area/station/service/janitor) "jRz" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance, @@ -27162,6 +27112,16 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"jSb" = ( +/obj/machinery/light_switch/directional/west, +/obj/effect/landmark/start/hangover, +/obj/machinery/duct, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "jSf" = ( /obj/structure/chair/stool/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -27204,18 +27164,16 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) -"jSW" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ - dir = 1 +"jTi" = ( +/obj/machinery/hydroponics/soil, +/obj/machinery/camera/directional/west{ + c_tag = "Prison Forestry"; + network = list("ss13","prison") }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/structure/cable, -/turf/open/floor/iron/textured, -/area/station/medical/chem_storage) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/turf/open/floor/grass, +/area/station/security/prison/garden) "jTs" = ( /obj/item/kirbyplants/potty, /obj/effect/turf_decal/siding/wood{ @@ -27279,15 +27237,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) -"jTU" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/mob/living/basic/pet/dog/corgi/puppy/void{ - dir = 4 - }, -/turf/open/floor/grass, -/area/station/science/research) "jTZ" = ( /turf/closed/wall, /area/station/security/execution/transfer) @@ -27306,6 +27255,18 @@ }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"jUj" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Chapel - Funeral Parlour" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/computer/pod/old/mass_driver_controller/chapelgun{ + pixel_x = 24 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) "jUm" = ( /obj/structure/closet/secure_closet/bar/all_access{ pixel_x = -3; @@ -27361,15 +27322,30 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/dark, /area/station/security/execution/education) -"jUU" = ( -/obj/structure/closet{ - name = "evidence closet 1" +"jUT" = ( +/obj/structure/table, +/obj/effect/turf_decal/delivery, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/evidence) +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/engineering/main) +"jUW" = ( +/obj/item/radio/intercom/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) "jVb" = ( /obj/effect/spawner/random/trash/garbage{ spawn_scatter_radius = 1 @@ -27377,19 +27353,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port) -"jVf" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/structure/disposaloutlet{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "jVl" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ @@ -27409,6 +27372,19 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"jVy" = ( +/obj/machinery/portable_atmospherics/pump/lil_pump, +/obj/effect/turf_decal/siding/purple{ + dir = 5 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/button/door/directional/north{ + id = "rdordnance"; + name = "Ordnance Containment Control"; + req_access = list("rd") + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) "jVG" = ( /obj/structure/table, /obj/item/storage/box/bodybags{ @@ -27482,13 +27458,12 @@ "jXu" = ( /turf/closed/wall, /area/station/maintenance/port/fore) -"jXv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red, -/obj/machinery/light/directional/east, +"jXw" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, -/area/station/hallway/primary/fore) +/area/station/hallway/secondary/command) "jXy" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/carpet, @@ -27552,16 +27527,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"jYz" = ( -/obj/machinery/door/window/right/directional/north{ - dir = 4; - name = "Research Delivery"; - req_access = list("science") - }, -/obj/machinery/light_switch/directional/north, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/white, -/area/station/science/lab) "jYB" = ( /obj/machinery/conveyor/inverted{ dir = 6; @@ -27595,18 +27560,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron/dark, /area/station/command/bridge) -"jYX" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 6 - }, -/obj/structure/sign/warning/fire/directional/east, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "jZl" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line, @@ -27673,12 +27626,6 @@ /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, /area/station/cargo/miningoffice) -"kay" = ( -/obj/machinery/light/directional/west, -/turf/open/floor/iron/chapel{ - dir = 4 - }, -/area/station/service/chapel) "kaC" = ( /obj/machinery/light_switch/directional/east, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -27784,14 +27731,6 @@ /obj/item/electropack, /turf/open/floor/engine, /area/station/science/xenobiology) -"kcD" = ( -/obj/structure/sign/warning/vacuum/external/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "kcF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27799,22 +27738,6 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"kcG" = ( -/obj/machinery/light/small/directional/west, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron, -/area/station/commons/dorms) -"kcP" = ( -/obj/structure/frame/machine{ - anchored = 1 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/circuit/green/off, -/area/station/science/research) "kcU" = ( /obj/structure/lattice, /obj/structure/window/reinforced/spawner/directional/south, @@ -27859,6 +27782,11 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"kdL" = ( +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) "kdN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -28085,13 +28013,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/lockers) -"kjB" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 +"kjj" = ( +/obj/machinery/duct, +/obj/effect/turf_decal/trimline/blue/filled/corner, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/machinery/light/floor, -/turf/open/floor/iron, -/area/station/engineering/atmos) +/turf/open/floor/iron/white, +/area/station/medical/cryo) "kjG" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -28150,6 +28083,26 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/central) +"kkX" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight, +/obj/item/analyzer{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/assembly/signaler, +/obj/item/stack/rods{ + amount = 25 + }, +/obj/item/stack/cable_coil, +/obj/item/gps, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/item/clothing/gloves/color/fyellow, +/obj/item/gps, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "klf" = ( /obj/item/folder, /obj/item/folder, @@ -28268,14 +28221,6 @@ /obj/machinery/status_display/evac, /turf/closed/wall, /area/station/commons/lounge) -"kmg" = ( -/obj/machinery/atmospherics/components/binary/pump/on, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine, -/area/station/science/ordnance/burnchamber) "kms" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -28294,19 +28239,12 @@ /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, /area/station/command/gateway) -"kne" = ( -/obj/item/crowbar, -/obj/item/wrench, -/obj/structure/table, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) +"knd" = ( +/obj/effect/landmark/start/assistant, +/obj/structure/chair/comfy/black, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood, +/area/station/service/library) "knf" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -28329,20 +28267,16 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"knE" = ( -/obj/structure/table, -/obj/structure/cable, -/obj/item/disk/tech_disk{ - pixel_x = -6 +"knI" = ( +/obj/structure/chair{ + dir = 4 }, -/obj/item/disk/tech_disk{ - pixel_x = 6 - }, -/obj/item/disk/tech_disk{ - pixel_y = 6 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, +/obj/machinery/light/directional/west, /turf/open/floor/iron, -/area/station/science/lab) +/area/station/hallway/secondary/exit/departure_lounge) "knK" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -28407,19 +28341,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/warehouse) -"kof" = ( -/obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Central Primary Hallway - Aft-Starboard Corner" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "koj" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -28479,13 +28400,6 @@ /obj/structure/sign/warning/vacuum/external/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"kqh" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/item/weldingtool, -/obj/item/clothing/head/utility/welding, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/construction/storage_wing) "kqm" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -28495,15 +28409,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"kqC" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "kqZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -28529,6 +28434,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison) +"krt" = ( +/obj/item/storage/bag/plants/portaseeder, +/obj/structure/table, +/obj/item/plant_analyzer, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "krL" = ( /turf/open/floor/wood, /area/station/command/corporate_showroom) @@ -28574,18 +28489,28 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/gateway) -"ksN" = ( -/obj/machinery/light_switch/directional/north, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 8 +"kss" = ( +/obj/structure/table, +/obj/item/folder/white{ + pixel_x = 3; + pixel_y = 4 }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/table/wood, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 7 + }, +/obj/item/reagent_containers/dropper{ + pixel_x = -3; + pixel_y = -6 + }, +/obj/machinery/airalarm/directional/north, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/turf/open/floor/iron/dark, -/area/station/service/chapel/funeral) +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/science/lab) "ksT" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -28648,17 +28573,6 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"ktF" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "ktG" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -28716,15 +28630,6 @@ /obj/structure/cable, /turf/open/floor/plating/airless, /area/station/solars/port/fore) -"kuS" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/random/trash/garbage{ - spawn_scatter_radius = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/aft/greater) "kuW" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -28737,19 +28642,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"kvg" = ( -/obj/machinery/suit_storage_unit/rd, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Research Director's Office"; - network = list("ss13","rd") - }, -/obj/item/radio/intercom/directional/west, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/command/heads_quarters/rd) "kvr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -28761,11 +28653,6 @@ /obj/structure/chair, /turf/open/floor/iron/grimy, /area/station/security/interrogation) -"kvH" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/station/construction/mining/aux_base) "kvK" = ( /obj/machinery/meter, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -28798,6 +28685,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"kwb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "kwi" = ( /obj/effect/spawner/random/structure/crate_empty, /obj/item/clothing/gloves/color/fyellow, @@ -28823,6 +28717,13 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/white, /area/station/science/research) +"kwC" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Brig - Hallway - Starboard" + }, +/turf/open/floor/iron, +/area/station/security/brig) "kwF" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -28846,11 +28747,6 @@ "kwZ" = ( /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) -"kxm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/dim/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/abandoned) "kxq" = ( /obj/machinery/status_display/evac/directional/north, /obj/machinery/porta_turret/ai, @@ -28925,15 +28821,11 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"kyK" = ( -/obj/machinery/modular_computer/preset/research{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/rd) +"kyt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) "kyQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -28981,13 +28873,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) -"kzt" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/spawner/random/structure/crate_loot, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "kzD" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ @@ -29018,6 +28903,13 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/port/aft) +"kAc" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) "kAp" = ( /obj/machinery/door/window/left/directional/north{ dir = 8; @@ -29093,19 +28985,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/genetics) -"kBJ" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Theater - Stage" - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/item/radio/intercom/directional/east, -/obj/structure/table/wood, -/obj/item/clothing/glasses/monocle, -/obj/structure/sign/poster/random/directional/south, -/turf/open/floor/wood/large, -/area/station/service/theater) "kBQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/electrolyzer, @@ -29142,6 +29021,14 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/holofloor/dark, /area/station/science/cytology) +"kCt" = ( +/obj/machinery/status_display/door_timer{ + id = "Cell 2"; + name = "Cell 2"; + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/station/security/brig) "kCC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, @@ -29159,12 +29046,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"kCQ" = ( -/obj/structure/closet/crate/freezer/blood, -/obj/effect/turf_decal/siding/white, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/iron/kitchen_coldroom, -/area/station/medical/coldroom) "kCZ" = ( /turf/closed/wall, /area/station/service/hydroponics) @@ -29330,6 +29211,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"kGJ" = ( +/obj/machinery/door/window/right/directional/north{ + dir = 4; + name = "Research Delivery"; + req_access = list("science") + }, +/obj/machinery/light_switch/directional/north, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/white, +/area/station/science/lab) "kHg" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -29367,18 +29258,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/engine, /area/station/science/explab) -"kHS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) "kHU" = ( /obj/structure/reagent_dispensers/watertank, /obj/structure/disposalpipe/segment{ @@ -29422,6 +29301,15 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/service/library) +"kJO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "kKd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29459,6 +29347,15 @@ "kKr" = ( /turf/open/floor/iron, /area/station/hallway/primary/port) +"kKu" = ( +/obj/machinery/reagentgrinder, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/structure/table/glass, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "kKv" = ( /obj/structure/lattice, /obj/machinery/atmospherics/components/unary/passive_vent, @@ -29592,13 +29489,6 @@ }, /turf/open/floor/wood, /area/station/commons/lounge) -"kMx" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "kMF" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -29607,13 +29497,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/service/hydroponics) -"kMS" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/courtroom) "kMX" = ( /obj/machinery/washing_machine, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -29628,6 +29511,18 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"kNO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) "kNV" = ( /obj/machinery/door/airlock/engineering{ name = "Port Quarter Solar Access" @@ -29865,17 +29760,6 @@ /obj/machinery/announcement_system, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) -"kRz" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Port Primary Hallway - Middle" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "kRA" = ( /obj/effect/spawner/random/engineering/atmospherics_portable, /obj/effect/mapping_helpers/broken_floor, @@ -29896,22 +29780,22 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -"kRO" = ( -/obj/structure/chair{ +"kRR" = ( +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Law Office"; + name = "Law Office Fax Machine" + }, +/obj/machinery/light/small/directional/south, +/obj/machinery/button/door/directional/west, +/turf/open/floor/wood, +/area/station/service/lawoffice) +"kRV" = ( +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) -"kSl" = ( -/obj/machinery/mech_bay_recharge_port{ - dir = 8 - }, /turf/open/floor/plating, -/area/station/science/robotics/mechbay) +/area/station/maintenance/aft/lesser) "kSo" = ( /obj/structure/chair{ dir = 1 @@ -30006,18 +29890,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/locker) -"kTB" = ( -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/aft/greater) -"kTF" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/digital_clock/directional/south, -/turf/open/floor/wood, -/area/station/service/library) "kTO" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -30081,22 +29953,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) -"kVl" = ( -/obj/machinery/computer/security/telescreen/entertainment/directional/east, -/obj/machinery/vending/wardrobe/curator_wardrobe, -/turf/open/floor/engine/cult, -/area/station/service/library) -"kVn" = ( -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 4 - }, -/obj/machinery/pdapainter/research, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "kVq" = ( /obj/structure/sign/warning/secure_area/directional/east, /obj/effect/turf_decal/stripes/corner, @@ -30132,6 +29988,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"kWd" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/locker) "kWg" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -30218,6 +30081,20 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"kXp" = ( +/obj/machinery/camera/autoname{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/landmark/start/depsec/engineering, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/security/checkpoint/engineering) "kXt" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -30326,6 +30203,10 @@ "kYG" = ( /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) +"kYP" = ( +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "kYU" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -30348,6 +30229,29 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/wood, /area/station/commons/lounge) +"kZp" = ( +/obj/machinery/door/window/right/directional/south{ + dir = 1; + name = "First Aid Supplies"; + req_access = list("medical") + }, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/medkit/toxin{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/toxin, +/obj/item/storage/medkit/toxin{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "kZq" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -30374,6 +30278,12 @@ }, /turf/open/floor/iron, /area/station/security/office) +"laa" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/iron/chapel{ + dir = 1 + }, +/area/station/service/chapel) "laf" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -30392,16 +30302,6 @@ /obj/effect/spawner/random/trash/janitor_supplies, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"lam" = ( -/obj/structure/table, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/item/reagent_containers/cup/glass/mug/britcup{ - pixel_y = 2 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/station/science/research) "lav" = ( /obj/structure/girder, /obj/effect/spawner/random/structure/grille, @@ -30458,13 +30358,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/prison/visit) -"lbu" = ( -/obj/machinery/hydroponics/soil, -/obj/item/cultivator, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/south, -/turf/open/floor/grass, -/area/station/security/prison/garden) "lbH" = ( /mob/living/basic/chicken{ name = "Featherbottom"; @@ -30472,13 +30365,6 @@ }, /turf/open/floor/grass, /area/station/service/hydroponics/garden) -"lbI" = ( -/obj/structure/frame/machine{ - anchored = 1 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/circuit/green/off, -/area/station/science/research) "lbL" = ( /obj/effect/decal/cleanable/insectguts, /obj/effect/turf_decal/siding/purple{ @@ -30598,15 +30484,19 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) -"ldT" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/iron, -/area/station/engineering/atmos) "lek" = ( /obj/machinery/power/smes, /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +"lew" = ( +/obj/machinery/power/smes{ + charge = 5e+006 + }, +/obj/structure/cable, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "leP" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 4 @@ -30640,14 +30530,14 @@ /obj/machinery/computer/department_orders/engineering, /turf/open/floor/iron, /area/station/engineering/break_room) -"lfl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +"lfk" = ( +/obj/effect/turf_decal/trimline/yellow/filled/end{ dir = 8 }, -/obj/effect/landmark/start/hangover, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet, -/area/station/commons/dorms) +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) "lfm" = ( /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/freezer, @@ -30669,24 +30559,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/drone_bay) -"lfZ" = ( -/obj/structure/chair, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/wood, -/area/station/security/office) -"lgb" = ( -/obj/machinery/airalarm/directional/east, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/entry) "lge" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -30755,17 +30627,19 @@ /obj/item/storage/medkit/brute, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"lho" = ( -/obj/structure/table/wood, -/obj/structure/sign/poster/official/random/directional/south, -/obj/effect/spawner/random/bureaucracy/paper, -/turf/open/floor/wood, -/area/station/commons/vacant_room/office) "lhD" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/spawner/random/trash/janitor_supplies, /turf/open/floor/plating, /area/station/maintenance/fore) +"lhF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/security/prison) "lhT" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -30778,19 +30652,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) -"lib" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/floor, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "lih" = ( /obj/machinery/newscaster/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -30906,44 +30767,11 @@ /obj/machinery/barsign, /turf/closed/wall, /area/station/commons/lounge) -"lks" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/requests_console/directional/south{ - department = "Engineering"; - name = "Engineering Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "lku" = ( /obj/structure/cable, /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"lkJ" = ( -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/machinery/newscaster/directional/west, -/turf/open/floor/iron/dark, -/area/station/medical/office) -"lkQ" = ( -/obj/machinery/computer/robotics{ - dir = 4 - }, -/obj/machinery/light_switch/directional/west, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "lkW" = ( /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -31105,12 +30933,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"loJ" = ( -/obj/structure/filingcabinet/filingcabinet, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/cargo/sorting) "loQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31131,6 +30953,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) +"loY" = ( +/obj/structure/rack, +/obj/item/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/e_gun/dragnet, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "lpo" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 @@ -31146,12 +30978,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/construction/storage_wing) -"lpy" = ( -/obj/structure/closet/crate/coffin, -/obj/structure/window/spawner/directional/east, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating, -/area/station/service/chapel/funeral) "lpA" = ( /obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, @@ -31195,28 +31021,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"lqg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/security/courtroom) "lqh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -"lqK" = ( -/obj/effect/landmark/blobstart, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Evidence Storage" - }, -/obj/item/storage/secure/safe/directional/north{ - name = "evidence safe" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/evidence) "lqL" = ( /obj/effect/turf_decal/siding{ dir = 1 @@ -31234,6 +31044,21 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +"lqW" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) +"lrh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/security/prison) "lro" = ( /obj/structure/showcase/cyborg/old{ dir = 4; @@ -31249,24 +31074,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"lrB" = ( -/obj/item/radio/intercom/directional/west{ - pixel_y = -10 - }, -/obj/machinery/light_switch/directional/west{ - pixel_y = 6 - }, -/obj/structure/table/reinforced, -/obj/machinery/fax{ - fax_name = "Engineering Lobby"; - name = "Engineering Lobby Fax Machine" - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/engineering/break_room) "lrK" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ @@ -31303,17 +31110,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"lrV" = ( -/obj/effect/spawner/random/contraband/prison, -/obj/structure/closet/crate, -/obj/item/stack/license_plates/empty/fifty, -/obj/item/stack/license_plates/empty/fifty, -/obj/item/stack/license_plates/empty/fifty, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/radio/intercom/prison/directional/north, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/plating, -/area/station/security/prison/work) "lrZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -31358,6 +31154,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) +"lsV" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/west, +/obj/machinery/dna_scannernew, +/turf/open/floor/iron/dark, +/area/station/science/genetics) +"lta" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/meter, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "ltb" = ( /obj/machinery/vending/security, /obj/machinery/firealarm/directional/east, @@ -31382,22 +31195,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) -"ltr" = ( -/obj/structure/table/wood, -/obj/item/clothing/head/costume/sombrero/green, -/obj/structure/sign/poster/random/directional/east, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/landmark/start/hangover, -/obj/machinery/light/small/directional/east, -/turf/open/floor/wood/large, -/area/station/service/theater) -"ltu" = ( -/obj/effect/landmark/blobstart, -/obj/structure/closet/secure_closet/detective, -/turf/open/floor/iron/grimy, -/area/station/security/detectives_office) "ltv" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -31470,6 +31267,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"lus" = ( +/obj/structure/closet/athletic_mixed, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "luE" = ( /obj/structure/rack, /obj/item/integrated_circuit/loaded/hello_world, @@ -31486,46 +31290,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central) -"luI" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/machinery/light_switch/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/teleporter) -"luS" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/pen, -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring the engine."; - dir = 8; - name = "Engine Monitor"; - network = list("engine"); - pixel_x = 26 - }, -/obj/machinery/button/door/directional/east{ - id = "Engineering"; - name = "Engineering Lockdown"; - pixel_y = 16; - req_access = list("engineering") - }, -/obj/machinery/button/door/directional/east{ - id = "atmos"; - name = "Atmospherics Lockdown"; - pixel_y = 24; - req_access = list("atmospherics") - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/security/checkpoint/engineering) "luV" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -31682,12 +31446,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"lxW" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/courtroom) "lyf" = ( /obj/structure/closet/l3closet, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ @@ -31777,16 +31535,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"lAn" = ( -/obj/effect/turf_decal/siding/purple/corner{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/white, -/area/station/science/research) "lAu" = ( /turf/open/space/basic, /area/space/nearstation) @@ -31801,6 +31549,18 @@ "lAM" = ( /turf/closed/wall/r_wall, /area/station/security/brig) +"lAY" = ( +/obj/structure/closet{ + name = "evidence closet 5" + }, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/evidence) "lBm" = ( /obj/machinery/conveyor{ dir = 4; @@ -31829,12 +31589,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/commons/lounge) -"lBX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/structure/closet/secure_closet/atmospherics, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "lCb" = ( /obj/structure/cable, /obj/structure/sign/poster/ripped/directional/south, @@ -31866,18 +31620,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"lDk" = ( -/obj/machinery/disposal/bin, -/obj/machinery/airalarm/directional/east, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/cargo/storage) "lDo" = ( /obj/item/radio/off, /obj/effect/turf_decal/stripes/line{ @@ -31932,17 +31674,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) -"lFh" = ( -/obj/machinery/computer/camera_advanced/xenobio{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/iron, -/area/station/science/xenobiology) "lFo" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -31961,12 +31692,28 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"lFt" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 10 + }, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "lFZ" = ( /obj/structure/chair/pew/right, /turf/open/floor/iron/chapel{ dir = 4 }, /area/station/service/chapel) +"lGj" = ( +/obj/machinery/vending/wardrobe/det_wardrobe, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) "lGL" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, @@ -31984,6 +31731,15 @@ /obj/docking_port/stationary/public_mining_dock, /turf/open/floor/plating, /area/station/construction/mining/aux_base) +"lGT" = ( +/obj/structure/sign/departments/science/directional/east{ + name = "\improper ROBOTICS!" + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) "lHe" = ( /obj/machinery/reagentgrinder{ pixel_y = 4 @@ -32010,41 +31766,11 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) -"lHC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/engineering/gravity_generator) "lHK" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/carpet, /area/station/service/chapel) -"lHW" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 8 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/button/door/directional/east{ - id = "rdgene"; - name = "Primary Genetics Shutters Control"; - pixel_y = 6; - req_access = list("science") - }, -/obj/machinery/button/door/directional/east{ - id = "rdgene2"; - name = "Secondary Genetics Shutters Control"; - pixel_y = -6; - req_access = list("science") - }, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "lIa" = ( /obj/structure/table/wood, /obj/item/folder, @@ -32056,6 +31782,17 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) +"lIi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "lIB" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32126,6 +31863,12 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"lJo" = ( +/obj/structure/closet/emcloset, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "lJr" = ( /obj/structure/chair{ dir = 1 @@ -32157,10 +31900,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"lKD" = ( -/obj/structure/dresser, -/turf/open/floor/wood, -/area/station/service/theater) "lKN" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, @@ -32218,6 +31957,14 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +"lLC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "lLF" = ( /obj/machinery/camera/directional/east{ c_tag = "Central Primary Hallway - Port" @@ -32273,18 +32020,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"lMP" = ( -/obj/structure/table/reinforced, -/obj/item/folder/red, -/obj/structure/cable, -/obj/machinery/requests_console/directional/south{ - department = "Security"; - name = "Security Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "lMW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32320,6 +32055,17 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) +"lNh" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Prison Sanitarium" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "lNF" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/landmark/event_spawn, @@ -32362,11 +32108,6 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) -"lOb" = ( -/obj/machinery/vending/wardrobe/bar_wardrobe, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/wood, -/area/station/service/bar/backroom) "lOf" = ( /obj/effect/spawner/random/trash/garbage{ spawn_scatter_radius = 1 @@ -32379,19 +32120,6 @@ }, /turf/open/floor/iron, /area/station/engineering/storage_shared) -"lOh" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Air to External Air Ports" - }, -/obj/machinery/light_switch/directional/north, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/atmos) "lOl" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -32407,6 +32135,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/genetics) +"lOA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics - External Airlock" + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "lOK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32520,6 +32258,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +"lPJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/line{ + dir = 6 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/station/security/prison) "lPS" = ( /obj/structure/table, /obj/machinery/button/door{ @@ -32546,12 +32292,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/command/bridge) -"lQk" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/directional/north, -/turf/open/floor/wood, -/area/station/service/library) "lQm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -32594,39 +32334,16 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"lQX" = ( -/obj/effect/turf_decal/stripes/line, -/obj/item/radio/intercom/directional/south, -/obj/machinery/light/cold/directional/south, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) -"lQY" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/effect/turf_decal/box, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron, -/area/station/science/xenobiology) -"lRq" = ( -/obj/machinery/airalarm/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Atmospherics - Port-Aft" +"lRN" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/atmos) -"lRH" = ( -/obj/effect/landmark/generic_maintenance_landmark, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/wood, -/area/station/commons/dorms) +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) "lRS" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/spawner/structure/window/reinforced, @@ -32640,6 +32357,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/cytology) +"lSy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) "lSz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32743,10 +32467,6 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"lUf" = ( -/obj/machinery/status_display/ai/directional/east, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/ai) "lUj" = ( /obj/structure/table, /obj/item/book/manual/wiki/security_space_law{ @@ -32782,16 +32502,6 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/iron/showroomfloor, /area/station/maintenance/starboard/lesser) -"lUt" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "lUz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/tile/yellow{ @@ -32903,10 +32613,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"lWb" = ( -/obj/machinery/light/small/directional/west, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "lWd" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -32930,20 +32636,18 @@ /turf/open/floor/wood, /area/station/service/lawoffice) "lWj" = ( -/obj/structure/table, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/rods/fifty, -/obj/item/stack/rods/fifty, -/obj/effect/turf_decal/bot{ +/obj/structure/bodycontainer/morgue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ - dir = 4 +/obj/machinery/camera/directional/south{ + c_tag = "Morgue"; + network = list("ss13","medbay") }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/engineering/atmos) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "lWm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32980,6 +32684,12 @@ /obj/structure/sign/warning/vacuum/directional/east, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"lWS" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/turf_decal/box, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron, +/area/station/science/xenobiology) "lXl" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, @@ -33044,15 +32754,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) -"lYf" = ( -/obj/structure/cable, -/obj/structure/bodycontainer/morgue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "lYk" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -33125,21 +32826,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) -"lYU" = ( -/obj/machinery/status_display/evac/directional/north, -/obj/item/folder/yellow{ - pixel_y = 4 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Bridge - Central" - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "lZk" = ( /obj/machinery/power/turbine/inlet_compressor{ dir = 4 @@ -33191,6 +32877,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"mao" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/science/xenobiology) +"mar" = ( +/obj/machinery/computer/camera_advanced/base_construction/aux{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) "mav" = ( /obj/machinery/door/airlock/medical{ name = "Medical Cold Room" @@ -33349,6 +33049,17 @@ /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"mdu" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/siding/blue/corner{ + dir = 4 + }, +/obj/machinery/pdapainter/research, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "mdy" = ( /obj/effect/landmark/blobstart, /obj/structure/cable, @@ -33384,14 +33095,14 @@ /obj/structure/sign/warning/electric_shock, /turf/open/floor/engine, /area/station/science/cytology) -"meD" = ( -/obj/machinery/photocopier, -/obj/machinery/camera/directional/east{ - c_tag = "Law Office" +"meJ" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Air to Mix" }, -/obj/machinery/light/directional/east, -/turf/open/floor/wood, -/area/station/service/lawoffice) +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/engineering/atmos) "meL" = ( /obj/machinery/light_switch/directional/south, /obj/structure/cable, @@ -33399,17 +33110,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) -"mff" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Departure Lounge - Port Fore" - }, -/obj/item/kirbyplants/organic/plant24, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/sign/poster/official/random/directional/west, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "mfh" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -33421,6 +33121,36 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/library) +"mgb" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "packageExternal" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Cargo Bay - Aft"; + pixel_x = 14 + }, +/obj/machinery/light/directional/south, +/obj/machinery/disposal/delivery_chute{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/door/window/right/directional/west{ + dir = 4; + name = "Crate to Shuttle"; + req_access = list("shipping") + }, +/obj/structure/plasticflaps/opaque{ + name = "Service Deliveries" + }, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron, +/area/station/cargo/storage) "mgc" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -33572,17 +33302,21 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"miG" = ( +"miW" = ( /obj/machinery/camera/directional/north{ - c_tag = "Recreation Area - Fore" + c_tag = "Command Hallway - Starboard" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/airalarm/directional/north, -/obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ - dir = 1 + dir = 4 }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, -/area/station/commons/fitness/recreation) +/area/station/hallway/secondary/command) "miX" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -33663,14 +33397,16 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter) -"mlo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 8 +"mkO" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/research{ + name = "Chemical Storage" }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/aft/greater) +/obj/effect/mapping_helpers/airlock/access/all/medical/pharmacy, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) "mlu" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -33722,6 +33458,16 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"mmA" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/machinery/camera/directional/south{ + c_tag = "Prison Cell Block 1"; + network = list("ss13","prison") + }, +/obj/machinery/light_switch/directional/south, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/security/prison) "mmF" = ( /obj/machinery/light/small/directional/east, /obj/item/solar_assembly, @@ -33744,6 +33490,16 @@ /obj/structure/closet/crate/engineering/electrical, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) +"mmK" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 + }, +/turf/open/floor/iron/checker, +/area/station/science/research) "mmR" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -33807,16 +33563,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"mnn" = ( -/obj/structure/weightmachine/weightlifter, -/obj/effect/turf_decal/tile/dark_red/half/contrasted, -/obj/effect/landmark/start/hangover, -/obj/machinery/light/directional/north, -/obj/structure/cable, -/turf/open/floor/iron/white/textured_edge{ - dir = 1 - }, -/area/station/commons/fitness) "mnq" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -33855,16 +33601,19 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"mnU" = ( +/obj/machinery/firealarm/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/security/brig) "mos" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) -"mot" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/space/basic, -/area/space/nearstation) "moD" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -33898,6 +33647,15 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/space, /area/space/nearstation) +"moK" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/disposal/bin, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "moQ" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /turf/open/floor/iron, @@ -34002,23 +33760,10 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port) -"mrT" = ( -/obj/structure/table/wood, -/obj/machinery/computer/security/telescreen/entertainment/directional/north, -/obj/item/radio/intercom/directional/west, -/obj/item/pinpointer/nuke, -/obj/item/disk/nuclear, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain/private) "msd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/fore) -"msf" = ( -/obj/structure/filingcabinet, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/grimy, -/area/station/security/detectives_office) "msl" = ( /obj/item/book/bible, /obj/structure/altar_of_gods, @@ -34035,21 +33780,23 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/station/engineering/supermatter) +"msJ" = ( +/obj/structure/table/reinforced, +/obj/item/folder/red, +/obj/structure/cable, +/obj/machinery/requests_console/directional/south{ + department = "Security"; + name = "Security Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "msN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"msP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "msR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/effect/turf_decal/delivery, @@ -34098,6 +33845,16 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"mtb" = ( +/obj/structure/table/wood, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/folder/blue, +/obj/item/clothing/head/collectable/hop{ + name = "novelty HoP hat" + }, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) "mtj" = ( /obj/machinery/medical_kiosk, /obj/effect/turf_decal/siding/white, @@ -34169,6 +33926,16 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"mun" = ( +/obj/structure/showcase/machinery/tv{ + dir = 1; + pixel_x = 2; + pixel_y = 3 + }, +/obj/structure/table/wood, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) "mup" = ( /obj/machinery/door/airlock/maintenance{ name = "Storage Room" @@ -34213,6 +33980,17 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) +"muZ" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Departure Lounge - Port Fore" + }, +/obj/item/kirbyplants/organic/plant24, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/sign/poster/official/random/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "mvg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34221,17 +33999,11 @@ }, /turf/open/floor/carpet, /area/station/service/library) -"mvy" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/obj/structure/sign/poster/official/moth_piping/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) +"mvo" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/engineering/atmos) "mvR" = ( /turf/closed/wall/r_wall, /area/station/science/lab) @@ -34305,12 +34077,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"mwP" = ( -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/port) "mxg" = ( /obj/machinery/shower/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -34343,22 +34109,6 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos) -"mxx" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/security/brig) -"mxF" = ( -/obj/structure/rack, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/spawner/random/armory/riot_helmet, -/obj/effect/spawner/random/armory/bulletproof_helmet, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "mxI" = ( /obj/structure/disposalpipe/junction/flip, /obj/structure/cable, @@ -34392,6 +34142,20 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"myg" = ( +/obj/machinery/firealarm/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Chemistry North"; + network = list("ss13","medbay") + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "myr" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -34499,14 +34263,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison/visit) -"mzV" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/commons/dorms) "mAb" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, @@ -34527,10 +34283,12 @@ /obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/iron, /area/station/security/brig) -"mAv" = ( -/obj/machinery/rnd/production/protolathe/department/science, +"mAs" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, -/area/station/science/lab) +/area/station/hallway/primary/port) "mAy" = ( /obj/machinery/computer/order_console/mining, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -34656,6 +34414,19 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron, /area/station/science/xenobiology) +"mCJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/north{ + c_tag = "Brig - Hallway - Port" + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/security/brig) "mCL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -34671,23 +34442,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/dorms) -"mCO" = ( -/obj/structure/table, -/obj/item/food/grown/wheat, -/obj/item/food/grown/watermelon, -/obj/item/food/grown/citrus/orange, -/obj/item/food/grown/grapes, -/obj/item/food/grown/cocoapod, -/obj/item/food/grown/apple, -/obj/item/food/grown/chili, -/obj/item/food/grown/cherries, -/obj/item/food/grown/soybeans, -/obj/item/food/grown/citrus/lime, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "mCV" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -34797,6 +34551,18 @@ /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"mEO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "mES" = ( /obj/structure/rack, /obj/item/aicard, @@ -34819,12 +34585,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) -"mEZ" = ( -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/structure/flora/bush/flowers_yw/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/turf/open/floor/grass, -/area/station/science/ordnance/office) "mFf" = ( /obj/structure/cable, /turf/open/floor/iron/grimy, @@ -34928,20 +34688,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"mGH" = ( -/obj/structure/table/wood, -/obj/item/cigbutt/cigarbutt{ - pixel_x = 5; - pixel_y = -1 - }, -/obj/item/radio/intercom/directional/north, -/obj/item/reagent_containers/cup/glass/mug{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/wood, -/area/station/command/corporate_showroom) "mGI" = ( /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, @@ -35017,13 +34763,6 @@ "mHT" = ( /turf/closed/wall, /area/station/engineering/atmos) -"mHW" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "mIg" = ( /obj/machinery/door/airlock/engineering{ name = "Port Bow Solar Access" @@ -35045,6 +34784,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) +"mIu" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) "mIH" = ( /obj/machinery/status_display/ai/directional/north, /obj/structure/disposalpipe/segment{ @@ -35120,6 +34866,13 @@ "mJI" = ( /turf/open/space, /area/space/nearstation) +"mJL" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/dorms) "mJN" = ( /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/neutral{ @@ -35157,6 +34910,13 @@ /obj/effect/turf_decal/tile/purple/fourcorners, /turf/open/floor/iron/white, /area/station/science/lab) +"mKf" = ( +/obj/structure/table, +/obj/item/flashlight/flare/candle, +/obj/effect/turf_decal/delivery, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "mKu" = ( /obj/machinery/light_switch/directional/west, /obj/structure/cable, @@ -35245,6 +35005,35 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/library) +"mMc" = ( +/obj/structure/table, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/structure/cable, +/obj/machinery/light_switch/directional/west, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/lockers) "mMl" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -35305,28 +35094,6 @@ "mMX" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/office) -"mNb" = ( -/obj/structure/rack, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/restraints/handcuffs, -/obj/item/restraints/handcuffs, -/obj/item/restraints/handcuffs, -/obj/item/restraints/handcuffs, -/obj/item/restraints/handcuffs, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/station/security/holding_cell) "mNj" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -35335,12 +35102,12 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/station/commons/storage/tools) -"mNs" = ( -/obj/structure/closet/emcloset, -/obj/machinery/firealarm/directional/east, +"mNx" = ( +/obj/structure/filingcabinet/filingcabinet, /obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron, -/area/station/cargo/miningoffice) +/area/station/cargo/sorting) "mNO" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/light_construct/directional/west, @@ -35359,6 +35126,13 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/cargo/storage) +"mOl" = ( +/obj/structure/closet/boxinggloves, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "mOt" = ( /obj/effect/landmark/start/detective, /obj/structure/chair/office{ @@ -35449,20 +35223,20 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/station/maintenance/fore) +"mQi" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) "mQr" = ( /turf/open/floor/iron/dark/side{ dir = 1 }, /area/station/security/prison) -"mQI" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Cargo Bay - Mailroom" - }, -/obj/effect/turf_decal/trimline/brown/filled/shrink_ccw, -/obj/effect/turf_decal/trimline/white/filled/warning, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/cargo/sorting) "mQR" = ( /obj/machinery/pdapainter/supply, /turf/open/floor/carpet/red, @@ -35532,6 +35306,13 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) +"mRw" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) "mRy" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -35567,6 +35348,19 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central) +"mSs" = ( +/obj/structure/cable, +/obj/machinery/camera/directional/south{ + c_tag = "Chief Medical Officer's Office"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/requests_console/directional/south, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/announcement, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) "mSB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35734,20 +35528,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /turf/open/floor/plating, /area/station/engineering/atmos) -"mVL" = ( -/obj/machinery/requests_console/directional/west{ - department = "Detective"; - name = "Detective Requests Console" - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/obj/machinery/camera/directional/west{ - c_tag = "Detective's Office" - }, -/turf/open/floor/iron/grimy, -/area/station/security/detectives_office) "mVS" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/effect/decal/cleanable/cobweb, @@ -35794,6 +35574,29 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"mWC" = ( +/obj/machinery/door/window/right/directional/south{ + name = "First Aid Supplies"; + req_access = list("medical") + }, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/medkit/brute{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/brute{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/table/reinforced, +/obj/machinery/light/cold/directional/north, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "mWE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35814,6 +35617,20 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"mWY" = ( +/obj/item/bodypart/chest/robot{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/bodypart/head/robot{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/structure/table/wood, +/obj/structure/cable, +/obj/machinery/light/small/directional/west, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) "mWZ" = ( /obj/item/folder/red, /obj/item/pen, @@ -35866,26 +35683,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"mXG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Service Hallway"; - name = "Service Fax Machine" - }, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "mXK" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -35933,15 +35730,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"mYt" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Brig - Hallway - Entrance" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/security/brig) "mYw" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -35987,6 +35775,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) +"mZc" = ( +/obj/structure/table/wood, +/obj/item/clothing/head/costume/sombrero/green, +/obj/structure/sign/poster/random/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood/large, +/area/station/service/theater) "mZy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36053,10 +35852,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"nag" = ( -/obj/structure/railing, -/turf/open/floor/plating/airless, -/area/space/nearstation) +"nao" = ( +/obj/structure/easel, +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "nau" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -36071,15 +35871,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/central) -"naE" = ( -/obj/machinery/disposal/bin, -/obj/machinery/firealarm/directional/south, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron/white, -/area/station/science/lobby) "naN" = ( /obj/machinery/button/door/directional/west{ id = "transitlockdown"; @@ -36096,11 +35887,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) -"nbd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/floor, -/turf/open/floor/wood, -/area/station/commons/lounge) "nbJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36120,18 +35906,19 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"nbV" = ( -/obj/machinery/camera/directional/south{ - c_tag = "MiniSat Exterior Access"; - network = list("minisat") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/blue{ +"ncd" = ( +/obj/item/crowbar, +/obj/item/wrench, +/obj/structure/table, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/aisat/exterior) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "ncf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -36171,6 +35958,11 @@ "ncx" = ( /turf/open/floor/iron, /area/station/engineering/main) +"ncB" = ( +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/locker) "ncG" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/spawner/random/structure/closet_maintenance, @@ -36229,12 +36021,16 @@ "ndS" = ( /turf/closed/wall/r_wall, /area/station/hallway/secondary/command) -"ndZ" = ( -/obj/structure/table/reinforced, -/obj/machinery/light/small/directional/east, -/obj/item/storage/backpack/duffelbag/med/surgery, +"ned" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/computer/department_orders/medical{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, -/area/station/medical/morgue) +/area/station/medical/medbay/central) "neG" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -36243,30 +36039,6 @@ /obj/structure/cable/layer3, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"neJ" = ( -/obj/machinery/button/door/directional/south{ - id = "roboticsprivacy2"; - name = "Robotics Privacy Control"; - req_access = list("robotics") - }, -/obj/item/mod/core/standard{ - pixel_x = -4 - }, -/obj/item/mod/core/standard{ - pixel_x = 4 - }, -/obj/item/mod/core/standard{ - pixel_y = 4 - }, -/obj/structure/closet/crate/science{ - name = "MOD core crate" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/robotics/lab) "neL" = ( /obj/machinery/door/airlock/maintenance{ name = "Storage Room" @@ -36279,14 +36051,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) -"neM" = ( -/obj/machinery/light/directional/north, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/watering_can, -/obj/effect/turf_decal/stripes/line, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/iron, -/area/station/service/hydroponics) "neO" = ( /obj/machinery/door/window/brigdoor/security/holding{ id = "Holding Cell"; @@ -36298,18 +36062,15 @@ /obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/iron, /area/station/security/holding_cell) -"neW" = ( -/obj/item/retractor, -/obj/item/hemostat{ - pixel_x = -10 - }, -/obj/structure/table, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) "nfs" = ( /turf/open/floor/engine, /area/station/command/heads_quarters/rd) +"nft" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "nfy" = ( /obj/structure/table, /obj/item/paper_bin, @@ -36435,6 +36196,17 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) +"nht" = ( +/obj/machinery/disposal/bin, +/obj/machinery/firealarm/directional/west, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) "nhP" = ( /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai_upload) @@ -36560,24 +36332,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"njZ" = ( -/obj/structure/rack, -/obj/machinery/firealarm/directional/north, -/obj/item/reagent_containers/cup/bottle/potassium{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bottle/phosphorus{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bottle/sodium{ - pixel_x = 1 - }, -/turf/open/floor/iron/dark/textured_edge{ - dir = 4 - }, -/area/station/medical/chem_storage) "nkj" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 @@ -36601,24 +36355,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"nku" = ( -/obj/effect/turf_decal/siding/purple/corner{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/purple/line, -/obj/structure/disposalpipe/segment, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/white, -/area/station/science/research) -"nkz" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "nkG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /obj/machinery/meter, @@ -36640,14 +36376,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/station/security/office) -"nlp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/white, -/area/station/science/research) "nlP" = ( /obj/structure/table, /obj/item/stock_parts/subspace/treatment, @@ -36764,6 +36492,14 @@ /obj/item/reagent_containers/cup/glass/flask/gold, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) +"nnl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "nnn" = ( /obj/structure/chair/office/light{ dir = 8 @@ -36800,16 +36536,16 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"nnH" = ( -/obj/machinery/rnd/production/protolathe/department/engineering, -/obj/effect/turf_decal/bot, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 +"nnR" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/storage_shared) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "noj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36817,6 +36553,17 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/science/explab) +"non" = ( +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/checker, +/area/station/science/research) "nor" = ( /obj/structure/sink/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36885,25 +36632,6 @@ }, /turf/open/floor/wood, /area/station/commons/dorms) -"nph" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/aft/greater) -"npm" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 8 - }, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "npv" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 @@ -36916,14 +36644,6 @@ /obj/structure/window/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"npy" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Gas to Filter" - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "npY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -36937,24 +36657,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"nqb" = ( -/obj/structure/rack, -/obj/item/reagent_containers/cup/bottle/acidic_buffer{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bottle/basic_buffer{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bottle/formaldehyde{ - pixel_x = 1 - }, -/obj/structure/sign/warning/chem_diamond/directional/north, -/turf/open/floor/iron/dark/textured_edge{ - dir = 8 - }, -/area/station/medical/chem_storage) "nqo" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -36969,18 +36671,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) -"nqz" = ( -/obj/machinery/door/window{ - name = "Secure Art Exhibition"; - req_access = list("library") - }, -/obj/structure/table/wood/fancy/royalblue, -/obj/structure/sign/painting/large/library{ - dir = 1 - }, -/obj/structure/window/spawner/directional/west, -/turf/open/floor/wood, -/area/station/service/library) "nqB" = ( /obj/structure/chair/office/light{ dir = 4 @@ -37015,24 +36705,16 @@ }, /turf/open/floor/engine, /area/station/engineering/atmospherics_engine) -"nqU" = ( -/obj/structure/table, -/obj/machinery/newscaster/directional/east, -/obj/machinery/camera/directional/south{ - c_tag = "Departure Lounge - Security Post" +"nqV" = ( +/obj/structure/closet/emcloset, +/obj/structure/sign/warning/pods{ + pixel_y = 30 }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/taperecorder{ - pixel_x = 4 - }, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "nre" = ( /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/broken_floor, @@ -37057,20 +36739,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"nrr" = ( -/obj/structure/chair{ - name = "Judge" - }, -/obj/machinery/status_display/evac/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Courtroom" - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/security/courtroom) "nrV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /turf/open/floor/iron/dark, @@ -37181,19 +36849,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"nsV" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/structure/cable, -/obj/machinery/newscaster/directional/east, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark, -/area/station/security/lockers) "nsZ" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -37288,6 +36943,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) +"nue" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) "nui" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/white, @@ -37474,17 +37141,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) -"nxD" = ( -/obj/structure/filingcabinet, -/obj/machinery/computer/security/telescreen/minisat{ - dir = 8; - pixel_x = 26 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/engineering) "nxF" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -37570,6 +37226,13 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) +"nyV" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "nyX" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/effect/spawner/structure/window/reinforced, @@ -37598,6 +37261,19 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"nzz" = ( +/obj/structure/rack, +/obj/effect/spawner/random/clothing/costume, +/obj/effect/spawner/random/clothing/costume, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"nzD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "nzP" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 @@ -37627,14 +37303,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/engineering/atmos) -"nAh" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/effect/landmark/event_spawn, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/station/construction/mining/aux_base) "nAC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37657,6 +37325,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/prison/safe) +"nAW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet, +/area/station/commons/dorms) "nBa" = ( /obj/structure/cable, /turf/open/floor/iron/solarpanel/airless, @@ -37718,20 +37394,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/white, /area/station/medical/virology) -"nBG" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring the engine."; - dir = 8; - name = "Engine Monitor"; - network = list("engine"); - pixel_x = 32 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "nCa" = ( /obj/machinery/meter/layer2, /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2{ @@ -37785,6 +37447,17 @@ /obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +"nCG" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Science Ordnance Test Lab"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/siding/purple{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) "nCI" = ( /obj/structure/chair/stool/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -37798,12 +37471,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"nDe" = ( -/obj/item/storage/crayons, -/obj/structure/table/wood, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/grimy, -/area/station/service/chapel/office) "nDk" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes{ @@ -37815,6 +37482,10 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) +"nDr" = ( +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) "nDw" = ( /obj/machinery/atmospherics/components/tank, /obj/effect/turf_decal/siding/purple{ @@ -37883,6 +37554,23 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) +"nEB" = ( +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 5 + }, +/obj/structure/sign/poster/random/directional/east, +/obj/machinery/requests_console/directional/south{ + department = "Kitchen"; + name = "Kitchen Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/deepfryer, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "nEC" = ( /turf/open/floor/carpet, /area/station/command/bridge) @@ -37895,6 +37583,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"nET" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/box, +/turf/open/floor/iron, +/area/station/science/xenobiology) "nEZ" = ( /obj/machinery/plate_press, /obj/effect/turf_decal/bot, @@ -37915,17 +37611,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/commons/locker) -"nFw" = ( -/obj/machinery/status_display/evac/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "nFL" = ( /obj/machinery/camera/directional/north{ c_tag = "MiniSat Exterior - Fore"; @@ -37976,6 +37661,18 @@ }, /turf/open/floor/iron, /area/station/security/office) +"nGA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "nGE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -37993,29 +37690,6 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/wood, /area/station/commons/lounge) -"nGY" = ( -/obj/machinery/power/shieldwallgen, -/obj/machinery/light/cold/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/window/spawner/directional/north, -/turf/open/floor/iron/dark, -/area/station/command/teleporter) -"nHg" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 10 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 5 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/structure/sign/poster/official/wtf_is_co2/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "nHB" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38023,20 +37697,6 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron, /area/station/security/prison/garden) -"nHD" = ( -/obj/machinery/firealarm/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Chemistry North"; - network = list("ss13","medbay") - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "nHG" = ( /obj/structure/chair/office/light{ dir = 8 @@ -38106,22 +37766,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/lockers) -"nJw" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/cup/bottle/morphine{ - pixel_y = 6 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Prison Sanitarium"; - network = list("ss13","prison") - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "nJA" = ( /obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior, /obj/effect/mapping_helpers/airlock/locked, @@ -38156,6 +37800,19 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"nJM" = ( +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/item/mod/module/plasma_stabilizer, +/obj/item/mod/module/thermal_regulator, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/storage_shared) "nJW" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -38179,13 +37836,6 @@ }, /turf/open/space/basic, /area/space) -"nKy" = ( -/obj/machinery/light_switch/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/service/lawoffice) "nKE" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, @@ -38208,6 +37858,13 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"nKM" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "nKO" = ( /obj/structure/toilet{ dir = 4 @@ -38228,12 +37885,6 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) -"nLp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/small/dim/directional/south, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "nLq" = ( /obj/machinery/airalarm/directional/south, /turf/open/floor/wood, @@ -38300,6 +37951,12 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"nMP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/dim/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "nMV" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -38392,6 +38049,13 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +"nOj" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "nOp" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 @@ -38456,16 +38120,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"nPk" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) "nPt" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -38522,15 +38176,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/range) -"nQO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +"nQQ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 10 }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/light/no_nightlight/directional/east, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/pumproom) "nQX" = ( /turf/open/floor/iron/white, /area/station/science/robotics/lab) @@ -38605,6 +38261,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"nSS" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "nTd" = ( /obj/structure/rack, /obj/effect/spawner/random/food_or_drink/seed, @@ -38614,6 +38277,11 @@ /obj/item/food/grown/mushroom/glowshroom, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"nTk" = ( +/obj/structure/flora/bush/jungle/c/style_random, +/obj/machinery/light/small/directional/east, +/turf/open/floor/grass, +/area/station/medical/virology) "nTn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38623,12 +38291,6 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"nTy" = ( -/obj/structure/mop_bucket, -/obj/item/mop, -/obj/machinery/light/small/dim/directional/south, -/turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) "nTA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, /turf/open/floor/iron/dark, @@ -38666,16 +38328,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"nUz" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/aisat/exterior) "nUF" = ( /obj/structure/closet/secure_closet/security/sec, /obj/structure/cable, @@ -38684,20 +38336,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/lockers) -"nUL" = ( -/obj/item/bodypart/chest/robot{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/bodypart/head/robot{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/structure/table/wood, -/obj/structure/cable, -/obj/machinery/light/small/directional/west, -/turf/open/floor/carpet, -/area/station/command/corporate_showroom) "nVq" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/random/maintenance, @@ -38846,6 +38484,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) +"nYy" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/closet/secure_closet/freezer/kitchen/maintenance, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "nYJ" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -38908,6 +38552,17 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) +"nZq" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/station/service/library) +"nZt" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/effect/turf_decal/delivery, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) "nZz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -38935,6 +38590,18 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) +"nZQ" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/computer/cargo{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) "oae" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, @@ -38975,26 +38642,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"oap" = ( -/obj/structure/table/reinforced, -/obj/item/tank/internals/anesthetic{ - pixel_x = 3 - }, -/obj/item/tank/internals/anesthetic, -/obj/item/tank/internals/anesthetic{ - pixel_x = -3 - }, -/obj/item/clothing/mask/breath/medical{ - pixel_y = -3 - }, -/obj/item/clothing/mask/breath/medical, -/obj/item/clothing/mask/breath/medical{ - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) "oar" = ( /obj/structure/chair/office/light{ dir = 1 @@ -39152,6 +38799,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/office) +"ocn" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/cargo/sorting) +"ocB" = ( +/obj/structure/table/wood, +/obj/machinery/microwave{ + pixel_x = 1; + pixel_y = 6 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) "ocC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -39182,6 +38844,17 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"ocQ" = ( +/obj/machinery/chem_heater/withbuffer, +/obj/machinery/light/small/directional/south, +/obj/machinery/button/door/directional/south{ + id = "pharmacy_shutters_2"; + name = "pharmacy shutters control"; + req_access = list("pharmacy") + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "odh" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -39228,23 +38901,6 @@ "oew" = ( /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"oeC" = ( -/obj/structure/rack, -/obj/item/reagent_containers/cup/bottle/iron{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bottle/lithium{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bottle/multiver{ - pixel_x = 1 - }, -/turf/open/floor/iron/dark/textured_edge{ - dir = 8 - }, -/area/station/medical/chem_storage) "oeR" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -39253,11 +38909,6 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) -"oeS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/computer/security/telescreen/entertainment/directional/north, -/turf/open/floor/iron/grimy, -/area/station/service/chapel/office) "ofe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -39276,26 +38927,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/main) -"ofo" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/atmos/pumproom) -"ofr" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/machinery/light_switch/directional/north, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/security/checkpoint/customs) "ofQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, @@ -39327,13 +38958,12 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/carpet, /area/station/service/theater) -"ogw" = ( -/obj/machinery/stasis, -/obj/machinery/defibrillator_mount/directional/north, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/cold/directional/north, +"ogk" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/light_switch/directional/south, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron/white, -/area/station/medical/treatment_center) +/area/station/medical/chemistry) "ogL" = ( /obj/structure/mirror/directional/north, /obj/structure/sink/directional/south, @@ -39343,15 +38973,6 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/captain/private) -"ohb" = ( -/obj/machinery/firealarm/directional/west, -/obj/item/banner/cargo/mundane, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/brown/filled/corner, -/turf/open/floor/iron, -/area/station/cargo/storage) "ohm" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -39410,6 +39031,19 @@ /obj/effect/turf_decal/tile/green/fourcorners, /turf/open/floor/iron/showroomfloor, /area/station/maintenance/starboard/lesser) +"ohZ" = ( +/obj/machinery/suit_storage_unit/rd, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Research Director's Office"; + network = list("ss13","rd") + }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) "oic" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -39462,18 +39096,6 @@ }, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) -"ojw" = ( -/obj/machinery/camera/directional/east, -/turf/open/floor/engine, -/area/station/engineering/supermatter) -"ojJ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/status_display/evac/directional/south, -/obj/machinery/light/small/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "okP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39579,29 +39201,12 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"omw" = ( -/obj/structure/table, -/obj/machinery/status_display/evac/directional/east, -/obj/machinery/flasher/directional/south{ - id = "AI" - }, -/obj/effect/spawner/round_default_module, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai_upload) "omF" = ( /obj/machinery/teleport/station, /obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) -"omQ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/obj/machinery/light/small/directional/south, -/turf/open/floor/wood, -/area/station/commons/dorms) "onf" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -39647,10 +39252,12 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"onP" = ( +"onN" = ( /obj/structure/table/wood, +/obj/structure/sign/poster/official/random/directional/south, +/obj/effect/spawner/random/bureaucracy/paper, /turf/open/floor/wood, -/area/station/service/library) +/area/station/commons/vacant_room/office) "onU" = ( /mob/living/basic/chicken{ name = "Kentucky"; @@ -39674,11 +39281,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"oon" = ( -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "oor" = ( /turf/closed/wall, /area/station/security/checkpoint/supply) @@ -39782,15 +39384,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"oqH" = ( -/obj/machinery/computer/security/telescreen/minisat{ - dir = 1; - pixel_y = -29 - }, -/obj/structure/bed/dogbed/renault, -/mob/living/basic/pet/fox/renault, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain/private) "oqK" = ( /obj/structure/rack, /obj/item/clothing/suit/hazardvest, @@ -39825,6 +39418,11 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/station/cargo/sorting) +"orp" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/commons/locker) "orv" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -39972,19 +39570,6 @@ "otu" = ( /turf/closed/wall, /area/station/service/chapel) -"otC" = ( -/obj/structure/table, -/obj/machinery/status_display/ai/directional/west, -/obj/machinery/flasher/directional/south{ - id = "AI" - }, -/obj/item/ai_module/reset{ - pixel_x = 2; - pixel_y = 8 - }, -/obj/item/ai_module/supplied/freeform, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai_upload) "otG" = ( /obj/item/radio/intercom/directional/east, /obj/structure/window/spawner/directional/north, @@ -40242,6 +39827,16 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"oxR" = ( +/obj/structure/table, +/obj/item/pipe_dispenser{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/item/pipe_dispenser, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "oxT" = ( /obj/structure/table/wood, /obj/structure/cable, @@ -40288,6 +39883,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"oyY" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/service/bar) "ozm" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -40334,15 +39939,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"oAG" = ( -/obj/structure/showcase/machinery/microwave{ - dir = 1; - pixel_y = 2 - }, -/obj/structure/table/wood, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet, -/area/station/command/corporate_showroom) "oAN" = ( /obj/machinery/gulag_teleporter, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -40360,6 +39956,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/space, /area/space/nearstation) +"oBn" = ( +/obj/structure/flora/bush/jungle/b/style_random, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/machinery/light/small/directional/east, +/turf/open/floor/grass, +/area/station/medical/virology) "oBq" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, @@ -40417,24 +40019,10 @@ /obj/item/radio/intercom/chapel/directional/west, /turf/open/floor/iron/dark, /area/station/service/chapel/office) -"oCg" = ( -/obj/structure/table/reinforced, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, -/area/station/service/bar) "oCE" = ( /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/grass, /area/station/science/genetics) -"oCF" = ( -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/cmo) "oCN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40700,18 +40288,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload_foyer) -"oGP" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/camera/directional/north{ - c_tag = "Science Research Office"; - network = list("ss13","rd") - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/science/lab) "oGZ" = ( /obj/structure/table, /obj/item/storage/bag/tray/cafeteria, @@ -40771,6 +40347,17 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"oHJ" = ( +/obj/structure/closet/secure_closet/security/sec, +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/lockers) "oHO" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -40798,6 +40385,15 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"oIO" = ( +/obj/machinery/computer/security/telescreen/interrogation{ + dir = 8; + pixel_x = 30 + }, +/obj/effect/turf_decal/trimline/red/filled/corner, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/security/brig) "oIW" = ( /obj/structure/sign/warning/vacuum/directional/east, /obj/effect/turf_decal/delivery, @@ -40837,15 +40433,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"oJF" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/disposal/bin, -/obj/machinery/light/cold/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) "oJH" = ( /obj/effect/spawner/random/maintenance, /obj/structure/reagent_dispensers/fueltank, @@ -40940,6 +40527,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"oKM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "oKU" = ( /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) @@ -40970,6 +40565,15 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"oLL" = ( +/obj/item/storage/secure/safe/hos{ + pixel_x = 36; + pixel_y = 28 + }, +/obj/machinery/status_display/evac/directional/north, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hos) "oLS" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/testlab) @@ -40991,20 +40595,6 @@ "oMA" = ( /turf/closed/wall/r_wall, /area/station/science/cytology) -"oMD" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Locker Room Entrance" - }, -/obj/structure/cable, -/obj/structure/sign/departments/lawyer/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/commons/locker) "oMR" = ( /obj/structure/table/wood, /obj/machinery/computer/libraryconsole/bookmanagement{ @@ -41034,41 +40624,10 @@ "oNs" = ( /turf/open/floor/engine, /area/station/engineering/supermatter) -"oNK" = ( -/obj/machinery/door/window/right/directional/south{ - name = "First Aid Supplies"; - req_access = list("medical") - }, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/medkit/brute{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/brute, -/obj/item/storage/medkit/brute{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/table/reinforced, -/obj/machinery/light/cold/directional/north, -/obj/structure/window/spawner/directional/west, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "oNP" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/medical/office) -"oOa" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "oOl" = ( /obj/machinery/flasher/directional/north{ id = "AI" @@ -41076,21 +40635,15 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai_upload) -"oOs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 +"oOz" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 }, -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/light/no_nightlight/directional/north, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/atmos) +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) "oOB" = ( /obj/structure/table, /obj/effect/turf_decal/siding{ @@ -41227,14 +40780,6 @@ }, /turf/open/floor/holofloor/dark, /area/station/science/cytology) -"oQq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "oQx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/suit_storage_unit/industrial/loader, @@ -41260,19 +40805,6 @@ /obj/structure/table/wood, /turf/open/floor/carpet, /area/station/command/corporate_showroom) -"oQY" = ( -/obj/machinery/power/smes{ - charge = 5e+006 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/flasher/directional/north{ - id = "AI"; - pixel_x = -22 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai) "oQZ" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=1.5-Fore-Central"; @@ -41309,6 +40841,24 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) +"oRV" = ( +/obj/structure/table, +/obj/machinery/newscaster/directional/east, +/obj/machinery/camera/directional/south{ + c_tag = "Departure Lounge - Security Post" + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/taperecorder{ + pixel_x = 4 + }, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "oSc" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -41391,41 +40941,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"oUi" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "packageExternal" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Cargo Bay - Aft"; - pixel_x = 14 - }, -/obj/machinery/light/directional/south, -/obj/machinery/disposal/delivery_chute{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/door/window/right/directional/west{ - dir = 4; - name = "Crate to Shuttle"; - req_access = list("shipping") - }, -/obj/structure/plasticflaps/opaque{ - name = "Service Deliveries" - }, -/obj/structure/window/spawner/directional/west, -/turf/open/floor/iron, -/area/station/cargo/storage) -"oUj" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) "oUu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -41472,6 +40987,13 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"oUK" = ( +/obj/structure/table, +/obj/item/electronics/apc, +/obj/item/electronics/airlock, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) "oUU" = ( /obj/structure/weightmachine/weightlifter, /obj/structure/cable, @@ -41491,6 +41013,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"oVL" = ( +/obj/structure/table, +/obj/item/folder, +/obj/item/pen, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/photo_album/prison, +/obj/item/camera, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison) "oVY" = ( /obj/structure/chair{ dir = 8; @@ -41517,22 +41049,10 @@ "oWk" = ( /turf/closed/wall/r_wall, /area/station/maintenance/starboard/aft) -"oWE" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/light/small/dim/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/central) "oWF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) -"oWG" = ( -/obj/machinery/bluespace_vendor/directional/south, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/commons/locker) "oWH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -41565,13 +41085,6 @@ /obj/machinery/telecomms/server/presets/science, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) -"oXq" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 8 - }, -/obj/machinery/module_duplicator, -/turf/open/floor/iron/white, -/area/station/science/explab) "oXv" = ( /obj/structure/rack, /obj/item/storage/briefcase{ @@ -41665,6 +41178,29 @@ /obj/machinery/light/small/red/directional/west, /turf/open/floor/plating/airless, /area/space/nearstation) +"oYv" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/structure/bed, +/obj/item/bedsheet/dorms, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/button/door/directional/west{ + id = "Cabin4"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) +"oYz" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Cargo Bay - Mailroom" + }, +/obj/effect/turf_decal/trimline/brown/filled/shrink_ccw, +/obj/effect/turf_decal/trimline/white/filled/warning, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/cargo/sorting) "oYM" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -41672,25 +41208,6 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"oYO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, -/obj/structure/cable, -/obj/item/kirbyplants/random, -/obj/machinery/camera/directional/east{ - c_tag = "Science Server Room"; - name = "science camera"; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/science/server) -"oYR" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/closet/secure_closet/freezer/kitchen/maintenance, -/obj/machinery/light/small/dim/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "oYZ" = ( /turf/closed/wall, /area/station/command/heads_quarters/rd) @@ -41771,16 +41288,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"pas" = ( -/obj/structure/reagent_dispensers/wall/peppertank/directional/north, -/obj/structure/closet/secure_closet/security, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/security/checkpoint/customs) "pav" = ( /obj/structure/chair/stool/directional/west, /obj/machinery/camera/directional/north{ @@ -41797,6 +41304,13 @@ /obj/structure/cable, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) +"pbb" = ( +/obj/structure/table, +/obj/machinery/microwave, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/science/research) "pbf" = ( /obj/effect/turf_decal/siding/blue/corner{ dir = 1 @@ -41929,12 +41443,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) -"pdF" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/iron/chapel{ - dir = 1 - }, -/area/station/service/chapel) "pdT" = ( /obj/effect/spawner/random/vending/colavend, /obj/effect/turf_decal/delivery, @@ -41997,13 +41505,6 @@ "peM" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/storage/gas) -"peS" = ( -/obj/machinery/firealarm/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/security/brig) "peX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42024,16 +41525,18 @@ /obj/structure/cable/layer3, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) -"pfC" = ( -/obj/machinery/modular_computer/preset/id{ - dir = 4 +"pfs" = ( +/obj/structure/closet/secure_closet{ + name = "contraband locker"; + req_access = list("armory") }, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/spawner/random/maintenance/three, +/obj/effect/spawner/random/contraband/armory, +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/cmo) +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "pfP" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light_switch/directional/south, @@ -42124,6 +41627,18 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) +"phJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering - Desk" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/engineering/break_room) "phN" = ( /obj/machinery/camera/directional/west{ c_tag = "AI Chamber - Port"; @@ -42163,16 +41678,19 @@ }, /turf/open/floor/iron, /area/station/command/gateway) -"pih" = ( -/obj/structure/showcase/machinery/tv{ - dir = 1; - pixel_x = 2; - pixel_y = 3 +"piv" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, -/obj/structure/table/wood, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet, -/area/station/command/corporate_showroom) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "piw" = ( /obj/effect/landmark/start/cyborg, /obj/machinery/holopad/secure, @@ -42204,6 +41722,23 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"piT" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/fluorine{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/iodine{ + pixel_x = 1 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) "pjd" = ( /turf/open/floor/plating, /area/station/commons/fitness/recreation) @@ -42214,15 +41749,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"pjk" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/spawner/random/armory/shotgun, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "pjs" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42232,11 +41758,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) -"pjO" = ( -/obj/machinery/firealarm/directional/south, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/office) "pjS" = ( /obj/machinery/vending/cigarette, /obj/structure/extinguisher_cabinet/directional/east, @@ -42251,6 +41772,15 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/station/security/checkpoint/science) +"pkx" = ( +/obj/machinery/modular_computer/preset/research{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) "pkH" = ( /obj/structure/rack, /obj/item/restraints/handcuffs, @@ -42285,22 +41815,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/station/security/execution/transfer) -"plf" = ( -/obj/effect/spawner/random/trash/cigbutt, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/textured, -/area/station/medical/chem_storage) -"plg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/service/chapel/funeral) "plp" = ( /obj/machinery/camera/directional/west{ c_tag = "Xenobiology Lab - Pen #1"; @@ -42357,6 +41871,14 @@ /obj/effect/landmark/start/mime, /turf/open/floor/carpet, /area/station/service/theater) +"pmW" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "pmZ" = ( /obj/machinery/light_switch/directional/west{ pixel_y = 26 @@ -42432,11 +41954,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) -"pol" = ( -/obj/structure/closet/crate/coffin, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating, -/area/station/service/chapel/funeral) "pom" = ( /turf/open/floor/iron, /area/station/engineering/storage_shared) @@ -42467,6 +41984,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/genetics) +"ppm" = ( +/obj/structure/cable, +/obj/machinery/computer/security/telescreen/interrogation{ + name = "isolation room monitor"; + network = list("isolation"); + pixel_y = 31 + }, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "ppB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, @@ -42483,33 +42010,14 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"ppH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/box/lights/mixed{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/storage/box/lights/mixed{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/grenade/chem_grenade/cleaner{ - pixel_x = -7; - pixel_y = 12 - }, -/obj/item/grenade/chem_grenade/cleaner{ - pixel_x = -7; - pixel_y = 12 - }, -/obj/item/grenade/chem_grenade/cleaner{ - pixel_x = -7; - pixel_y = 12 - }, -/obj/machinery/light/small/directional/north, -/obj/structure/table, +"ppI" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/south, /turf/open/floor/iron, -/area/station/service/janitor) +/area/station/hallway/secondary/entry) "ppJ" = ( /obj/machinery/door/morgue{ name = "Chapel Garden" @@ -42574,6 +42082,13 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) +"pqt" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/machinery/module_duplicator, +/turf/open/floor/iron/white, +/area/station/science/explab) "pqu" = ( /obj/machinery/light/small/directional/east, /obj/effect/landmark/start/chaplain, @@ -42595,17 +42110,6 @@ /obj/item/fish_feed, /turf/open/space/basic, /area/space/nearstation) -"pqK" = ( -/obj/effect/landmark/generic_maintenance_landmark, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/obj/effect/spawner/random/trash/soap{ - spawn_scatter_radius = 1 - }, -/obj/effect/landmark/event_spawn, -/obj/machinery/light/floor, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "prg" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -42636,6 +42140,12 @@ /obj/effect/turf_decal/tile/green/anticorner/contrasted, /turf/open/floor/iron/white, /area/station/medical/virology) +"pry" = ( +/obj/effect/turf_decal/stripes/line, +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "prD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, @@ -42735,6 +42245,14 @@ /obj/machinery/keycard_auth/directional/east, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) +"psz" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) "psT" = ( /turf/open/floor/iron/dark, /area/station/science/lab) @@ -42830,6 +42348,17 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/iron/white, /area/station/medical/virology) +"puP" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/mecha_part_fabricator{ + dir = 4 + }, +/obj/structure/noticeboard/directional/west, +/turf/open/floor/iron, +/area/station/science/robotics/lab) "puQ" = ( /obj/machinery/door/poddoor/preopen{ id = "Prison Gate"; @@ -42890,15 +42419,6 @@ name = "Holodeck Projector Floor" }, /area/station/holodeck/rec_center) -"pwj" = ( -/obj/structure/cable, -/obj/effect/landmark/event_spawn, -/obj/machinery/requests_console/directional/north{ - department = "Security"; - name = "Security Requests Console" - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/customs) "pwm" = ( /obj/machinery/telecomms/processor/preset_four, /turf/open/floor/circuit/telecomms/mainframe, @@ -42982,6 +42502,25 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"pyh" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/security/office) +"pyy" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/item/radio/intercom/prison/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/garden) "pyI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -43010,18 +42549,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"pyT" = ( -/obj/structure/chair/comfy{ - dir = 4 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Science Break Room"; - network = list("ss13","rd") - }, -/obj/machinery/light_switch/directional/south, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/turf/open/floor/iron, -/area/station/science/research) "pyY" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -43113,14 +42640,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"pAG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/depsec/supply, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "pAW" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ dir = 4 @@ -43140,6 +42659,23 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/commons/lounge) +"pBm" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"pBs" = ( +/obj/structure/sign/warning/cold_temp/directional/north{ + name = "\improper CRYOGENICS" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) "pBG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43225,17 +42761,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/command/bridge) -"pCX" = ( -/obj/machinery/mineral/stacking_unit_console{ - pixel_x = 32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "pDe" = ( /obj/machinery/computer/telecomms/server{ dir = 8; @@ -43245,6 +42770,15 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) +"pDh" = ( +/obj/structure/showcase/machinery/microwave{ + dir = 1; + pixel_y = 2 + }, +/obj/structure/table/wood, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) "pDl" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/left/directional/north{ @@ -43294,10 +42828,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/construction/storage_wing) -"pEb" = ( -/obj/machinery/vending/tool, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "pEk" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -43348,10 +42878,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/library) -"pES" = ( -/obj/structure/cable, -/turf/open/floor/circuit/red, -/area/station/ai_monitored/turret_protected/ai_upload) +"pEI" = ( +/obj/effect/spawner/random/contraband/prison, +/obj/structure/closet/crate, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/radio/intercom/prison/directional/north, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/plating, +/area/station/security/prison/work) "pFd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43368,21 +42905,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) -"pFi" = ( -/obj/machinery/flasher/portable, -/obj/item/radio/intercom/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Security - Secure Gear Storage" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/lockers) "pFt" = ( /obj/structure/cable, /obj/effect/landmark/event_spawn, @@ -43496,17 +43018,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"pHu" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 10 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/light/no_nightlight/directional/east, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/atmos/pumproom) "pHv" = ( /obj/machinery/door/airlock/maintenance{ name = "Surgery Maintenance" @@ -43556,6 +43067,12 @@ /obj/effect/mapping_helpers/airlock/access/any/command/eva, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"pIs" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) "pIw" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -43590,10 +43107,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) -"pJa" = ( -/obj/effect/turf_decal/trimline/red/filled/line, +"pIU" = ( +/obj/structure/closet/secure_closet/medical1, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron/white, -/area/station/security/prison) +/area/station/medical/virology) "pJf" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -43619,13 +43139,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"pJo" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/floor, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai_upload) "pJu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43649,6 +43162,11 @@ "pJE" = ( /turf/open/floor/iron, /area/station/commons/locker) +"pJN" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/east, +/obj/machinery/vending/wardrobe/curator_wardrobe, +/turf/open/floor/engine/cult, +/area/station/service/library) "pJR" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/hop) @@ -43690,11 +43208,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"pKc" = ( -/obj/structure/window/spawner/directional/west, -/obj/machinery/light/floor, -/turf/open/floor/carpet, -/area/station/service/theater) "pKs" = ( /obj/structure/table/wood, /obj/item/paper_bin/carbon{ @@ -43755,6 +43268,14 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"pLz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "pMd" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/engine/n2, @@ -43812,16 +43333,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"pMW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "QM #2" - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "pNb" = ( /obj/effect/spawner/random/maintenance, /obj/structure/cable, @@ -44040,6 +43551,12 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"pQy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/secure_closet/atmospherics, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "pQC" = ( /obj/structure/table/wood, /obj/machinery/firealarm/directional/south, @@ -44112,13 +43629,19 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"pRW" = ( -/obj/structure/chair/stool/directional/south, -/obj/machinery/computer/pod/old/mass_driver_controller/trash{ - pixel_x = -24 +"pRM" = ( +/obj/machinery/disposal/bin, +/obj/machinery/camera/directional/east{ + c_tag = "Garden" }, -/turf/open/floor/plating, -/area/station/maintenance/disposal) +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "pSa" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -44189,14 +43712,15 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"pTP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +"pTL" = ( /obj/structure/cable, -/obj/machinery/light/floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 + }, /turf/open/floor/plating, -/area/station/maintenance/port/fore) +/area/station/maintenance/aft/greater) "pTS" = ( /turf/closed/wall, /area/station/service/bar) @@ -44252,22 +43776,16 @@ /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"pUJ" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching output from station security cameras."; - name = "Security Camera Monitor"; - network = list("ss13"); - pixel_y = 30 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, +"pUM" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/white/corner, +/obj/machinery/firealarm/directional/north, +/obj/item/clipboard, +/obj/item/paper, +/obj/item/pen, /obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) +/turf/open/floor/iron/dark, +/area/station/medical/office) "pUS" = ( /obj/item/paper_bin{ pixel_x = -3; @@ -44287,11 +43805,6 @@ /obj/structure/closet/crate/preopen, /turf/open/floor/iron, /area/station/cargo/warehouse) -"pVJ" = ( -/obj/structure/cable, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/construction/storage_wing) "pVM" = ( /obj/machinery/light/small/directional/south, /obj/machinery/camera/directional/south{ @@ -44387,14 +43900,6 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/station/science/explab) -"pXz" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/item/radio/intercom/prison/directional/north, -/turf/open/floor/iron, -/area/station/security/prison/garden) "pXA" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -44434,14 +43939,6 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/office) -"pYz" = ( -/obj/effect/landmark/generic_maintenance_landmark, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/wood, -/area/station/commons/dorms) "pYE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44497,13 +43994,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) -"pZY" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/engineering/gravity_generator) "qaf" = ( /obj/structure/chair/stool/bar/directional/south, /obj/effect/turf_decal/siding/wood{ @@ -44524,6 +44014,16 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"qaw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "qaA" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -44638,14 +44138,13 @@ "qcd" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/pumproom) -"qct" = ( -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/machinery/light/small/dim/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/port) +"qcy" = ( +/obj/machinery/newscaster/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Courtroom - Gallery" + }, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) "qcP" = ( /obj/effect/landmark/blobstart, /obj/effect/mapping_helpers/burnt_floor, @@ -44655,16 +44154,6 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/station/commons/lounge) -"qcS" = ( -/obj/structure/sign/poster/official/random/directional/south, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) -"qde" = ( -/obj/machinery/vending/wardrobe/det_wardrobe, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/grimy, -/area/station/security/detectives_office) "qdm" = ( /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/stripes/corner{ @@ -44681,6 +44170,14 @@ /obj/machinery/door/airlock/external, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"qdy" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/wood, +/area/station/commons/dorms) "qdI" = ( /obj/structure/table, /obj/machinery/microwave, @@ -44708,6 +44205,11 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/plating, /area/station/maintenance/central) +"qeo" = ( +/obj/machinery/newscaster/directional/north, +/obj/structure/dresser, +/turf/open/floor/carpet, +/area/station/commons/dorms) "qeq" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44917,6 +44419,22 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"qhw" = ( +/obj/machinery/button/door/directional/west{ + id = "Engineering"; + name = "Engineering Lockdown"; + pixel_y = -6; + req_access = list("engineering") + }, +/obj/machinery/button/door/directional/west{ + id = "atmos"; + name = "Atmospherics Lockdown"; + pixel_y = 6; + req_access = list("atmospherics") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "qhx" = ( /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/tile/purple, @@ -44935,6 +44453,10 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/station/security/holding_cell) +"qhE" = ( +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "qhF" = ( /obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/stripes/line{ @@ -44966,14 +44488,6 @@ dir = 1 }, /area/station/engineering/atmos/pumproom) -"qhM" = ( -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "qhR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -45011,6 +44525,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"qiY" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/sign/poster/random/directional/east, +/obj/structure/table/wood, +/obj/item/food/pie/cream, +/turf/open/floor/wood/large, +/area/station/service/theater) "qjf" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -45021,6 +44544,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"qjl" = ( +/obj/machinery/vending/tool, +/obj/effect/turf_decal/delivery, +/obj/machinery/light_switch/directional/west, +/obj/machinery/incident_display/delam/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/storage_shared) "qjr" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/line, @@ -45250,6 +44780,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/interrogation) +"qoK" = ( +/obj/structure/closet/crate/freezer/blood, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/kitchen_coldroom, +/area/station/medical/coldroom) "qoR" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -45277,14 +44812,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"qpu" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/airalarm/directional/south, -/obj/structure/bodycontainer/morgue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "qpD" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -45334,6 +44861,13 @@ dir = 1 }, /area/station/service/chapel) +"qrj" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/suit_storage_unit/ce, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "qrn" = ( /turf/open/floor/iron/dark, /area/station/security/interrogation) @@ -45379,28 +44913,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"qrV" = ( -/obj/structure/table, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/window/spawner/directional/south, -/obj/machinery/light/cold/directional/west, -/turf/open/floor/iron/dark, -/area/station/command/teleporter) -"qsd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Atmospherics - External Airlock" - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "qsf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -45548,6 +45060,15 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"qvZ" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/cryo) "qwh" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -45693,6 +45214,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"qyQ" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/secure_closet/engineering_welding, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) "qyT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -45824,16 +45351,6 @@ "qBy" = ( /turf/closed/wall, /area/station/command/heads_quarters/hop) -"qBB" = ( -/obj/effect/turf_decal/trimline/yellow/filled/corner{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "qBC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -45856,13 +45373,6 @@ }, /turf/open/floor/engine, /area/station/science/explab) -"qBS" = ( -/obj/structure/table, -/obj/item/flashlight/flare/candle, -/obj/effect/turf_decal/delivery, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "qCa" = ( /obj/structure/rack, /obj/item/storage/box/shipping, @@ -45896,6 +45406,14 @@ /obj/machinery/telecomms/processor/preset_two, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) +"qCw" = ( +/obj/structure/cable, +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "qCC" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -45949,6 +45467,18 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"qDg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison) +"qDi" = ( +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) "qDy" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -45960,6 +45490,16 @@ /obj/machinery/hydroponics/constructable, /turf/open/floor/iron, /area/station/service/hydroponics) +"qDD" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Arrivals - Fore Arm" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) "qDS" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -46077,12 +45617,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) -"qGr" = ( -/obj/structure/sink/directional/south, -/mob/living/basic/mouse/brown/tom, -/obj/machinery/light/small/dim/directional/west, -/turf/open/floor/plating, -/area/station/security/prison/safe) "qGs" = ( /obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46094,11 +45628,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/dorms) -"qGy" = ( -/obj/machinery/newscaster/directional/south, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/commons/locker) "qGK" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -46206,14 +45735,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"qIE" = ( -/obj/item/storage/secure/briefcase, -/obj/structure/table/wood, -/obj/item/folder/blue, -/obj/item/storage/secure/briefcase, -/obj/item/assembly/flash/handheld, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "qIK" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/preopen{ @@ -46252,6 +45773,20 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/range) +"qJb" = ( +/obj/machinery/requests_console/directional/west{ + department = "Detective"; + name = "Detective Requests Console" + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/machinery/camera/directional/west{ + c_tag = "Detective's Office" + }, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) "qJd" = ( /obj/machinery/status_display/ai/directional/north, /obj/machinery/computer/station_alert, @@ -46270,13 +45805,13 @@ /obj/structure/table, /turf/open/floor/iron, /area/station/security/prison/visit) -"qJv" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/commons/locker) +"qJn" = ( +/obj/machinery/chem_master, +/obj/structure/noticeboard/directional/east, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "qJH" = ( /obj/machinery/vending/autodrobe/all_access, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -46330,16 +45865,23 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"qKD" = ( +/obj/structure/sign/poster/random/directional/east, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 10 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "qKR" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/plating, /area/station/engineering/atmos) -"qKS" = ( -/obj/structure/closet/firecloset, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) "qLe" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -46371,6 +45913,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/theater) +"qLu" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) "qLw" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -46393,6 +45943,40 @@ }, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"qLR" = ( +/obj/structure/rack, +/obj/machinery/airalarm/directional/west, +/obj/item/reagent_containers/cup/bottle/mercury{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/nitrogen{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/oxygen{ + pixel_x = 1 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/medical/chem_storage) +"qLU" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 8 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "qLY" = ( /obj/machinery/camera/directional/south{ c_tag = "Arrivals - Middle Arm - Far" @@ -46438,22 +46022,13 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"qMw" = ( -/obj/structure/closet/emcloset, -/obj/machinery/camera/directional/south{ - c_tag = "Science Entry"; - network = list("ss13","rd") +"qMm" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/checker, -/area/station/science/research) +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/engineering/atmos) "qMA" = ( /obj/machinery/computer/cargo{ dir = 4 @@ -46486,6 +46061,12 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating/airless, /area/space/nearstation) +"qMW" = ( +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/station/command/gateway) "qNb" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock" @@ -46563,6 +46144,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/command/bridge) +"qOk" = ( +/obj/structure/table/optable, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) "qOs" = ( /obj/machinery/door/airlock/maintenance{ name = "Genetics Maintenance" @@ -46638,22 +46226,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"qOY" = ( -/obj/item/cigbutt, -/obj/structure/table/reinforced, -/obj/item/storage/medkit/fire{ - pixel_y = -4 - }, -/obj/item/paper{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/engineering/break_room) "qOZ" = ( /obj/machinery/requests_console/directional/south{ department = "Mining"; @@ -46677,6 +46249,10 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/iron/white, /area/station/medical/virology) +"qPF" = ( +/obj/machinery/computer/security/wooden_tv, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) "qPJ" = ( /turf/closed/wall, /area/station/security/checkpoint/medical) @@ -46718,6 +46294,15 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"qQJ" = ( +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/science/xenobiology) "qQX" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -46729,6 +46314,27 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) +"qQY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"qRa" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"qRe" = ( +/obj/effect/turf_decal/siding/purple, +/obj/item/kirbyplants/random, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) "qRf" = ( /obj/machinery/firealarm/directional/east, /turf/open/floor/wood, @@ -46853,6 +46459,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/commons/storage/primary) +"qSP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 1 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 9 + }, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "qST" = ( /turf/open/floor/iron, /area/station/cargo/drone_bay) @@ -46934,25 +46550,21 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +"qTU" = ( +/obj/item/retractor, +/obj/item/hemostat{ + pixel_x = -10 + }, +/obj/structure/table, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) "qTX" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"qUg" = ( -/obj/effect/turf_decal/bot, -/obj/structure/rack, -/obj/item/mod/module/plasma_stabilizer, -/obj/item/mod/module/thermal_regulator, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/storage_shared) "qUz" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/white, @@ -46997,6 +46609,20 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"qVD" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/computer/security/telescreen{ + desc = "Used for monitoring the engine."; + dir = 8; + name = "Engine Monitor"; + network = list("engine"); + pixel_x = 32 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "qWm" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -47005,16 +46631,6 @@ dir = 9 }, /area/station/commons/fitness) -"qWE" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "qWF" = ( /turf/closed/wall/r_wall, /area/station/hallway/primary/fore) @@ -47051,19 +46667,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"qWS" = ( -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/effect/turf_decal/delivery, -/obj/structure/table, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/engineering/main) "qWX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47118,6 +46721,14 @@ /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, /area/station/maintenance/port) +"qXt" = ( +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "qXw" = ( /obj/structure/filingcabinet/chestdrawer, /mob/living/simple_animal/parrot/poly, @@ -47318,19 +46929,6 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/wood, /area/station/commons/lounge) -"rbh" = ( -/obj/structure/table, -/obj/effect/spawner/random/entertainment/deck, -/obj/effect/spawner/random/entertainment/cigarette_pack{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "rbi" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance, @@ -47354,13 +46952,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/warden) -"rbB" = ( -/obj/machinery/computer/security/qm{ - dir = 4 +"rbD" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood, -/area/station/command/heads_quarters/qm) +/obj/effect/turf_decal/siding/purple{ + dir = 5 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/sign/poster/official/wtf_is_co2/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "rbF" = ( /obj/machinery/mass_driver/chapelgun, /obj/structure/sign/warning/vacuum/external/directional/north, @@ -47372,6 +46979,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) +"rbG" = ( +/obj/structure/rack, +/obj/effect/spawner/random/clothing/costume, +/obj/item/clothing/mask/balaclava, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/commons/locker) "rbH" = ( /obj/machinery/door/airlock{ name = "Port Emergency Storage" @@ -47448,57 +47063,47 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) -"rdW" = ( -/obj/structure/table, -/obj/effect/turf_decal/siding/white/corner, -/obj/machinery/firealarm/directional/north, -/obj/item/clipboard, -/obj/item/paper, -/obj/item/pen, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/station/medical/office) -"rdX" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/machinery/button/door/directional/north{ - id = "rdrnd"; - name = "Research and Development Containment Control"; - pixel_x = -6; - req_access = list("rd") - }, -/obj/machinery/button/door/directional/north{ - id = "rdordnance"; - name = "Ordnance Containment Control"; - pixel_x = 6; - req_access = list("rd") - }, -/obj/machinery/button/door/directional/north{ - id = "rdoffice"; - name = "Privacy Control"; - pixel_y = 34; - req_access = list("rd") - }, -/obj/machinery/computer/security/telescreen/rd{ - pixel_x = 31; - pixel_y = 30 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/rd) "rea" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 5 }, /turf/open/floor/engine, /area/station/science/cytology) +"rem" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Service Hallway"; + name = "Service Fax Machine" + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "ret" = ( /obj/effect/spawner/random/trash/garbage{ spawn_scatter_radius = 1 }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"rew" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "rez" = ( /obj/machinery/newscaster/directional/south, /obj/structure/cable, @@ -47543,24 +47148,6 @@ "rft" = ( /turf/closed/wall/r_wall, /area/station/security/prison/mess) -"rfX" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring medbay to ensure patient safety."; - dir = 4; - name = "Medbay Monitor"; - network = list("medbay"); - pixel_x = -32 - }, -/obj/machinery/light_switch/directional/west{ - pixel_x = -20 - }, -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/medical) "rfY" = ( /obj/structure/lattice, /obj/structure/sign/warning/electric_shock/directional/east, @@ -47575,11 +47162,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) -"rgh" = ( -/obj/structure/flora/bush/jungle/c/style_random, -/obj/machinery/light/small/directional/east, -/turf/open/floor/grass, -/area/station/medical/virology) "rgL" = ( /obj/structure/table, /obj/item/reagent_containers/cup/glass/mug/britcup{ @@ -47661,6 +47243,13 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"rhW" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/item/weldingtool, +/obj/item/clothing/head/utility/welding, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/construction/storage_wing) "riz" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -47695,6 +47284,16 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/wood, /area/station/commons/lounge) +"rjl" = ( +/obj/structure/weightmachine/weightlifter, +/obj/effect/turf_decal/tile/dark_red/half/contrasted, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/white/textured_edge{ + dir = 1 + }, +/area/station/commons/fitness) "rjz" = ( /obj/machinery/power/shieldwallgen, /obj/structure/extinguisher_cabinet/directional/west, @@ -47714,6 +47313,21 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"rjZ" = ( +/obj/structure/table, +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) "rke" = ( /obj/machinery/recharge_station, /turf/open/floor/plating, @@ -47753,11 +47367,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"rkS" = ( -/obj/effect/turf_decal/siding/purple, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/white, -/area/station/science/ordnance/storage) "rkT" = ( /obj/item/target/syndicate, /turf/open/floor/engine, @@ -47919,6 +47528,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"roe" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "roj" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -47932,10 +47552,14 @@ }, /turf/open/floor/iron, /area/station/science/explab) -"rpf" = ( -/obj/machinery/light/small/dim/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +"roF" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/landmark/event_spawn, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) "rps" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -47986,6 +47610,24 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"rqc" = ( +/obj/machinery/computer/security/telescreen{ + desc = "Used for monitoring medbay to ensure patient safety."; + dir = 4; + name = "Medbay Monitor"; + network = list("medbay"); + pixel_x = -32 + }, +/obj/machinery/light_switch/directional/west{ + pixel_x = -20 + }, +/obj/machinery/computer/records/medical{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) "rqs" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -48011,31 +47653,21 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"rrp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 1 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 9 - }, -/obj/machinery/light_switch/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "rrt" = ( /obj/structure/lattice, /obj/effect/spawner/random/structure/grille, /turf/open/space/basic, /area/space/nearstation) -"rrG" = ( -/obj/structure/cable, -/obj/machinery/computer/security/telescreen/interrogation{ - name = "isolation room monitor"; - network = list("isolation"); - pixel_y = 31 +"rrz" = ( +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 1 }, -/obj/machinery/light/cold/directional/north, +/obj/structure/table, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/light/small/directional/south, +/obj/machinery/digital_clock/directional/south, /turf/open/floor/iron, -/area/station/security/execution/transfer) +/area/station/service/bar) "rrL" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/left/directional/north{ @@ -48075,16 +47707,6 @@ }, /turf/open/floor/iron/white, /area/station/security/prison/visit) -"rse" = ( -/obj/machinery/light_switch/directional/north, -/obj/effect/turf_decal/siding/wood, -/obj/effect/landmark/start/clown, -/obj/structure/chair/wood/wings{ - dir = 8 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/wood/large, -/area/station/service/theater) "rsi" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/machinery/meter, @@ -48129,6 +47751,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"rsR" = ( +/obj/structure/railing, +/turf/open/floor/plating/airless, +/area/space/nearstation) "rtd" = ( /obj/machinery/camera/motion/directional/east{ c_tag = "E.V.A. Storage" @@ -48147,13 +47773,17 @@ /obj/machinery/igniter/incinerator_ordmix, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) -"rty" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) +"rtD" = ( +/obj/effect/turf_decal/tile/purple, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) +"rtI" = ( +/obj/effect/landmark/secequipment, +/obj/effect/turf_decal/bot, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/office) "rtN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48260,25 +47890,17 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"ruY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "rvb" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/medical/storage) -"rve" = ( -/obj/structure/table/wood, -/obj/machinery/microwave{ - pixel_x = 1; - pixel_y = 6 +"rvq" = ( +/obj/machinery/computer/records/medical{ + dir = 4 }, -/obj/machinery/light/small/directional/north, +/obj/machinery/newscaster/directional/west, /turf/open/floor/iron/dark, -/area/station/service/cafeteria) +/area/station/medical/office) "rvx" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/engine/n2o, @@ -48323,6 +47945,21 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) +"rwa" = ( +/obj/structure/table, +/obj/item/storage/bag/plants, +/obj/item/reagent_containers/cup/watering_can, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "rwd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/green{ @@ -48433,21 +48070,19 @@ /obj/structure/cable, /turf/open/floor/plating/airless, /area/station/solars/starboard/aft) -"rxW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar{ +"rxP" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/computer/security, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/machinery/light/directional/north, +/obj/machinery/requests_console/directional/north{ + department = "Security"; + name = "Security Requests Console" + }, /turf/open/floor/iron, -/area/station/hallway/secondary/service) +/area/station/security/checkpoint/customs) "rxY" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -48498,6 +48133,22 @@ /obj/item/stock_parts/cell/high, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"ryA" = ( +/obj/item/cigbutt, +/obj/structure/table/reinforced, +/obj/item/storage/medkit/fire{ + pixel_y = -4 + }, +/obj/item/paper{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/engineering/break_room) "ryJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -48594,6 +48245,12 @@ }, /turf/closed/wall/r_wall, /area/station/engineering/atmos/pumproom) +"rzY" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/brig) "rAa" = ( /obj/machinery/door/airlock/maintenance{ name = "Storage Room" @@ -48667,28 +48324,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"rBt" = ( -/obj/structure/table/glass, -/obj/item/scalpel{ - pixel_y = 12 - }, -/obj/item/circular_saw, -/obj/item/blood_filter, -/obj/item/bonesetter, -/obj/machinery/button/door/directional/north{ - id = "main_surgery"; - name = "privacy shutters control" - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) -"rBz" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "rBU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48697,18 +48332,6 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) -"rCj" = ( -/obj/structure/rack, -/obj/item/storage/box/lights/mixed, -/obj/item/clothing/gloves/color/fyellow, -/obj/item/stack/package_wrap, -/obj/item/stack/sheet/glass{ - amount = 30 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "rCn" = ( /obj/item/mmi, /obj/structure/rack, @@ -48719,6 +48342,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"rCW" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Gas to Filter" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "rDf" = ( /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) @@ -48766,6 +48397,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"rDM" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) "rDT" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48823,6 +48459,10 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"rEK" = ( +/obj/machinery/telecomms/server/presets/service, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) "rEO" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -48830,6 +48470,13 @@ "rES" = ( /turf/closed/wall/r_wall, /area/station/security/office) +"rFq" = ( +/obj/structure/table, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) "rFB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -48963,13 +48610,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/wood, /area/station/service/theater) -"rHC" = ( -/obj/structure/table, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/station/science/research) "rHE" = ( /obj/structure/table, /obj/item/clipboard, @@ -49083,6 +48723,22 @@ "rJB" = ( /turf/closed/wall/r_wall, /area/station/security/evidence) +"rJI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) +"rJQ" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/security/brig) "rJS" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -49126,6 +48782,15 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/engine, /area/station/science/explab) +"rKF" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/structure/closet/secure_closet/psychology, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) "rKG" = ( /obj/structure/cable, /obj/machinery/door/airlock/virology/glass{ @@ -49180,18 +48845,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) -"rLj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "rLo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49200,23 +48853,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/science/lab) -"rLp" = ( -/obj/structure/rack, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bottle/fluorine{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bottle/iodine{ - pixel_x = 1 - }, -/turf/open/floor/iron/dark/textured_edge{ - dir = 8 - }, -/area/station/medical/chem_storage) "rLv" = ( /turf/open/floor/plating/foam{ initial_gas_mix = "TEMP=2.7" @@ -49234,16 +48870,10 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"rLO" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{ - dir = 4 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Atmospherics - Central Aft" - }, -/obj/machinery/light/no_nightlight/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +"rLZ" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "rMe" = ( /obj/structure/table, /obj/machinery/button/door{ @@ -49311,6 +48941,23 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/carpet, /area/station/service/library) +"rMJ" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"rMT" = ( +/obj/machinery/power/smes{ + capacity = 9e+006; + charge = 10000 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "rMZ" = ( /obj/structure/table, /obj/item/folder/blue{ @@ -49431,6 +49078,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload_foyer) +"rPA" = ( +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/floor/grass, +/area/station/science/ordnance/office) "rPF" = ( /obj/machinery/shower/directional/south{ name = "emergency shower" @@ -49487,6 +49140,14 @@ "rQw" = ( /turf/open/floor/plating/airless, /area/station/solars/starboard/fore) +"rQz" = ( +/obj/item/storage/secure/briefcase, +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/item/storage/secure/briefcase, +/obj/item/assembly/flash/handheld, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "rQB" = ( /obj/item/flashlight/flare/candle, /obj/machinery/light_switch/directional/west, @@ -49495,16 +49156,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/chapel) -"rQN" = ( -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Cargo Office"; - name = "Cargo Office Fax Machine" - }, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/cargo/sorting) "rQS" = ( /obj/structure/table, /obj/item/storage/box/evidence{ @@ -49579,6 +49230,15 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +"rRJ" = ( +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "rRR" = ( /obj/structure/sign/warning/vacuum/external/directional/south, /obj/machinery/light/small/directional/north, @@ -49649,15 +49309,6 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) -"rTo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/north, -/obj/machinery/light/small/directional/north, -/obj/effect/spawner/random/engineering/tracking_beacon, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "rTw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49769,14 +49420,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) -"rUU" = ( -/obj/machinery/light/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) "rVb" = ( /obj/structure/sink/directional/west, /obj/item/reagent_containers/cup/watering_can, @@ -49825,17 +49468,17 @@ /obj/structure/cable, /turf/open/floor/grass, /area/station/medical/virology) +"rWf" = ( +/obj/structure/urinal/directional/north, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/light/floor, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "rWi" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/engine/n2, /area/station/engineering/atmos) -"rWk" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/light/cold/directional/south, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/aisat/foyer) "rWH" = ( /obj/machinery/door/window{ name = "HoP's Desk"; @@ -49884,6 +49527,23 @@ }, /turf/open/floor/iron, /area/station/security/prison/visit) +"rXW" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/table/glass, +/obj/machinery/camera/directional/west{ + c_tag = "Medbay Pharmacy"; + network = list("ss13","medbay") + }, +/obj/item/book/manual/wiki/chemistry{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/book/manual/wiki/grenades, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "rXX" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, @@ -50060,13 +49720,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"saq" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) "saB" = ( /obj/machinery/button/door/directional/west{ id = "atmoshfr"; @@ -50154,6 +49807,18 @@ dir = 8 }, /area/station/medical/medbay/lobby) +"sbM" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 9 + }, +/obj/effect/turf_decal/tile/bar, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "sbX" = ( /obj/machinery/hydroponics/soil, /obj/effect/decal/cleanable/dirt, @@ -50174,6 +49839,16 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) +"scq" = ( +/obj/machinery/computer/robotics{ + dir = 4 + }, +/obj/machinery/light_switch/directional/west, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "scB" = ( /obj/structure/chair/office/light, /turf/open/floor/iron/white, @@ -50208,14 +49883,6 @@ "sdb" = ( /turf/open/floor/plating, /area/station/science/ordnance/testlab) -"sdl" = ( -/obj/structure/rack, -/obj/effect/spawner/random/clothing/costume, -/obj/item/clothing/mask/balaclava, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/commons/locker) "sdn" = ( /obj/item/target, /obj/structure/training_machine, @@ -50239,15 +49906,6 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) -"sdz" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/filled/end{ - dir = 1 - }, -/turf/open/floor/iron/textured, -/area/station/medical/chem_storage) "sdC" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/structure/easel, @@ -50270,6 +49928,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"sdW" = ( +/obj/structure/sign/warning/radiation/rad_area/directional/north, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/gravity_generator) "see" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ @@ -50347,13 +50012,15 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"sfR" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ - dir = 1 +"sfK" = ( +/obj/structure/closet{ + name = "evidence closet 1" }, -/obj/machinery/light/small/dim/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/evidence) "sgc" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -50363,6 +50030,18 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"sgh" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 5 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) "sgv" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -50391,14 +50070,6 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"sgY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Fuel Pipe to Incinerator" - }, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "shg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -50465,16 +50136,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"sig" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 9 - }, -/turf/open/floor/iron/checker, -/area/station/science/research) "sip" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50482,28 +50143,11 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"siq" = ( -/obj/structure/table, -/obj/item/folder/white{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -4; - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 7 - }, -/obj/item/reagent_containers/dropper{ - pixel_x = -3; - pixel_y = -6 - }, -/obj/machinery/airalarm/directional/north, -/obj/structure/cable, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/science/lab) +"siy" = ( +/obj/machinery/vending/wardrobe/atmos_wardrobe, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "siz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -50565,6 +50209,11 @@ }, /turf/open/floor/wood/parquet, /area/station/medical/psychology) +"sjB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/l3closet/janitor, +/turf/open/floor/iron, +/area/station/service/janitor) "sjM" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -50585,18 +50234,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -"skj" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Chapel - Funeral Parlour" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/machinery/computer/pod/old/mass_driver_controller/chapelgun{ - pixel_x = 24 - }, -/turf/open/floor/iron/dark, -/area/station/service/chapel/funeral) "skx" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -50611,44 +50248,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/science/lab) -"skA" = ( -/obj/structure/table, -/obj/item/folder/red, -/obj/item/restraints/handcuffs, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/structure/cable, -/obj/machinery/light_switch/directional/west, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/lockers) -"skG" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "slc" = ( /obj/effect/decal/cleanable/dirt, /obj/vehicle/ridden/janicart, @@ -50661,6 +50260,12 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) +"sls" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) "sly" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -50744,30 +50349,6 @@ /obj/item/pen, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -"snx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/table/glass, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/screwdriver{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/requests_console/directional/west{ - department = "Pharmacy"; - name = "Pharmacy Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/ore_update, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "snB" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -50794,6 +50375,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"snU" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "soa" = ( /obj/machinery/light/small/directional/south, /obj/structure/sign/poster/official/random/directional/south, @@ -50869,14 +50458,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"spO" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/light/floor, -/turf/open/floor/wood, -/area/station/commons/lounge) "sqt" = ( /obj/machinery/disposal/delivery_chute{ dir = 1; @@ -51076,26 +50657,6 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"sum" = ( -/obj/structure/table/reinforced, -/obj/item/flashlight, -/obj/item/analyzer{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/assembly/signaler, -/obj/item/stack/rods{ - amount = 25 - }, -/obj/item/stack/cable_coil, -/obj/item/gps, -/obj/structure/cable, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/item/clothing/gloves/color/fyellow, -/obj/item/gps, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "suD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -51160,21 +50721,18 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"svy" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ +"svK" = ( +/obj/machinery/power/terminal{ dir = 1 }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark/corner{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 6 }, -/area/station/engineering/atmos/storage/gas) +/obj/structure/sign/warning/fire/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "svP" = ( /obj/machinery/conveyor{ dir = 1; @@ -51244,6 +50802,11 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"swP" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) "swR" = ( /obj/machinery/door/airlock{ name = "Cleaning Closet" @@ -51299,11 +50862,18 @@ /obj/machinery/computer/security/wooden_tv, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -"sxU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) +"sxX" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/obj/structure/table/wood, +/obj/item/stack/sheet/cloth/ten, +/obj/item/toy/crayon/spraycan, +/obj/item/stack/rods/ten, +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood/large, +/area/station/service/theater) "syc" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -51391,6 +50961,14 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/white, /area/station/science/cytology) +"sza" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) "szk" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -51403,6 +50981,16 @@ "szp" = ( /turf/closed/wall, /area/station/commons/fitness/recreation) +"szu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "QM #2" + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "szJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/janitor, @@ -51416,6 +51004,13 @@ /obj/machinery/telecomms/server/presets/engineering, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) +"sAv" = ( +/obj/machinery/stasis, +/obj/machinery/defibrillator_mount/directional/north, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "sAz" = ( /obj/machinery/computer/monitor{ name = "Bridge Power Monitoring Console" @@ -51482,16 +51077,6 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron, /area/station/science/research) -"sBU" = ( -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Law Office"; - name = "Law Office Fax Machine" - }, -/obj/machinery/light/small/directional/south, -/obj/machinery/button/door/directional/west, -/turf/open/floor/wood, -/area/station/service/lawoffice) "sBV" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 @@ -51562,14 +51147,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos) -"sCQ" = ( -/obj/effect/turf_decal/trimline/brown/filled/corner{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron, -/area/station/construction/storage_wing) "sCW" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -51631,6 +51208,21 @@ /obj/effect/mapping_helpers/airlock/access/any/command/hop, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"sDK" = ( +/obj/machinery/flasher/portable, +/obj/item/radio/intercom/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Security - Secure Gear Storage" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/lockers) "sDQ" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -51646,6 +51238,18 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/warden) +"sDT" = ( +/obj/machinery/door/window{ + name = "Secure Art Exhibition"; + req_access = list("library") + }, +/obj/structure/table/wood/fancy/royalblue, +/obj/structure/sign/painting/large/library{ + dir = 1 + }, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/wood, +/area/station/service/library) "sEk" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/structure/cable, @@ -51719,6 +51323,19 @@ "sFw" = ( /turf/open/floor/iron/chapel, /area/station/service/chapel) +"sFz" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "sFB" = ( /turf/open/floor/wood/large, /area/station/commons/lounge) @@ -51735,15 +51352,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"sGo" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/effect/turf_decal/box/red, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "sGw" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{ dir = 9 @@ -51765,6 +51373,16 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"sGH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "sGL" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -51775,13 +51393,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"sGR" = ( -/obj/machinery/vending/tool, -/obj/effect/turf_decal/delivery, -/obj/machinery/light_switch/directional/west, -/obj/machinery/incident_display/delam/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/storage_shared) "sHg" = ( /obj/item/radio/intercom/directional/south, /obj/machinery/camera/directional/south{ @@ -51828,18 +51439,6 @@ "sIe" = ( /turf/closed/wall/r_wall, /area/station/security/execution/transfer) -"sIp" = ( -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/blue/filled/corner, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/light/floor, -/turf/open/floor/iron/white, -/area/station/medical/cryo) "sIs" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -51849,13 +51448,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"sIE" = ( -/obj/structure/table, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/courtroom) "sIG" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/shutters/preopen{ @@ -51948,6 +51540,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/storage/tools) +"sKD" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) "sKG" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -52024,6 +51625,19 @@ }, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai) +"sMb" = ( +/obj/machinery/airalarm/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics - Port-Aft" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) "sMe" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 @@ -52038,14 +51652,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) -"sMr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/spawner/random/structure/closet_maintenance, -/turf/open/floor/plating, -/area/station/maintenance/aft/greater) "sMB" = ( /obj/machinery/door/window/brigdoor/security/cell{ id = "Cell 1"; @@ -52158,6 +51764,12 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"sOw" = ( +/obj/structure/sink/directional/south, +/mob/living/basic/mouse/brown/tom, +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/security/prison/safe) "sOF" = ( /obj/structure/light_construct/directional/east, /turf/open/floor/wood, @@ -52212,6 +51824,16 @@ /obj/effect/mapping_helpers/airlock/access/all/security/hos, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) +"sPy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/xenobio_guide/directional/north, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "sPB" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -52283,15 +51905,6 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) -"sQU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ - dir = 4 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "sQY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52358,6 +51971,16 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +"sSh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/bluespace_vendor/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "sSn" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance, @@ -52455,12 +52078,19 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"sTJ" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/small/directional/east, +"sTD" = ( +/obj/machinery/vending/wardrobe/sec_wardrobe, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/machinery/requests_console/directional/east, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/iron, -/area/station/cargo/miningoffice) +/area/station/security/checkpoint/customs) +"sTK" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) "sTQ" = ( /obj/structure/bed/roller, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -52558,11 +52188,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) -"sUZ" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "sVc" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/field/generator, @@ -52684,13 +52309,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) -"sWD" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/machinery/photocopier, -/turf/open/floor/iron/white, -/area/station/medical/office) "sWF" = ( /obj/machinery/plate_press, /obj/effect/turf_decal/bot, @@ -52726,6 +52344,15 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +"sXm" = ( +/obj/machinery/seed_extractor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/security/prison/garden) "sXr" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -52738,20 +52365,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"sXv" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/window/spawner/directional/west, -/obj/effect/turf_decal/trimline/dark_red/line{ - dir = 8 - }, -/obj/effect/turf_decal/arrows/red{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/commons/fitness) "sXz" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -52817,6 +52430,33 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +"sZa" = ( +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/siding/wood, +/obj/effect/landmark/start/clown, +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood/large, +/area/station/service/theater) +"sZi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/modular_computer/preset/cargochat/service{ + dir = 8 + }, +/obj/structure/sign/poster/random/directional/east, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) +"sZo" = ( +/obj/machinery/light/directional/north, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/watering_can, +/obj/effect/turf_decal/stripes/line, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, +/area/station/service/hydroponics) "sZH" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -52913,6 +52553,14 @@ /obj/structure/flora/bush/ferny/style_random, /turf/open/floor/grass, /area/station/medical/virology) +"taX" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) "taZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52956,13 +52604,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"tcq" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/status_display/evac/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "tcr" = ( /obj/structure/table/wood, /obj/item/storage/box/coffeepack{ @@ -52976,6 +52617,10 @@ /obj/machinery/coffeemaker/impressa, /turf/open/floor/iron/dark, /area/station/service/cafeteria) +"tcu" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/security/courtroom) "tcx" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -53000,13 +52645,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"tcJ" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/wood, -/area/station/service/library) "tcN" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -53212,10 +52850,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) -"tgV" = ( -/obj/machinery/light/floor, -/turf/open/floor/wood, -/area/station/commons/lounge) "thc" = ( /obj/machinery/camera/directional/east{ c_tag = "Gravity Generator Room" @@ -53234,18 +52868,6 @@ dir = 1 }, /area/station/engineering/atmos/pumproom) -"thE" = ( -/obj/machinery/modular_computer/preset/cargochat/science{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/science/explab) "thQ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -53292,23 +52914,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/primary/port) -"tiM" = ( -/obj/item/radio/intercom/directional/west, -/obj/structure/table/glass, -/obj/machinery/camera/directional/west{ - c_tag = "Medbay Pharmacy"; - network = list("ss13","medbay") - }, -/obj/item/book/manual/wiki/chemistry{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/book/manual/wiki/grenades, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "tjf" = ( /obj/machinery/hydroponics/soil{ pixel_y = 8 @@ -53327,18 +52932,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/security/office) -"tjn" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "tjo" = ( /obj/effect/spawner/random/maintenance, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"tjs" = ( +/obj/structure/chair/sofa/corp/right, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) "tju" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -53395,16 +53002,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron, /area/station/cargo/sorting) -"tjW" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/station/commons/locker) "tkg" = ( /obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 4 @@ -53448,9 +53045,6 @@ /obj/item/radio/intercom/prison/directional/north, /turf/open/floor/iron, /area/station/security/prison) -"tlf" = ( -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "tlh" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -53464,6 +53058,12 @@ /obj/structure/sign/warning/docking, /turf/closed/wall, /area/space/nearstation) +"tlI" = ( +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/chapel{ + dir = 8 + }, +/area/station/service/chapel) "tlK" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -53642,15 +53242,6 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"tnY" = ( -/obj/item/radio/intercom/directional/east, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) -"toe" = ( -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/chapel, -/area/station/service/chapel) "tot" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -53729,23 +53320,6 @@ /obj/machinery/griddle, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -"tpO" = ( -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 5 - }, -/obj/structure/sign/poster/random/directional/east, -/obj/machinery/requests_console/directional/south{ - department = "Kitchen"; - name = "Kitchen Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/obj/machinery/deepfryer, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "tqd" = ( /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/white, @@ -53778,22 +53352,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) -"tqF" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/small/directional/south, -/turf/open/floor/wood, -/area/station/service/library) -"tqO" = ( -/obj/machinery/newscaster/directional/west, -/obj/structure/filingcabinet, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/break_room) "tqU" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -53889,6 +53447,13 @@ /obj/item/knife/kitchen, /turf/open/floor/iron/white, /area/station/science/cytology) +"tsT" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "tsZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/structure/lattice/catwalk, @@ -53897,31 +53462,12 @@ /obj/structure/cable, /turf/open/space, /area/space/nearstation) -"tta" = ( -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/engineering/atmos) "tth" = ( /obj/item/paper_bin/carbon, /obj/item/pen/fountain, /obj/structure/table, /turf/open/floor/iron/dark, /area/station/security/office) -"ttp" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Science Ordnance Test Lab"; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/siding/purple{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance/testlab) "tts" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/closed/wall/r_wall, @@ -54010,24 +53556,6 @@ /obj/effect/spawner/random/food_or_drink/seed, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"tuW" = ( -/obj/structure/sign/departments/science/directional/east, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) -"tvc" = ( -/obj/structure/table, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/pipe_dispenser, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/construction/mining/aux_base) "tvg" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -54037,16 +53565,6 @@ "tvE" = ( /turf/closed/wall/r_wall, /area/station/command/gateway) -"tvN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/event_spawn, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/brig) "tvR" = ( /obj/machinery/door/poddoor/shutters{ id = "supplybridge" @@ -54134,14 +53652,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"txd" = ( -/obj/structure/bodycontainer/morgue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "txg" = ( /obj/machinery/suit_storage_unit/security, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -54194,15 +53704,6 @@ /obj/machinery/vending/cigarette, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"txK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/no_nightlight/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmos) "txP" = ( /obj/effect/landmark/start/botanist, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54216,6 +53717,15 @@ }, /turf/open/floor/holofloor/dark, /area/station/science/cytology) +"tyy" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/end{ + dir = 1 + }, +/turf/open/floor/iron/textured, +/area/station/medical/chem_storage) "tyE" = ( /obj/structure/table/glass, /obj/item/phone{ @@ -54311,13 +53821,14 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/primary/aft) -"tAA" = ( -/obj/effect/spawner/random/vending/snackvend, -/obj/structure/disposalpipe/segment{ - dir = 9 +"tAy" = ( +/obj/machinery/photocopier, +/obj/machinery/camera/directional/east{ + c_tag = "Law Office" }, +/obj/machinery/light/directional/east, /turf/open/floor/wood, -/area/station/security/office) +/area/station/service/lawoffice) "tAD" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -54326,14 +53837,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"tAF" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet, -/area/station/commons/dorms) "tAG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54449,12 +53952,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"tCi" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "tCC" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -54484,13 +53981,6 @@ }, /turf/open/floor/iron, /area/station/security/office) -"tCM" = ( -/obj/machinery/conveyor{ - dir = 9; - id = "garbage" - }, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "tCS" = ( /turf/closed/wall/r_wall, /area/station/maintenance/starboard/fore) @@ -54498,19 +53988,6 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/iron/dark, /area/station/science/lab) -"tDi" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/no_nightlight/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmos) "tDk" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/engineering_all, @@ -54619,6 +54096,13 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) +"tGI" = ( +/obj/machinery/light_switch/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) "tGL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54687,6 +54171,21 @@ /obj/structure/cable/multilayer/connected, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"tIb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/watertank, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "tId" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/camera/directional/east{ @@ -54794,14 +54293,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) -"tJx" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "tJE" = ( /obj/effect/turf_decal/trimline/red/filled/corner, /turf/open/floor/iron/dark, @@ -54996,6 +54487,20 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) +"tMb" = ( +/obj/structure/table, +/obj/structure/cable, +/obj/item/disk/tech_disk{ + pixel_x = -6 + }, +/obj/item/disk/tech_disk{ + pixel_x = 6 + }, +/obj/item/disk/tech_disk{ + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/station/science/lab) "tMe" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/machinery/light/small/directional/east, @@ -55046,14 +54551,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"tMU" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/machinery/requests_console/directional/east, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/assistance, -/turf/open/floor/iron, -/area/station/security/checkpoint/customs) "tNg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -55066,6 +54563,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/warden) +"tNt" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/modular_computer/preset/curator{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/library) "tNu" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/north, @@ -55141,6 +54645,14 @@ }, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) +"tOd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "tOg" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -55173,6 +54685,34 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/medical/virology) +"tOT" = ( +/obj/structure/table/glass, +/obj/item/scalpel{ + pixel_y = 12 + }, +/obj/item/circular_saw, +/obj/item/blood_filter, +/obj/item/bonesetter, +/obj/machinery/button/door/directional/north{ + id = "main_surgery"; + name = "privacy shutters control" + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) +"tOU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Science Research"; + network = list("ss13","rd") + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/science/lab) "tOV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -55185,6 +54725,10 @@ }, /turf/open/floor/plating, /area/station/medical/abandoned) +"tOX" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain/private) "tOZ" = ( /obj/item/radio/intercom/directional/west, /obj/structure/frame/computer{ @@ -55207,6 +54751,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) +"tPe" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/digital_clock/directional/south, +/turf/open/floor/wood, +/area/station/service/library) "tPw" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -55333,12 +54884,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"tTi" = ( -/obj/structure/flora/bush/jungle/b/style_random, -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/machinery/light/small/directional/east, -/turf/open/floor/grass, -/area/station/medical/virology) "tTB" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2, /obj/structure/window/reinforced/spawner/directional/south, @@ -55421,6 +54966,19 @@ "tUn" = ( /turf/closed/wall, /area/station/maintenance/starboard/lesser) +"tUo" = ( +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Security Post - Medbay"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/light/small/directional/north, +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) "tUu" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -55538,6 +55096,24 @@ /obj/structure/table/wood, /turf/open/floor/carpet, /area/station/service/chapel/funeral) +"tVC" = ( +/obj/machinery/power/smes{ + charge = 5e+006 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/flasher/directional/north{ + id = "AI"; + pixel_x = -22 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) +"tVG" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "tVP" = ( /obj/machinery/light/no_nightlight/directional/east, /turf/open/floor/iron/dark, @@ -55578,17 +55154,6 @@ /obj/machinery/oven, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"tWv" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/effect/spawner/random/maintenance, -/obj/item/storage/belt/utility, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/storage_shared) "tWE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55622,6 +55187,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) +"tXl" = ( +/obj/structure/table, +/obj/item/stack/cable_coil{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/stack/cable_coil, +/obj/item/stock_parts/cell/high, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) "tXx" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 8 @@ -55758,6 +55334,11 @@ /obj/item/canvas/twentythree_twentythree, /turf/open/floor/iron, /area/station/commons/storage/tools) +"tZX" = ( +/obj/structure/window/spawner/directional/west, +/obj/machinery/light/floor, +/turf/open/floor/carpet, +/area/station/service/theater) "uac" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -55816,6 +55397,15 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"uaG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/computer/atmos_control/nocontrol/incinerator{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "uaN" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -55886,6 +55476,13 @@ }, /turf/open/floor/iron, /area/station/commons/storage/tools) +"ubQ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "ucc" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 @@ -55947,10 +55544,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"udw" = ( -/obj/machinery/status_display/ai/directional/west, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/ai) "udC" = ( /obj/machinery/door/airlock/maintenance{ name = "Storage Room" @@ -55977,13 +55570,6 @@ dir = 1 }, /area/station/engineering/atmos) -"udE" = ( -/obj/structure/closet/boxinggloves, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "udI" = ( /obj/structure/table/reinforced, /obj/item/stamp/denied{ @@ -56062,6 +55648,19 @@ }, /turf/open/floor/iron, /area/station/security/office) +"uew" = ( +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + pixel_y = 6 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/checker, +/area/station/engineering/storage_shared) "ueB" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -56121,17 +55720,6 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"ugF" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/chapel{ - dir = 1 - }, -/area/station/service/chapel) -"ugM" = ( -/obj/effect/decal/cleanable/oil, -/obj/machinery/light_switch/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "ugP" = ( /obj/effect/turf_decal/box/corners{ dir = 4 @@ -56146,13 +55734,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"uhi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/radio/intercom/directional/west, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "uhq" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -56169,6 +55750,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"uht" = ( +/obj/machinery/vending/tool, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "uhu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -56183,6 +55768,15 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) +"uhI" = ( +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/obj/machinery/requests_console/directional/north{ + department = "Security"; + name = "Security Requests Console" + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) "uhP" = ( /obj/structure/chair/stool/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56201,12 +55795,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) -"uhV" = ( -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/chapel{ - dir = 8 - }, -/area/station/service/chapel) "uhW" = ( /obj/structure/cable, /obj/machinery/door/window{ @@ -56258,18 +55846,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"ujy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/directional/south{ - c_tag = "Engineering - Desk" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron, -/area/station/engineering/break_room) "ujH" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box/white{ @@ -56394,12 +55970,16 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"umP" = ( -/obj/item/cigbutt, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/turf/open/floor/wood, -/area/station/command/corporate_showroom) +"umA" = ( +/obj/machinery/defibrillator_mount/directional/south, +/obj/structure/bed/pod{ + desc = "An old medical bed, just waiting for replacement with something up to date."; + name = "medical bed" + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "umS" = ( /obj/item/radio/intercom/directional/west, /obj/machinery/computer/records/security{ @@ -56414,15 +55994,6 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) -"umV" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/break_room) "unj" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 4 @@ -56444,6 +56015,14 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"unw" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet, +/area/station/commons/dorms) "uny" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -56511,6 +56090,31 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/cargo/storage) +"uou" = ( +/obj/structure/rack, +/obj/item/clothing/glasses/hud/security/sunglasses/gars{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/clothing/glasses/hud/security/sunglasses/gars{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/clothing/glasses/hud/security/sunglasses{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/clothing/glasses/hud/security/sunglasses{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/machinery/airalarm/directional/west, +/obj/machinery/camera/motion/directional/west{ + c_tag = "Armory - Internal" + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "uoM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/brig{ @@ -56520,14 +56124,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) -"uoQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/obj/machinery/light/directional/east, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "upe" = ( /obj/machinery/camera/directional/east{ c_tag = "Interrogation room"; @@ -56547,11 +56143,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/lockers) -"upS" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/service/chapel/office) "upT" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -56745,6 +56336,16 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/storage) +"usD" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Departure Lounge - Starboard Aft" + }, +/obj/item/kirbyplants/organic/plant16, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "usK" = ( /obj/structure/table, /obj/item/storage/toolbox/emergency, @@ -56814,6 +56415,19 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"utE" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Theater - Stage" + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/item/radio/intercom/directional/east, +/obj/structure/table/wood, +/obj/item/clothing/glasses/monocle, +/obj/structure/sign/poster/random/directional/south, +/turf/open/floor/wood/large, +/area/station/service/theater) "utM" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=13.3-Engineering-Central"; @@ -56831,16 +56445,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) -"utU" = ( -/obj/machinery/hydroponics/soil, -/obj/machinery/camera/directional/west{ - c_tag = "Prison Forestry"; - network = list("ss13","prison") - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/west, -/turf/open/floor/grass, -/area/station/security/prison/garden) "uuc" = ( /obj/structure/chair/pew/left, /turf/open/floor/iron/chapel{ @@ -56864,14 +56468,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) -"uuy" = ( -/obj/machinery/atmospherics/components/tank/air, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 +"uuz" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/virology) +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood, +/area/station/commons/dorms) "uuD" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56982,15 +56586,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"uwH" = ( -/obj/structure/sign/departments/science/directional/east{ - name = "\improper ROBOTICS!" - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "uwK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -57042,6 +56637,21 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +"uxm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) "uxt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/machinery/meter, @@ -57090,16 +56700,12 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) -"uyH" = ( -/obj/structure/table/wood, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/item/folder/blue, -/obj/item/clothing/head/collectable/hop{ - name = "novelty HoP hat" - }, +"uyY" = ( /obj/structure/cable, -/turf/open/floor/carpet, -/area/station/command/corporate_showroom) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/north, +/turf/open/floor/wood, +/area/station/service/library) "uza" = ( /turf/closed/wall/r_wall, /area/station/security/prison/visit) @@ -57199,6 +56805,31 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port) +"uAT" = ( +/obj/structure/table, +/obj/item/storage/medkit/regular{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/medkit/regular, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"uBo" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Medbay Break Room"; + network = list("ss13","medbay") + }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/vending/coffee, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) "uBp" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 @@ -57260,28 +56891,11 @@ dir = 8 }, /area/station/medical/medbay/lobby) -"uBS" = ( -/obj/machinery/light_switch/directional/west, -/obj/effect/landmark/start/hangover, -/obj/machinery/duct, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) "uCq" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) -"uCw" = ( -/obj/item/radio/intercom/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/commons/vacant_room/office) "uCG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/spawner/random/trash/garbage{ @@ -57289,6 +56903,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"uCH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/wood, +/area/station/command/corporate_showroom) "uCS" = ( /obj/structure/chair/stool/directional/south, /turf/open/floor/iron, @@ -57350,19 +56970,6 @@ }, /turf/open/floor/engine, /area/station/science/explab) -"uDT" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark/start/hangover, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) -"uEh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/turf/open/floor/iron, -/area/station/maintenance/starboard/greater) "uEo" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -57371,23 +56978,6 @@ /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"uEp" = ( -/obj/machinery/portable_atmospherics/scrubber, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/red/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "uEw" = ( /obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, @@ -57579,6 +57169,10 @@ /obj/effect/spawner/random/techstorage/ai_all, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"uGx" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/freezer, +/area/station/security/prison/shower) "uGD" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -57604,6 +57198,17 @@ /obj/effect/spawner/random/engineering/flashlight, /turf/open/floor/iron, /area/station/command/gateway) +"uHo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/firealarm/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron, +/area/station/service/hydroponics) "uHp" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -57635,15 +57240,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"uIb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/modular_computer/preset/cargochat/service{ - dir = 8 - }, -/obj/structure/sign/poster/random/directional/east, -/obj/machinery/light/cold/directional/east, -/turf/open/floor/iron, -/area/station/maintenance/starboard/greater) +"uHE" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "uId" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -57733,12 +57336,6 @@ /obj/machinery/incident_display/delam/directional/south, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"uJR" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/cargo/sorting) "uKa" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 @@ -57775,6 +57372,21 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, /area/station/medical/virology) +"uKz" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/storage/gas) "uKL" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -57855,6 +57467,24 @@ dir = 4 }, /area/station/security/prison) +"uMi" = ( +/obj/structure/rack, +/obj/machinery/firealarm/directional/north, +/obj/item/reagent_containers/cup/bottle/potassium{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/phosphorus{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/sodium{ + pixel_x = 1 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/medical/chem_storage) "uMR" = ( /obj/machinery/holopad, /turf/open/floor/iron/white/side{ @@ -57931,6 +57561,10 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron, /area/station/service/janitor) +"uNG" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "uNO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -57943,30 +57577,22 @@ /obj/effect/spawner/random/trash/box, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"uOc" = ( -/obj/machinery/computer/atmos_alert{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/sign/poster/official/safety_internals/directional/south, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/atmos/storage/gas) "uOd" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/command/corporate_showroom) -"uOj" = ( -/obj/machinery/firealarm/directional/east, -/obj/structure/cable, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/security/execution/education) +"uOi" = ( +/obj/structure/rack, +/obj/item/storage/box/lights/mixed, +/obj/item/clothing/gloves/color/fyellow, +/obj/item/stack/package_wrap, +/obj/item/stack/sheet/glass{ + amount = 30 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "uOp" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -58013,11 +57639,23 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"uPz" = ( -/obj/structure/bookcase/random/nonfiction, -/obj/machinery/light/small/directional/west, -/turf/open/floor/wood, -/area/station/service/library) +"uPJ" = ( +/obj/structure/table, +/obj/item/food/grown/wheat, +/obj/item/food/grown/watermelon, +/obj/item/food/grown/citrus/orange, +/obj/item/food/grown/grapes, +/obj/item/food/grown/cocoapod, +/obj/item/food/grown/apple, +/obj/item/food/grown/chili, +/obj/item/food/grown/cherries, +/obj/item/food/grown/soybeans, +/obj/item/food/grown/citrus/lime, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "uQe" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -58027,6 +57665,21 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"uQk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/structure/cable, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"uQy" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) "uQF" = ( /obj/structure/lattice, /obj/item/stack/rods, @@ -58060,21 +57713,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/evidence) -"uQS" = ( -/obj/structure/table, -/obj/item/storage/bag/plants, -/obj/item/reagent_containers/cup/watering_can, -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "uRa" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -58084,16 +57722,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) -"uRe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "uRl" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -58110,6 +57738,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/sorting) +"uRw" = ( +/obj/structure/closet/toolcloset, +/obj/effect/turf_decal/delivery, +/obj/item/clothing/glasses/meson/engine, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) "uRA" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/item/kirbyplants/organic/applebush, @@ -58150,14 +57785,24 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"uSy" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Air to Mix" +"uSL" = ( +/obj/machinery/camera/motion/directional/south{ + c_tag = "Vault"; + network = list("vault") }, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/station/engineering/atmos) +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) +"uSM" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + dir = 1 + }, +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "uTj" = ( /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/dark, @@ -58285,16 +57930,6 @@ /obj/structure/sign/poster/official/nanotrasen_logo/directional/east, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) -"uVh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sign/xenobio_guide/directional/north, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "uVm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58319,6 +57954,16 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"uVE" = ( +/obj/effect/turf_decal/siding/purple/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) "uVJ" = ( /obj/effect/spawner/random/structure/grille, /obj/structure/girder, @@ -58373,6 +58018,23 @@ /obj/effect/turf_decal/bot/left, /turf/open/floor/engine, /area/station/engineering/atmospherics_engine) +"uWA" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/machinery/door/window{ + dir = 8; + name = "Secure Art Exhibition"; + req_access = list("library") + }, +/obj/machinery/light/directional/east, +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 + }, +/obj/effect/spawner/random/decoration/statue{ + spawn_loot_chance = 50 + }, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/carpet/royalblue, +/area/station/service/library) "uWK" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -58394,12 +58056,53 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"uWN" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/item/pen, +/obj/machinery/computer/security/telescreen{ + desc = "Used for monitoring the engine."; + dir = 8; + name = "Engine Monitor"; + network = list("engine"); + pixel_x = 26 + }, +/obj/machinery/button/door/directional/east{ + id = "Engineering"; + name = "Engineering Lockdown"; + pixel_y = 16; + req_access = list("engineering") + }, +/obj/machinery/button/door/directional/east{ + id = "atmos"; + name = "Atmospherics Lockdown"; + pixel_y = 24; + req_access = list("atmospherics") + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/security/checkpoint/engineering) "uWS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"uWU" = ( +/obj/structure/table/reinforced, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) "uXd" = ( /turf/closed/wall/r_wall, /area/station/engineering/main) @@ -58562,16 +58265,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -"uZU" = ( -/obj/structure/table, -/obj/item/pipe_dispenser{ - pixel_x = 3; - pixel_y = 7 - }, -/obj/item/pipe_dispenser, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "vae" = ( /obj/machinery/camera/directional/east{ c_tag = "Prison Isolation Cell"; @@ -58598,14 +58291,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/medical) -"vbj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral, +"vaI" = ( +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/effect/turf_decal/delivery, +/obj/structure/table, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /obj/machinery/light/directional/east, /turf/open/floor/iron, -/area/station/commons/dorms) +/area/station/engineering/main) "vbq" = ( /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)."; @@ -58623,6 +58321,28 @@ }, /turf/open/floor/iron/checker, /area/station/engineering/atmos/storage/gas) +"vbt" = ( +/obj/structure/table, +/obj/item/folder/red{ + pixel_x = 3 + }, +/obj/item/folder/white{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/restraints/handcuffs, +/obj/item/radio/off, +/obj/machinery/requests_console/directional/east{ + department = "Security"; + name = "Security Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "vbL" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -58683,26 +58403,6 @@ /obj/machinery/rnd/experimentor, /turf/open/floor/engine, /area/station/science/explab) -"vdz" = ( -/obj/machinery/disposal/bin, -/obj/machinery/firealarm/directional/west, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) -"vdF" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "vdJ" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood/random, @@ -58767,17 +58467,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) -"veU" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/button/door/directional/south{ - id = "PermaLockdown"; - name = "Panic Button"; - req_access = list("brig") - }, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "vfa" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -58786,11 +58475,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white/smooth_large, /area/station/medical/treatment_center) -"vfe" = ( -/obj/machinery/light_switch/directional/south, -/obj/machinery/light/no_nightlight/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/atmospherics_engine) "vfh" = ( /obj/machinery/door/window/right/directional/north{ dir = 8; @@ -58852,6 +58536,14 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"vgu" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "vgv" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -58882,16 +58574,20 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) -"vhb" = ( -/obj/machinery/light/directional/west, -/obj/machinery/chem_dispenser{ - layer = 2.7 +"vhj" = ( +/obj/structure/chair{ + name = "Judge" }, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 8 +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Courtroom" }, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/security/courtroom) "vht" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -58924,6 +58620,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/evidence) +"vhU" = ( +/obj/machinery/mineral/stacking_unit_console{ + pixel_x = 32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "vif" = ( /obj/machinery/holopad, /turf/open/floor/iron, @@ -59198,14 +58905,10 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) -"vmh" = ( -/obj/machinery/airalarm/directional/south, -/obj/machinery/computer/mech_bay_power_console{ - dir = 8 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/station/science/robotics/mechbay) +"vmk" = ( +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai) "vmm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -59250,13 +58953,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) -"vmW" = ( -/obj/structure/table/optable, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/light/cold/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) "vmX" = ( /obj/machinery/light/directional/west, /obj/structure/disposalpipe/segment, @@ -59315,14 +59011,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) -"vnV" = ( -/obj/machinery/light/directional/west, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood/parquet, -/area/station/medical/psychology) "vnZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/flasher/directional/west{ @@ -59358,14 +59046,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/cargo/warehouse) -"voV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron/cafeteria, -/area/station/security/prison) "vpg" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; @@ -59473,6 +59153,20 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"vqj" = ( +/obj/machinery/computer/atmos_alert{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/sign/poster/official/safety_internals/directional/south, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/atmos/storage/gas) "vqk" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -59504,6 +59198,25 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"vrn" = ( +/obj/item/seeds/wheat, +/obj/item/seeds/sugarcane, +/obj/item/seeds/potato, +/obj/item/seeds/apple, +/obj/item/grown/corncob, +/obj/item/food/grown/carrot, +/obj/item/food/grown/wheat, +/obj/item/food/grown/pumpkin{ + pixel_y = 5 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/service/hydroponics) "vro" = ( /obj/structure/sink/directional/west, /turf/open/floor/iron/white, @@ -59547,11 +59260,22 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "vsI" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/service/chapel/funeral) +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/obj/item/stack/sheet/glass, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/signaler, +/obj/item/assembly/timer{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/science/lobby) "vsO" = ( /obj/machinery/conveyor{ dir = 1; @@ -59572,25 +59296,12 @@ /obj/item/pen, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"vsX" = ( -/obj/structure/closet/secure_closet/medical1, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) "vth" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/central) -"vtl" = ( -/obj/effect/turf_decal/bot_white/left, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark, -/area/station/command/gateway) "vtp" = ( /obj/structure/disposalpipe/sorting/mail, /obj/effect/landmark/start/station_engineer, @@ -59600,18 +59311,17 @@ /obj/effect/mapping_helpers/mail_sorting/engineering/general, /turf/open/floor/iron, /area/station/engineering/main) -"vtw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +"vtu" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/bar, +/obj/machinery/light/directional/east, /turf/open/floor/iron, -/area/station/hallway/primary/starboard) +/area/station/hallway/primary/central) "vtx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line{ @@ -59637,6 +59347,33 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"vtI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/lights/mixed{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/storage/box/lights/mixed{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/machinery/light/small/directional/north, +/obj/structure/table, +/turf/open/floor/iron, +/area/station/service/janitor) "vtK" = ( /obj/machinery/reagentgrinder{ pixel_x = 6; @@ -59701,6 +59438,16 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"vva" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ + dir = 8; + initialize_directions = 4; + name = "euthanization chamber freezer" + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, +/area/station/science/xenobiology) "vvd" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/disposalpipe/segment{ @@ -59785,11 +59532,6 @@ /obj/effect/spawner/random/bureaucracy/paper, /turf/open/floor/plating, /area/station/maintenance/port) -"vwU" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "vxa" = ( /mob/living/simple_animal/slime, /turf/open/floor/engine, @@ -59870,16 +59612,38 @@ /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, /area/station/command/corporate_showroom) -"vyF" = ( -/obj/machinery/recharge_station, -/obj/effect/landmark/start/hangover, -/obj/effect/spawner/random/trash/graffiti{ - pixel_y = -32; - spawn_loot_chance = 50 +"vyl" = ( +/obj/item/book/bible, +/obj/machinery/newscaster/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Chapel - Fore" }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet/restrooms) +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel) +"vyv" = ( +/obj/structure/table, +/obj/machinery/status_display/ai/directional/west, +/obj/machinery/flasher/directional/south{ + id = "AI" + }, +/obj/item/ai_module/reset{ + pixel_x = 2; + pixel_y = 8 + }, +/obj/item/ai_module/supplied/freeform, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) +"vyy" = ( +/obj/machinery/washing_machine, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison) "vyM" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59968,6 +59732,14 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"vzW" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/rnd/production/circuit_imprinter/department/science, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/robotics/lab) "vzX" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -60024,10 +59796,14 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) -"vAK" = ( -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/dark, -/area/station/service/chapel/funeral) +"vBe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "vBf" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, @@ -60089,17 +59865,6 @@ /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/iron, /area/station/commons/toilet/auxiliary) -"vCx" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/checker, -/area/station/science/research) "vCN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -60219,12 +59984,36 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) -"vEE" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/structure/window/reinforced/spawner/directional/north, +"vEw" = ( +/obj/structure/chair/stool/directional/south, +/obj/item/radio/intercom/prison/directional/north, +/obj/machinery/light/directional/north, /turf/open/floor/iron, -/area/station/science/research) +/area/station/security/prison) +"vEC" = ( +/obj/structure/table, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/item/radio/headset/headset_medsci{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = 6; + pixel_y = 9 + }, +/obj/item/storage/box/gloves{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "vEH" = ( /obj/machinery/door/window/right/directional/east{ name = "Danger: Conveyor Access"; @@ -60257,16 +60046,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"vEY" = ( -/obj/structure/bed, -/obj/item/bedsheet/captain, -/obj/effect/landmark/start/captain, -/obj/machinery/camera/directional/east{ - c_tag = "Captain's Quarters" - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain/private) "vFb" = ( /obj/structure/lattice/catwalk, /obj/item/binoculars, @@ -60343,6 +60122,10 @@ /obj/structure/sign/warning/biohazard, /turf/closed/wall, /area/station/science/xenobiology) +"vGt" = ( +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/security/office) "vGw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60409,6 +60192,13 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) +"vHM" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/security/prison) "vHO" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -60428,6 +60218,16 @@ /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/closed/wall/r_wall, /area/station/maintenance/starboard/greater) +"vIt" = ( +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk, +/obj/structure/window/spawner/directional/east, +/obj/structure/window/spawner/directional/west, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/cargo/sorting) "vIz" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 @@ -60478,10 +60278,6 @@ "vIY" = ( /turf/closed/wall, /area/station/engineering/storage_shared) -"vJd" = ( -/obj/machinery/recharge_station, -/turf/open/floor/iron/dark, -/area/station/security/lockers) "vJe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60527,17 +60323,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) -"vJQ" = ( -/obj/machinery/chem_master, -/obj/structure/noticeboard/directional/south, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/obj/machinery/button/door/directional/south{ - id = "pharmacy_shutters_2"; - name = "pharmacy shutters control"; - req_access = list("pharmacy") - }, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "vJX" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -60557,17 +60342,6 @@ /obj/item/clothing/suit/hazardvest, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"vKq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron/white, -/area/station/science/research) "vKt" = ( /obj/structure/table/wood/fancy/royalblue, /obj/structure/sign/painting/library_secure{ @@ -60628,30 +60402,11 @@ }, /turf/open/floor/iron, /area/station/commons/locker) -"vLI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark/telecomms, -/area/station/science/server) "vLM" = ( /obj/structure/table/wood/poker, /obj/item/storage/dice, /turf/open/floor/wood, /area/station/commons/lounge) -"vLW" = ( -/obj/structure/sign/warning/secure_area/directional/north, -/obj/structure/closet/radiation, -/obj/effect/turf_decal/delivery, -/obj/item/clothing/glasses/meson/engine, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/engineering/main) "vLX" = ( /obj/item/wrench, /turf/open/floor/iron/dark, @@ -60727,6 +60482,13 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) +"vNM" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "vNT" = ( /obj/structure/lattice, /obj/machinery/atmospherics/components/unary/passive_vent{ @@ -60734,10 +60496,6 @@ }, /turf/open/space, /area/space/nearstation) -"vNU" = ( -/obj/structure/cable, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/ai_upload) "vOh" = ( /obj/effect/turf_decal/stripes/end, /turf/open/floor/plating/airless, @@ -60796,6 +60554,14 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"vPu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/radiation, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "vPy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60837,6 +60603,17 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +"vPV" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/spawner/random/maintenance, +/obj/item/storage/belt/utility, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/storage_shared) "vPW" = ( /obj/item/extinguisher, /turf/open/floor/plating, @@ -60958,6 +60735,12 @@ }, /turf/open/space/basic, /area/space/nearstation) +"vRj" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/commons/locker) "vRk" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -61006,6 +60789,19 @@ "vRU" = ( /turf/open/floor/carpet, /area/station/service/theater) +"vSh" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "vSo" = ( /obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -61040,6 +60836,16 @@ dir = 9 }, /area/station/medical/treatment_center) +"vSC" = ( +/obj/machinery/rnd/production/protolathe/department/engineering, +/obj/effect/turf_decal/bot, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/storage_shared) "vSI" = ( /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) @@ -61056,21 +60862,27 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) -"vTx" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Departure Lounge - Starboard Aft" - }, -/obj/item/kirbyplants/organic/plant16, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) +"vTs" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/under/misc/assistantformal, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/shoes/winterboots, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/commons/dorms) "vTC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/iv_drip, /turf/open/floor/plating, /area/station/medical/abandoned) +"vTK" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/closet/secure_closet/security/science, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "vTX" = ( /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) @@ -61082,6 +60894,22 @@ }, /turf/open/floor/iron, /area/station/cargo/drone_bay) +"vUC" = ( +/obj/structure/bed, +/obj/item/bedsheet, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/iv_drip, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/white, +/area/station/security/medical) "vUH" = ( /obj/structure/table/glass, /obj/structure/cable, @@ -61299,15 +61127,6 @@ /obj/structure/sign/poster/random/directional/west, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -"vYm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/chem_heater/withbuffer, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "vYD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -61336,6 +61155,14 @@ /obj/effect/mapping_helpers/airlock/access/all/security/entrance, /turf/open/floor/iron, /area/station/security/brig) +"vYI" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/obj/structure/closet/radiation, +/obj/effect/turf_decal/delivery, +/obj/item/clothing/glasses/meson/engine, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) "vYJ" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -61401,15 +61228,6 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"vZL" = ( -/obj/machinery/washing_machine, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/cafeteria, -/area/station/security/prison) "vZM" = ( /obj/machinery/airalarm/directional/south, /obj/item/stack/package_wrap{ @@ -61423,14 +61241,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/wood, /area/station/service/bar/backroom) -"vZP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/structure/closet/radiation, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/all_access, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "vZQ" = ( /obj/effect/spawner/random/vending/colavend, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -61496,6 +61306,14 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plating, /area/station/cargo/storage) +"waD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) "waH" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -61532,16 +61350,12 @@ /obj/effect/spawner/random/trash/bin, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"wbK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/iron/white, -/area/station/security/medical) +"wcf" = ( +/obj/structure/closet/crate/coffin, +/obj/structure/window/spawner/directional/east, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/service/chapel/funeral) "wcr" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -61643,39 +61457,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) -"wdL" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 9 - }, -/obj/effect/turf_decal/tile/bar, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "wdM" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/construction/storage_wing) -"wdZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/chem_master, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) -"wei" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/service/hydroponics) "wen" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -61729,6 +61514,15 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/central) +"weP" = ( +/obj/machinery/chem_dispenser{ + layer = 2.7 + }, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "weS" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -61759,6 +61553,17 @@ }, /turf/open/floor/carpet, /area/station/commons/vacant_room/office) +"wfA" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/mech_bay_power_console{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) "wfC" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -61860,6 +61665,16 @@ /obj/item/stock_parts/matter_bin, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"whr" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) "whx" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61903,6 +61718,12 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos) +"whJ" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/watering_can, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/service/hydroponics) "whN" = ( /obj/docking_port/stationary{ dheight = 4; @@ -61929,15 +61750,6 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"wiJ" = ( -/obj/machinery/computer/security/telescreen/interrogation{ - dir = 8; - pixel_x = 30 - }, -/obj/effect/turf_decal/trimline/red/filled/corner, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/security/brig) "wiS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -61987,18 +61799,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) -"wkd" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_y = 5 - }, -/obj/item/reagent_containers/dropper{ - pixel_y = -4 - }, -/turf/open/floor/iron/dark/textured_corner{ - dir = 1 - }, -/area/station/medical/chem_storage) "wkh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -62010,12 +61810,6 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/wood, /area/station/service/library) -"wkj" = ( -/obj/effect/decal/cleanable/oil, -/obj/effect/spawner/random/engineering/tank, -/obj/machinery/light/small/dim/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) "wkv" = ( /obj/structure/railing{ dir = 8 @@ -62076,6 +61870,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/central) +"wlx" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Foyer - Shared Storage" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/storage_shared) "wlL" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -62107,19 +61913,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/iron, /area/station/engineering/atmos) -"wmC" = ( -/obj/structure/cable, -/obj/machinery/camera/directional/south{ - c_tag = "Chief Medical Officer's Office"; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/machinery/requests_console/directional/south, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/mapping_helpers/requests_console/announcement, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/cmo) "wmL" = ( /turf/closed/wall/r_wall, /area/station/science/xenobiology/hallway) @@ -62208,6 +62001,12 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/abandoned) +"woz" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/iron/chapel{ + dir = 4 + }, +/area/station/service/chapel) "woG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62297,11 +62096,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) -"wpQ" = ( -/obj/machinery/computer/security/telescreen/entertainment/directional/east, -/obj/machinery/skill_station, -/turf/open/floor/wood, -/area/station/service/library) "wqh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -62392,6 +62186,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"wss" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/item/folder/yellow{ + pixel_y = 4 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Bridge - Central" + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "wst" = ( /obj/machinery/door/airlock{ name = "Unisex Showers" @@ -62455,6 +62264,16 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) +"wsQ" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, +/obj/structure/closet/secure_closet/security, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) "wsS" = ( /obj/machinery/door/airlock/external{ name = "Departure Lounge Airlock"; @@ -62466,6 +62285,18 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"wsW" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_y = 5 + }, +/obj/item/reagent_containers/dropper{ + pixel_y = -4 + }, +/turf/open/floor/iron/dark/textured_corner{ + dir = 1 + }, +/area/station/medical/chem_storage) "wsX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -62513,6 +62344,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison) +"wtB" = ( +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai_upload) "wtP" = ( /obj/effect/turf_decal/siding{ dir = 4 @@ -62581,6 +62416,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/port) +"wvF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet, +/area/station/commons/dorms) "wvP" = ( /obj/machinery/iv_drip, /obj/machinery/airalarm/directional/north, @@ -62624,18 +62467,6 @@ /obj/effect/turf_decal/tile/purple/fourcorners, /turf/open/floor/iron, /area/station/science/robotics/mechbay) -"wwB" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/atmos) "wwW" = ( /obj/effect/turf_decal/trimline/purple/line{ dir = 1 @@ -62666,6 +62497,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/central) +"wxh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "wxj" = ( /turf/open/floor/iron/dark, /area/station/security/office) @@ -62692,12 +62530,21 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"wyj" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/closet/secure_closet/engineering_welding, -/obj/machinery/light/small/directional/south, +"wxG" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/wood/large, +/area/station/commons/lounge) +"wxM" = ( +/obj/machinery/status_display/door_timer{ + id = "Cell 1"; + name = "Cell 1"; + pixel_y = -32 + }, /turf/open/floor/iron, -/area/station/engineering/main) +/area/station/security/brig) "wyn" = ( /obj/machinery/hydroponics/soil, /obj/item/shovel/spade, @@ -62736,14 +62583,24 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) +"wyC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/chapel/funeral) "wyG" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"wzv" = ( -/obj/machinery/light/small/dim/directional/west, -/turf/open/floor/iron, -/area/station/maintenance/port/aft) +"wzd" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/table, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/item/flashlight/lamp, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) "wzy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62768,14 +62625,27 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"wzN" = ( -/obj/item/radio/intercom/directional/west, -/obj/structure/table, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/item/flashlight/lamp, -/turf/open/floor/iron/dark, -/area/station/security/execution/education) +"wAk" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/port) +"wAt" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/effect/spawner/random/trash/soap, +/obj/structure/sign/poster/random/directional/east, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood/large, +/area/station/service/theater) "wAA" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62789,19 +62659,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"wAR" = ( -/obj/machinery/status_display/ai/directional/north, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -1; - pixel_y = 4 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "wBe" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -62811,29 +62668,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison) -"wBm" = ( -/obj/structure/cable, -/obj/structure/table, -/obj/effect/turf_decal/stripes/line, -/obj/item/clothing/head/utility/welding{ - pixel_y = 9 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/item/clothing/head/utility/welding{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/clothing/head/utility/welding{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/atmos/storage/gas) "wBn" = ( /obj/structure/chair/stool/directional/north, /obj/structure/cable, @@ -62909,6 +62743,13 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"wCb" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/science/research) "wCe" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -62963,6 +62804,27 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/sorting) +"wDh" = ( +/obj/machinery/vending/wardrobe/chef_wardrobe, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 6 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light_switch/directional/south{ + pixel_x = -6 + }, +/obj/machinery/button/door/directional/south{ + id = "kitchen_service"; + name = "Service Shutter Control"; + pixel_x = 6; + req_access = list("kitchen") + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "wDq" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -63083,6 +62945,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"wGa" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Central Primary Hallway - Starboard - Art Storage" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "wGk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63152,6 +63024,11 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) +"wHL" = ( +/obj/machinery/vending/wardrobe/bar_wardrobe, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/wood, +/area/station/service/bar/backroom) "wHW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63159,16 +63036,10 @@ luminosity = 2 }, /area/station/ai_monitored/command/nuke_storage) -"wIo" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light/directional/east, +"wIa" = ( +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) +/area/station/engineering/atmos) "wIr" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 10 @@ -63253,6 +63124,13 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"wLu" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/wood, +/area/station/service/library) "wLw" = ( /obj/machinery/duct, /turf/open/floor/plating, @@ -63263,6 +63141,23 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/commons/locker) +"wLz" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/iron{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/lithium{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 1 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) "wMx" = ( /obj/effect/turf_decal/bot, /obj/effect/landmark/start/hangover, @@ -63350,14 +63245,16 @@ }, /turf/open/floor/iron/white, /area/station/science/cytology) -"wOc" = ( -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/bot, -/obj/effect/landmark/event_spawn, -/obj/effect/landmark/start/hangover, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) +"wOf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "wOl" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -63391,11 +63288,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/office) -"wOA" = ( -/obj/machinery/vending/medical, -/obj/machinery/light/cold/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "wOB" = ( /obj/machinery/vending/wardrobe/engi_wardrobe, /obj/effect/turf_decal/delivery, @@ -63555,6 +63447,14 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/science/lab) +"wQb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood, +/area/station/commons/dorms) "wQj" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ dir = 8 @@ -63644,6 +63544,15 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/grass, /area/station/service/hydroponics/garden) +"wRI" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "wRL" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -63675,12 +63584,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) -"wSa" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/light_switch/directional/south, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "wSe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63690,6 +63593,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"wSq" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/photocopier, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hos) "wSs" = ( /obj/structure/table/wood/poker, /obj/effect/spawner/random/entertainment/deck, @@ -63793,6 +63705,29 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"wUM" = ( +/obj/structure/cable, +/obj/structure/table, +/obj/effect/turf_decal/stripes/line, +/obj/item/clothing/head/utility/welding{ + pixel_y = 9 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/item/clothing/head/utility/welding{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/clothing/head/utility/welding{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/storage/gas) "wUQ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -63800,6 +63735,13 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"wVa" = ( +/obj/machinery/conveyor{ + dir = 9; + id = "garbage" + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "wVc" = ( /obj/structure/table/reinforced, /obj/item/folder/white{ @@ -63858,14 +63800,6 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/security/office) -"wVJ" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/drinkingglass, -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "wVO" = ( /obj/item/reagent_containers/cup/bottle/toxin{ pixel_x = 4; @@ -63950,6 +63884,11 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"wXT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/security/courtroom) "wYe" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63981,14 +63920,14 @@ "wYB" = ( /turf/closed/wall, /area/station/hallway/secondary/service) -"wYT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +"wZb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/white, -/area/station/science/research) +/obj/machinery/light/floor, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "wZe" = ( /obj/machinery/door/airlock/public/glass{ name = "Chapel Office" @@ -64045,6 +63984,37 @@ }, /turf/open/floor/iron, /area/station/security/warden) +"xac" = ( +/obj/machinery/firealarm/directional/west, +/obj/item/banner/cargo/mundane, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/brown/filled/corner, +/turf/open/floor/iron, +/area/station/cargo/storage) +"xaj" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/gloves{ + pixel_y = 9; + pixel_x = 2 + }, +/obj/item/assembly/igniter{ + pixel_y = -3 + }, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/medical/chem_storage) +"xap" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/depsec/supply, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "xar" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -64073,11 +64043,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"xaW" = ( -/obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/pipe, -/turf/open/floor/wood, -/area/station/commons/lounge) "xba" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/bot{ @@ -64088,6 +64053,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/main) +"xbb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) "xbd" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/structure/disposalpipe/segment{ @@ -64116,32 +64090,9 @@ /obj/structure/cable, /turf/open/floor/iron/white/smooth_large, /area/station/command/heads_quarters/cmo) -"xcb" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Command Hallway - Starboard" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) "xcp" = ( /turf/open/floor/iron/dark, /area/station/medical/morgue) -"xcw" = ( -/obj/machinery/suit_storage_unit/atmos, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/engineering/atmos) "xcz" = ( /obj/effect/turf_decal/stripes/corner, /obj/structure/reagent_dispensers/watertank, @@ -64157,10 +64108,6 @@ /obj/effect/mapping_helpers/mail_sorting/service/bar, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) -"xcU" = ( -/obj/machinery/light/small/dim/directional/north, -/turf/open/floor/wood, -/area/station/commons/vacant_room/office) "xcW" = ( /obj/machinery/computer/atmos_control/air_tank{ dir = 1 @@ -64172,24 +64119,6 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos) -"xde" = ( -/obj/structure/rack, -/obj/item/reagent_containers/cup/bottle/ethanol{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bottle/carbon{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bottle/chlorine{ - pixel_x = 1 - }, -/obj/machinery/light/cold/directional/east, -/turf/open/floor/iron/dark/textured_edge{ - dir = 8 - }, -/area/station/medical/chem_storage) "xdm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -64206,14 +64135,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall, /area/station/engineering/atmos/pumproom) -"xdB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) +"xdx" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) "xdF" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -64269,11 +64197,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port) -"xeT" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/mannequin/skeleton, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "xff" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64594,17 +64517,6 @@ /obj/item/pen, /turf/open/floor/wood, /area/station/service/library) -"xjD" = ( -/obj/structure/sign/poster/official/anniversary_vintage_reprint/directional/north, -/obj/machinery/light/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "xjH" = ( /turf/closed/wall/r_wall, /area/station/medical/virology) @@ -64616,6 +64528,12 @@ }, /turf/open/floor/wood/parquet, /area/station/medical/psychology) +"xkb" = ( +/obj/item/hand_labeler_refill, +/obj/structure/rack, +/obj/machinery/light/small/dim/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "xko" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -64646,6 +64564,16 @@ /obj/structure/cable/layer3, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/satellite) +"xkE" = ( +/obj/machinery/recharge_station, +/obj/effect/landmark/start/hangover, +/obj/effect/spawner/random/trash/graffiti{ + pixel_y = -32; + spawn_loot_chance = 50 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "xkT" = ( /obj/structure/table/reinforced, /obj/item/folder/blue{ @@ -64666,28 +64594,35 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) -"xlu" = ( -/obj/machinery/power/smes{ - capacity = 9e+006; - charge = 10000 +"xld" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/effect/turf_decal/bot{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) +/area/station/engineering/atmos) +"xlv" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/computer/mech_bay_power_console{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) "xly" = ( /obj/machinery/door/morgue{ name = "Confession Booth" }, /turf/open/floor/iron/dark, /area/station/service/chapel) -"xlz" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/station/commons/locker) "xlF" = ( /turf/open/floor/iron, /area/station/service/hydroponics) @@ -64696,12 +64631,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/engine, /area/station/science/xenobiology) -"xlJ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/light/floor, -/turf/open/floor/iron/white, -/area/station/science/xenobiology/hallway) "xlU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64749,21 +64678,6 @@ }, /turf/open/space, /area/space/nearstation) -"xnf" = ( -/obj/item/book/manual/wiki/security_space_law{ - name = "space law"; - pixel_y = 2 - }, -/obj/item/toy/gun, -/obj/item/restraints/handcuffs, -/obj/structure/table/wood, -/obj/item/clothing/head/collectable/hos{ - name = "novelty HoS hat" - }, -/obj/machinery/firealarm/directional/east, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/station/command/corporate_showroom) "xnk" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -64899,6 +64813,13 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/iron, /area/station/engineering/atmos) +"xpH" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/bluespace_vendor/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "xpX" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -64909,6 +64830,15 @@ }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"xpZ" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Telecomms - Server Room - Aft-Starboard"; + network = list("ss13","tcomms") + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) "xqc" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ dir = 4 @@ -64977,6 +64907,18 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) +"xrG" = ( +/obj/structure/fireaxecabinet/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics - Port" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos) "xrN" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, @@ -65032,19 +64974,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/aft) -"xsD" = ( -/obj/machinery/disposal/bin, -/obj/machinery/status_display/ai/directional/east, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) "xsH" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral{ @@ -65073,13 +65002,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"xtm" = ( -/obj/structure/closet/athletic_mixed, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "xtp" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -65237,13 +65159,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) -"xwb" = ( -/obj/machinery/newscaster/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Courtroom - Gallery" - }, -/turf/open/floor/iron/dark, -/area/station/security/courtroom) "xwf" = ( /obj/structure/weightmachine/weightlifter, /turf/open/floor/iron/dark/side{ @@ -65280,6 +65195,17 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/grass, /area/station/science/genetics) +"xwT" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/spawner/random/armory/disablers, +/obj/machinery/requests_console/directional/west, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "xwV" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -65306,11 +65232,48 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"xxh" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "rdrnd"; + name = "Research and Development Containment Control"; + pixel_x = -6; + req_access = list("rd") + }, +/obj/machinery/button/door/directional/north{ + id = "rdordnance"; + name = "Ordnance Containment Control"; + pixel_x = 6; + req_access = list("rd") + }, +/obj/machinery/button/door/directional/north{ + id = "rdoffice"; + name = "Privacy Control"; + pixel_y = 34; + req_access = list("rd") + }, +/obj/machinery/computer/security/telescreen/rd{ + pixel_x = 31; + pixel_y = 30 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) "xxk" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"xxn" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) "xxp" = ( /obj/machinery/airalarm/directional/west, /obj/effect/mapping_helpers/burnt_floor, @@ -65335,6 +65298,16 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"xxQ" = ( +/obj/structure/table, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/item/reagent_containers/cup/glass/mug/britcup{ + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/science/research) "xxU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65465,29 +65438,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"xzY" = ( -/obj/machinery/computer/camera_advanced/base_construction/aux{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/construction/mining/aux_base) -"xAa" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "xAb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65526,6 +65476,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"xAp" = ( +/obj/effect/turf_decal/siding, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron, +/area/station/science/lab) "xAt" = ( /obj/machinery/door/window/right/directional/east{ base_state = "left"; @@ -65542,6 +65499,17 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/fore) +"xAT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/commons/locker) "xAW" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -65584,6 +65552,10 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"xBX" = ( +/obj/machinery/firealarm/directional/east, +/turf/closed/wall, +/area/station/security/checkpoint/customs) "xCf" = ( /obj/item/clothing/suit/jacket/straight_jacket, /obj/item/electropack, @@ -65905,31 +65877,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"xIc" = ( -/obj/structure/table, -/obj/item/flashlight{ - pixel_x = 1; - pixel_y = 5 +"xIp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 }, -/obj/item/flashlight{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/item/assembly/flash/handheld, -/obj/item/assembly/flash/handheld, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tech) -"xIe" = ( -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/structure/table/wood, -/obj/structure/noticeboard/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/service/chapel) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/brig) "xIx" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -65986,6 +65943,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"xJl" = ( +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/structure/table/glass, +/obj/item/storage/secure/safe/caps_spare/directional/west, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "xJA" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -66048,12 +66017,6 @@ "xKK" = ( /turf/closed/wall, /area/station/science/research) -"xLg" = ( -/obj/structure/chair/stool/directional/south, -/obj/item/radio/intercom/prison/directional/north, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/security/prison) "xLu" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -66071,6 +66034,17 @@ }, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"xLR" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/pipe_dispenser, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) "xMl" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=15-Court"; @@ -66279,12 +66253,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) -"xPw" = ( -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/watering_can, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/station/service/hydroponics) "xPy" = ( /obj/machinery/camera/directional/north{ c_tag = "Atmospherics - Hypertorus Fusion Reactor Chamber Fore" @@ -66307,13 +66275,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"xQu" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/entry) "xQx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -66327,6 +66288,15 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"xQI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Entrance" + }, +/turf/open/floor/iron, +/area/station/engineering/main) "xQJ" = ( /obj/machinery/status_display/evac/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -66337,16 +66307,6 @@ /obj/machinery/exodrone_launcher, /turf/open/floor/plating, /area/station/cargo/drone_bay) -"xQP" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/requests_console/directional/east, -/obj/effect/mapping_helpers/requests_console/supplies, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "xQT" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/effect/turf_decal/siding/wood{ @@ -66388,17 +66348,38 @@ "xRZ" = ( /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"xSg" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) +"xSO" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/wood/large, +/area/station/service/theater) "xSQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"xST" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/west, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) +"xTg" = ( +/obj/structure/chair/comfy{ + dir = 4 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Science Break Room"; + network = list("ss13","rd") + }, +/obj/machinery/light_switch/directional/south, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/turf/open/floor/iron, +/area/station/science/research) "xTw" = ( /turf/closed/wall/r_wall, /area/station/medical/medbay/central) @@ -66411,28 +66392,12 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) -"xTR" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/station/engineering/atmos) "xTT" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"xTW" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/computer/mech_bay_power_console{ - dir = 8 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/science/robotics/mechbay) "xUb" = ( /obj/machinery/firealarm/directional/west, /obj/structure/disposalpipe/segment, @@ -66455,17 +66420,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"xUA" = ( -/obj/machinery/chem_heater/withbuffer, -/obj/machinery/light/small/directional/south, -/obj/machinery/button/door/directional/south{ - id = "pharmacy_shutters_2"; - name = "pharmacy shutters control"; - req_access = list("pharmacy") - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "xUB" = ( /obj/structure/sign/directions/security{ dir = 1; @@ -66541,6 +66495,15 @@ "xVu" = ( /turf/closed/wall, /area/station/science/xenobiology) +"xVx" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering Supermatter Fore"; + network = list("ss13","engine") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "xVA" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -66671,6 +66634,11 @@ }, /turf/open/floor/iron, /area/station/command/teleporter) +"xXC" = ( +/obj/effect/landmark/blobstart, +/obj/structure/closet/secure_closet/detective, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) "xXG" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{ @@ -66726,6 +66694,16 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"xYy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "xYD" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -66741,6 +66719,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) +"xYV" = ( +/obj/structure/table/glass, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) "xYW" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -66772,6 +66759,15 @@ /obj/structure/mirror/directional/west, /turf/open/floor/wood, /area/station/maintenance/port/aft) +"xZv" = ( +/obj/machinery/newscaster/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/mechanical, +/obj/machinery/camera/directional/north, +/obj/structure/cable, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "xZx" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -66833,6 +66829,20 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"yaF" = ( +/obj/structure/table, +/obj/effect/turf_decal/delivery, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/glasses/meson/engine, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser, +/turf/open/floor/iron, +/area/station/engineering/main) "yaH" = ( /obj/structure/chair/office{ dir = 8 @@ -66850,18 +66860,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/service/theater) -"yaW" = ( -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/structure/table/glass, -/obj/item/storage/secure/safe/caps_spare/directional/west, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "ybi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66899,6 +66897,13 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/chapel, /area/station/service/chapel) +"ybN" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "yce" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66960,17 +66965,15 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "ycw" = ( -/obj/machinery/airalarm/directional/west, -/obj/structure/closet/secure_closet/security/med, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/requests_console/directional/north{ - department = "Security"; - name = "Security Requests Console" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/assistance, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/medical) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "ycz" = ( /obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -67038,6 +67041,20 @@ }, /turf/open/floor/engine, /area/station/engineering/atmospherics_engine) +"ydM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible/layer5, +/obj/structure/sign/poster/official/wtf_is_co2/directional/south, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) +"yec" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Fuel Pipe to Incinerator" + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "yeq" = ( /obj/machinery/conveyor{ dir = 1; @@ -67062,6 +67079,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/execution/transfer) +"yeA" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) "yeI" = ( /obj/structure/mop_bucket, /obj/item/mop, @@ -67131,6 +67156,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"yfw" = ( +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/obj/effect/spawner/random/trash/soap{ + spawn_scatter_radius = 1 + }, +/obj/effect/landmark/event_spawn, +/obj/machinery/light/floor, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet/restrooms) "yfx" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ dir = 1 @@ -67176,6 +67212,22 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +"ygt" = ( +/obj/structure/table/wood, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/structure/cable, +/obj/machinery/button/door/directional/east{ + id = "corporate_privacy"; + name = "corporate showroom shutters control"; + req_access = list("command") + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/carpet, +/area/station/command/corporate_showroom) "ygR" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 4 @@ -67185,27 +67237,6 @@ /obj/effect/turf_decal/tile/bar, /turf/open/floor/iron, /area/station/construction/storage_wing) -"ygS" = ( -/obj/effect/turf_decal/trimline/yellow/filled/end{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/turf/open/floor/iron/textured, -/area/station/medical/chem_storage) -"ygW" = ( -/obj/machinery/photocopier{ - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/brig) "yhm" = ( /obj/machinery/airalarm/directional/west, /obj/structure/disposaloutlet{ @@ -67314,41 +67345,12 @@ /obj/item/reagent_containers/cup/glass/bottle/vodka, /turf/open/floor/iron/white, /area/station/medical/abandoned) -"yjp" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/firealarm/directional/south, -/obj/structure/table/wood, -/obj/item/stack/sheet/cloth/ten, -/obj/item/toy/crayon/spraycan, -/obj/item/stack/rods/ten, -/obj/machinery/light/small/directional/south, -/turf/open/floor/wood/large, -/area/station/service/theater) -"yjv" = ( -/turf/closed/wall, -/area/station/medical/chem_storage) "yjw" = ( /obj/machinery/airalarm/directional/east, /obj/structure/table/wood, /obj/effect/spawner/random/bureaucracy/stamp, /turf/open/floor/wood, /area/station/commons/vacant_room/office) -"yka" = ( -/obj/structure/table, -/obj/effect/turf_decal/delivery, -/obj/item/clothing/glasses/meson/engine, -/obj/item/clothing/glasses/meson/engine, -/obj/item/clothing/glasses/meson/engine, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/pipe_dispenser, -/obj/item/pipe_dispenser, -/obj/item/pipe_dispenser, -/turf/open/floor/iron, -/area/station/engineering/main) "ykn" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -67433,10 +67435,6 @@ /obj/item/clothing/suit/jacket/straight_jacket, /turf/open/floor/iron/dark, /area/station/medical/office) -"ylr" = ( -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/nuke_storage) "ylt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67452,10 +67450,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"ylJ" = ( -/obj/machinery/newscaster/directional/north, -/obj/structure/dresser, -/turf/open/floor/carpet, +"ylM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, /area/station/commons/dorms) "ylQ" = ( /obj/machinery/door/firedoor, @@ -78384,7 +78385,7 @@ aDa aDa aDa iYU -xzY +mar dCx aDb inL @@ -78899,7 +78900,7 @@ aDa aDa iYU kFg -kvH +diJ cYL qAN wpw @@ -79672,7 +79673,7 @@ iYU oSc oQc aDb -aSs +rew lGL qEt qEt @@ -79688,7 +79689,7 @@ qEt qEt qEt sCZ -clC +vNM wdr aaf lXm @@ -79927,9 +79928,9 @@ aDa aDa iYU oYM -nAh +roF aDb -msP +fAE lGL ykn hBD @@ -79945,7 +79946,7 @@ mxV auJ riz sCZ -qhM +ppI wdr qEt qEt @@ -79953,7 +79954,7 @@ usB qEt qEt wdr -kcD +qXt dPh pOa pOa @@ -80440,7 +80441,7 @@ aDa aDa aDa iYU -tvc +xLR dhb aDb dIP @@ -80721,8 +80722,8 @@ cUd sCz oHw xOO -ixD -lgb +bqg +ahe slD nyF vpM @@ -81191,7 +81192,7 @@ lMJ aaa nmg nwi -gqU +wOf jXu jXu jXu @@ -81215,18 +81216,18 @@ sHu aPk jXu vzG -gLW +qDD crk slD -xQu -cHl +cMg +buF aid -dmn +mRw hxD rBU rzq xOV -awK +lRN dXg dXg dXg @@ -81476,7 +81477,7 @@ wdr fcq xfI fcq -gDb +xBX qhW xjh yme @@ -81705,7 +81706,7 @@ aaa aaa lMJ qGV -pTP +bEh tvR aaa aaa @@ -81733,11 +81734,11 @@ aaa fcq nJG fcq -ofr +aSQ oaw vSs xjh -dPv +sSh mjg xJA kOK @@ -81747,10 +81748,10 @@ kOK kOK xJA xXi -gpI +hCG pOa qag -qct +iXC hJH pOa lHk @@ -81785,11 +81786,11 @@ lMJ aaa aaa xjH -vsX +pIU dno uKy oPY -iKC +iOt xjH nzQ vol @@ -82247,8 +82248,8 @@ aaa fcq uEw fcq -auu -pwj +rxP +uhI vrP hve dRH @@ -82265,7 +82266,7 @@ vvp jzp xLv unR -uCw +iFI gCW nOZ fkd @@ -82299,7 +82300,7 @@ nBy aaa aaa xjH -uuy +jPm nBF tOP bYm @@ -82504,7 +82505,7 @@ aaa kzI fxQ fcq -iOR +bEW pBJ vGx ngf @@ -82520,12 +82521,12 @@ htE xxg nMY jzp -xcU +dGQ kEm ifF olq njE -lho +onN pOa lEu uOH @@ -82816,7 +82817,7 @@ xjH tmJ ark uGq -rty +iam kHk gqI gqj @@ -83018,11 +83019,11 @@ aaa kzI fxQ fcq -pas +wsQ pTm -tMU +sTD xjh -vdF +ccP bTj htE kOK @@ -83247,7 +83248,7 @@ aaa aaa lMJ rqa -imf +wZb iQd aaa aaa @@ -83316,7 +83317,7 @@ cBc aFf ekI eNV -wzv +duk oOZ gbJ cBc @@ -83761,7 +83762,7 @@ lMJ lMJ nmg vEV -cIv +jPp jXu aaa aaa @@ -83769,7 +83770,7 @@ aaa pnI bUm kRe -sTJ +qRa pnI lMJ lMJ @@ -83816,7 +83817,7 @@ pOa uOH jUb xIK -hHc +bar nBp dqN pqz @@ -83847,12 +83848,12 @@ rKQ aaa aaa xjH -rgh +nTk taW xNi ccD gXl -tTi +oBn rKQ lMJ lMJ @@ -84051,7 +84052,7 @@ cJQ fcq fcq iSk -jFU +nzD uxa bVz bNQ @@ -84059,7 +84060,7 @@ aal sEk aal dPQ -qWE +xYy vJB fjD pUl @@ -84077,7 +84078,7 @@ qKs dPJ hBC jUb -oYR +nYy jUb ifh jUb @@ -84271,8 +84272,8 @@ lVe dqo eXy wCf -tCM -jVf +wVa +sFz jXu jXu hWS @@ -84283,8 +84284,8 @@ jXu jXu qvY kRe -fdS -fZZ +wxh +dIS mdL hKg hxo @@ -84300,12 +84301,12 @@ hxo hxo cbz uyj -fws +jty jLb tTa kQP fSw -gbd +gip kQP dHc dHc @@ -84531,7 +84532,7 @@ jfG gYE lBm qKy -jtj +ybN edP dwA bje @@ -84612,7 +84613,7 @@ shK jUb huF xjH -rUU +uQy eSR vYJ xjH @@ -84782,7 +84783,7 @@ aaa aaa qvJ nxi -pRW +bWw hTn tVr iPE @@ -84826,7 +84827,7 @@ kKr hyW xOw iOc -mwP +mAs fjD aOo haE @@ -85071,7 +85072,7 @@ ejo jRM uKm thQ -ohb +xac qIK sRD nre @@ -85334,7 +85335,7 @@ qTx qTx fHX nDS -rbB +bPa kQP kQP hyW @@ -85553,10 +85554,10 @@ aaa aaa qvJ adD -ugM +eks fpH -pCX -oQq +vhU +eNU aQE jXu nME @@ -85594,7 +85595,7 @@ cjJ cLc vkR kQP -kRz +jmN xOw mux pOa @@ -85822,13 +85823,13 @@ gQv jXu fhn jXu -mNs +lJo xJV -rbh +jpI uxd sfG oor -gZp +jqr wfU hDX hDX @@ -85885,8 +85886,8 @@ jUb vAF snb tGu -oJF -iwT +moK +gGK snb vAF jUb @@ -86054,7 +86055,7 @@ cmB cmB opF sbX -utU +jTi wyn iOr aaa @@ -86099,7 +86100,7 @@ aok aok bgx mmR -oUi +mgb kQP kQP kQP @@ -86150,9 +86151,9 @@ jUb iEm kym jUb -kCQ +qoK cqD -eEV +apO bLQ tXx tzE @@ -86336,13 +86337,13 @@ aps xgB jZW jXu -djK +xkb xgB nsM twr mdW jXu -aZE +hvo cHN mXX oor @@ -86367,7 +86368,7 @@ bLC eVh hKw xOw -nFw +wAk pOa pOa pOa @@ -86396,13 +86397,13 @@ cIS jUb rvI jUb -rBt +tOT tJr vSI ude jSA oZO -jqN +bMS jUb dqN kym @@ -86565,7 +86566,7 @@ lMJ aaa aaa cmB -clw +sXm fiA fiA bSb @@ -86600,14 +86601,14 @@ twr twr jXu jmR -pAG +xap oUx knT ivX bgx edA fkC -lDk +dBv cdY wUC dfk @@ -86620,7 +86621,7 @@ cSb hYx yhL hYx -gTH +vIt iev mkb sly @@ -86633,10 +86634,10 @@ ahD wki jIY mjr -uPz -ekK +bXQ +cxC saN -kTF +tPe sVY ivM sdC @@ -86668,13 +86669,13 @@ jUb jUb jUb jUb -ihh +lIi oBO ieH vDc miX bfg -bFX +iAu tBJ ngV oxj @@ -86827,7 +86828,7 @@ rVb viQ dTQ rOP -lbu +jGO iOr aUn aUn @@ -86871,7 +86872,7 @@ jLf iqt mmR kaf -gXM +auO xXf gOb jld @@ -86893,12 +86894,12 @@ mjr tbK fZa eXA -ikh +jwE sVY mjr kUZ mfp -tqF +bCr pOa bAA pOa @@ -86916,7 +86917,7 @@ ixv jml wRZ mPF -oap +dRL jUb oOZ omm @@ -86931,7 +86932,7 @@ nMf bIv miX hIx -vmW +qOk tBJ gIB oxj @@ -87082,7 +87083,7 @@ rft aXa aXa aXa -pXz +pyy jjM ilg cmB @@ -87130,7 +87131,7 @@ mJo bzH bzH bzH -uJR +ocn aOg piB hvB @@ -87328,14 +87329,14 @@ aaa suD suD iUv -hXz +oVL aXa jMx -crM +azZ fdl aht ivu -bSl +jJl iAR dhW aXa @@ -87385,7 +87386,7 @@ aUj rVK baW bzH -loJ +mNx gOb wCT qMi @@ -87412,7 +87413,7 @@ dEX mLS dRY kwX -onP +nZq pOa iar uYD @@ -87439,7 +87440,7 @@ wFa iov nwl vun -rtX +etC wGk ukN vDc @@ -87463,7 +87464,7 @@ vQg vQg vQg vQg -pol +eEn gGh gGh gYU @@ -87666,10 +87667,10 @@ mjr nxz nLq sVY -lQk +uyY vWF utt -tcJ +wLu pOa uAM vZE @@ -87680,7 +87681,7 @@ fYc jUb jUb jUb -bGD +ina drE vfa gXz @@ -87688,15 +87689,15 @@ rSw vJe jfO wDq -cMu +hgu vun -bEU +csH dMN ejg ehX -wOA +dEM vun -huN +rtX tFr xYu xdJ @@ -87717,12 +87718,12 @@ tSw sfl eqz lUP -upS -buY +hVg +dgN vQg kvN aGD -lpy +wcf gYU ppJ gYU @@ -87912,7 +87913,7 @@ rEO iOc sVY hlu -hMh +eaa sVY cIU cWr @@ -87935,7 +87936,7 @@ jwp qCL uIM ahg -dpu +qvZ sSp wvP wUQ @@ -87953,18 +87954,18 @@ sja elb hlX rvb -ihw +jGt tFr pDU ngl duw hyn -iOU +uBo lYx hYN cyX jhv -kxm +gCU tDn xmD tSw @@ -87978,7 +87979,7 @@ hBh jVG vQg gYU -vAK +nDr klt fkP mhR @@ -88105,13 +88106,13 @@ aXa kKZ aXa aXa -wVJ +iuE oUE aij oGZ aXa myH -egy +vHM wZz gEl egg @@ -88181,7 +88182,7 @@ yfT klf sVY jfa -wpQ +anv rur knK sQx @@ -88218,7 +88219,7 @@ abX xTO lEP lEP -chn +bYn tBJ tBJ tBJ @@ -88395,7 +88396,7 @@ rlU qrg cpi cpi -ylr +fdI qpD aEH aEH @@ -88418,24 +88419,24 @@ piB bnv cOB gBN -mQI +oYz bzH bzH unj ivB -uRe +qaw sVY hlu ouM sVY -ccl +knd cWr ecO mjr inH flQ mjr -eeA +eZf sVY sVY sVY @@ -88445,10 +88446,10 @@ pOa sQY nPt qSk -diY +pBs lgC aZq -sIp +kjj sfF wsv hcU @@ -88478,8 +88479,8 @@ vRN xoj rOF ryf -vnV -jcI +bFK +rKF qNk tSw wZA @@ -88487,7 +88488,7 @@ vpP tSw wRB iix -nDe +cvy xvf qKi vQg @@ -88610,7 +88611,7 @@ aaa rrt lMJ iUv -xLg +vEw bBK qEG wBn @@ -88661,8 +88662,8 @@ jSm vQs pVi kod -ibD -pMW +dXp +szu voS vQs cyR @@ -88670,13 +88671,13 @@ rVn uwx mgJ aqG -rQN +iyv bGt uRu piB gBN haq -vdz +nht aqG nQw tEr @@ -88746,11 +88747,11 @@ bzN afo aMf xUX -bGT +fAt vQg tVy hto -skj +jUj dLy tPI rIG @@ -88909,7 +88910,7 @@ rlU cTU wHW wHW -dDu +uSL rlU aEH aEH @@ -88939,7 +88940,7 @@ sXr ybn fLp sVY -nqz +sDT mjr mjr mjr @@ -88948,7 +88949,7 @@ ecO mjr erS oMR -jro +tNt qRf xrd fKG @@ -88986,7 +88987,7 @@ tFr nMf lOV uYp -bmP +tjs cpR lxC uYp @@ -89006,7 +89007,7 @@ hrG lPB vQg gYU -vsI +pIs gYU kho gEk @@ -89175,8 +89176,8 @@ uwx aIE aMA aMA -sCQ -pVJ +anW +fCO hIE suE sUm @@ -89186,7 +89187,7 @@ vpX sIQ fwZ bzH -eXh +nZQ wew gBN udI @@ -89197,7 +89198,7 @@ xOw iOc sVY vKt -bxi +uWA mjr mjr cWr @@ -89208,8 +89209,8 @@ sVY sVY sVY sVY -kVl -juD +pJN +iWB uJm sVY pOa @@ -89222,7 +89223,7 @@ odu oNP bMY sSp -ogw +sAv pSl eUN jpU @@ -89230,18 +89231,18 @@ jpU vJe qXh ehg -gIh +umA vun -oNK +mWC uTj usC ehX -jtr +kZp vun gQG tFr oqi -hGR +ned uYp oAj qOV @@ -89256,14 +89257,14 @@ tSw tAH ifQ tSw -oeS -eYr +bQN +igi sMl -eml +bwh wEn wZe jsr -plg +wyC gYU rbF rxY @@ -89395,7 +89396,7 @@ nyf uZa nEZ wZz -qGr +sOw qOT swR tGX @@ -89403,7 +89404,7 @@ iFz oDX dfB aCQ -btF +mmA wZz wZz wZz @@ -89427,7 +89428,7 @@ rlU rlU lMJ aEH -kqh +rhW grR xAZ wcs @@ -89473,7 +89474,7 @@ xxk ahr bMY sTe -lkJ +rvq fFi iWD vDz @@ -89508,7 +89509,7 @@ ikS cnc igP sjx -axR +eIr tSw tAH fKP @@ -89519,7 +89520,7 @@ vQg vQg gzm vQg -ksN +bVp lTA gYU gYU @@ -89642,15 +89643,15 @@ iUv vjZ dAc lyu -voV +qDg ihb lfm hOR -cRM +uGx ihb -lrV +pEI jDB -jlE +hei wZz dXA lnM @@ -89729,7 +89730,7 @@ bBA txz wYe bMY -rdW +pUM mna gVn cXz @@ -89768,7 +89769,7 @@ rOF tSw tSw tAH -sMr +waD tSw jTy vQg @@ -89898,7 +89899,7 @@ aaa iUv iUv pCh -vZL +vyy jFK ihb mxg @@ -89912,7 +89913,7 @@ wZz wOm fpE wZz -dwE +lPJ vtx jxS mQr @@ -89941,7 +89942,7 @@ aaa aaa aaa guX -pEb +uht nZh hSf pID @@ -89993,8 +89994,8 @@ mBb pYw irL oNP -kqC -uhi +wRI +xST nor eMU ttE @@ -90002,13 +90003,13 @@ aPm sZH wUG eGJ -fXM +pBm gQG gQG gQG gQG gQG -jLr +pLz lgT hDp sOn @@ -90019,12 +90020,12 @@ jfN eMI ctO egZ -hhU +dqg xar -oOa +aoj tSw fje -kTB +swP ixY tSw tSw @@ -90169,12 +90170,12 @@ tdW tdW tdW tdW -bnN +lhF uRT gQw mQr aCQ -pJa +hDE wZz wZz wZz @@ -90198,13 +90199,13 @@ aaa aaa aaa guX -bkq +xZv boc xnt ifn -rCj +uOi guX -rve +ocB kSN qTF euo @@ -90281,15 +90282,15 @@ xSQ rGB qEK pyd -kuS -mlo -nph +pTL +rJI +taX tSw rQB gmX lHK -kay -toe +woz +bas tey mqe tey @@ -90421,8 +90422,8 @@ tUX drq why cwa -bSH -wzN +iki +wzd ybu wPM tdW @@ -90455,17 +90456,17 @@ aaa aaa aaa guX -sum +kkX ddP bVk bNP -hmu +asi guX qIp mLD sEM jWR -fnD +fbE pAk ykS hPM @@ -90524,25 +90525,25 @@ nmQ nmQ nmQ nmQ -iGk +fBe xwD dVt iHn ubd -tnY +aYP nmQ nmQ nmQ qZa xQh -eDN +nSS tSw tSw tSw tSw xtz tSw -dzl +vyl iJj uZD hKv @@ -90726,7 +90727,7 @@ avK avK tEj jPU -hDi +oKM oIa oIa lVH @@ -90758,9 +90759,9 @@ htd xAb nvI oNP -sWD +ehE rlw -jGh +bTm ylf tzI bMY @@ -90791,11 +90792,11 @@ bqX iHn nmQ qZa -yjv -yjv -yjv -dKv -cps +aec +aec +aec +jJY +xaj tSw xtz tSw @@ -90940,7 +90941,7 @@ tzJ hxW cTp tdW -cQT +lrh ncv cez mQr @@ -90990,7 +90991,7 @@ wvo xCl nMz pJR -qIE +rQz kfA rWH oOE @@ -91029,7 +91030,7 @@ lTP rQd cJm jGw -pfC +bJG vPO bqX ulR @@ -91043,16 +91044,16 @@ qXL oqk xZB hIJ -vhb +weP lrZ kiz nmQ oDW -yjv -njZ -eKy -wkd -ygS +aec +uMi +qLR +wsW +lfk tSw lEr pgD @@ -91271,10 +91272,10 @@ gqX htd oGK qPJ -ycw +don wde jJd -rfX +rqc umS qPJ bgS @@ -91287,7 +91288,7 @@ xbY scB rHk sXT -oCF +sTK bqX jYy iqz @@ -91305,11 +91306,11 @@ xCR dIL pPU fxW -aDd -sdz -gps -plf -jSW +mkO +tyy +ege +aaz +kNO hav xGX tSw @@ -91449,7 +91450,7 @@ ahS fWm tdW urf -uOj +esK qNj tdW cTl @@ -91470,7 +91471,7 @@ sch kSs xUH euX -wbK +gvC nRZ gES cGu @@ -91528,7 +91529,7 @@ gqX htd oGK qPJ -fbn +tUo waH vbV ixr @@ -91546,7 +91547,7 @@ edo pXM iNc bqX -kMx +nKM iqz bgt dkx @@ -91560,17 +91561,17 @@ aeF hNV lrZ kiz -nmQ -qBB -yjv -nqb -xde -rLp -oeC +uNG +fck +aec +ett +gNr +piT +wLz tSw xtz tSw -xIe +hPv iZi kVN lFZ @@ -91712,7 +91713,7 @@ gEg ikO pNY qjr -hvG +lNh yey cWI gYi @@ -91727,9 +91728,9 @@ sch oWZ oPn oPn -ixh +vUC sch -cpa +bRF tjh uTF tjh @@ -91768,7 +91769,7 @@ kEp aVd kfC pJR -wOc +aHN qRI urA tYW @@ -91800,7 +91801,7 @@ jgs uyw pcM cNk -wmC +mSs bqX bqX jYy @@ -91830,13 +91831,13 @@ tSw oum iZi kVN -pdF -uhV +laa +tlI qri iIq qfZ fkW -ugF +ica otu aaa aaa @@ -91963,16 +91964,16 @@ dcN vae slI pPR -ado +jJp gYi jTZ -nJw +jMJ qbr ouj aBL yey cWI -veU +aZA tjh tjh mAm @@ -92003,8 +92004,8 @@ aJS aJS akF pQG -vNU -otC +wtB +vyv aJS aaa ihq @@ -92020,7 +92021,7 @@ siL grl noA pJR -cRB +fGs mIl fJp bSj @@ -92051,13 +92052,13 @@ qPJ klj gQG oBO -jNl +uAT pKP jet -dEW +aix hGl kha -xsD +dbD bqX saa ffj @@ -92074,9 +92075,9 @@ hZV kBR kBR nZm -dyh +bMq iJC -gfo +euL sru tSw juV @@ -92093,7 +92094,7 @@ pPp sFw rmO yby -eJH +iWk otu aaa aaa @@ -92220,7 +92221,7 @@ sjP sjP sjP sjP -rrG +ppm yey jTZ aBL @@ -92242,7 +92243,7 @@ iRW jff iRW hRv -mxx +rJQ pHb vMX lsP @@ -92288,7 +92289,7 @@ dhX nIR gBD twl -qrV +bcx rhK rKJ wFe @@ -92334,17 +92335,17 @@ kOM xsv wsF gSN -dGi +jCF tSw vpP tSw tSw sGA tSw -qBS +mKf fgl btx -qBS +mKf otu otu otu @@ -92503,7 +92504,7 @@ uGD rlg keL nsZ -gkw +wxM tjh wsX wsX @@ -92544,7 +92545,7 @@ ndS urA pFG gBD -luI +xxn fRu hVE xXw @@ -92585,7 +92586,7 @@ ePM dVN bxE hZV -cft +xcp xcp kOM osD @@ -92595,9 +92596,9 @@ vPH qZM aID iUm -qKS +aoL vke -mff +muZ jay mRy wBW @@ -92750,7 +92751,7 @@ sUC mtG uyd cJj -baR +aOC eyd iMs cJj @@ -92775,7 +92776,7 @@ dWf nhP aOc aPw -pJo +lSy ome wpJ iUf @@ -92830,7 +92831,7 @@ eIO eIO xit fvE -nHD +myg iqz fmo vfU @@ -92840,7 +92841,7 @@ mAb mAb ePM dVN -vwU +iaK hZV pap bMh @@ -92848,7 +92849,7 @@ kOM kOM rmD gSN -lYf +qCw tSw nNJ iUm @@ -93000,7 +93001,7 @@ gYi gYi gYi cWI -cMK +akT lAM osw lAM @@ -93014,12 +93015,12 @@ rQS xqI gWc oAN -ygW +iKj vQI -ddW +mCJ lsP ekP -tvN +xIp iPX wkL rsI @@ -93063,7 +93064,7 @@ ilq kAp jnI ghK -nGY +cky fHd gBD eMH @@ -93080,14 +93081,14 @@ xJI tIx wmT hCt -fxb -tiM -snx +kKu +rXW +bSs rla eIO sGn fvE -xjD +fRP iqz iqz iqz @@ -93097,15 +93098,15 @@ lWd cBg uId dVN -wSa +ogk hZV -xeT +jwd lxT pYo kOM sKG uWM -txd +cpb tSw oBD iUm @@ -93264,7 +93265,7 @@ aaa rJB kaU nqD -jUU +sfK rTw aeq aeq @@ -93274,7 +93275,7 @@ sKs lQC wsX bPk -gRM +kCt tjh wsX wsX @@ -93362,7 +93363,7 @@ gdz pdV nHK ykH -eyg +lWj tSw agR iUm @@ -93519,12 +93520,12 @@ aaa aaa aaa rJB -lqK +jNm dxe wTO xxZ anl -mxF +iCr apJ lDe qGQ @@ -93545,8 +93546,8 @@ aJS aJS hlB vrJ -pES -omw +fEO +cFr aJS aaa ihq @@ -93558,7 +93559,7 @@ tKN aaf dsQ mZL -yaW +xJl aGQ acf hmq @@ -93576,9 +93577,9 @@ aaf aaf inX pRh -hCG -nUL -uyH +uCH +mWY +mtb oSo nNY htd @@ -93597,7 +93598,7 @@ dHN fVY mVf fhe -xUA +ocQ eIO deO fvE @@ -93619,14 +93620,14 @@ vvd kOM uYG wfa -gui +snU tSw dbX iUm sUi dzM iWJ -wIo +ePN izG xPb izG @@ -93777,11 +93778,11 @@ uzi vRi rJB wmc -iIe +lAY uQK dPL aeq -gZZ +cTA apJ lDe qGQ @@ -93827,7 +93828,7 @@ kcn qsL dho bCt -nPk +whr ndS qRI qRI @@ -93854,7 +93855,7 @@ mVE hxq nJn nqB -vJQ +erU eIO hKG fvE @@ -93868,27 +93869,27 @@ tqd cYx pbz joj -jEj +dWI hZV eyy -ndZ +jas hjF kOM pTx gSN -qpu +ave tSw iDN iUm irW gmp -ojJ +pmW iUm jdg iUm bxX iUm -rTo +aAS dDo biA gRb @@ -94105,7 +94106,7 @@ nxy aYJ hEc bFN -fRY +qJn hYA jsh rvE @@ -94121,7 +94122,7 @@ wPH xyA drW jxm -gSm +lFt bqX bqX bqX @@ -94144,7 +94145,7 @@ eje eje hlq eje -kRO +knI ewB dDo hQu @@ -94291,14 +94292,14 @@ aaa aaa aeq xCo -cLP +loY tTP -hOK -ckY +xwT +uou agc apM aeq -mYt +dFW fYJ ycM rOA @@ -94328,7 +94329,7 @@ uoe tKN aaf dho -lYU +wss gGy qVc dMY @@ -94343,13 +94344,13 @@ lPZ lyN cem fix -uDT +yeA tnm jzN sUy dkL uOd -oAG +pDh jzN qyI qaP @@ -94574,7 +94575,7 @@ iVA mlK dNX dNX -hMZ +nyV dNX lKZ amy @@ -94603,7 +94604,7 @@ lLk fix haP jzN -mGH +fEC eQe oQS iAA @@ -94622,7 +94623,7 @@ njX njX njX tug -fkq +bnl iEK iEK iEK @@ -94636,7 +94637,7 @@ aCE dLN mpJ eGm -nQO +qQY njX njX jcd @@ -94871,7 +94872,7 @@ mYq htd rkg wVo -jsl +kdL mYs wVo sDo @@ -95062,11 +95063,11 @@ aaa aaa aaa aeq -hbI +pfs jcc eew fnO -pjk +gHA kaC anl vDh @@ -95086,7 +95087,7 @@ goX gGo gGo gGo -jXv +fYC tnP oKc gGo @@ -95131,12 +95132,12 @@ sVH jON kFK kFK -gvW +rtD kFK -icT +kAc lTB cbi -tuW +eDX kFK ceZ ceZ @@ -95154,11 +95155,11 @@ gmt qhx ceZ ceZ -uwH +lGT gmt xDz gmt -xSg +rDM gmt gmt gmt @@ -95173,8 +95174,8 @@ izG tDU vkj vPq -vTx -bqY +usD +jFZ oIW sou iaQ @@ -95326,7 +95327,7 @@ aeq aeq aeq aeq -fvI +jpj ewj ycM mMM @@ -95356,7 +95357,7 @@ tGL tKN aaf dho -wAR +vSh gGy gGy dMY @@ -95371,13 +95372,13 @@ lPZ lyN cem fix -saq +mIu haP jzN tNC nvc nBs -pih +mun jzN bcq sRf @@ -95579,9 +95580,9 @@ eft upR nJu pti -vJd -ico -skA +cvw +cvs +mMc ahj jxV ayV @@ -95598,9 +95599,9 @@ gGo olw pxT xEt -lqg +wXT jcR -lxW +fky vWI txH urs @@ -95647,9 +95648,9 @@ suW hJF cZK ihF -aOi +cXg nyy -eXu +gVl usg fma ebV @@ -95659,7 +95660,7 @@ fma xgi sck iwA -eGM +puP wsL wOS orv @@ -95670,19 +95671,19 @@ cId rQl oIg wBq -npm -gAF +bEC +lsV kZf jxW svS rhU -bzd +kYP mGI jjs dKC xLu dKC -pUJ +ezP ctL oPD iUm @@ -95912,7 +95913,7 @@ eut nZC cwq rgS -ivv +vzW tKl ose tzq @@ -96085,12 +96086,12 @@ rrt lMJ iTZ iTZ -bfx +czt wPG -pFi +sDK iTZ -dQV -nsV +oHJ +eYT nUF tNn ltb @@ -96128,7 +96129,7 @@ tKN aaf dsQ kGc -fLC +dTV gkD nXm wNh @@ -96146,9 +96147,9 @@ aaf aaf inX sxA -umP -jzS -xnf +cPU +ygt +dqu oSo wpx htd @@ -96177,7 +96178,7 @@ ekB aJa eut gle -gZL +xYV syC gqm fHD @@ -96356,7 +96357,7 @@ vZm kYg mLL kYg -dOi +rzY jVv esR ieV @@ -96375,7 +96376,7 @@ dCo vWI wwY wwY -xwb +qcy olw olw wEG @@ -96454,8 +96455,8 @@ kZk kZk dKC tVR -duz -nqU +vbt +oRV iUm lMJ lMJ @@ -96613,18 +96614,18 @@ ljf kYg nnt kYg -peS +mnU pXC pHb qwh mrL fnN -mNb +cqd ieV qhz juj iHD -nrr +vhj nhh rzJ dYh @@ -96633,7 +96634,7 @@ mmZ xCg iaZ xCg -sIE +rFq olw wEG htd @@ -96672,18 +96673,18 @@ xdX pZc fak jUh -gBb +vsI cZK -xTW -kSl +wfA +cBV wsD -kSl -vmh +cBV +xlv eut -iEY +bUo jrR jtS -efu +bFH mMl lhT cqT @@ -96695,11 +96696,11 @@ gwf gfZ gqm jZP -xQP +cWk jrb -dDn -lHW -skG +vEC +eOo +rRJ edH mHL svS @@ -96860,7 +96861,7 @@ jOF iDq mPT fCn -edh +pyh aja lyF woG @@ -96929,7 +96930,7 @@ ghk aTi fak jUh -naE +aLF cZK sGm ola @@ -96945,7 +96946,7 @@ uBy kiy qDy reL -neJ +deH eut kwy gwf @@ -97118,7 +97119,7 @@ fOf eZI dgD kYg -gww +vGt fYb mYX aEj @@ -97136,7 +97137,7 @@ htb xdm fxj wJL -gWU +jpX iHD alE lpo @@ -97167,7 +97168,7 @@ wBs apw eVX syo -kHS +nue vQe tvE kWg @@ -97189,14 +97190,14 @@ nuS vGz uqp eKA -wYT +sza eKA -nlp +azF eKA uqp kaF bse -nku +eIV gcU noN bCc @@ -97392,7 +97393,7 @@ mrL gHo rFU ieV -iyT +aNu wJL kdO fHU @@ -97410,7 +97411,7 @@ sey hPM hvr syo -mrT +bUt vNG tIR tyY @@ -97479,7 +97480,7 @@ nCa sIX svS gma -nLp +nMP dKC uGg uGg @@ -97654,9 +97655,9 @@ fAL olw rGC dFz -fuv +tcu alE -kMS +dMO vWI vfC rGC @@ -97667,7 +97668,7 @@ wEG htd kGq syo -hcj +oOz tLi nnh tyY @@ -97679,10 +97680,10 @@ njP gLe cSg uYl -fbq +tOX syo -xcb -gVm +miW +jXw tvE tvE bUO @@ -97703,20 +97704,20 @@ ibw nIP gFQ aDm -vCx +non vro -sig -qMw +mmK +ikr xKK gVO gwf hCK eut -aco +fZw wRD -jFD +lqW xIM -neW +qTU eut beZ gwf @@ -97888,7 +97889,7 @@ ksg aGM rpz dgD -anA +rtI kxA kAT wVt @@ -97900,12 +97901,12 @@ kYg kYg ylZ rKZ -fFX +kwC sWV sWV sWV sWV -mVL +qJb fEn hME olw @@ -97924,7 +97925,7 @@ ozX kON vjn syo -dsN +qPF hlD iox tyY @@ -97936,7 +97937,7 @@ jxv sqJ gPA lZM -oqH +giR syo lSz vQe @@ -97944,7 +97945,7 @@ vZQ tvE kso fIo -vtl +qMW lcG iVE vYg @@ -97965,7 +97966,7 @@ wQI kZx wQI kZx -cFn +esT gwf vBG eut @@ -97985,12 +97986,12 @@ uBF raK dOA gyQ -rrp +qSP dIW iTc qfQ cLk -uZU +oxR svS dKC qkX @@ -98160,19 +98161,19 @@ sOZ uWo jMy jOQ -cjA +aHr mhA xNo woV -msf +bkZ xNU iJd nVy -nKy +tGI daC -sBU +kRR xNU -cBo +eFJ usP spd usP @@ -98211,11 +98212,11 @@ htd saU ooP mvR -oGP +izX bPi gpB sky -fKW +xAp ipM sxB sQB @@ -98247,7 +98248,7 @@ fhi fhi fhi bft -xAa +jws gyQ iVt iNi @@ -98403,7 +98404,7 @@ nuI qJa dgD kYg -eyQ +jAN wxj wxj wxj @@ -98421,7 +98422,7 @@ iOS iOS jAP fEn -ltu +xXC xNU iUb exr @@ -98449,7 +98450,7 @@ nCB wll gpS xuH -dTx +jdv ljD syo kBl @@ -98468,7 +98469,7 @@ htd saU ooP mvR -siq +kss iQi fGv knY @@ -98491,7 +98492,7 @@ xVD swV ili cpW -lAn +uVE pxt oRM gal @@ -98499,7 +98500,7 @@ fMn gal fgH gyQ -mvy +hSl fhi fhi fhi @@ -98659,14 +98660,14 @@ ikZ gdb ikZ gdb -cwm +hYd olD mLx eiO aOH nvA nWu -pjO +fii kYg kYg pHb @@ -98676,7 +98677,7 @@ jMy uJs sOi pKs -dic +bHN ilh ilh ilh @@ -98720,13 +98721,13 @@ tvE aan tvE kmZ -foj +tsT htd dhU dkW mvR bgn -knE +tMb rHE dbd aBJ @@ -98741,7 +98742,7 @@ bjJ rWL htn muB -vKq +iRc ulv qWX fke @@ -98926,7 +98927,7 @@ pyY sNB xWm mLL -wiJ +oIO vkb cLl sWV @@ -98953,7 +98954,7 @@ htd qBC syo aEP -vEY +cRU oRn sjS xNd @@ -98963,7 +98964,7 @@ syo tHE kkU qaG -oWE +fgJ srp eEH xPN @@ -98979,7 +98980,7 @@ srp eEH uDK dbk -kof +cGX tUn wXF wXF @@ -98991,7 +98992,7 @@ dlG ipM rsD qos -jlQ +tOU kZx oBz gTo @@ -99011,7 +99012,7 @@ fmM iWy rpG qKn -rkS +gJl gyQ ozm fhi @@ -99179,7 +99180,7 @@ fgY rFR lNW jkj -aSx +bpB kgy nGz rES @@ -99190,17 +99191,17 @@ sWV ovz dbj jyQ -qde +lGj ilh sNK rmF lHx jhY -meD +tAy ylU deG xNU -oMD +iIf pJE uUl cBf @@ -99254,7 +99255,7 @@ beQ iTO jyr qdT -gxp +vTK tEt xKk jHg @@ -99468,14 +99469,14 @@ qBC sqM kwQ jZR -hwp -rBz -tcq -ioO +xpH +ubQ +nOj +wGa kwQ mmS vLb -hTf +jmT jZR mJN cwP @@ -99488,8 +99489,8 @@ diE dYg hwF diE -tJx -lUt +ggq +nnR wah wpx htd @@ -99501,11 +99502,11 @@ tUn tUn hKV wXF -jYz +kGJ sQB lqL psT -mAv +gFy tzQ hNz iTO @@ -99521,20 +99522,20 @@ afZ sds cVn pxt -bKJ +jVy jTN vAH kIY -jbL +cyp gyQ -nHg +rbD jwj ujk jvo aHH -gFU +iYE pCa -kmg +dEF pCa cOT dXU @@ -99689,7 +99690,7 @@ shs qbC tLN mxn -lfZ +jaj tji gMZ cju @@ -99768,7 +99769,7 @@ myB vWz hkE pke -lMP +msJ xKK xKK rJA @@ -99994,9 +99995,9 @@ xCD xCD xCD xCD -dSj +byQ hio -ktF +vtu cWT xBx bdb @@ -100025,7 +100026,7 @@ olG ohH dTS gtV -bIY +enF tEt rMr xff @@ -100054,7 +100055,7 @@ qXW dKC rzx nFa -bzd +kYP tvg dKC aaa @@ -100204,7 +100205,7 @@ kcg meL mxn iDP -tAA +cUk gMZ gTk ilh @@ -100229,7 +100230,7 @@ qRk pJE nFn qsK -xlz +vRj sHg qXB jXq @@ -100272,11 +100273,11 @@ qOM tUn ftj wXF -esf +fNE tZo -thE +cCx rop -jlB +gvS oYZ oYZ oYZ @@ -100454,11 +100455,11 @@ aaa rrt lMJ mxn -htt +oLL gTt sdu fad -gLs +wSq gMZ gMZ gMZ @@ -100487,7 +100488,7 @@ nFn uJB qsK pJE -oWG +eFC qXB xNv mqK @@ -100507,8 +100508,8 @@ xEJ yjc crf vwn -oCg -bkN +uWU +oyY dfp tRL hrM @@ -100535,12 +100536,12 @@ cnu yaH gZQ vQb -kVn +mdu xPm -kvg +ohZ sac huq -lkQ +scq vQb sWB gwf @@ -100548,9 +100549,9 @@ pOv kYU bZB efZ -gys +qRe svS -kzt +bGo iLw nFa svS @@ -100558,9 +100559,9 @@ mHy mHy kVq pdi -tCi +kRV svS -fdy +nzz tWL gma oJu @@ -100712,7 +100713,7 @@ aaa aaa mxn yeV -bYM +hUB qmf jTH gMZ @@ -100734,12 +100735,12 @@ qnS uxb hAk gzO -oon -uBS +eqn +jSb kAF pGH usP -jyP +xAT kKw nGp vME @@ -100805,7 +100806,7 @@ fnh mMX moF klT -fmH +iWT svS dKC lMW @@ -100991,7 +100992,7 @@ eCn ilh dKO lNf -tlf +fLz ujM cwF pGH @@ -101014,7 +101015,7 @@ vFB fRS twN rac -jCe +ekR wCL gPh hkG @@ -101033,7 +101034,7 @@ eQE rVG kqZ wYB -cdu +iji cAG hbM hbM @@ -101047,7 +101048,7 @@ sPB upT noj yia -oXq +pqt vQb pbf oEq @@ -101061,7 +101062,7 @@ gwf pOv mMX rhe -mEZ +rPA mmW oWk fPD @@ -101246,8 +101247,8 @@ ilh ilh ilh ilh -eTZ -tjn +rWf +nft dIO dIO dIO @@ -101259,7 +101260,7 @@ cBy cBy oNl uUl -hot +cwK qXB gaG qXB @@ -101282,7 +101283,7 @@ pof owi nxA hyX -eOw +rrz eQE eEf rOM @@ -101504,19 +101505,19 @@ mgE xnU dIO jlY -dtF -tlf +vgu +fLz lvU nKO dIO -jte +aqa rNJ bxm pJE uJB nFn uUl -iKg +eAq qXB wzK qXB @@ -101529,11 +101530,11 @@ fRS tLx bvJ dYK -tgV +iPT gae uFf qVt -iiX +wxG gwc jjF vfm @@ -101541,7 +101542,7 @@ gWl epO qrO eQE -byS +nnl qfB dDH pkK @@ -101553,7 +101554,7 @@ xlF xlF xlF pdl -aVj +hpM tUn hKV wXF @@ -101756,13 +101757,13 @@ shg cur sab ilh -ehK -pqK +aCM +yfw eek wst mPE knf -qcS +gGf dIO dIO dIO @@ -101794,14 +101795,14 @@ bIi bTl lIB dDq -eNi +dUo utS bNh eQE mFC -lOb +wHL eQE -mXG +rem eLI ltW jyF @@ -101810,7 +101811,7 @@ byW byW byW nDO -wei +hmI tUn hKV wXF @@ -101820,7 +101821,7 @@ sIW bRb cKm tAg -rdX +xxh poq vYE lAH @@ -102021,7 +102022,7 @@ eYz kdX xvZ wHj -vyF +xkE dIO mHO jrL @@ -102058,7 +102059,7 @@ eQE eQE eQE eQE -rxW +tIb ndk cve xEe @@ -102078,7 +102079,7 @@ jSk rkT tAg yfa -kyK +pkx hBB wnY nfs @@ -102086,7 +102087,7 @@ nfs tAg sWB gwf -eCs +qLu oWk xuD sip @@ -102096,7 +102097,7 @@ bLd bLd bLd oWk -sGo +hCT sEZ evE xsn @@ -102287,7 +102288,7 @@ dcF cON jMo uUl -aad +anE qXB wzK qXB @@ -102313,7 +102314,7 @@ pmZ qdI xPh yfn -bQR +wDh uIs amu gsr @@ -102514,18 +102515,18 @@ oAa peF liO sSs -fOV -hZu +gkM +bcw uKL uKL mKu bWV hSG lnc -dZJ +dSE noW lnc -ylJ +qeo xpo lnc kMX @@ -102543,7 +102544,7 @@ qsK nFn qFU nFn -qGy +ncB cBf qXB qnK @@ -102557,11 +102558,11 @@ fRS mjs bvJ pIz -nbd +hNn fSd fSd raT -iiX +wxG qaf pmA xfn @@ -102780,10 +102781,10 @@ lOU piM lnc piA -omQ +wQb lnc cqp -tAF +wvF lnc hoQ wcr @@ -102796,7 +102797,7 @@ ikb iVN nFn kls -tjW +dpx pJE pJE nFn @@ -102813,7 +102814,7 @@ jhp fRS mjs rac -hFJ +fWl pCJ hkG qpM @@ -102833,7 +102834,7 @@ jER rMA ukv wYB -xPw +whJ rwd byW byW @@ -102842,14 +102843,14 @@ xAg tUn hKV ruX -nTy +aLx tUn -wkj +gLm tUn pSz -hrf +fVc wXF -vLI +jdX ohI tbp uzc @@ -103020,7 +103021,7 @@ rrt lMJ blx aag -mnn +rjl htk ubs cfy @@ -103051,13 +103052,13 @@ qEy aAg aAg uKx -qJv +kWd txk nOi tKn -sdl +rbG vQY -ggg +orp wLx qXB eHR @@ -103086,11 +103087,11 @@ exf dVm xWY uIs -uQS +rwa aJI iJK wYB -neM +sZo rwd cOa cOa @@ -103109,7 +103110,7 @@ wXF mRs tBp sbK -oYO +ejL aPX elJ wGH @@ -103127,7 +103128,7 @@ pNp oWk pIF qBF -ttp +nCG tqx bOm jPi @@ -103279,10 +103280,10 @@ aaa iHc gpF pHe -sXv +buE aag szp -miG +jjG ewf jUH fMm @@ -103300,11 +103301,11 @@ lnc tiA lnc lnc -mzV +psz cfi fRl ejl -fDZ +mJL lnc lqQ lqQ @@ -103341,7 +103342,7 @@ hPK cFl msT lPi -hug +cuM uIs jui oLF @@ -103552,7 +103553,7 @@ ewk dtg wcr mMx -kcG +edq wcr mMx qTz @@ -103580,16 +103581,16 @@ xww hht xww xww -rLj +mEO fRS tUv rac bQO -spO +joP wKu wKu jIk -hmQ +hZn cgl uZu mal @@ -103598,9 +103599,9 @@ mqu mJk itg tEy -tpO +nEB uIs -jed +bjl vqp wen bMa @@ -103795,7 +103796,7 @@ iHc iHc aag aag -xtm +lus clE byz biF @@ -103819,7 +103820,7 @@ ikb qwK mtO pFd -fJK +vTs lqQ nMK mos @@ -103862,7 +103863,7 @@ huG amj gEe kCZ -esg +uHo beO lXr cZm @@ -104052,7 +104053,7 @@ aaa lMJ aaa nvn -udE +mOl xrf mnl biF @@ -104069,7 +104070,7 @@ qEy qSf vxD qEy -vbj +ylM mCM iQy jHm @@ -104084,7 +104085,7 @@ jBY knZ jBY weS -mCO +uPJ qXB ool dVb @@ -104094,11 +104095,11 @@ lxv lNF lkW xww -iJA +aSk tlZ lje klZ -xaW +bqC fqD wSs pur @@ -104121,7 +104122,7 @@ qFF kCZ nKI bZq -chD +vrn fYI gFD unL @@ -104310,7 +104311,7 @@ lMJ aaa szp szp -eRm +gEN sqH jAs aiw @@ -104358,12 +104359,12 @@ obG lbX yks okX -pKc +tZX ogb uhW eSC obG -hVr +jqd jzT ivy ebK @@ -104396,10 +104397,10 @@ qph wXF vWT tOZ -kcP -vEE +fuc +cln aHM -pyT +xTg oWk mEL fwP @@ -104566,7 +104567,7 @@ szp nvn szp szp -gKI +nqV tgo xsH sqH @@ -104578,7 +104579,7 @@ kZq gNh aTD lnc -fxp +oYv cKC lnc lxf @@ -104598,7 +104599,7 @@ qgy ldg ivb bYN -aQl +krt qXB psZ qXB @@ -104612,25 +104613,25 @@ biV fRS tUv obG -rse +sZa vRU gpf ouk jTM wBT -yjp +sxX obG sEx gIm -wdL -dYj +sbM +qKD aNN huG gLF leP apt huG -clM +bJp wYB oXM siz @@ -104651,12 +104652,12 @@ qXb mBK tUn wXF -jTU +eAr gcV nNe dBb aHM -lam +xxQ oWk ddu fwP @@ -104836,18 +104837,18 @@ gNh fgu lnc qwl -foQ +unw lnc elV -pYz +uuz qXB vIa qXB pnD -lfl +nAW lnc -lRH -iGg +iGy +qdy lqQ wRF jzC @@ -104869,13 +104870,13 @@ vFB fRS tUv obG -inO +dSJ wrZ aWq oph yaO gyO -gIP +xSO obG rIb obG @@ -104921,7 +104922,7 @@ fwP fwP fwP qkl -sfR +uSM bLd bLd bLd @@ -105109,7 +105110,7 @@ lqQ lbH lJa mie -alp +pRM otG jYu lJa @@ -105152,7 +105153,7 @@ bnE unL kTZ unL -cIw +iMF guI uND slc @@ -105166,7 +105167,7 @@ nTU kjO wXF tAQ -duy +fbl vkq hQY xGD @@ -105381,15 +105382,15 @@ rwn cdX vFB fRS -dlM +sGH obG -aBu -ltr -gzV +aEA +mZc +iUe dLT -bnk -fEa -kBJ +qiY +wAt +utE xXW nst lih @@ -105427,7 +105428,7 @@ wZg ojo xfV sBS -rHC +wCb oWk bLd bLd @@ -105625,12 +105626,12 @@ ldO vKm tbd cPQ -jDp +nao wyG qXB psZ qXB -xIc +rjZ uWS kyc can @@ -105650,7 +105651,7 @@ unL unL unL unL -lKD +cEx vRU iks cwb @@ -105666,7 +105667,7 @@ unL unL fGW unL -ppH +vtI mma iMQ rAo @@ -105681,10 +105682,10 @@ ohW tUn vWT pOw -lbI -vEE +gqa +cln sgB -ass +pbb gFQ aaa aaa @@ -105888,8 +105889,8 @@ psZ psZ qXB gAU -bCm -hBe +tXl +oUK eRR ryp cdX @@ -105914,7 +105915,7 @@ deX rJk ofe nEf -uEh +kyt aBM unL lPy @@ -105924,7 +105925,7 @@ fhA gub unL gjF -jRp +sjB wOy vMc tUn @@ -106120,7 +106121,7 @@ afD afD qXB gbG -rpf +qhE mXk oPZ qXB @@ -106402,12 +106403,12 @@ ofk uXd fDL hSt -bHU +qhw naN fMN icR sqE -vtw +nGA gnS rlm esk @@ -106428,7 +106429,7 @@ gIS xNG gYV lFo -uIb +sZi tHk unL hLs @@ -106438,9 +106439,9 @@ xZb hcP jCx cZF -sQU -vZP -lBX +uaG +vPu +pQy ovX xYQ pnH @@ -106662,7 +106663,7 @@ nLz vGl cYc iIP -hhj +qrj sqE rKS gnS @@ -106711,7 +106712,7 @@ aaa aaa aaa tOg -dhR +gLr tOg aaa aaa @@ -106921,9 +106922,9 @@ rSi pCt aRS sqE -rLj +mEO gnS -cWj +jPf esk esk esk @@ -106950,7 +106951,7 @@ mWA isl fWA hcP -sxU +dRj lWq fBi lWq @@ -107183,13 +107184,13 @@ pYE rlm iiN mbJ -kne +ncd gYO -uEp +flE fcA cVj -svy -eBg +uKz +fnT dss pMH fWA @@ -107470,7 +107471,7 @@ tLv lWq ldc xpB -xdB +caO huZ uaB xrr @@ -107484,7 +107485,7 @@ aaa tOg hxu vRg -xlJ +sls vRg vRg vRg @@ -107687,8 +107688,8 @@ xUY fbf nie qtm -hwN -nBG +fyJ +qVD cuc fqC tUw @@ -107696,7 +107697,7 @@ rHq peX kRi klw -gMJ +roe uAg xrN hDa @@ -107720,11 +107721,11 @@ unL sfz wao hum -xlu -jYX -sgY +rMT +svK +yec xhb -fqv +uQk lYM vzc gUY @@ -107745,7 +107746,7 @@ tOg tOg tOg gUS -dhR +gLr tOg aaa aaa @@ -107940,7 +107941,7 @@ blG tBz lia ncx -lks +acU cnK sqE sqE @@ -107965,7 +107966,7 @@ htP vGF ecp qXk -aEe +mQi fWA wac kQT @@ -108182,7 +108183,7 @@ qXB qXB cgL tCS -fvX +nZt gLK gyH mKV @@ -108198,19 +108199,19 @@ ncx cOs ncx pTw -wyj +qyQ cnK -vLW +vYI cDQ -iZj +xQI dOQ cnK itY uMU mGX kfp -lrB -tqO +jxM +jvu eSy juJ cZL @@ -108232,8 +108233,8 @@ guD fWA dBZ qRM -lRq -wwB +sMb +sgh kLp wxe uwQ @@ -108702,13 +108703,13 @@ wbF qaA bMA rao -qWS -yka +vaI +yaF qaA fTL qaA wgf -hzY +jUT rao qaA haR @@ -108717,7 +108718,7 @@ cnK doD vIT siA -hau +uRw cnK qGK fzd @@ -108733,16 +108734,16 @@ tYF jPH wfC jIz -uOc +vqj peM -lWj +xld dkC dwz dwz -aUw +frE afz uwQ -ebe +siy lgL lrK heV @@ -108985,26 +108986,26 @@ heL mBi ayr nck -ujy +phJ peM peM opG lEH -bbz +jUW peM -lOh +eWu vWB hta vXt ecB ecB -ewb +xrG prT prT fVA jAV wmz -xTR +mvo oJL gyg lAh @@ -109208,7 +109209,7 @@ tCS jhD pql nqL -gnb +hcc eaN cuZ pTw @@ -109221,19 +109222,19 @@ vyZ vyZ eGC vyZ -ghx +fmX vyZ vyZ aRt xAl kYG -sGR -eDg +qjl +wlx qPT jRb -cua +uew qsv -umV +sKD lUz sWs ruu @@ -109241,10 +109242,10 @@ uTH dFH ygb pEG -qOY +ryA ssk peM -wBm +wUM cZw hUn pQK @@ -109459,7 +109460,7 @@ hHK hHK qhb gTh -lHC +tOd dEx fZL snB @@ -109484,7 +109485,7 @@ qLw tdf mdk kYG -cMZ +dqE oFH oFH sSz @@ -109511,7 +109512,7 @@ iUs mCZ mHT dKE -xcw +aVv dKE mHT tJF @@ -109741,7 +109742,7 @@ mYE uLp mdk kYG -qUg +nJM lOg pom pom @@ -109968,7 +109969,7 @@ aaa aaa aox nqL -dky +sdW hHK dLc lJh @@ -109991,7 +109992,7 @@ aXL rHn mkr oNs -npy +rCW rHn hko hko @@ -110000,9 +110001,9 @@ qTX kYG uJz iHy -nnH -fQb -tWv +vSC +eKw +vPV qsv lfd eup @@ -110012,7 +110013,7 @@ khu nsO efY mRm -aFw +kXp cVJ peM mSM @@ -110020,19 +110021,19 @@ mSM peM ovf peM -oOs +uxm ruP oqK mHT hQB -tta +jku hQB mHT egP gMt vuU jvj -kjB +qMm lMC smZ lAh @@ -110238,11 +110239,11 @@ cOX tCS eVi bwE -iYJ +xVx nTA cKx fXi -aWU +uHE rHn rHn kww @@ -110252,7 +110253,7 @@ cAm fec rHn fJP -dvo +ycw uJL fJy bDW @@ -110267,8 +110268,8 @@ dRA wCe khu hUu -luS -nxD +uWN +ggw mEG nRp dtY @@ -110280,7 +110281,7 @@ wDG udD sCN cyW -ldT +wIa cyW cyW cyW @@ -110489,7 +110490,7 @@ bhM gTh oTR jYI -awu +lew tCS psZ tCS @@ -110507,7 +110508,7 @@ qZB oNs hRl jWE -lWb +auc rtQ uLp lLu @@ -110750,7 +110751,7 @@ rYc tCS kbo tCS -oUj +tVG sph owp tmq @@ -110781,7 +110782,7 @@ wsI fia sRW hKi -bZh +xbb lLB aJz rzT @@ -111001,7 +111002,7 @@ aaa aaa aaa gTh -pZY +rMJ oww xvR tCS @@ -111015,16 +111016,16 @@ sGC stl qOz wBE -iSx +eEP eyD qZB oNs hRl jWE -ojw +eQL rtQ mBo -fAu +hJi fJy fJy gHI @@ -111060,7 +111061,7 @@ cyW nzo vuU dwf -kjB +qMm xcW smZ lAh @@ -111265,12 +111266,12 @@ qXB mSB tCS xGr -fIr +lLC pmj pmj bgs pWB -amF +lta rHn rHn rHn @@ -111280,7 +111281,7 @@ muu rHn rHn fJP -iIz +vBe wBV aUP dgd @@ -111343,7 +111344,7 @@ dVv gog jjj jNo -lib +gAH klK aDQ hFz @@ -111548,7 +111549,7 @@ ack fJy mhW uNl -aTY +rLZ fJy ygp tyE @@ -111598,11 +111599,11 @@ bus hMv iTQ vGq -lFh +avx vBf uNs tIP -cxI +qQJ vGq bjs gyI @@ -111786,7 +111787,7 @@ lXN dQP jmq gWv -uoQ +fjv gWv cRq mYE @@ -111815,8 +111816,8 @@ iRh qcd bMC fkb -ofo -pHu +ieI +nQQ efd nwK fFC @@ -111833,7 +111834,7 @@ dVT jhn svj rhx -cyB +ydM uwQ aaf aaf @@ -112090,7 +112091,7 @@ xpi kUb dfj agw -rLO +dpU uwQ lMJ eoU @@ -112319,7 +112320,7 @@ dgB fJy xcz mzu -nkz +bjF nyX tsZ hns @@ -112333,8 +112334,8 @@ oGw iLe uwQ vRS -gLg -iJu +gyJ +qLU fFA nGq kRf @@ -112368,13 +112369,13 @@ xiL idA xVu dgz -sUZ +egS xVu -wdZ +dJk vDV -vYm +etV xVu -mHW +jjv pfP xVu idA @@ -112602,7 +112603,7 @@ cQQ sCW lNY sCW -kjB +qMm afp oIM lAh @@ -113395,15 +113396,15 @@ xiL xiL idA xVu -uVh +sPy iWc xVu -hAA +vva jSj rzz xVu lVB -lQX +pry xVu idA xiL @@ -113620,7 +113621,7 @@ tts sfu oFt hgE -jcC +efN fXj vPy tjG @@ -113630,7 +113631,7 @@ jZz vlq gTC cyW -kjB +qMm mxv oIM lAh @@ -113661,7 +113662,7 @@ fdZ iMR bnQ psc -ruY +eTI rKg xiL lmn @@ -114395,7 +114396,7 @@ vTX vTX isr vhv -tDi +piv nzo qVi uhx @@ -114650,7 +114651,7 @@ nBu gHY das vTX -vfe +fKv vhv bYo xRc @@ -114658,7 +114659,7 @@ qTA jZz nnD cyW -kjB +qMm cQx oIM lAh @@ -115198,7 +115199,7 @@ xiL jlU rRo lyL -eHE +mao mCu kgW jlU @@ -115453,11 +115454,11 @@ rDf uhs fjd jlU -lQY +lWS sZN msR xkv -ciY +nET jlU iOJ lmn @@ -115680,13 +115681,13 @@ oog vTX jTS sCp -txK +kJO cyW jvj pul cyW cyW -uSy +meJ dct oIM lAh @@ -116458,7 +116459,7 @@ tmQ tmQ nkj kaS -jgN +hAq wez gAT kuD @@ -116711,9 +116712,9 @@ nsC lMJ uwQ uwQ -qsd +lOA mcl -jNy +kwb uwQ uwQ uwQ @@ -116973,8 +116974,8 @@ xyT uwQ uwQ rWS -aTr -nag +css +rsR aaa nYJ aaa @@ -116997,7 +116998,7 @@ lMJ jlU jlU bPu -cvG +aYl kcu jlU jlU @@ -119261,8 +119262,8 @@ beq blx qZX hml -nbV -mot +hAF +hBH aaa lMJ aaa @@ -120032,7 +120033,7 @@ nWS moI fJt neG -nUz +eFX eNR nWS moI @@ -121060,7 +121061,7 @@ bjP omF bnx kWn -rWk +xdx gfU gfU gfU @@ -121562,7 +121563,7 @@ aaa gfU aTV aVl -udw +vmk phN jEr lro @@ -121586,7 +121587,7 @@ tUA tUA juf uRp -eXW +jNZ ubl gfU aaa @@ -122331,7 +122332,7 @@ qyc jZC pan mbS -oQY +tVC mCL aWO aYz @@ -122615,7 +122616,7 @@ dlb dlb dlb dlb -gMC +rEK jGr gfU gfU @@ -123104,11 +123105,11 @@ aaa gfU aTV aVr -lUf +qDi oDc hyZ rZy -lUf +qDi aVr qsV ubB @@ -123128,7 +123129,7 @@ tUA tUA hqE oln -jMU +xpZ kOf gfU aaa diff --git a/code/_globalvars/lighting.dm b/code/_globalvars/lighting.dm index e59a3d42fdb..8a245328b98 100644 --- a/code/_globalvars/lighting.dm +++ b/code/_globalvars/lighting.dm @@ -81,11 +81,21 @@ GLOBAL_LIST_INIT_TYPED(light_types, /datum/light_template, generate_light_types( category = "Bar" path_to_read = /obj/machinery/light/warm +/datum/light_template/read_light/dimwarm_bar + name = "Dim Warm Bar" + category = "Bar" + path_to_read = /obj/machinery/light/warm/dim + /datum/light_template/read_light/cold_bar name = "Cold Bar" category = "Bar" path_to_read = /obj/machinery/light/cold +/datum/light_template/read_light/dimcold_bar + name = "Dim Cold Bar" + category = "Bar" + path_to_read = /obj/machinery/light/cold/dim + /datum/light_template/read_light/red_bar name = "Red Bar" category = "Bar" diff --git a/code/modules/power/lighting/light_mapping_helpers.dm b/code/modules/power/lighting/light_mapping_helpers.dm index 89b04ed6812..a2171c8897c 100644 --- a/code/modules/power/lighting/light_mapping_helpers.dm +++ b/code/modules/power/lighting/light_mapping_helpers.dm @@ -16,6 +16,10 @@ /obj/machinery/light/warm/no_nightlight nightshift_allowed = FALSE +/obj/machinery/light/warm/dim + nightshift_allowed = FALSE + bulb_power = 0.6 + /obj/machinery/light/cold bulb_colour = LIGHT_COLOR_FAINT_BLUE nightshift_light_color = LIGHT_COLOR_FAINT_BLUE @@ -23,6 +27,10 @@ /obj/machinery/light/cold/no_nightlight nightshift_allowed = FALSE +/obj/machinery/light/cold/dim + nightshift_allowed = FALSE + bulb_power = 0.6 + /obj/machinery/light/red bulb_colour = "#FF3232" nightshift_allowed = FALSE @@ -108,12 +116,18 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/warm, 0) // ---- No nightlight warm light tubes MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/warm/no_nightlight, 0) +// ---- Dim warm light tubes +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/warm/dim, 0) + // ---- Cold light tubes MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/cold, 0) // ---- No nightlight cold light tubes MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/cold/no_nightlight, 0) +// ---- Dim cold light tubes +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/cold/dim, 0) + // ---- Red tubes MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/red, 0) From 8ea8f09378727faf2d52877b59176e5fbe44887b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 08:25:25 +0200 Subject: [PATCH 08/69] Automatic changelog for PR #22669 [ci skip] --- html/changelogs/AutoChangeLog-pr-22669.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22669.yml diff --git a/html/changelogs/AutoChangeLog-pr-22669.yml b/html/changelogs/AutoChangeLog-pr-22669.yml new file mode 100644 index 00000000000..b8181d994d0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22669.yml @@ -0,0 +1,4 @@ +author: "Rhials" +delete-after: True +changes: + - qol: "Modifies the contents of some Mafia lockers. Go check 'em out!" \ No newline at end of file From e5bc36b66b33898ccd871593c031a911c95d0c0c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 08:25:35 +0200 Subject: [PATCH 09/69] Automatic changelog for PR #22668 [ci skip] --- html/changelogs/AutoChangeLog-pr-22668.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22668.yml diff --git a/html/changelogs/AutoChangeLog-pr-22668.yml b/html/changelogs/AutoChangeLog-pr-22668.yml new file mode 100644 index 00000000000..e52d3a784c9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22668.yml @@ -0,0 +1,4 @@ +author: "Senefi" +delete-after: True +changes: + - rscadd: "Some Metastation Medbay lights have been moved and adjusted." \ No newline at end of file From 6a5f3c50c4c4a5735867f69c87cc9050ec9d2447 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 08:53:43 +0200 Subject: [PATCH 10/69] [MIRROR] Material container & related stuff ui refactors & clean-up [MDB IGNORE] (#22667) * Material container & related stuff ui refactors & clean-up (#76220) ## About The Pull Request **1. Material container clean-up & refactor** - Replaced `total_amount` var with `total_amount()` proc, this var can be easily computed by summing up all material amounts rather than storing it as a var which is tedious to update & keep track of when materials are added/removed - Removed unused procs `transer_amt_to()`, `can_insert_amount_mat()`, and `get_categories()`. These procs are not used anywhere in the codebase so let's remove them & make some space. - Callbacks are replaced with signals, the callbacks don't need to be explicitly garbage collected & having macros & procs marked with `SIGNAL_HANDLER` makes your intentions more readable & explicit. - Fixes #76151 All material adding, removal, checking operations are "Integer" operations, i.e. the final value is rounded & them made 1 if the final value is 0 using the macro `OPTIMIZE_COST`[coudn't come up with a better name]. No more dealing with decimal value materials The problem was after the protolathe was upgraded with better parts all the design costs were multiplied with a decimal `efficiency_coeff` value, this means even though in the UI the cost was displayed as 60 bluespace crystals its actual cost was `60.0001` something in the backend causing this check for materials to fail & print the error message. - Replaced `GetComponent(/datum/component_material_container)` with just a simple ref to the material container when adding the component, so we can save some overhead from calling this proc - Gave all procs a ton of documentation with documentation having documentation - Fixes #76506 RCD and other devices that uses the silo link upgrade now have the correct material usages - Fixes #72096. It wasn't just a problem with ancient protolathe but with all machines that used `datum/component/remote_materials` the problem was remote materials would add an instance of `datum/remote/material_container` if it wanted to use local storage but this component would get added before `datum/component/remote_materials` could be registered i.e. it comes before remote_materials in the component list. So when the machine is destroyed it will first destroy `material_container` & then `remote_materials` therefore destroying the materials before they could get ejected - Silo link is established when parent is registered with remote materials raher than adding an external timer which is faster - Everything that uses a material container will auto eject their sheets when destroyed - Moved this & remote materials into its own folder for better organization **2. Material UI Changes** - Removed the x25 & x50 print buttons from the autolathe, now they just have x5 & x10 buttons like the protolathe, These buttons were of no use since you could just type the exact amount you want to print in the `[Max: ]` side bar. The code to compute these buttons was just plain right nasty & some of it unused in the UI. - The material eject button in the material bar does not gray out when you can eject exactly one sheet - All material cost are integer values rounded - Fixes #76253 Exosuit Fabricator sends the material container static data to the UI so its material bar is not greyed out when there are sufficient materials to eject - Component printer material bar sends the material container static data to the UI so its material bar is not greyed out when there are sufficient materials to eject - Autolathe Material bars now display number of sheets available - Max printable amount of items are now computed & updated correctly in the UI. They were displaying wrong values & now get updated when items are printed, materials are removed - Silo hold actually works now. When a machine is put on hold it calls this proc https://github.com/tgstation/tgstation/blob/e929cf39cded5207d63df1fa8521f41f2816b383/code/datums/components/remote_materials.dm#L78-L87 Notice how the key is `src` so we should be consistent during checking if a machine is on hold using the same `src` var. But for some reason we did dumb shit like this https://github.com/tgstation/tgstation/blob/e929cf39cded5207d63df1fa8521f41f2816b383/code/datums/components/remote_materials.dm#L150-L153 What is category? Why do we care for the area the machine is in? None of it made sense so i removed all that junk and just made it check for `src` like it should - Removed redundant `removable` & `sheets` var from the material container ui_data. These vars are unused in the UI - If an item does not have the required materials then upon clicking that item you will not get any error message but instead nothing happens ## Changelog :cl: fix: items can be printed from autolathe & protolathe when the exact material amounts are present in them after upgrading fix: max printable amount now shows the correct value & updates when items are printed, materials are removed in the autolathe & protolathe fix: component printer material bar is not greyed out when there are sufficient materials to eject fix: rcd and other devices that uses the silo link upgrade now have the correct material usages fix: silo hold actually works fix: machines using local storage to hold materials will eject it's materials as sheets when deconstructed/destroyed refactor: Autolathe Material bars now display number of sheets available refactor: printing an item that does not have enough materials will fail silently with no error messages refactor: Drone dispenser will eject sheets upon deconstruction refactor: all things that store materials will auto ejects its sheets(if there is sufficient material) when destroyed refactor: inserting an item into the material container will display the units consumed as sheets not absolute units refactor: removed x25 & x50 print buttons from the autolathe * Material container & related stuff ui refactors & clean-up * Update ammo_workbench.dm --------- Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> --- .../dcs/signals/signals_material_container.dm | 11 + code/__DEFINES/materials.dm | 3 + code/__HELPERS/construction.dm | 41 ++ .../{ => material}/material_container.dm | 578 +++++++++--------- .../{ => material}/remote_materials.dm | 62 +- code/game/machinery/autolathe.dm | 202 +++--- code/game/machinery/droneDispenser.dm | 38 +- code/game/machinery/rechargestation.dm | 1 - code/game/machinery/recycler.dm | 8 +- code/game/machinery/sheetifier.dm | 25 +- code/game/objects/items/rcd/RHD.dm | 22 +- .../antagonists/clown_ops/clown_weapons.dm | 4 +- code/modules/clothing/shoes/bananashoes.dm | 11 +- code/modules/mining/machine_processing.dm | 24 +- code/modules/mining/machine_redemption.dm | 8 +- code/modules/mining/machine_silo.dm | 18 +- code/modules/mining/machine_stacking.dm | 7 +- code/modules/mod/modules/modules_general.dm | 25 +- .../modules/research/machinery/_production.dm | 83 +-- .../departmental_circuit_imprinter.dm | 1 - .../machinery/departmental_protolathe.dm | 6 - .../machinery/departmental_techfab.dm | 6 - .../modules/vehicles/mecha/mech_fabricator.dm | 68 +-- .../modules/wiremod/core/component_printer.dm | 92 ++- .../ammo_workbench/code/ammo_workbench.dm | 9 +- tgstation.dme | 5 +- tgui/packages/tgui/interfaces/Autolathe.tsx | 88 ++- .../tgui/interfaces/ComponentPrinter.tsx | 33 +- .../tgui/interfaces/ExosuitFabricator.tsx | 60 +- .../Fabrication/MaterialAccessBar.tsx | 38 +- .../Fabrication/MaterialCostSequence.tsx | 15 +- .../tgui/interfaces/Fabrication/Types.ts | 15 +- tgui/packages/tgui/interfaces/Fabricator.tsx | 52 +- 33 files changed, 869 insertions(+), 790 deletions(-) create mode 100644 code/__DEFINES/dcs/signals/signals_material_container.dm rename code/datums/components/{ => material}/material_container.dm (66%) rename code/datums/components/{ => material}/remote_materials.dm (77%) diff --git a/code/__DEFINES/dcs/signals/signals_material_container.dm b/code/__DEFINES/dcs/signals/signals_material_container.dm new file mode 100644 index 00000000000..3f9ab395175 --- /dev/null +++ b/code/__DEFINES/dcs/signals/signals_material_container.dm @@ -0,0 +1,11 @@ +//Material Container Signals +/// Called from datum/component/material_container/proc/can_hold_material() : (mat) +#define COMSIG_MATCONTAINER_MAT_CHECK "matcontainer_mat_check" + #define MATCONTAINER_ALLOW_MAT (1<<0) +/// Called from datum/component/material_container/proc/user_insert() : (held_item, user) +#define COMSIG_MATCONTAINER_PRE_USER_INSERT "matcontainer_pre_user_insert" + #define MATCONTAINER_BLOCK_INSERT (1<<1) +/// Called from datum/component/material_container/proc/insert_item() : (target, last_inserted_id, material_amount, container) +#define COMSIG_MATCONTAINER_ITEM_CONSUMED "matcontainer_item_consumed" +/// Called from datum/component/material_container/proc/retrieve_sheets() : (sheets) +#define COMSIG_MATCONTAINER_SHEETS_RETRIVED "matcontainer_sheets_retrived" diff --git a/code/__DEFINES/materials.dm b/code/__DEFINES/materials.dm index f58ec028dbb..08b88324826 100644 --- a/code/__DEFINES/materials.dm +++ b/code/__DEFINES/materials.dm @@ -15,6 +15,9 @@ /// Used to make a material type able to be instantiated on demand after roundstart. #define MATERIAL_INIT_BESPOKE (1<<1) +/// Makes sure only integer values are used when consuming, removing & checking for mats +#define OPTIMAL_COST(cost)(max(1, round(cost))) + //Material Container Flags. ///If the container shows the amount of contained materials on examine. #define MATCONTAINER_EXAMINE (1<<0) diff --git a/code/__HELPERS/construction.dm b/code/__HELPERS/construction.dm index ad9f24cef3c..add76c0f9ce 100644 --- a/code/__HELPERS/construction.dm +++ b/code/__HELPERS/construction.dm @@ -8,3 +8,44 @@ ) else return defaults + +/** + * Turns material amount into the number of sheets, returning FALSE if the number is less than SHEET_MATERIAL_AMOUNT + * + * Arguments: + * - amt: amount to convert + */ +/proc/amount2sheet(amt) + if(amt >= SHEET_MATERIAL_AMOUNT) + return round(amt / SHEET_MATERIAL_AMOUNT) + return 0 + +/** + * Turns number of sheets into material amount, returning FALSE if the number is <= 0 + * + * Arguments: + * - amt: amount to convert + */ +/proc/sheet2amount(sheet_amt) + if(sheet_amt > 0) + return sheet_amt * SHEET_MATERIAL_AMOUNT + return 0 + +/** + * Splits a stack. we don't use /obj/item/stack/proc/fast_split_stack because Byond complains that should only be called asynchronously. + * This proc is also more faster because it doesn't deal with mobs, copying evidences or refreshing atom storages + * Has special internal uses for e.g. by the material container + * + * Arguments: + * - [target][obj/item]: the stack to splot + * - [amount]: amount to split by + */ +/datum/component/material_container/proc/fast_split_stack(obj/item/stack/target, amount) + if(!target.use(amount, TRUE, FALSE)) + return null + + . = new target.type(target.drop_location(), amount, FALSE, target.mats_per_unit) + target.loc.atom_storage?.refresh_views() + + target.is_zero_amount(delete_if_zero = TRUE) + diff --git a/code/datums/components/material_container.dm b/code/datums/components/material/material_container.dm similarity index 66% rename from code/datums/components/material_container.dm rename to code/datums/components/material/material_container.dm index af9b3f32903..02d73b51055 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material/material_container.dm @@ -10,8 +10,6 @@ */ /datum/component/material_container - /// The total amount of materials this material container contains - var/total_amount = 0 /// The maximum amount of materials this material container can contain var/max_amount /// Map of material ref -> amount @@ -20,31 +18,22 @@ var/list/allowed_materials /// The typecache of things that this material container can accept var/list/allowed_item_typecache - /// The last main material that was inserted into this container - var/last_inserted_id /// Whether or not this material container allows specific amounts from sheets to be inserted var/precise_insertion = FALSE - /// A callback for checking wheter we can insert a material into this container - var/datum/callback/insertion_check - /// A callback invoked before materials are inserted into this container - var/datum/callback/precondition - /// A callback invoked after materials are inserted into this container - var/datum/callback/after_insert - /// A callback invoked after sheets are retrieve from this container - var/datum/callback/after_retrieve /// The material container flags. See __DEFINES/materials.dm. var/mat_container_flags + /// Signals that are registered with this contained + var/list/registered_signals /// Sets up the proper signals and fills the list of materials with the appropriate references. -/datum/component/material_container/Initialize(list/init_mats, +/datum/component/material_container/Initialize( + list/init_mats, max_amt = 0, - _mat_container_flags=NONE, - list/allowed_mats=init_mats, + _mat_container_flags = NONE, + list/allowed_mats = init_mats, list/allowed_items, - datum/callback/_insertion_check, - datum/callback/_precondition, - datum/callback/_after_insert, - datum/callback/_after_retrieve) + list/container_signals + ) if(!isatom(parent)) return COMPONENT_INCOMPATIBLE @@ -60,11 +49,6 @@ else allowed_item_typecache = typecacheof(allowed_items) - insertion_check = _insertion_check - precondition = _precondition - after_insert = _after_insert - after_retrieve = _after_retrieve - for(var/mat in init_mats) //Make the assoc list material reference -> amount var/mat_ref = GET_MATERIAL_REF(mat) if(isnull(mat_ref)) @@ -74,6 +58,11 @@ mat_amt = 0 materials[mat_ref] += mat_amt + //all user handled signals + if(length(container_signals)) + for(var/signal in container_signals) + parent.RegisterSignal(src, signal, container_signals[signal]) + if(_mat_container_flags & MATCONTAINER_NO_INSERT) return @@ -83,19 +72,11 @@ RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) /datum/component/material_container/Destroy(force, silent) + retrieve_all() materials = null allowed_materials = null - if(insertion_check) - QDEL_NULL(insertion_check) - if(precondition) - QDEL_NULL(precondition) - if(after_insert) - QDEL_NULL(after_insert) - if(after_retrieve) - QDEL_NULL(after_retrieve) return ..() - /datum/component/material_container/RegisterWithParent() . = ..() @@ -104,6 +85,14 @@ if(mat_container_flags & MATCONTAINER_EXAMINE) RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) +/datum/component/material_container/proc/on_examine(datum/source, mob/user, list/examine_texts) + SIGNAL_HANDLER + + for(var/I in materials) + var/datum/material/M = I + var/amt = materials[I] / SHEET_MATERIAL_AMOUNT + if(amt) + examine_texts += span_notice("It has [amt] sheets of [lowertext(M.name)] stored.") /datum/component/material_container/vv_edit_var(var_name, var_value) var/old_flags = mat_container_flags @@ -119,27 +108,137 @@ else if(!(old_flags & MATCONTAINER_NO_INSERT) && mat_container_flags & MATCONTAINER_NO_INSERT) UnregisterSignal(parent, COMSIG_ATOM_ATTACKBY) +/** + * 3 Types of Procs + * Material Insertion : Insert materials into the container + * Material Validation : Checks how much materials are available, Extracts materials from items if the container can hold them + * Material Removal : Removes material from the container + * + * Each Proc furthur belongs to a specific category + * LOW LEVEL: Procs that are used internally & should not be used anywhere else unless you know what your doing + * MID LEVEL: Procs that can be used by machines(like recycler, stacking machines) to bypass majority of checks + * HIGH LEVEL: Procs that can be used by anyone publically and guarentees safty checks & limits + */ -/datum/component/material_container/proc/on_examine(datum/source, mob/user, list/examine_texts) - SIGNAL_HANDLER +//================================Material Insertion procs============================== - for(var/I in materials) - var/datum/material/M = I - var/amt = materials[I] - if(amt) - examine_texts += span_notice("It has [amt] units of [lowertext(M.name)] stored.") +//======================================LOW LEVEL========================================= +/** + * Inserts the relevant materials from an item into this material container. + * This low level proc should not be used directly by anyone + * + * Arguments: + * - [source][/obj/item]: The source of the materials we are inserting. + * - multiplier: The multiplier for the materials extract from this item being inserted. + * - breakdown_flags: The breakdown bitflags that will be used to retrieve the materials from the source + */ +/datum/component/material_container/proc/insert_item_materials(obj/item/source, multiplier = 1, breakdown_flags = mat_container_flags) + var/primary_mat + var/max_mat_value = 0 -/// Proc that allows players to fill the parent with mats -/datum/component/material_container/proc/on_attackby(datum/source, obj/item/weapon, mob/living/user) - SIGNAL_HANDLER + var/list/item_materials = source.get_material_composition(breakdown_flags) + for(var/MAT in item_materials) + if(!can_hold_material(MAT)) + continue + materials[MAT] += OPTIMAL_COST(item_materials[MAT] * multiplier) + if(item_materials[MAT] > max_mat_value) + max_mat_value = item_materials[MAT] + primary_mat = MAT - user_insert(weapon, user) + return primary_mat +//=================================================================================== - return COMPONENT_NO_AFTERATTACK + +//===============================MID LEVEL=================================================== +/** + * For inserting an amount of material. Use this to add materials to the container directly + * + * Arguments: + * - amt: amount of said material to insert + * - mat: the material type to insert + */ +/datum/component/material_container/proc/insert_amount_mat(amt, datum/material/mat) + if(amt <= 0) + return 0 + amt = OPTIMAL_COST(amt) + if(!has_space(amt)) + return 0 + + var/total_amount_saved = total_amount() + if(mat) + if(!istype(mat)) + mat = GET_MATERIAL_REF(mat) + materials[mat] += amt + else + var/num_materials = length(materials) + if(!num_materials) + return 0 + + amt /= num_materials + for(var/i in materials) + materials[i] += amt + return (total_amount() - total_amount_saved) +/** + * Proc specifically for inserting items, use this when you want to insert any item into the container + * this bypasses most of the material flag checks so much be used by machines like recycler, stacking machine etc that + * does not care for such checks + * + * Arguments: + * - [weapon][obj/item]: the item you are trying to insert + * - multiplier: The multiplier for the materials being inserted + * - breakdown_flags: The breakdown bitflags that will be used to retrieve the materials from the source + */ +/datum/component/material_container/proc/insert_item(obj/item/weapon, multiplier = 1, breakdown_flags = mat_container_flags) + if(QDELETED(weapon)) + return MATERIAL_INSERT_ITEM_NO_MATS + multiplier = CEILING(multiplier, 0.01) + + var/obj/item/target = weapon + + var/material_amount = get_item_material_amount(target, breakdown_flags) * multiplier + if(!material_amount) + return MATERIAL_INSERT_ITEM_NO_MATS + var/obj/item/stack/item_stack + if(isstack(weapon) && !has_space(material_amount)) //not enough space split and feed as many sheets possible + item_stack = weapon + var/space_left = max_amount - total_amount() + if(!space_left) + return MATERIAL_INSERT_ITEM_NO_SPACE + var/material_per_sheet = material_amount / item_stack.amount + var/sheets_to_insert = round(space_left / material_per_sheet) + if(!sheets_to_insert) + return MATERIAL_INSERT_ITEM_NO_SPACE + target = fast_split_stack(item_stack, sheets_to_insert) + material_amount = get_item_material_amount(target, breakdown_flags) * multiplier + material_amount = OPTIMAL_COST(material_amount) + + //not enough space, time to bail + if(!has_space(material_amount)) + return MATERIAL_INSERT_ITEM_NO_SPACE + + //do the insert + var/last_inserted_id = insert_item_materials(target, multiplier, breakdown_flags) + if(!isnull(last_inserted_id)) + SEND_SIGNAL(src, COMSIG_MATCONTAINER_ITEM_CONSUMED, target, last_inserted_id, material_amount, src) + qdel(target) //item gone + return material_amount + else if(!isnull(item_stack) && item_stack != target) //insertion failed, merge the split stack back into the original + var/obj/item/stack/inserting_stack = target + item_stack.add(inserting_stack.amount) + qdel(inserting_stack) + + return MATERIAL_INSERT_ITEM_FAILURE +//============================================================================================ + + +//===================================HIGH LEVEL=================================================== /** * inserts an item from the players hand into the container. Loops through all the contents inside reccursively - * Arguments + * Does all explicit checking for mat flags & callbacks to check if insertion is valid + * This proc is what you should be using for almost all cases + * + * Arguments: * * held_item - the item to insert * * user - the mob inserting this item * * breakdown_flags - how this item and all it's contents inside are broken down during insertion. This is unique to the machine doing the insertion @@ -160,7 +259,7 @@ if(held_item.resistance_flags & INDESTRUCTIBLE) return //user defined conditions - if(precondition && !precondition.Invoke(user)) + if(SEND_SIGNAL(src, COMSIG_MATCONTAINER_PRE_USER_INSERT, held_item, user) & MATCONTAINER_BLOCK_INSERT) return //get all contents of this item reccursively @@ -216,7 +315,7 @@ if(parent != current_parent || user.get_active_held_item() != active_held) continue if(requested_amount != item_stack.amount) //only split if its not the whole amount - target = split_stack(item_stack, requested_amount) //split off the requested amount + target = fast_split_stack(item_stack, requested_amount) //split off the requested amount requested_amount = 0 //is this item a stack and was it split by the player? @@ -235,6 +334,7 @@ var/inserted = insert_item(target, breakdown_flags = mat_container_flags) if(inserted > 0) . += inserted + inserted /= SHEET_MATERIAL_AMOUNT // display units inserted as sheets for improved readability var/message = null //stack was either split by the container(!QDELETED(target) means the container only consumed a part of it) or by the player, put whats left back of the original stack back in players hand @@ -249,21 +349,23 @@ //was this the original item in the players hand? put what's left back in the player's hand if(!isnull(original_item)) user.put_in_active_hand(original_item) - message = "Only [inserted] amount of [item_name] was consumed by [parent]." + message = "Only [inserted] sheets of [item_name] was consumed by [parent]." //collect all messages to print later if(!message) - message = "[item_name] worth [inserted] material was consumed by [parent]." + message = "[item_name] worth [inserted] sheets of material was consumed by [parent]." if(inserts[message]) inserts[message] += 1 else inserts[message] = 1 else var/error_msg - if(inserted == -2) + if(inserted == MATERIAL_INSERT_ITEM_NO_SPACE) error_msg = "[parent] has insufficient space to accept [target]" - else + else if(inserted == MATERIAL_INSERT_ITEM_NO_MATS) error_msg = "[target] has insufficient materials to be accepted by [parent]" + else + error_msg = "[parent] refuses to accept [target]" //collect all messages to print later if(errors[error_msg]) @@ -293,79 +395,27 @@ for(var/i in 1 to count) to_chat(user, span_warning(error_msg)) +/// Proc that allows players to fill the parent with mats +/datum/component/material_container/proc/on_attackby(datum/source, obj/item/weapon, mob/living/user) + SIGNAL_HANDLER + + user_insert(weapon, user) + + return COMPONENT_NO_AFTERATTACK +//=============================================================================================== + + +//======================================Material Validation======================================= + +//=========================================LOW LEVEL=================================== /** - * Splits a stack. we don't use /obj/item/stack/proc/split_stack because Byond complains that should only be called asynchronously. - * This proc is also more faster because it doesn't deal with mobs, copying evidences or refreshing atom storages - */ -/datum/component/material_container/proc/split_stack(obj/item/stack/target, amount) - if(!target.use(amount, TRUE, FALSE)) - return null - - . = new target.type(target.drop_location(), amount, FALSE, target.mats_per_unit) - target.loc.atom_storage?.refresh_views() - - target.is_zero_amount(delete_if_zero = TRUE) - -/// Proc specifically for inserting items, returns the amount of materials entered. -/datum/component/material_container/proc/insert_item(obj/item/weapon, multiplier = 1, breakdown_flags = mat_container_flags) - if(QDELETED(weapon)) - return MATERIAL_INSERT_ITEM_NO_MATS - multiplier = CEILING(multiplier, 0.01) - - var/obj/item/target = weapon - - var/material_amount = get_item_material_amount(target, breakdown_flags) * multiplier - if(!material_amount) - return MATERIAL_INSERT_ITEM_NO_MATS - var/obj/item/stack/item_stack - if(isstack(weapon) && !has_space(material_amount)) //not enugh space split and feed as many sheets possible - item_stack = weapon - var/space_left = max_amount - total_amount - if(!space_left) - return MATERIAL_INSERT_ITEM_NO_SPACE - var/material_per_sheet = material_amount / item_stack.amount - var/sheets_to_insert = round(space_left / material_per_sheet) - if(!sheets_to_insert) - return MATERIAL_INSERT_ITEM_NO_SPACE - target = split_stack(item_stack, sheets_to_insert) - material_amount = get_item_material_amount(target, breakdown_flags) * multiplier - if(!has_space(material_amount)) - return MATERIAL_INSERT_ITEM_NO_SPACE - - last_inserted_id = insert_item_materials(target, multiplier, breakdown_flags) - if(!isnull(last_inserted_id)) - if(after_insert) - after_insert.Invoke(target, last_inserted_id, material_amount, src) - qdel(target) //item gone - return material_amount - else if(!isnull(item_stack) && item_stack != target) //insertion failed, merge the split stack back into the original - var/obj/item/stack/inserting_stack = target - item_stack.add(inserting_stack.amount) - qdel(inserting_stack) - return MATERIAL_INSERT_ITEM_FAILURE - -/** - * Inserts the relevant materials from an item into this material container. + * Proc that returns TRUE if the container has space * * Arguments: - * - [source][/obj/item]: The source of the materials we are inserting. - * - multiplier: The multiplier for the materials being inserted. - * - breakdown_flags: The breakdown bitflags that will be used to retrieve the materials from the source + * - amt: can this container hold this much amount of materials */ -/datum/component/material_container/proc/insert_item_materials(obj/item/source, multiplier = 1, breakdown_flags = mat_container_flags) - var/primary_mat - var/max_mat_value = 0 - var/list/item_materials = source.get_material_composition(breakdown_flags) - for(var/MAT in item_materials) - if(!can_hold_material(MAT)) - continue - materials[MAT] += item_materials[MAT] * multiplier - total_amount += item_materials[MAT] * multiplier - if(item_materials[MAT] > max_mat_value) - max_mat_value = item_materials[MAT] - primary_mat = MAT - - return primary_mat +/datum/component/material_container/proc/has_space(amt = 0) + return (total_amount() + amt) <= max_amount /** * The default check for whether we can add materials to this material container. @@ -379,102 +429,146 @@ if(istype(mat) && ((mat.id in allowed_materials) || (mat.type in allowed_materials))) allowed_materials += mat // This could get messy with passing lists by ref... but if you're doing that the list expansion is probably being taken care of elsewhere anyway... return TRUE - if(insertion_check?.Invoke(mat)) + if(SEND_SIGNAL(src, COMSIG_MATCONTAINER_MAT_CHECK, mat) & MATCONTAINER_ALLOW_MAT) allowed_materials += mat return TRUE return FALSE +//======================================================================================== -/// For inserting an amount of material -/datum/component/material_container/proc/insert_amount_mat(amt, datum/material/mat) - if(amt <= 0 || !has_space(amt)) - return 0 - var/total_amount_saved = total_amount - if(mat) - if(!istype(mat)) - mat = GET_MATERIAL_REF(mat) - materials[mat] += amt - else - var/num_materials = length(materials) - if(!num_materials) - return 0 - - amt /= num_materials - for(var/i in materials) - materials[i] += amt - total_amount += amt - return (total_amount - total_amount_saved) - -/// Uses an amount of a specific material, effectively removing it. -/datum/component/material_container/proc/use_amount_mat(amt, datum/material/mat) +//===================================MID LEVEL============================================= +/** + * Returns the amount of a specific material in this container. + * + * Arguments: + * -[mat][datum/material] : the material type to check for 3 cases + * a) If it's an path its ref is retrived + * b) If it's text then its an category material & there is no way to deal with it so return 0 + * c) If normal material proceeds as usual + */ +/datum/component/material_container/proc/get_material_amount(datum/material/mat) if(!istype(mat)) mat = GET_MATERIAL_REF(mat) + return materials[mat] - if(!mat) - return 0 - var/amount = materials[mat] - if(amount < amt) +/** + * Returns the amount of material relevant to this container; + * if this container does not support glass, any glass in 'I' will not be taken into account + * + * Arguments: + * - [I][obj/item]: the item whos materials must be retrived + * - breakdown_flags: how this item must be broken down to retrive its materials + */ +/datum/component/material_container/proc/get_item_material_amount(obj/item/I, breakdown_flags = mat_container_flags) + if(!istype(I) || !I.custom_materials) return 0 + var/material_amount = 0 + var/list/item_materials = I.get_material_composition(breakdown_flags) + for(var/MAT in item_materials) + if(!can_hold_material(MAT)) + continue + material_amount += item_materials[MAT] + return material_amount +//================================================================================================ - materials[mat] -= amt - total_amount -= amt - return amt -/// Proc for transfering materials to another container. -/datum/component/material_container/proc/transer_amt_to(datum/component/material_container/T, amt, datum/material/mat) - if(!istype(mat)) - mat = GET_MATERIAL_REF(mat) - if((amt == 0) || (!T) || (!mat)) +//=========================================HIGH LEVEL========================================== +/// returns the total amount of material in the container +/datum/component/material_container/proc/total_amount() + . = 0 + for(var/i in materials) + . += get_material_amount(i) + +/** + * Returns TRUE if you have enough of the specified material. + * + * Arguments: + * - [req_mat][datum/material]: the material to check for + * - amount: how much material do we need + */ +/datum/component/material_container/proc/has_enough_of_material(datum/material/req_mat, amount = 1) + return get_material_amount(req_mat) >= OPTIMAL_COST(amount) + + +/** + * Checks if its possible to afford a certain amount of materials. Takes a dictionary of materials. + * coefficient can be thought of as the machines efficiency & multiplier as the print quantity + * + * Arguments: + * - mats: list of materials(key=material, value= 1 unit of material) to check for + * - coefficient: scaling applied to 1 unit of material in the mats list + * - multiplier: how many units(after scaling) do we require + */ +/datum/component/material_container/proc/has_materials(list/mats, coefficient = 1, multiplier = 1) + if(!length(mats)) return FALSE - if(amt<0) - return T.transer_amt_to(src, -amt, mat) - var/tr = min(amt, materials[mat], T.can_insert_amount_mat(amt, mat)) - if(tr) - use_amount_mat(tr, mat) - T.insert_amount_mat(tr, mat) - return tr - return FALSE -/// Proc for checking if there is room in the component, returning the amount or else the amount lacking. -/datum/component/material_container/proc/can_insert_amount_mat(amt, datum/material/mat) - if(!amt || !mat) + for(var/x in mats) //Loop through all required materials + if(!has_enough_of_material(x, OPTIMAL_COST(mats[x] * coefficient) * multiplier))//Not a category, so just check the normal way + return FALSE + + return TRUE +//========================================================================================================== + + +//================================================Material Usage============================================ + +//==================================================LOW LEVEL======================================= +/** + * Uses an amount of a specific material, effectively removing it. + * + * Arguments: + * - amt: amount of said material to use + * - [mat][datum/material]: type of mat to use + */ +/datum/component/material_container/proc/use_amount_mat(amt, datum/material/mat) + //round amount + amt = OPTIMAL_COST(amt) + + //get ref if nessassary + if(!istype(mat)) + mat = GET_MATERIAL_REF(mat) + + //check if sufficient is available + if(materials[mat] < amt) return 0 - if((total_amount + amt) <= max_amount) - return amt - else - return (max_amount - total_amount) + //consume & return amount consumed + materials[mat] -= amt + return amt +//============================================================================================== - -/// For consuming a dictionary of materials. mats is the map of materials to use and the corresponding amounts, example: list(M/datum/material/glass =100, datum/material/iron=SMALL_MATERIAL_AMOUNT * 2) -/datum/component/material_container/proc/use_materials(list/mats, multiplier=1) +//=========================================MID LEVEL========================================== +/** + * For consuming a dictionary of materials. + * + * Arguments: + * - mats: map of materials to consume(key = material type, value = amount) + * - coefficient: how much fraction of unit material in the mats list must be consumed. This is usually your machines efficiency + * - multiplier: how many units of material in the mats list(after each unit is multiplied and rounded with coefficient) must be consumed, This is usually your print quantity + */ +/datum/component/material_container/proc/use_materials(list/mats, coefficient = 1, multiplier = 1) if(!mats || !length(mats)) return FALSE - var/list/mats_to_remove = list() //Assoc list MAT | AMOUNT + var/amount_removed = 0 + for(var/i in mats) + amount_removed += use_amount_mat(OPTIMAL_COST(mats[i] * coefficient) * multiplier, i) - for(var/x in mats) //Loop through all required materials - var/datum/material/req_mat = x - if(!istype(req_mat)) - req_mat = GET_MATERIAL_REF(req_mat) //Get the ref if necesary - if(!materials[req_mat]) //Do we have the resource? - return FALSE //Can't afford it - var/amount_required = mats[x] * multiplier - if(amount_required < 0) - return FALSE //No negative mats - if(!(materials[req_mat] >= amount_required)) // do we have enough of the resource? - return FALSE //Can't afford it - mats_to_remove[req_mat] += amount_required //Add it to the assoc list of things to remove - continue + return amount_removed +//============================================================================================ - var/total_amount_save = total_amount - for(var/i in mats_to_remove) - total_amount_save -= use_amount_mat(mats_to_remove[i], i) +//===========================================HIGH LEVEL======================================= - return total_amount_save - total_amount - -/// For spawning mineral sheets at a specific location. Used by machines to output sheets. +/** + * For spawning mineral sheets at a specific location. Used by machines to output sheets. + * + * Arguments: + * sheet_amt: number of sheets to extract + * [material][datum/material]: type of sheets present in this container to extract + * [target][atom]: drop location + */ /datum/component/material_container/proc/retrieve_sheets(sheet_amt, datum/material/material, atom/target = null) if(!material.sheet_type) return 0 //Add greyscale sheet handling here later @@ -489,108 +583,32 @@ var/count = 0 while(sheet_amt > MAX_STACK_SIZE) var/obj/item/stack/sheet/new_sheets = new material.sheet_type(target, MAX_STACK_SIZE, null, list((material) = SHEET_MATERIAL_AMOUNT)) - after_retrieve?.Invoke(new_sheets) count += MAX_STACK_SIZE use_amount_mat(sheet_amt * SHEET_MATERIAL_AMOUNT, material) sheet_amt -= MAX_STACK_SIZE + SEND_SIGNAL(src, COMSIG_MATCONTAINER_SHEETS_RETRIVED, new_sheets) if(sheet_amt >= 1) var/obj/item/stack/sheet/new_sheets = new material.sheet_type(target, sheet_amt, null, list((material) = SHEET_MATERIAL_AMOUNT)) - after_retrieve?.Invoke(new_sheets) count += sheet_amt use_amount_mat(sheet_amt * SHEET_MATERIAL_AMOUNT, material) + SEND_SIGNAL(src, COMSIG_MATCONTAINER_SHEETS_RETRIVED, new_sheets) return count -/// Proc to get all the materials and dump them as sheets +/** + * Proc to get all the materials and dump them as sheets + * + * Arguments: + * - target: drop location of the sheets + */ /datum/component/material_container/proc/retrieve_all(target = null) var/result = 0 for(var/MAT in materials) var/amount = materials[MAT] result += retrieve_sheets(amount2sheet(amount), MAT, target) return result +//============================================================================================ -/// Proc that returns TRUE if the container has space -/datum/component/material_container/proc/has_space(amt = 0) - return (total_amount + amt) <= max_amount - -/// Checks if its possible to afford a certain amount of materials. Takes a dictionary of materials. -/datum/component/material_container/proc/has_materials(list/mats, multiplier=1) - if(!mats || !mats.len) - return FALSE - - for(var/x in mats) //Loop through all required materials - var/datum/material/req_mat = x - if(!istype(req_mat)) - if(ispath(req_mat)) //Is this an actual material, or is it a category? - req_mat = GET_MATERIAL_REF(req_mat) //Get the ref - - else // Its a category. (For example MAT_CATEGORY_RIGID) - if(!has_enough_of_category(req_mat, mats[x], multiplier)) //Do we have enough of this category? - return FALSE - else - continue - - if(!has_enough_of_material(req_mat, mats[x], multiplier))//Not a category, so just check the normal way - return FALSE - - return TRUE - -/// Returns all the categories in a recipe. -/datum/component/material_container/proc/get_categories(list/mats) - var/list/categories = list() - for(var/x in mats) //Loop through all required materials - if(!istext(x)) //This means its not a category - continue - categories += x - return categories - -/// Returns TRUE if you have enough of the specified material. -/datum/component/material_container/proc/has_enough_of_material(datum/material/req_mat, amount, multiplier=1) - if(!materials[req_mat]) //Do we have the resource? - return FALSE //Can't afford it - var/amount_required = amount * multiplier - if(materials[req_mat] >= amount_required) // do we have enough of the resource? - return TRUE - return FALSE //Can't afford it - -/// Returns TRUE if you have enough of a specified material category (Which could be multiple materials) -/datum/component/material_container/proc/has_enough_of_category(category, amount, multiplier=1) - for(var/i in SSmaterials.materials_by_category[category]) - var/datum/material/mat = i - if(materials[mat] >= amount) //we have enough - return TRUE - return FALSE - -/// Turns a material amount into the amount of sheets it should output -/datum/component/material_container/proc/amount2sheet(amt) - if(amt >= SHEET_MATERIAL_AMOUNT) - return round(amt / SHEET_MATERIAL_AMOUNT) - return FALSE - -/// Turns an amount of sheets into the amount of material amount it should output -/datum/component/material_container/proc/sheet2amount(sheet_amt) - if(sheet_amt > 0) - return sheet_amt * SHEET_MATERIAL_AMOUNT - return FALSE - - -///returns the amount of material relevant to this container; if this container does not support glass, any glass in 'I' will not be taken into account -/datum/component/material_container/proc/get_item_material_amount(obj/item/I, breakdown_flags = mat_container_flags) - if(!istype(I) || !I.custom_materials) - return 0 - var/material_amount = 0 - var/list/item_materials = I.get_material_composition(breakdown_flags) - for(var/MAT in item_materials) - if(!can_hold_material(MAT)) - continue - material_amount += item_materials[MAT] - return material_amount - -/// Returns the amount of a specific material in this container. -/datum/component/material_container/proc/get_material_amount(datum/material/mat) - if(!istype(mat)) - mat = GET_MATERIAL_REF(mat) - return materials[mat] /datum/component/material_container/ui_static_data(mob/user) var/list/data = list() @@ -608,8 +626,6 @@ "name" = material.name, "ref" = REF(material), "amount" = amount, - "sheets" = round(amount / SHEET_MATERIAL_AMOUNT), - "removable" = amount >= SHEET_MATERIAL_AMOUNT, "color" = material.greyscale_colors )) diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/material/remote_materials.dm similarity index 77% rename from code/datums/components/remote_materials.dm rename to code/datums/components/material/remote_materials.dm index a3c61221c6f..e20a4dbdaec 100644 --- a/code/datums/components/remote_materials.dm +++ b/code/datums/components/material/remote_materials.dm @@ -10,19 +10,24 @@ handles linking back and forth. // 1. silo exists, materials is parented to silo // 2. silo is null, materials is parented to parent // 3. silo is null, materials is null + + /// The silo machine this container is connected to var/obj/machinery/ore_silo/silo + //material container. the value is either the silo or local var/datum/component/material_container/mat_container - var/category + //should we create a local storage if we can't connect to silo var/allow_standalone + //are we trying to connect to the silo + var/connecting + //local size of container when silo = null var/local_size = INFINITY ///Flags used when converting inserted materials into their component materials. var/mat_container_flags = NONE -/datum/component/remote_materials/Initialize(category, mapload, allow_standalone = TRUE, force_connect = FALSE, mat_container_flags=NONE) +/datum/component/remote_materials/Initialize(mapload, allow_standalone = TRUE, force_connect = FALSE, mat_container_flags = NONE) if (!isatom(parent)) return COMPONENT_INCOMPATIBLE - src.category = category src.allow_standalone = allow_standalone src.mat_container_flags = mat_container_flags @@ -30,30 +35,26 @@ handles linking back and forth. RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(OnMultitool)) var/turf/T = get_turf(parent) - if (force_connect || (mapload && is_station_level(T.z))) - addtimer(CALLBACK(src, PROC_REF(LateInitialize))) - else if (allow_standalone) - _MakeLocal() + if(force_connect || (mapload && is_station_level(T.z))) + connecting = TRUE -/datum/component/remote_materials/proc/LateInitialize() - silo = GLOB.ore_silo_default - if (silo) - silo.ore_connected_machines += src - mat_container = silo.GetComponent(/datum/component/material_container) - else +/datum/component/remote_materials/RegisterWithParent() + if (connecting) + silo = GLOB.ore_silo_default + if (silo) + silo.ore_connected_machines += src + mat_container = silo.GetComponent(/datum/component/material_container) + connecting = FALSE + if (!mat_container && allow_standalone) _MakeLocal() /datum/component/remote_materials/Destroy() if (silo) silo.ore_connected_machines -= src + silo.holds -= src silo.updateUsrDialog() silo = null - mat_container = null - else if (mat_container) - // specify explicitly in case the other component is deleted first - var/atom/P = parent - mat_container.retrieve_all(P.drop_location()) - QDEL_NULL(mat_container) + mat_container = null return ..() /datum/component/remote_materials/proc/_MakeLocal() @@ -71,9 +72,15 @@ handles linking back and forth. /datum/material/titanium, /datum/material/bluespace, /datum/material/plastic, - ) + ) - mat_container = parent.AddComponent(/datum/component/material_container, allowed_mats, local_size, mat_container_flags, allowed_items=/obj/item/stack) + mat_container = parent.AddComponent( \ + /datum/component/material_container, \ + allowed_mats, \ + local_size, \ + mat_container_flags, \ + allowed_items = /obj/item/stack \ + ) /datum/component/remote_materials/proc/toggle_holding(force_hold = FALSE) if(isnull(silo)) @@ -123,9 +130,9 @@ handles linking back and forth. return COMPONENT_BLOCK_TOOL_ATTACK if (silo) silo.ore_connected_machines -= src + silo.holds -= src silo.updateUsrDialog() else if (mat_container) - mat_container.retrieve_all() qdel(mat_container) silo = M.buffer silo.ore_connected_machines += src @@ -150,7 +157,7 @@ handles linking back and forth. /datum/component/remote_materials/proc/on_hold() if(!check_z_level()) return FALSE - return silo.holds["[get_area(parent)]/[category]"] + return silo.holds[src] /datum/component/remote_materials/proc/silo_log(obj/machinery/M, action, amount, noun, list/mats) if (silo) @@ -158,7 +165,7 @@ handles linking back and forth. /datum/component/remote_materials/proc/format_amount() if (mat_container) - return "[mat_container.total_amount] / [mat_container.max_amount == INFINITY ? "Unlimited" : mat_container.max_amount] ([silo ? "remote" : "local"])" + return "[mat_container.total_amount()] / [mat_container.max_amount == INFINITY ? "Unlimited" : mat_container.max_amount] ([silo ? "remote" : "local"])" else return "0 / 0" @@ -179,10 +186,3 @@ handles linking back and forth. matlist[material_ref] = eject_amount silo_log(parent, "ejected", -count, "sheets", matlist) return count - -/// Returns `TRUE` if and only if the given material ref can be inserted/removed from this component -/datum/component/remote_materials/proc/can_hold_material(datum/material/material_ref) - if(!mat_container) - return FALSE - - return mat_container.can_hold_material(material_ref) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index d1a7de25556..6ad97655c4c 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -22,15 +22,26 @@ ///Designs imported from technology disks that we can print. var/list/imported_designs = list() + ///The container to hold materials + var/datum/component/material_container/materials + /obj/machinery/autolathe/Initialize(mapload) - AddComponent(/datum/component/material_container, SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], 0, MATCONTAINER_EXAMINE, _after_insert = CALLBACK(src, PROC_REF(AfterMaterialInsert))) + materials = AddComponent( \ + /datum/component/material_container, \ + SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], \ + 0, \ + MATCONTAINER_EXAMINE, \ + container_signals = list(COMSIG_MATCONTAINER_ITEM_CONSUMED = TYPE_PROC_REF(/obj/machinery/autolathe, AfterMaterialInsert)) \ + ) . = ..() + set_wires(new /datum/wires/autolathe(src)) if(!GLOB.autounlock_techwebs[/datum/techweb/autounlocking/autolathe]) GLOB.autounlock_techwebs[/datum/techweb/autounlocking/autolathe] = new /datum/techweb/autounlocking/autolathe stored_research = GLOB.autounlock_techwebs[/datum/techweb/autounlocking/autolathe] /obj/machinery/autolathe/Destroy() + materials = null QDEL_NULL(wires) return ..() @@ -48,7 +59,7 @@ ui.open() /obj/machinery/autolathe/ui_static_data(mob/user) - var/list/data = list() + var/list/data = materials.ui_static_data() data["designs"] = handle_designs(stored_research.researched_designs) if(imported_designs.len) @@ -62,10 +73,7 @@ var/list/data = list() data["materials"] = list() - - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - - data["materialtotal"] = materials.total_amount + data["materialtotal"] = materials.total_amount() data["materialsmax"] = materials.max_amount data["active"] = busy data["materials"] = materials.ui_data() @@ -78,63 +86,38 @@ var/datum/asset/spritesheet/research_designs/spritesheet = get_asset_datum(/datum/asset/spritesheet/research_designs) var/size32x32 = "[spritesheet.name]32x32" + var/max_multiplier = INFINITY for(var/design_id in designs) var/datum/design/design = SSresearch.techweb_design_by_id(design_id) + if(design.make_reagent) + continue - var/unbuildable = FALSE // we can't build the design currently - var/m10 = FALSE // 10x mult - var/m25 = FALSE // 25x mult - var/m50 = FALSE // 50x mult - var/m5 = FALSE // 5x mult - var/sheets = FALSE // sheets or no? + //compute cost & maximum number of printable items + max_multiplier = INFINITY + var/coeff = (ispath(design.build_path, /obj/item/stack) ? 1 : creation_efficiency) + var/list/cost = list() + for(var/i in design.materials) + var/datum/material/mat = i - if(disabled || !can_build(design)) - unbuildable = TRUE + var/design_cost = OPTIMAL_COST(design.materials[i] * coeff) + if(istype(mat)) + cost[mat.name] = design_cost + else + cost[i] = design_cost - var/max_multiplier = unbuildable ? 0 : 1 - - if(ispath(design.build_path, /obj/item/stack)) - sheets = TRUE - - if(!unbuildable) - var/datum/component/material_container/mats = GetComponent(/datum/component/material_container) - - for(var/datum/material/mat in design.materials) - max_multiplier = min(design.maxstack, round(mats.get_material_amount(mat) / design.materials[mat])) - if (max_multiplier >= 10 && !disabled) - m10 = TRUE - if (max_multiplier >= 25 && !disabled) - m25 = TRUE - else - if(!unbuildable) - if(!disabled && can_build(design, 5)) - m5 = TRUE - if(!disabled && can_build(design, 10)) - m10 = TRUE - - var/datum/component/material_container/mats = GetComponent(/datum/component/material_container) - - for(var/datum/material/mat in design.materials) - max_multiplier = min(50, round(mats.get_material_amount(mat) / (design.materials[mat] * creation_efficiency))) + max_multiplier = min(max_multiplier, 50, round((istype(mat) ? materials.get_material_amount(i) : 0) / design_cost)) + //create & send ui data var/icon_size = spritesheet.icon_size_id(design.id) - var/list/design_data = list( "name" = design.name, "desc" = design.get_description(), - "cost" = get_design_cost(design), + "cost" = cost, "id" = design.id, "categories" = design.category, "icon" = "[icon_size == size32x32 ? "" : "[icon_size] "][design.id]", "constructionTime" = -1, - - "buildable" = unbuildable, - "mult5" = m5, - "mult10" = m10, - "mult25" = m25, - "mult50" = m50, - "sheet" = sheets, - "maxmult" = max_multiplier, + "maxmult" = max_multiplier ) output += list(design_data) @@ -153,85 +136,78 @@ return if(action == "make") + if(disabled) + say("The autolathe wires are disabled.") + return + if(busy) + say("The autolathe is busy. Please wait for completion of previous operation.") + return + var/design_id = params["id"] if(!istext(design_id)) return - if(!stored_research.researched_designs.Find(design_id) && !stored_research.hacked_designs.Find(design_id) && !imported_designs.Find(design_id)) return - var/datum/design/design = SSresearch.techweb_design_by_id(design_id) - if(!(design.build_type & AUTOLATHE) || design.id != design_id) return - if (busy) - to_chat(usr, span_alert("The autolathe is busy. Please wait for completion of previous operation.")) - return - being_built = design + var/is_stack = ispath(being_built.build_path, /obj/item/stack) + var/coeff = (is_stack ? 1 : creation_efficiency) // Stacks are unaffected by production coefficient var/multiplier = round(text2num(params["multiplier"])) - if(!multiplier || !IS_FINITE(multiplier)) return - - var/is_stack = ispath(being_built.build_path, /obj/item/stack) multiplier = clamp(multiplier, 1, 50) - var/coeff = (is_stack ? 1 : creation_efficiency) // Stacks are unaffected by production coefficient - var/total_amount = 0 - - for(var/material in being_built.materials) - total_amount += being_built.materials[material] - - var/power = max(active_power_usage, (total_amount)*multiplier/5) // Change this to use all materials - - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - + //check for materials var/list/materials_used = list() var/list/custom_materials = list() // These will apply their material effect, should usually only be one. - for(var/mat in being_built.materials) var/datum/material/used_material = mat - var/amount_needed = being_built.materials[mat] * coeff * multiplier + var/amount_needed = being_built.materials[mat] if(istext(used_material)) // This means its a category var/list/list_to_show = list() - + //list all materials in said category for(var/i in SSmaterials.materials_by_category[used_material]) if(materials.materials[i] > 0) list_to_show += i - + //ask user to pick specific material from list used_material = tgui_input_list( usr, "Choose [used_material]", "Custom Material", sort_list(list_to_show, GLOBAL_PROC_REF(cmp_typepaths_asc)) ) - if(isnull(used_material)) - // Didn't pick any material, so you can't build shit either. return - + //the item composition will be made of these materials custom_materials[used_material] += amount_needed - materials_used[used_material] = amount_needed - if(materials.has_materials(materials_used)) - busy = TRUE - to_chat(usr, span_notice("You print [multiplier] item(s) from the [src]")) - use_power(power) - icon_state = "autolathe_n" - var/time = is_stack ? 32 : (32 * coeff * multiplier) ** 0.8 - addtimer(CALLBACK(src, PROC_REF(make_item), power, materials_used, custom_materials, multiplier, coeff, is_stack, usr), time) - . = TRUE - else - to_chat(usr, span_alert("Not enough materials for this operation.")) + if(!materials.has_materials(materials_used, coeff, multiplier)) + say("Not enough materials for this operation!.") + return -/obj/machinery/autolathe/on_deconstruction() - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - materials.retrieve_all() + //use power + var/total_amount = 0 + for(var/material in being_built.materials) + total_amount += being_built.materials[material] + use_power(max(active_power_usage, (total_amount) * multiplier / 5)) + + //use materials + materials.use_materials(materials_used, coeff, multiplier) + busy = TRUE + to_chat(usr, span_notice("You print [multiplier] item(s) from the [src]")) + update_static_data_for_all_viewers() + //print item + icon_state = "autolathe_n" + var/time = is_stack ? 32 : (32 * coeff * multiplier) ** 0.8 + addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/autolathe, make_item), custom_materials, multiplier, is_stack, usr), time) + + return TRUE /obj/machinery/autolathe/attackby(obj/item/attacking_item, mob/living/user, params) if(busy) @@ -303,8 +279,10 @@ return SECONDARY_ATTACK_CALL_NORMAL -/obj/machinery/autolathe/proc/AfterMaterialInsert(obj/item/item_inserted, id_inserted, amount_inserted) - if(istype(item_inserted, /obj/item/stack/ore/bluespace_crystal)) +/obj/machinery/autolathe/proc/AfterMaterialInsert(obj/machinery/machine, obj/item/item_inserted, last_inserted_id, amount_inserted, container) + SIGNAL_HANDLER + + if(ispath(item_inserted, /obj/item/stack/ore/bluespace_crystal)) use_power(SHEET_MATERIAL_AMOUNT / 10) else if(item_inserted.has_material_type(/datum/material/glass)) flick("autolathe_r", src)//plays glass insertion animation by default otherwise @@ -312,13 +290,10 @@ flick("autolathe_o", src)//plays metal insertion animation use_power(min(active_power_usage * 0.25, amount_inserted / 100)) + update_static_data_for_all_viewers() -/obj/machinery/autolathe/proc/make_item(power, list/materials_used, list/picked_materials, multiplier, coeff, is_stack, mob/user) - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) +/obj/machinery/autolathe/proc/make_item(list/picked_materials, multiplier, is_stack, mob/user) var/atom/A = drop_location() - use_power(power) - - materials.use_materials(materials_used) if(is_stack) var/obj/item/stack/N = new being_built.build_path(A, multiplier, FALSE) @@ -334,7 +309,6 @@ if(!istype(M, /datum/material/glass) && !istype(M, /datum/material/iron)) user.client.give_award(/datum/award/achievement/misc/getting_an_upgrade, user) - icon_state = "autolathe" busy = FALSE @@ -343,7 +317,6 @@ var/mat_capacity = 0 for(var/datum/stock_part/matter_bin/new_matter_bin in component_parts) mat_capacity += new_matter_bin.tier * (37.5*SHEET_MATERIAL_AMOUNT) - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) materials.max_amount = mat_capacity var/efficiency=1.8 @@ -353,40 +326,9 @@ /obj/machinery/autolathe/examine(mob/user) . += ..() - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) if(in_range(user, src) || isobserver(user)) . += span_notice("The status display reads: Storing up to [materials.max_amount] material units.
Material consumption at [creation_efficiency*100]%.") -/obj/machinery/autolathe/proc/can_build(datum/design/D, amount = 1) - if(D.make_reagent) - return FALSE - - var/coeff = (ispath(D.build_path, /obj/item/stack) ? 1 : creation_efficiency) - - var/list/required_materials = list() - - for(var/i in D.materials) - required_materials[i] = D.materials[i] * coeff * amount - - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - - return materials.has_materials(required_materials) - - -/obj/machinery/autolathe/proc/get_design_cost(datum/design/design) - var/coeff = (ispath(design.build_path, /obj/item/stack) ? 1 : creation_efficiency) - var/list/cost = list() - - for(var/material in design.materials) - if (istext(material)) - // Wildcard materials - cost[material] = design.materials[material] * coeff - else - var/datum/material/cast = material - cost[cast.name] = design.materials[cast] * coeff - - return cost - /obj/machinery/autolathe/proc/reset(wire) switch(wire) if(WIRE_HACK) diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index 8b4ba250a43..4b3c2a37d50 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -21,8 +21,8 @@ var/list/using_materials var/starting_amount = 0 - var/iron_cost =HALF_SHEET_MATERIAL_AMOUNT - var/glass_cost =HALF_SHEET_MATERIAL_AMOUNT + var/iron_cost = HALF_SHEET_MATERIAL_AMOUNT + var/glass_cost = HALF_SHEET_MATERIAL_AMOUNT var/power_used = 1000 var/mode = DRONE_READY @@ -48,16 +48,28 @@ var/break_message = "lets out a tinny alarm before falling dark." var/break_sound = 'sound/machines/warning-buzzer.ogg' + var/datum/component/material_container/materials + /obj/machinery/drone_dispenser/Initialize(mapload) . = ..() - var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass), SHEET_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_DRONE_DISPENSER, allowed_items=/obj/item/stack) + materials = AddComponent( \ + /datum/component/material_container, \ + list(/datum/material/iron, /datum/material/glass), \ + SHEET_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, \ + MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_DRONE_DISPENSER, \ + allowed_items=/obj/item/stack \ + ) materials.insert_amount_mat(starting_amount) materials.precise_insertion = TRUE using_materials = list(/datum/material/iron = iron_cost, /datum/material/glass = glass_cost) REGISTER_REQUIRED_MAP_ITEM(1, 1) +/obj/machinery/drone_dispenser/Destroy() + materials = null + return ..() + /obj/machinery/drone_dispenser/preloaded - starting_amount = 5000 + starting_amount = SHEET_MATERIAL_AMOUNT * 2.5 /obj/machinery/drone_dispenser/syndrone //Please forgive me name = "syndrone shell dispenser" @@ -66,7 +78,7 @@ //If we're gonna be a jackass, go the full mile - 10 second recharge timer cooldownTime = 100 end_create_message = "dispenses a suspicious drone shell." - starting_amount = 25000 + starting_amount = SHEET_MATERIAL_AMOUNT * 12.5 /obj/machinery/drone_dispenser/syndrone/badass //Please forgive me name = "badass syndrone shell dispenser" @@ -81,10 +93,10 @@ dispense_type = /obj/effect/mob_spawn/ghost_role/drone/snowflake end_create_message = "dispenses a snowflake drone shell." // Those holoprojectors aren't cheap - iron_cost =SHEET_MATERIAL_AMOUNT - glass_cost =SHEET_MATERIAL_AMOUNT + iron_cost = SHEET_MATERIAL_AMOUNT + glass_cost = SHEET_MATERIAL_AMOUNT power_used = 2000 - starting_amount = 10000 + starting_amount = SHEET_MATERIAL_AMOUNT * 5 // If the derelict gets lonely, make more friends. /obj/machinery/drone_dispenser/derelict @@ -92,8 +104,8 @@ desc = "A rusty machine that, when supplied with iron and glass, will periodically create a derelict drone shell. Does not need to be manually operated." dispense_type = /obj/effect/mob_spawn/ghost_role/drone/derelict end_create_message = "dispenses a derelict drone shell." - iron_cost = 10000 - glass_cost = 5000 + iron_cost = SHEET_MATERIAL_AMOUNT * 5 + glass_cost = SHEET_MATERIAL_AMOUNT * 2.5 starting_amount = 0 cooldownTime = 600 @@ -128,11 +140,11 @@ . = ..() var/material_requirement_string = "It needs " if (iron_cost > 0) - material_requirement_string += "[iron_cost] iron " + material_requirement_string += "[iron_cost / SHEET_MATERIAL_AMOUNT] iron sheets " if (glass_cost > 0) material_requirement_string += "and " if (glass_cost > 0) - material_requirement_string += "[glass_cost] glass " + material_requirement_string += "[glass_cost / SHEET_MATERIAL_AMOUNT] glass sheets " if (iron_cost > 0 || glass_cost > 0) material_requirement_string += "to produce one drone shell." . += span_notice(material_requirement_string) @@ -144,7 +156,6 @@ if((machine_stat & (NOPOWER|BROKEN)) || !anchored) return - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) if(!materials.has_materials(using_materials)) return // We require more minerals @@ -212,7 +223,6 @@ /obj/machinery/drone_dispenser/attackby(obj/item/I, mob/living/user) if(I.tool_behaviour == TOOL_CROWBAR) - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) materials.retrieve_all() I.play_tool_sound(src) to_chat(user, span_notice("You retrieve the materials from [src].")) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 16af9a22423..415dacc9f17 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -21,7 +21,6 @@ materials = AddComponent( /datum/component/remote_materials, \ - "charger", \ mapload, \ mat_container_flags = MATCONTAINER_NO_INSERT, \ ) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index fa75e70506c..3e78f2dfe54 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -17,6 +17,7 @@ var/crush_damage = 1000 var/eat_victim_items = TRUE var/item_recycle_sound = 'sound/items/welder.ogg' + var/datum/component/material_container/materials /obj/machinery/recycler/Initialize(mapload) var/list/allowed_materials = list( @@ -32,7 +33,7 @@ /datum/material/titanium, /datum/material/bluespace ) - AddComponent(/datum/component/material_container, allowed_materials, INFINITY, MATCONTAINER_NO_INSERT|BREAKDOWN_FLAGS_RECYCLER) + materials = AddComponent(/datum/component/material_container, allowed_materials, INFINITY, MATCONTAINER_NO_INSERT|BREAKDOWN_FLAGS_RECYCLER) AddComponent(/datum/component/butchering/recycler, \ speed = 0.1 SECONDS, \ effectiveness = amount_produced, \ @@ -50,6 +51,10 @@ ) AddElement(/datum/element/connect_loc, loc_connections) +/obj/machinery/recycler/Destroy() + materials = null + return ..() + /obj/machinery/recycler/RefreshParts() . = ..() var/amt_made = 0 @@ -183,7 +188,6 @@ new wood.plank_type(loc, 1 + seed_modifier) . = TRUE else - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/retrived = materials.insert_item(weapon, multiplier = (amount_produced / 100), breakdown_flags=BREAKDOWN_FLAGS_RECYCLER) if(retrived > 0) //item was salvaged i.e. deleted materials.retrieve_all() diff --git a/code/game/machinery/sheetifier.dm b/code/game/machinery/sheetifier.dm index 5b01dd99018..57decf63ae4 100644 --- a/code/game/machinery/sheetifier.dm +++ b/code/game/machinery/sheetifier.dm @@ -7,11 +7,25 @@ circuit = /obj/item/circuitboard/machine/sheetifier layer = BELOW_OBJ_LAYER var/busy_processing = FALSE + var/datum/component/material_container/materials /obj/machinery/sheetifier/Initialize(mapload) . = ..() + materials = AddComponent( \ + /datum/component/material_container, \ + list(/datum/material/meat, /datum/material/hauntium), \ + SHEET_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, \ + MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_SHEETIFIER, \ + typesof(/datum/material/meat) + /datum/material/hauntium, list(/obj/item/food/meat, /obj/item/photo), \ + container_signals = list( + COMSIG_MATCONTAINER_PRE_USER_INSERT = TYPE_PROC_REF(/obj/machinery/sheetifier, CanInsertMaterials), + COMSIG_MATCONTAINER_ITEM_CONSUMED = TYPE_PROC_REF(/obj/machinery/sheetifier, AfterInsertMaterials) + ) \ + ) - AddComponent(/datum/component/material_container, list(/datum/material/meat, /datum/material/hauntium), SHEET_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_SHEETIFIER, typesof(/datum/material/meat) + /datum/material/hauntium, list(/obj/item/food/meat, /obj/item/photo), null, CALLBACK(src, PROC_REF(CanInsertMaterials)), CALLBACK(src, PROC_REF(AfterInsertMaterials))) +/obj/machinery/sheetifier/Destroy() + materials = null + return ..() /obj/machinery/sheetifier/update_overlays() . = ..() @@ -24,10 +38,12 @@ icon_state = "base_machine[busy_processing ? "_processing" : ""]" return ..() -/obj/machinery/sheetifier/proc/CanInsertMaterials() - return !busy_processing +/obj/machinery/sheetifier/proc/CanInsertMaterials(obj/machinery/machine, held_item, user) + SIGNAL_HANDLER -/obj/machinery/sheetifier/proc/AfterInsertMaterials(item_inserted, id_inserted, amount_inserted) + return busy_processing ? MATCONTAINER_BLOCK_INSERT : TRUE + +/obj/machinery/sheetifier/proc/AfterInsertMaterials(obj/machinery/machine, item_inserted, id_inserted, amount_inserted, container) busy_processing = TRUE update_appearance() var/datum/material/last_inserted_material = id_inserted @@ -39,7 +55,6 @@ /obj/machinery/sheetifier/proc/finish_processing() busy_processing = FALSE update_appearance() - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) materials.retrieve_all() //Returns all as sheets use_power(active_power_usage) diff --git a/code/game/objects/items/rcd/RHD.dm b/code/game/objects/items/rcd/RHD.dm index a296eefa973..68355267315 100644 --- a/code/game/objects/items/rcd/RHD.dm +++ b/code/game/objects/items/rcd/RHD.dm @@ -1,5 +1,7 @@ //RAPID HANDHELD DEVICE. the base for all rapid devices +#define SILO_USE_AMOUNT (SHEET_MATERIAL_AMOUNT / 4) + /obj/item/construction name = "not for ingame use" desc = "A device used to rapidly build and deconstruct. Reload with iron, plasteel, glass or compressed matter cartridges." @@ -13,7 +15,7 @@ throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_NORMAL - custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*50) + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 50) req_access = list(ACCESS_ENGINE_EQUIP) armor_type = /datum/armor/item_construction resistance_flags = FIRE_PROOF @@ -46,13 +48,13 @@ spark_system.set_up(5, 0, src) spark_system.attach(src) if(upgrade & RCD_UPGRADE_SILO_LINK) - silo_mats = AddComponent(/datum/component/remote_materials, "RCD", mapload, FALSE) + silo_mats = AddComponent(/datum/component/remote_materials, mapload, FALSE) update_appearance() ///used for examining the RCD and for its UI /obj/item/construction/proc/get_silo_iron() if(silo_link && silo_mats.mat_container && !silo_mats.on_hold()) - return silo_mats.mat_container.get_material_amount(/datum/material/iron)/500 + return silo_mats.mat_container.get_material_amount(/datum/material/iron) / SILO_USE_AMOUNT return FALSE ///returns local matter units available. overriden by rcd borg to return power units available @@ -99,7 +101,7 @@ return upgrade |= design_disk.upgrade if((design_disk.upgrade & RCD_UPGRADE_SILO_LINK) && !silo_mats) - silo_mats = AddComponent(/datum/component/remote_materials, "RCD", FALSE, FALSE) + silo_mats = AddComponent(/datum/component/remote_materials, FALSE, FALSE) playsound(loc, 'sound/machines/click.ogg', 50, TRUE) qdel(design_disk) @@ -171,16 +173,17 @@ balloon_alert(user, "silo on hold!") return FALSE if(!silo_mats.mat_container) - balloon_alert(user, "no silo detected!") + if(user) + balloon_alert(user, "no silo detected!") return FALSE - if(!silo_mats.mat_container.has_materials(list(/datum/material/iron = 500), amount)) + if(!silo_mats.mat_container.has_materials(list(/datum/material/iron = SILO_USE_AMOUNT), multiplier = amount)) if(user) balloon_alert(user, "not enough silo material!") return FALSE var/list/materials = list() - materials[GET_MATERIAL_REF(/datum/material/iron)] = 500 - silo_mats.mat_container.use_materials(materials, amount) + materials[GET_MATERIAL_REF(/datum/material/iron)] = SILO_USE_AMOUNT + silo_mats.mat_container.use_materials(materials, multiplier = amount) silo_mats.silo_log(src, "consume", -amount, "build", materials) return TRUE @@ -235,7 +238,7 @@ if(user) balloon_alert(user, "silo on hold!") return FALSE - . = silo_mats.mat_container.has_materials(list(/datum/material/iron = 500), amount) + . = silo_mats.mat_container.has_materials(list(/datum/material/iron = SILO_USE_AMOUNT), multiplier = amount) if(!. && user) balloon_alert(user, "low ammo!") if(has_ammobar) @@ -295,3 +298,4 @@ name = "Destruction Scan" desc = "Scans the surrounding area for destruction. Scanned structures will rebuild significantly faster." +#undef SILO_USE_AMOUNT diff --git a/code/modules/antagonists/clown_ops/clown_weapons.dm b/code/modules/antagonists/clown_ops/clown_weapons.dm index 5341a9db5ba..1c55e5416e2 100644 --- a/code/modules/antagonists/clown_ops/clown_weapons.dm +++ b/code/modules/antagonists/clown_ops/clown_weapons.dm @@ -64,13 +64,11 @@ . = ..() create_storage(storage_type = /datum/storage/pockets/shoes) - - var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container) bananium.insert_amount_mat(BANANA_SHOES_MAX_CHARGE, /datum/material/bananium) + START_PROCESSING(SSobj, src) /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/process(seconds_per_tick) - var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container) var/bananium_amount = bananium.get_material_amount(/datum/material/bananium) if(bananium_amount < BANANA_SHOES_MAX_CHARGE) bananium.insert_amount_mat(min(BANANA_SHOES_RECHARGE_RATE * seconds_per_tick, BANANA_SHOES_MAX_CHARGE - bananium_amount), /datum/material/bananium) diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm index 46e98db0a8c..0c280eb2f3b 100644 --- a/code/modules/clothing/shoes/bananashoes.dm +++ b/code/modules/clothing/shoes/bananashoes.dm @@ -13,16 +13,22 @@ var/material_per_banana =SMALL_MATERIAL_AMOUNT /// Typepath of created banana var/banana_type = /obj/item/grown/bananapeel/specialpeel + /// Material container for bananium + var/datum/component/material_container/bananium /obj/item/clothing/shoes/clown_shoes/banana_shoes/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) - AddComponent(/datum/component/material_container, list(/datum/material/bananium), 100 * SHEET_MATERIAL_AMOUNT, MATCONTAINER_EXAMINE|MATCONTAINER_ANY_INTENT|MATCONTAINER_SILENT, allowed_items=/obj/item/stack) + bananium = AddComponent(/datum/component/material_container, list(/datum/material/bananium), 100 * SHEET_MATERIAL_AMOUNT, MATCONTAINER_EXAMINE|MATCONTAINER_ANY_INTENT|MATCONTAINER_SILENT, allowed_items=/obj/item/stack) AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 75, falloff_exponent = 20) RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(on_step)) if(always_noslip) LAZYOR(clothing_traits, TRAIT_NO_SLIP_WATER) +/obj/item/clothing/shoes/clown_shoes/banana_shoes/Destroy() + bananium = null + return ..() + /obj/item/clothing/shoes/clown_shoes/banana_shoes/proc/toggle_clowning_action() on = !on update_appearance() @@ -38,7 +44,6 @@ SIGNAL_HANDLER var/mob/wearer = loc - var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container) if(!on || !istype(wearer)) return @@ -50,7 +55,6 @@ to_chat(wearer, span_warning("You ran out of bananium!")) /obj/item/clothing/shoes/clown_shoes/banana_shoes/attack_self(mob/user) - var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container) var/sheet_amount = bananium.retrieve_all() if(sheet_amount) to_chat(user, span_notice("You retrieve [sheet_amount] sheets of bananium from the prototype shoes.")) @@ -62,7 +66,6 @@ . += span_notice("The shoes are [on ? "enabled" : "disabled"].") /obj/item/clothing/shoes/clown_shoes/banana_shoes/ui_action_click(mob/user) - var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container) if(bananium.get_material_amount(/datum/material/bananium) >= material_per_banana) toggle_clowning_action() to_chat(user, span_notice("You [on ? "activate" : "deactivate"] the prototype shoes.")) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index b89083824fd..41fdf228939 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -136,6 +136,8 @@ var/datum/techweb/stored_research ///Proximity monitor associated with this atom, needed for proximity checks. var/datum/proximity_monitor/proximity_monitor + ///Material container for materials + var/datum/component/material_container/materials /obj/machinery/mineral/processing_unit/Initialize(mapload) . = ..() @@ -152,13 +154,20 @@ /datum/material/titanium, /datum/material/bluespace, ) - AddComponent(/datum/component/material_container, allowed_materials, INFINITY, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_ORE_PROCESSOR, allowed_items=/obj/item/stack) + materials = AddComponent( \ + /datum/component/material_container, \ + allowed_materials, \ + INFINITY, \ + MATCONTAINER_EXAMINE | BREAKDOWN_FLAGS_ORE_PROCESSOR, \ + allowed_items = /obj/item/stack \ + ) if(!GLOB.autounlock_techwebs[/datum/techweb/autounlocking/smelter]) GLOB.autounlock_techwebs[/datum/techweb/autounlocking/smelter] = new /datum/techweb/autounlocking/smelter stored_research = GLOB.autounlock_techwebs[/datum/techweb/autounlocking/smelter] selected_material = GET_MATERIAL_REF(/datum/material/iron) /obj/machinery/mineral/processing_unit/Destroy() + materials = null mineral_machine = null stored_research = null return ..() @@ -166,7 +175,6 @@ /obj/machinery/mineral/processing_unit/proc/process_ore(obj/item/stack/ore/O) if(QDELETED(O)) return - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/material_amount = materials.get_item_material_amount(O, BREAKDOWN_FLAGS_ORE_PROCESSOR) if(!materials.has_space(material_amount)) unload_mineral(O) @@ -177,7 +185,6 @@ /obj/machinery/mineral/processing_unit/proc/get_machine_data() var/dat = "Smelter control console

" - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) for(var/datum/material/all_materials as anything in materials.materials) var/amount = materials.materials[all_materials] dat += "[all_materials.name]: [amount] cm³" @@ -231,7 +238,6 @@ mineral_machine.updateUsrDialog() /obj/machinery/mineral/processing_unit/proc/smelt_ore(seconds_per_tick = 2) - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/datum/material/mat = selected_material if(!mat) return @@ -254,8 +260,7 @@ on = FALSE return - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - materials.use_materials(alloy.materials, amount) + materials.use_materials(alloy.materials, multiplier = amount) generate_mineral(alloy.build_path) @@ -265,8 +270,6 @@ var/build_amount = SMELT_AMOUNT * seconds_per_tick - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - for(var/mat_cat in D.materials) var/required_amount = D.materials[mat_cat] var/amount = materials.materials[mat_cat] @@ -279,9 +282,4 @@ var/O = new P(src) unload_mineral(O) -/obj/machinery/mineral/processing_unit/on_deconstruction() - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - materials.retrieve_all() - return ..() - #undef SMELT_AMOUNT diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 9ed337f9d56..03ec725dc31 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -52,7 +52,11 @@ if(!GLOB.autounlock_techwebs[/datum/techweb/autounlocking/smelter]) GLOB.autounlock_techwebs[/datum/techweb/autounlocking/smelter] = new /datum/techweb/autounlocking/smelter stored_research = GLOB.autounlock_techwebs[/datum/techweb/autounlocking/smelter] - materials = AddComponent(/datum/component/remote_materials, "orm", mapload, mat_container_flags=BREAKDOWN_FLAGS_ORM) + materials = AddComponent( + /datum/component/remote_materials, \ + mapload, \ + mat_container_flags = BREAKDOWN_FLAGS_ORM \ + ) /obj/machinery/mineral/ore_redemption/Destroy() stored_research = null @@ -375,7 +379,7 @@ var/amount = round(min(text2num(params["sheets"]), 50, can_smelt_alloy(alloy))) if(amount < 1) //no negative mats return - mat_container.use_materials(alloy.materials, amount) + mat_container.use_materials(alloy.materials, multiplier = amount) materials.silo_log(src, "released", -amount, "sheets", alloy.materials) var/output if(ispath(alloy.build_path, /obj/item/stack/sheet)) diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm index 2af363335e5..b06188fb2c6 100644 --- a/code/modules/mining/machine_silo.dm +++ b/code/modules/mining/machine_silo.dm @@ -15,6 +15,8 @@ GLOBAL_LIST_EMPTY(silo_access_logs) var/list/holds = list() /// List of all components that are sharing ores with this silo. var/list/datum/component/remote_materials/ore_connected_machines = list() + /// Material Container + var/datum/component/material_container/materials /obj/machinery/ore_silo/Initialize(mapload) . = ..() @@ -31,7 +33,13 @@ GLOBAL_LIST_EMPTY(silo_access_logs) /datum/material/bluespace, /datum/material/plastic, ) - AddComponent(/datum/component/material_container, materials_list, INFINITY, MATCONTAINER_NO_INSERT, allowed_items=/obj/item/stack) + materials = AddComponent( \ + /datum/component/material_container, \ + materials_list, \ + INFINITY, \ + MATCONTAINER_NO_INSERT, \ + allowed_items = /obj/item/stack \ + ) if (!GLOB.ore_silo_default && mapload && is_station_level(z)) GLOB.ore_silo_default = src @@ -43,15 +51,11 @@ GLOBAL_LIST_EMPTY(silo_access_logs) mats.disconnect_from(src) ore_connected_machines = null - - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - materials.retrieve_all() + materials = null return ..() /obj/machinery/ore_silo/proc/remote_attackby(obj/machinery/M, mob/living/user, obj/item/stack/I, breakdown_flags=NONE) - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) - // stolen from /datum/component/material_container/proc/OnAttackBy if(user.combat_mode) return if(I.item_flags & ABSTRACT) @@ -92,7 +96,6 @@ GLOBAL_LIST_EMPTY(silo_access_logs) popup.open() /obj/machinery/ore_silo/proc/generate_ui() - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/list/ui = list("Ore Silo

Stored Material:

") var/any = FALSE for(var/M in materials.materials) @@ -166,7 +169,6 @@ GLOBAL_LIST_EMPTY(silo_access_logs) return TRUE else if(href_list["ejectsheet"]) var/datum/material/eject_sheet = locate(href_list["ejectsheet"]) - var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/count = materials.retrieve_sheets(text2num(href_list["eject_amt"]), eject_sheet, drop_location()) var/list/matlist = list() matlist[eject_sheet] = SHEET_MATERIAL_AMOUNT * count diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 366791c6a01..1635c5c2fa3 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -101,7 +101,12 @@ /obj/machinery/mineral/stacking_machine/Initialize(mapload) . = ..() proximity_monitor = new(src, 1) - materials = AddComponent(/datum/component/remote_materials, "stacking", mapload, FALSE, (mapload && force_connect)) + materials = AddComponent( + /datum/component/remote_materials, \ + mapload, \ + FALSE, \ + (mapload && force_connect) \ + ) /obj/machinery/mineral/stacking_machine/Destroy() if(console) diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index a97683ca59f..fab4b2a6b0f 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -726,10 +726,22 @@ COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON = PROC_REF(on_atom_initialized_on), ) var/datum/component/connect_loc_behalf/connector + var/datum/component/material_container/container /obj/item/mod/module/recycler/Initialize(mapload) . = ..() - AddComponent(/datum/component/material_container, accepted_mats, 50 * SHEET_MATERIAL_AMOUNT, MATCONTAINER_EXAMINE|MATCONTAINER_NO_INSERT, _after_retrieve=CALLBACK(src, PROC_REF(attempt_insert_storage))) + container = AddComponent( \ + /datum/component/material_container, \ + accepted_mats, 50 * SHEET_MATERIAL_AMOUNT, \ + MATCONTAINER_EXAMINE|MATCONTAINER_NO_INSERT, \ + container_signals = list( \ + COMSIG_MATCONTAINER_SHEETS_RETRIVED = TYPE_PROC_REF(/obj/item/mod/module/recycler, InsertSheets) \ + ) \ + ) + +/obj/item/mod/module/recycler/Destroy() + container = null + return ..() /obj/item/mod/module/recycler/on_activation() . = ..() @@ -747,6 +759,7 @@ /obj/item/mod/module/recycler/proc/on_wearer_moved(datum/source, atom/old_loc, dir, forced) SIGNAL_HANDLER + for(var/obj/item/item in mod.wearer.loc) if(!is_type_in_list(item, allowed_item_types)) return @@ -754,12 +767,14 @@ /obj/item/mod/module/recycler/proc/on_obj_entered(atom/new_loc, atom/movable/arrived, atom/old_loc) SIGNAL_HANDLER + if(!is_type_in_list(arrived, allowed_item_types)) return insert_trash(arrived) /obj/item/mod/module/recycler/proc/on_atom_initialized_on(atom/loc, atom/new_atom) SIGNAL_HANDLER + if(!is_type_in_list(new_atom, allowed_item_types)) return //Give the new atom the time to fully initialize and maybe live if the wearer moves away. @@ -770,7 +785,6 @@ insert_trash(new_atom) /obj/item/mod/module/recycler/proc/insert_trash(obj/item/item) - var/datum/component/material_container/container = GetComponent(/datum/component/material_container) var/retrieved = container.insert_item(item, multiplier = efficiency, breakdown_flags = BREAKDOWN_FLAGS_RECYCLER) if(retrieved == MATERIAL_INSERT_ITEM_NO_MATS) //even if it doesn't have any material to give, trash is trash. qdel(item) @@ -787,7 +801,6 @@ dispense(target) /obj/item/mod/module/recycler/proc/dispense(atom/target) - var/datum/component/material_container/container = GetComponent(/datum/component/material_container) if(container.retrieve_all(target)) balloon_alert(mod.wearer, "material dispensed") playsound(src, 'sound/machines/microwave/microwave-end.ogg', 50, TRUE) @@ -795,6 +808,11 @@ balloon_alert(mod.wearer, "not enough material") playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE) +/obj/item/mod/module/recycler/proc/InsertSheets(obj/item/recycler, obj/item/stack/sheets) + SIGNAL_HANDLER + + attempt_insert_storage(sheets) + /obj/item/mod/module/recycler/proc/attempt_insert_storage(obj/item/to_drop) if(!isturf(to_drop.loc) && !to_drop.loc.atom_storage?.attempt_insert(to_drop, mod.wearer, override = TRUE)) to_drop.forceMove(to_drop.loc.drop_location()) @@ -815,7 +833,6 @@ var/required_amount = SHEET_MATERIAL_AMOUNT*12.5 /obj/item/mod/module/recycler/donk/dispense(atom/target) - var/datum/component/material_container/container = GetComponent(/datum/component/material_container) if(!container.use_amount_mat(required_amount, /datum/material/iron)) balloon_alert(mod.wearer, "not enough material") playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE) diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 5822a354f06..55d9f3ae711 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -22,9 +22,6 @@ /// All designs in the techweb that can be fabricated by this machine, since the last update. var/list/datum/design/cached_designs - /// The department this fabricator is assigned to. - var/department_tag = "Unassigned" - /// What color is this machine's stripe? Leave null to not have a stripe. var/stripe_color = null @@ -37,7 +34,6 @@ cached_designs = list() materials = AddComponent( /datum/component/remote_materials, \ - "lathe", \ mapload, \ mat_container_flags = BREAKDOWN_FLAGS_LATHE, \ ) @@ -121,27 +117,25 @@ ui.open() /obj/machinery/rnd/production/ui_static_data(mob/user) - var/list/data - if(isnull(materials.mat_container)) - data = list() - else - data = materials.mat_container.ui_static_data() + var/list/data = materials.mat_container.ui_static_data() var/list/designs = list() var/datum/asset/spritesheet/research_designs/spritesheet = get_asset_datum(/datum/asset/spritesheet/research_designs) var/size32x32 = "[spritesheet.name]32x32" - var/max_multiplier + var/max_multiplier = INFINITY var/coefficient for(var/datum/design/design in cached_designs) var/cost = list() - coefficient = efficient_with(design.build_path) ? efficiency_coeff : 1 - for(var/datum/material/material in design.materials) - cost[material.name] = design.materials[material] * coefficient - max_multiplier = min(50, round(materials.mat_container.get_material_amount(material) / (design.materials[material] * coefficient))) - var/icon_size = spritesheet.icon_size_id(design.id) + max_multiplier = INFINITY + coefficient = build_efficiency(design.build_path) + for(var/datum/material/mat in design.materials) + cost[mat.name] = OPTIMAL_COST(design.materials[mat] * coefficient) + max_multiplier = min(max_multiplier, 50, round(materials.mat_container.get_material_amount(mat) / cost[mat.name])) + + var/icon_size = spritesheet.icon_size_id(design.id) designs[design.id] = list( "name" = design.name, "desc" = design.get_description(), @@ -161,7 +155,7 @@ /obj/machinery/rnd/production/ui_data(mob/user) var/list/data = list() - data["materials"] = materials.mat_container?.ui_data() + data["materials"] = materials.mat_container.ui_data() data["onHold"] = materials.on_hold() data["busy"] = busy data["materialMaximum"] = materials.local_size @@ -181,7 +175,7 @@ if("remove_mat") var/datum/material/material = locate(params["ref"]) - if(!materials.can_hold_material(material)) + if(!materials.mat_container.can_hold_material(material)) // I don't know who you are or what you want, but whatever it is, // we don't have it. return @@ -223,14 +217,17 @@ return ..() -/obj/machinery/rnd/production/proc/do_print(path, amount, list/matlist) +/obj/machinery/rnd/production/proc/do_print(path, amount) for(var/i in 1 to amount) new path(get_turf(src)) SSblackbox.record_feedback("nested tally", "item_printed", amount, list("[type]", "[path]")) -/obj/machinery/rnd/production/proc/efficient_with(path) - return !ispath(path, /obj/item/stack/sheet) && !ispath(path, /obj/item/stack/ore/bluespace_crystal) +/obj/machinery/rnd/production/proc/build_efficiency(path) + if(ispath(path, /obj/item/stack/sheet) || ispath(path, /obj/item/stack/ore/bluespace_crystal)) + return 1 + else + return efficiency_coeff /obj/machinery/rnd/production/proc/user_try_print_id(design_id, print_quantity) if(!design_id) @@ -267,37 +264,29 @@ say("Mineral access is on hold, please contact the quartermaster.") return FALSE - var/power = active_power_usage - print_quantity = clamp(print_quantity, 1, 50) + var/coefficient = build_efficiency(design.build_path) - for(var/material in design.materials) - power += round(design.materials[material] * print_quantity / 35) - - power = min(active_power_usage, power) - use_power(power) - - var/coefficient = efficient_with(design.build_path) ? efficiency_coeff : 1 - var/list/efficient_mats = list() - - for(var/material in design.materials) - efficient_mats[material] = design.materials[material] * coefficient - - if(!materials.mat_container.has_materials(efficient_mats, print_quantity)) + //check if sufficient materials/reagents are available + if(!materials.mat_container.has_materials(design.materials, coefficient, print_quantity)) say("Not enough materials to complete prototype[print_quantity > 1? "s" : ""].") return FALSE - for(var/reagent in design.reagents_list) if(!reagents.has_reagent(reagent, design.reagents_list[reagent] * print_quantity * coefficient)) say("Not enough reagents to complete prototype[print_quantity > 1? "s" : ""].") return FALSE + //use power + var/power = active_power_usage + for(var/material in design.materials) + power += round(design.materials[material] * print_quantity / 35) + power = min(active_power_usage, power) + use_power(power) + // Charge the lathe tax at least once per ten items. var/total_cost = LATHE_TAX * max(round(print_quantity / 10), 1) - if(!charges_tax) total_cost = 0 - if(isliving(usr)) var/mob/living/user = usr var/obj/item/card/id/card = user.get_idcard(TRUE) @@ -309,34 +298,28 @@ var/datum/bank_account/our_acc = card.registered_account if(our_acc.account_job.departments_bitflags & allowed_department_flags) total_cost = 0 // We are not charging crew for printing their own supplies and equipment. - if(attempt_charge(src, usr, total_cost) & COMPONENT_OBJ_CANCEL_CHARGE) say("Insufficient funds to complete prototype. Please present a holochip or valid ID card.") return FALSE - if(iscyborg(usr)) var/mob/living/silicon/robot/borg = usr - if(!borg.cell) return FALSE - borg.cell.use(SILICON_LATHE_TAX) - materials.mat_container.use_materials(efficient_mats, print_quantity) - materials.silo_log(src, "built", -print_quantity, "[design.name]", efficient_mats) - + //consume materials + materials.mat_container.use_materials(design.materials, coefficient, print_quantity) + materials.silo_log(src, "built", -print_quantity, "[design.name]", design.materials) for(var/reagent in design.reagents_list) reagents.remove_reagent(reagent, design.reagents_list[reagent] * print_quantity * coefficient) - + //produce item busy = TRUE - if(production_animation) flick(production_animation, src) - var/time_coefficient = design.lathe_time_factor * efficiency_coeff - addtimer(CALLBACK(src, PROC_REF(reset_busy)), (30 * time_coefficient * print_quantity) ** 0.5) - addtimer(CALLBACK(src, PROC_REF(do_print), design.build_path, print_quantity, efficient_mats), (32 * time_coefficient * print_quantity) ** 0.8) + addtimer(CALLBACK(src, PROC_REF(do_print), design.build_path, print_quantity), (32 * time_coefficient * print_quantity) ** 0.8) + update_static_data_for_all_viewers() return TRUE diff --git a/code/modules/research/machinery/departmental_circuit_imprinter.dm b/code/modules/research/machinery/departmental_circuit_imprinter.dm index 7277c41d978..2f5a606d8a2 100644 --- a/code/modules/research/machinery/departmental_circuit_imprinter.dm +++ b/code/modules/research/machinery/departmental_circuit_imprinter.dm @@ -8,5 +8,4 @@ name = "department circuit imprinter (Science)" circuit = /obj/item/circuitboard/machine/circuit_imprinter/department/science allowed_department_flags = DEPARTMENT_BITFLAG_SCIENCE - department_tag = "Science" payment_department = ACCOUNT_SCI diff --git a/code/modules/research/machinery/departmental_protolathe.dm b/code/modules/research/machinery/departmental_protolathe.dm index 44f78564a1e..9fbaa28c953 100644 --- a/code/modules/research/machinery/departmental_protolathe.dm +++ b/code/modules/research/machinery/departmental_protolathe.dm @@ -7,7 +7,6 @@ /obj/machinery/rnd/production/protolathe/department/engineering name = "department protolathe (Engineering)" allowed_department_flags = DEPARTMENT_BITFLAG_ENGINEERING - department_tag = "Engineering" circuit = /obj/item/circuitboard/machine/protolathe/department/engineering stripe_color = "#EFB341" payment_department = ACCOUNT_ENG @@ -19,7 +18,6 @@ /obj/machinery/rnd/production/protolathe/department/service name = "department protolathe (Service)" allowed_department_flags = DEPARTMENT_BITFLAG_SERVICE - department_tag = "Service" circuit = /obj/item/circuitboard/machine/protolathe/department/service stripe_color = "#83ca41" payment_department = ACCOUNT_SRV @@ -27,7 +25,6 @@ /obj/machinery/rnd/production/protolathe/department/medical name = "department protolathe (Medical)" allowed_department_flags = DEPARTMENT_BITFLAG_MEDICAL - department_tag = "Medical" circuit = /obj/item/circuitboard/machine/protolathe/department/medical stripe_color = "#52B4E9" payment_department = ACCOUNT_MED @@ -35,7 +32,6 @@ /obj/machinery/rnd/production/protolathe/department/cargo name = "department protolathe (Cargo)" allowed_department_flags = DEPARTMENT_BITFLAG_CARGO - department_tag = "Cargo" circuit = /obj/item/circuitboard/machine/protolathe/department/cargo stripe_color = "#956929" payment_department = ACCOUNT_CAR @@ -43,7 +39,6 @@ /obj/machinery/rnd/production/protolathe/department/science name = "department protolathe (Science)" allowed_department_flags = DEPARTMENT_BITFLAG_SCIENCE - department_tag = "Science" circuit = /obj/item/circuitboard/machine/protolathe/department/science stripe_color = "#D381C9" payment_department = ACCOUNT_SCI @@ -51,7 +46,6 @@ /obj/machinery/rnd/production/protolathe/department/security name = "department protolathe (Security)" allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY - department_tag = "Security" circuit = /obj/item/circuitboard/machine/protolathe/department/security stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A" payment_department = ACCOUNT_SEC diff --git a/code/modules/research/machinery/departmental_techfab.dm b/code/modules/research/machinery/departmental_techfab.dm index a7e03e355d0..339c98a6222 100644 --- a/code/modules/research/machinery/departmental_techfab.dm +++ b/code/modules/research/machinery/departmental_techfab.dm @@ -7,7 +7,6 @@ /obj/machinery/rnd/production/techfab/department/engineering name = "department techfab (Engineering)" allowed_department_flags = DEPARTMENT_BITFLAG_ENGINEERING - department_tag = "Engineering" circuit = /obj/item/circuitboard/machine/techfab/department/engineering stripe_color = "#EFB341" payment_department = ACCOUNT_ENG @@ -15,7 +14,6 @@ /obj/machinery/rnd/production/techfab/department/service name = "department techfab (Service)" allowed_department_flags = DEPARTMENT_BITFLAG_SERVICE - department_tag = "Service" circuit = /obj/item/circuitboard/machine/techfab/department/service stripe_color = "#83ca41" payment_department = ACCOUNT_SRV @@ -23,7 +21,6 @@ /obj/machinery/rnd/production/techfab/department/medical name = "department techfab (Medical)" allowed_department_flags = DEPARTMENT_BITFLAG_MEDICAL - department_tag = "Medical" circuit = /obj/item/circuitboard/machine/techfab/department/medical stripe_color = "#52B4E9" payment_department = ACCOUNT_MED @@ -31,7 +28,6 @@ /obj/machinery/rnd/production/techfab/department/cargo name = "department techfab (Cargo)" allowed_department_flags = DEPARTMENT_BITFLAG_CARGO - department_tag = "Cargo" circuit = /obj/item/circuitboard/machine/techfab/department/cargo stripe_color = "#956929" payment_department = ACCOUNT_CAR @@ -39,7 +35,6 @@ /obj/machinery/rnd/production/techfab/department/science name = "department techfab (Science)" allowed_department_flags = DEPARTMENT_BITFLAG_SCIENCE - department_tag = "Science" circuit = /obj/item/circuitboard/machine/techfab/department/science stripe_color = "#D381C9" payment_department = ACCOUNT_SCI @@ -47,7 +42,6 @@ /obj/machinery/rnd/production/techfab/department/security name = "department techfab (Security)" allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY - department_tag = "Security" circuit = /obj/item/circuitboard/machine/techfab/department/security stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A" payment_department = ACCOUNT_SEC diff --git a/code/modules/vehicles/mecha/mech_fabricator.dm b/code/modules/vehicles/mecha/mech_fabricator.dm index d3aa604ef49..f6f54aae05d 100644 --- a/code/modules/vehicles/mecha/mech_fabricator.dm +++ b/code/modules/vehicles/mecha/mech_fabricator.dm @@ -55,7 +55,11 @@ /obj/machinery/mecha_part_fabricator/Initialize(mapload) if(!CONFIG_GET(flag/no_default_techweb_link) && !stored_research) connect_techweb(SSresearch.science_tech) - rmat = AddComponent(/datum/component/remote_materials, "mechfab", mapload && link_on_init, mat_container_flags=BREAKDOWN_FLAGS_LATHE) + rmat = AddComponent( \ + /datum/component/remote_materials, \ + mapload && link_on_init, \ + mat_container_flags = BREAKDOWN_FLAGS_LATHE \ + ) cached_designs = list() RefreshParts() //Recalculating local material sizes if the fab isn't linked if(stored_research) @@ -92,7 +96,7 @@ //maximum stocking amount (default 300000, 600000 at T4) for(var/datum/stock_part/matter_bin/matter_bin in component_parts) T += matter_bin.tier - rmat.set_local_size(((100*SHEET_MATERIAL_AMOUNT) + (T * (25*SHEET_MATERIAL_AMOUNT)))) + rmat.set_local_size(((100 * SHEET_MATERIAL_AMOUNT) + (T * (25 * SHEET_MATERIAL_AMOUNT)))) //resources adjustment coefficient (1 -> 0.85 -> 0.7 -> 0.55) T = 1.15 @@ -173,34 +177,6 @@ desc = initial(desc) process_queue = FALSE -/** - * Calculates resource/material costs for printing an item based on the machine's resource coefficient. - * - * Returns a list of k,v resources with their amounts. - * * D - Design datum to calculate the modified resource cost of. - */ -/obj/machinery/mecha_part_fabricator/proc/get_resources_w_coeff(datum/design/D) - var/list/resources = list() - for(var/R in D.materials) - var/datum/material/M = R - resources[M] = get_resource_cost_w_coeff(D, M) - return resources - -/** - * Checks if the Exofab has enough resources to print a given item. - * - * Returns FALSE if the design has no reagents used in its construction (?) or if there are insufficient resources. - * Returns TRUE if there are sufficient resources to print the item. - * * D - Design datum to calculate the modified resource cost of. - */ -/obj/machinery/mecha_part_fabricator/proc/check_resources(datum/design/D) - if(length(D.reagents_list)) // No reagents storage - no reagent designs. - return FALSE - var/datum/component/material_container/materials = rmat.mat_container - if(materials.has_materials(get_resources_w_coeff(D))) - return TRUE - return FALSE - /** * Attempts to build the next item in the build queue. * @@ -228,7 +204,7 @@ * * verbose - Whether the machine should use say() procs. Set to FALSE to disable the machine saying reasons for failure to build. */ /obj/machinery/mecha_part_fabricator/proc/build_part(datum/design/D, verbose = TRUE) - if(!D) + if(!D || length(D.reagents_list)) return FALSE var/datum/component/material_container/materials = rmat.mat_container @@ -240,19 +216,16 @@ if(verbose) say("Mineral access is on hold, please contact the quartermaster.") return FALSE - if(!check_resources(D)) + if(!materials.has_materials(D.materials, component_coeff)) if(verbose) say("Not enough resources. Processing stopped.") return FALSE - build_materials = get_resources_w_coeff(D) - - materials.use_materials(build_materials) + materials.use_materials(D.materials, component_coeff) being_built = D build_finish = world.time + get_construction_time_w_coeff(initial(D.construction_time)) build_start = world.time desc = "It's building \a [D.name]." - rmat.silo_log(src, "built", -1, "[D.name]", build_materials) return TRUE @@ -339,17 +312,6 @@ queue.Cut(index,++index) return TRUE -/** - * Calculates the coefficient-modified resource cost of a single material component of a design's recipe. - * - * Returns coefficient-modified resource cost for the given material component. - * * D - Design datum to pull the resource cost from. - * * resource - Material datum reference to the resource to calculate the cost of. - * * roundto - Rounding value for round() proc - */ -/obj/machinery/mecha_part_fabricator/proc/get_resource_cost_w_coeff(datum/design/D, datum/material/resource, roundto = 1) - return round(D.materials[resource]*component_coeff, roundto) - /** * Calculates the coefficient-modified build time of a design. * @@ -373,7 +335,8 @@ ui.open() /obj/machinery/mecha_part_fabricator/ui_static_data(mob/user) - var/list/data = list() + var/list/data = rmat.mat_container.ui_static_data() + var/list/designs = list() var/datum/asset/spritesheet/research_designs/spritesheet = get_asset_datum(/datum/asset/spritesheet/research_designs) @@ -381,12 +344,11 @@ for(var/datum/design/design in cached_designs) var/cost = list() - - for(var/datum/material/material in design.materials) - cost[material.name] = get_resource_cost_w_coeff(design, material) + var/list/materials = design["materials"] + for(var/datum/material/mat in materials) + cost[mat.name] = OPTIMAL_COST(materials[mat] * component_coeff) var/icon_size = spritesheet.icon_size_id(design.id) - designs[design.id] = list( "name" = design.name, "desc" = design.get_description(), @@ -404,7 +366,7 @@ /obj/machinery/mecha_part_fabricator/ui_data(mob/user) var/list/data = list() - data["materials"] = rmat.mat_container?.ui_data() + data["materials"] = rmat.mat_container.ui_data() data["queue"] = list() data["processing"] = process_queue diff --git a/code/modules/wiremod/core/component_printer.dm b/code/modules/wiremod/core/component_printer.dm index 7925f3b76ff..b0365fa0b14 100644 --- a/code/modules/wiremod/core/component_printer.dm +++ b/code/modules/wiremod/core/component_printer.dm @@ -17,6 +17,9 @@ /// The current unlocked circuit component designs. Used by integrated circuits to print off circuit components remotely. var/list/current_unlocked_designs = list() + /// The efficiency of this machine + var/efficiency_coeff = 1 + /obj/machinery/component_printer/Initialize(mapload) . = ..() if(!CONFIG_GET(flag/no_default_techweb_link) && !techweb) @@ -24,7 +27,6 @@ materials = AddComponent( \ /datum/component/remote_materials, \ - "component_printer", \ mapload, \ mat_container_flags = BREAKDOWN_FLAGS_LATHE, \ ) @@ -74,18 +76,9 @@ get_asset_datum(/datum/asset/spritesheet/sheetmaterials) ) -/obj/machinery/component_printer/proc/calculate_efficiency() - var/rating = 0 +/obj/machinery/component_printer/RefreshParts() + . = ..() - for(var/datum/stock_part/servo/servo in component_parts) - ///we do -1 because normal manipulators rating of 1 gives us 1-1=0 i.e no decrement in cost - rating += servo.tier-1 - - ///linear interpolation between full cost i.e 1 & 1/8th the cost i.e 0.125 - ///we do it in 6 steps because maximum rating of 2 manipulators is 8 but -1 gives us 6 - var/coff = 1.0+((0.125-1.0)*(rating/6)) - - ///copied from production.dm calculate_efficiency() proc if(materials) var/total_storage = 0 @@ -94,7 +87,17 @@ materials.set_local_size(total_storage) - return coff + efficiency_coeff = 0 + + for(var/datum/stock_part/servo/servo in component_parts) + ///we do -1 because normal manipulators rating of 1 gives us 1-1=0 i.e no decrement in cost + efficiency_coeff += servo.tier-1 + + ///linear interpolation between full cost i.e 1 & 1/8th the cost i.e 0.125 + ///we do it in 6 steps because maximum rating of 2 manipulators is 8 but -1 gives us 6 + efficiency_coeff = 1.0+((0.125-1.0)*(efficiency_coeff / 6)) + + update_static_data_for_all_viewers() /obj/machinery/component_printer/proc/print_component(typepath) var/design_id = current_unlocked_designs[typepath] @@ -106,8 +109,7 @@ if (materials.on_hold()) return - var/efficiency_coeff = calculate_efficiency() - if (!materials.mat_container?.has_materials(design.materials, efficiency_coeff)) + if (!materials.mat_container.has_materials(design.materials, efficiency_coeff)) return materials.mat_container.use_materials(design.materials, efficiency_coeff) @@ -133,14 +135,12 @@ say("Mineral access is on hold, please contact the quartermaster.") return TRUE - var/efficiency_coeff = calculate_efficiency() - - if (!materials.mat_container?.has_materials(design.materials, efficiency_coeff)) + if (!materials.mat_container.has_materials(design.materials, efficiency_coeff)) say("Not enough materials.") return TRUE balloon_alert_to_viewers("printed [design.name]") - materials.mat_container?.use_materials(design.materials, efficiency_coeff) + materials.mat_container.use_materials(design.materials, efficiency_coeff) materials.silo_log(src, "printed", -1, design.name, design.materials) var/atom/printed_design = new design.build_path(drop_location()) printed_design.pixel_x = printed_design.base_pixel_x + rand(-5, 5) @@ -163,12 +163,12 @@ return data /obj/machinery/component_printer/ui_static_data(mob/user) - var/list/data = list() + var/list/data = materials.mat_container.ui_static_data() + var/list/designs = list() var/datum/asset/spritesheet/research_designs/spritesheet = get_asset_datum(/datum/asset/spritesheet/research_designs) var/size32x32 = "[spritesheet.name]32x32" - var/efficiency_coeff = calculate_efficiency() // for (var/datum/design/component/component_design_type as anything in subtypesof(/datum/design/component)) for (var/researched_design_id in techweb.researched_designs) @@ -176,12 +176,15 @@ if (!(design.build_type & COMPONENT_PRINTER)) continue - var/icon_size = spritesheet.icon_size_id(design.id) + var/list/cost = list() + for(var/datum/material/mat in design.materials) + cost[mat.name] = OPTIMAL_COST(design.materials[mat] * efficiency_coeff) + var/icon_size = spritesheet.icon_size_id(design.id) designs[researched_design_id] = list( "name" = design.name, "desc" = design.desc, - "cost" = get_material_cost_data(design.materials, efficiency_coeff), + "cost" = cost, "id" = researched_design_id, "categories" = design.category, "icon" = "[icon_size == size32x32 ? "" : "[icon_size] "][design.id]", @@ -315,12 +318,13 @@ var/cost_per_component = 1000 + var/efficiency_coeff = 1 + /obj/machinery/module_duplicator/Initialize(mapload) . = ..() materials = AddComponent( \ /datum/component/remote_materials, \ - "module_duplicator", \ mapload, \ mat_container_flags = BREAKDOWN_FLAGS_LATHE, \ ) @@ -337,8 +341,9 @@ get_asset_datum(/datum/asset/spritesheet/research_designs) ) -/obj/machinery/module_duplicator/proc/calculate_efficiency() - ///copied from production.dm calculate_efficiency() proc +/obj/machinery/module_duplicator/RefreshParts() + . = ..() + if(materials) var/total_storage = 0 @@ -347,17 +352,17 @@ materials.set_local_size(total_storage) - var/rating = 0 + efficiency_coeff = 0 for(var/datum/stock_part/servo/servo in component_parts) ///we do -1 because normal manipulators rating of 1 gives us 1-1=0 i.e no decrement in cost - rating += servo.tier - 1 + efficiency_coeff += servo.tier - 1 ///linear interpolation between full cost i.e 1 & 1/8th the cost i.e 0.125 ///we do it in 6 steps because maximum rating of 2 manipulators is 8 but -1 gives us 6 - var/coff = 1.0 + ((0.125 - 1.0) * (rating/6)) + efficiency_coeff = 1.0 + ((0.125 - 1.0) * (efficiency_coeff / 6)) - return coff + update_static_data_for_all_viewers() /obj/machinery/module_duplicator/ui_act(action, list/params) . = ..() @@ -377,14 +382,12 @@ say("Mineral access is on hold, please contact the quartermaster.") return TRUE - var/efficiency_coeff = calculate_efficiency() - - if (!materials.mat_container?.has_materials(design["materials"], efficiency_coeff)) + if (!materials.mat_container.has_materials(design["materials"], efficiency_coeff)) say("Not enough materials.") return TRUE balloon_alert_to_viewers("printed [design["name"]]") - materials.mat_container?.use_materials(design["materials"], efficiency_coeff) + materials.mat_container.use_materials(design["materials"], efficiency_coeff) materials.silo_log(src, "printed", -1, design["name"], design["materials"]) print_module(design) if ("remove_mat") @@ -481,19 +484,22 @@ return data /obj/machinery/module_duplicator/ui_static_data(mob/user) - var/list/data = list() + var/list/data = materials.mat_container.ui_static_data() var/list/designs = list() var/index = 1 - - var/efficiency_coeff = calculate_efficiency() - for (var/list/design as anything in scanned_designs) + + var/list/cost = list() + var/list/materials = design["materials"] + for(var/datum/material/mat in materials) + cost[mat.name] = OPTIMAL_COST(materials[mat] * efficiency_coeff) + designs["[index]"] = list( "name" = design["name"], "desc" = design["desc"], - "cost" = get_material_cost_data(design["materials"], efficiency_coeff), + "cost" = cost, "id" = "[index]", "icon" = "integrated_circuit", "categories" = list("/Saved Circuits"), @@ -513,11 +519,3 @@ if(..()) return TRUE return default_deconstruction_screwdriver(user, "module-fab-o", "module-fab-idle", tool) - -/obj/machinery/module_duplicator/proc/get_material_cost_data(list/materials, efficiency_coeff) - var/list/data = list() - - for (var/datum/material/material_type as anything in materials) - data[initial(material_type.name)] = materials[material_type] * efficiency_coeff - - return data diff --git a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm index 29857955e57..2b5ceef309d 100644 --- a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm +++ b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm @@ -66,7 +66,14 @@ ) /obj/machinery/ammo_workbench/Initialize(mapload) - AddComponent(/datum/component/material_container, SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], 200000, MATCONTAINER_EXAMINE, allowed_items = /obj/item/stack, _after_insert = CALLBACK(src, PROC_REF(AfterMaterialInsert))) + AddComponent( \ + /datum/component/material_container, \ + SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], \ + 200000, \ + MATCONTAINER_EXAMINE, \ + allowed_items = /obj/item/stack, \ + container_signals = list(COMSIG_MATCONTAINER_ITEM_CONSUMED = TYPE_PROC_REF(/obj/machinery/autolathe, AfterMaterialInsert)) \ + ) . = ..() set_wires(new /datum/wires/ammo_workbench(src)) diff --git a/tgstation.dme b/tgstation.dme index cba26f2aa82..af15fbf999e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -290,6 +290,7 @@ #include "code\__DEFINES\dcs\signals\signals_ladder.dm" #include "code\__DEFINES\dcs\signals\signals_lift.dm" #include "code\__DEFINES\dcs\signals\signals_light_eater.dm" +#include "code\__DEFINES\dcs\signals\signals_material_container.dm" #include "code\__DEFINES\dcs\signals\signals_medical.dm" #include "code\__DEFINES\dcs\signals\signals_mind.dm" #include "code\__DEFINES\dcs\signals\signals_mining.dm" @@ -1053,7 +1054,6 @@ #include "code\datums\components\lock_on_cursor.dm" #include "code\datums\components\manual_blinking.dm" #include "code\datums\components\manual_breathing.dm" -#include "code\datums\components\material_container.dm" #include "code\datums\components\mind_linker.dm" #include "code\datums\components\mirage_border.dm" #include "code\datums\components\mirv.dm" @@ -1082,7 +1082,6 @@ #include "code\datums\components\redirect_attack_hand_from_turf.dm" #include "code\datums\components\regenerator.dm" #include "code\datums\components\religious_tool.dm" -#include "code\datums\components\remote_materials.dm" #include "code\datums\components\rename.dm" #include "code\datums\components\revenge_ability.dm" #include "code\datums\components\rot.dm" @@ -1179,6 +1178,8 @@ #include "code\datums\components\food\germ_sensitive.dm" #include "code\datums\components\food\golem_food.dm" #include "code\datums\components\food\ice_cream_holder.dm" +#include "code\datums\components\material\material_container.dm" +#include "code\datums\components\material\remote_materials.dm" #include "code\datums\components\pet_commands\fetch.dm" #include "code\datums\components\pet_commands\obeys_commands.dm" #include "code\datums\components\pet_commands\pet_command.dm" diff --git a/tgui/packages/tgui/interfaces/Autolathe.tsx b/tgui/packages/tgui/interfaces/Autolathe.tsx index 0f5a63879b6..1436d045256 100644 --- a/tgui/packages/tgui/interfaces/Autolathe.tsx +++ b/tgui/packages/tgui/interfaces/Autolathe.tsx @@ -8,26 +8,25 @@ import { BooleanLike, classes } from 'common/react'; import { MaterialCostSequence } from './Fabrication/MaterialCostSequence'; import { Material } from './Fabrication/Types'; -type AutolatheDesign = Design & { - buildable: BooleanLike; - mult5: BooleanLike; - mult10: BooleanLike; - mult25: BooleanLike; - mult50: BooleanLike; - sheet: BooleanLike; -}; - type AutolatheData = { materials: Material[]; materialtotal: number; materialsmax: number; - designs: AutolatheDesign[]; + SHEET_MATERIAL_AMOUNT: number; + designs: Design[]; active: BooleanLike; }; export const Autolathe = (props, context) => { - const { act, data } = useBackend(context); - const { materialtotal, materialsmax, materials, designs, active } = data; + const { data } = useBackend(context); + const { + materialtotal, + materialsmax, + materials, + designs, + active, + SHEET_MATERIAL_AMOUNT, + } = data; const filteredMaterials = materials.filter((material) => material.amount > 0); @@ -54,7 +53,10 @@ export const Autolathe = (props, context) => { 'average': [materialsmax * 0.25, materialsmax * 0.85], 'bad': [0, materialsmax * 0.25], }}> - {materialtotal + '/' + materialsmax + ' cm³'} + {materialtotal / SHEET_MATERIAL_AMOUNT + + '/' + + materialsmax / SHEET_MATERIAL_AMOUNT + + ' sheets'} @@ -74,7 +76,8 @@ export const Autolathe = (props, context) => { backgroundColor={material.color} color="black">
- {material.amount + ' cm³'} + {material.amount / SHEET_MATERIAL_AMOUNT + + ' sheets'}
@@ -98,6 +101,7 @@ export const Autolathe = (props, context) => { ) => ( )} @@ -113,11 +117,12 @@ type PrintButtonProps = { design: Design; quantity: number; availableMaterials: MaterialMap; + SHEET_MATERIAL_AMOUNT: number; }; const PrintButton = (props: PrintButtonProps, context) => { - const { act, data } = useBackend(context); - const { design, quantity, availableMaterials } = props; + const { act } = useBackend(context); + const { design, quantity, availableMaterials, SHEET_MATERIAL_AMOUNT } = props; const canPrint = !Object.entries(design.cost).some( ([material, amount]) => @@ -131,6 +136,7 @@ const PrintButton = (props: PrintButtonProps, context) => { }> @@ -148,13 +154,14 @@ const PrintButton = (props: PrintButtonProps, context) => { }; type AutolatheRecipeProps = { - design: AutolatheDesign; + design: Design; availableMaterials: MaterialMap; + SHEET_MATERIAL_AMOUNT: number; }; const AutolatheRecipe = (props: AutolatheRecipeProps, context) => { - const { act, data } = useBackend(context); - const { design, availableMaterials } = props; + const { act } = useBackend(context); + const { design, availableMaterials, SHEET_MATERIAL_AMOUNT } = props; const canPrint = !Object.entries(design.cost).some( ([material, amount]) => @@ -179,6 +186,7 @@ const AutolatheRecipe = (props: AutolatheRecipeProps, context) => { }> @@ -199,37 +207,19 @@ const AutolatheRecipe = (props: AutolatheRecipeProps, context) => {
- {!!design.mult5 && ( - - )} + - {!!design.mult10 && ( - - )} - - {!!design.mult25 && ( - - )} - - {!!design.mult50 && ( - - )} +
; materials: Material[]; + SHEET_MATERIAL_AMOUNT: number; }; export const ComponentPrinter = (props, context) => { const { act, data } = useBackend(context); - const { designs, materials } = data; + const { materials, designs, SHEET_MATERIAL_AMOUNT } = data; // Reduce the material count array to a map of actually available materials. const availableMaterials: MaterialMap = {}; - for (const material of data.materials) { + for (const material of materials) { availableMaterials[material.name] = material.amount; } @@ -37,13 +38,20 @@ export const ComponentPrinter = (props, context) => { design, availableMaterials, _onPrintDesign - ) => } + ) => ( + + )} />
act('remove_mat', { ref: material.ref, amount }) } @@ -56,9 +64,15 @@ export const ComponentPrinter = (props, context) => { ); }; -const Recipe = (props: { design: Design; available: MaterialMap }, context) => { - const { act, data } = useBackend(context); - const { design, available } = props; +type RecipeProps = { + design: Design; + available: MaterialMap; + SHEET_MATERIAL_AMOUNT: number; +}; + +const Recipe = (props: RecipeProps, context) => { + const { act } = useBackend(context); + const { design, available, SHEET_MATERIAL_AMOUNT } = props; const canPrint = !Object.entries(design.cost).some( ([material, amount]) => @@ -82,6 +96,7 @@ const Recipe = (props: { design: Design; available: MaterialMap }, context) => { }> @@ -90,7 +105,9 @@ const Recipe = (props: { design: Design; available: MaterialMap }, context) => { 'FabricatorRecipe__Title', !canPrint && 'FabricatorRecipe__Title--disabled', ])} - onClick={() => act('print', { designId: design.id, amount: 1 })}> + onClick={() => + canPrint && act('print', { designId: design.id, amount: 1 }) + }>
{ const { act, data } = useBackend(context); + const { materials, SHEET_MATERIAL_AMOUNT } = data; const availableMaterials: MaterialMap = {}; - for (const material of data.materials) { + for (const material of materials) { availableMaterials[material.name] = material.amount; } @@ -33,7 +33,11 @@ export const ExosuitFabricator = (props, context) => { designs={Object.values(data.designs)} availableMaterials={availableMaterials} buildRecipeElement={(design, availableMaterials) => ( - + )} categoryButtons={(category) => (
); From d4c2b65e0c3f8530f3a6449bb26b9c8a997e6812 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 08:54:09 +0200 Subject: [PATCH 11/69] Automatic changelog for PR #22667 [ci skip] --- html/changelogs/AutoChangeLog-pr-22667.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22667.yml diff --git a/html/changelogs/AutoChangeLog-pr-22667.yml b/html/changelogs/AutoChangeLog-pr-22667.yml new file mode 100644 index 00000000000..4ff8fb0b53e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22667.yml @@ -0,0 +1,15 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "items can be printed from autolathe & protolathe when the exact material amounts are present in them after upgrading" + - bugfix: "max printable amount now shows the correct value & updates when items are printed, materials are removed in the autolathe & protolathe" + - bugfix: "component printer material bar is not greyed out when there are sufficient materials to eject" + - bugfix: "rcd and other devices that uses the silo link upgrade now have the correct material usages" + - bugfix: "silo hold actually works" + - bugfix: "machines using local storage to hold materials will eject it's materials as sheets when deconstructed/destroyed" + - refactor: "Autolathe Material bars now display number of sheets available" + - refactor: "printing an item that does not have enough materials will fail silently with no error messages" + - refactor: "Drone dispenser will eject sheets upon deconstruction" + - refactor: "all things that store materials will auto ejects its sheets(if there is sufficient material) when destroyed" + - refactor: "inserting an item into the material container will display the units consumed as sheets not absolute units" + - refactor: "removed x25 & x50 print buttons from the autolathe" \ No newline at end of file From db11bf1b52cc475f285a4f8a5290d5de9bfe0620 Mon Sep 17 00:00:00 2001 From: Bloop <13398309+vinylspiders@users.noreply.github.com> Date: Tue, 25 Jul 2023 02:55:36 -0400 Subject: [PATCH 12/69] [MODULAR] Fixes nitrogen breather quirk (#22663) * Fixes runtime in nitrogen lungs quirk * fixes dogtag not spawning --- .../master_files/code/datums/quirks/neutral.dm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modular_skyrat/master_files/code/datums/quirks/neutral.dm b/modular_skyrat/master_files/code/datums/quirks/neutral.dm index 9ecdf53d593..51d96c8fdbe 100644 --- a/modular_skyrat/master_files/code/datums/quirks/neutral.dm +++ b/modular_skyrat/master_files/code/datums/quirks/neutral.dm @@ -67,20 +67,22 @@ if (istype(current_lungs, lungs_typepath)) return lungs_holding = current_lungs - lungs_holding.organ_flags |= ORGAN_FROZEN + if(!isnull(lungs_holding)) + lungs_holding.organ_flags |= ORGAN_FROZEN // stop decay on the old lungs lungs_added = new lungs_typepath - lungs_added.Insert(carbon_holder) - lungs_holding.moveToNullspace() + lungs_added.Insert(carbon_holder, special = TRUE) + if(!isnull(lungs_holding)) + lungs_holding.moveToNullspace() // save them for later /datum/quirk/equipping/lungs/remove() var/mob/living/carbon/carbon_holder = quirk_holder - if (!istype(carbon_holder) || !lungs_holding) + if (!istype(carbon_holder) || !istype(lungs_holding)) return var/obj/item/organ/internal/lungs/lungs = carbon_holder.get_organ_slot(ORGAN_SLOT_LUNGS) if (lungs != lungs_added && lungs != lungs_holding) qdel(lungs_holding) return - lungs_holding.Insert(carbon_holder, drop_if_replaced = FALSE) + lungs_holding.Insert(carbon_holder, special = TRUE, drop_if_replaced = FALSE) lungs_holding.organ_flags &= ~ORGAN_FROZEN /datum/quirk/equipping/lungs/on_equip_item(obj/item/equipped, success) @@ -89,7 +91,7 @@ return var/obj/item/clothing/accessory/breathing/acc = equipped acc.breath_type = breath_type - if (acc.can_attach_accessory(human_holder?.w_uniform)) + if (acc.can_attach_accessory(human_holder?.w_uniform, human_holder)) acc.attach(human_holder.w_uniform, human_holder) /obj/item/clothing/accessory/breathing From 065635a28bd8bbaf1d85b87b667939ee9ce54a7e Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 08:56:00 +0200 Subject: [PATCH 13/69] Automatic changelog for PR #22663 [ci skip] --- html/changelogs/AutoChangeLog-pr-22663.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22663.yml diff --git a/html/changelogs/AutoChangeLog-pr-22663.yml b/html/changelogs/AutoChangeLog-pr-22663.yml new file mode 100644 index 00000000000..42ae2fd04bd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22663.yml @@ -0,0 +1,4 @@ +author: "vinylspiders" +delete-after: True +changes: + - bugfix: "fixes the nitrogen breather quirk not giving the correct lungs or spawning the breathing dogtag" \ No newline at end of file From 5fd1bea8f8852db1da5cc5dae53832ad0d0d73c4 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 19:26:22 +0200 Subject: [PATCH 14/69] [MIRROR] [NO-GBP] Optimizes rad nebula [MDB IGNORE] (#22675) * [NO-GBP] Optimizes rad nebula (#77014) Switches rad nebula to only directly irradiate carbons and use radiated component * [NO-GBP] Optimizes rad nebula --------- Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com> --- code/__DEFINES/alerts.dm | 1 + .../signals_atom/signals_atom_movable.dm | 2 + code/__DEFINES/radiation.dm | 12 ++- .../datums/components/radioactive_exposure.dm | 78 ++++++++++++++++++ code/datums/elements/radioactive.dm | 14 ++-- code/datums/station_traits/negative_traits.dm | 29 ++++--- .../weather/weather_types/radiation_storm.dm | 26 ++++-- code/game/area/areas.dm | 1 + icons/hud/screen_alert.dmi | Bin 134681 -> 135427 bytes tgstation.dme | 1 + 10 files changed, 138 insertions(+), 26 deletions(-) create mode 100644 code/datums/components/radioactive_exposure.dm diff --git a/code/__DEFINES/alerts.dm b/code/__DEFINES/alerts.dm index d309ebd8d2e..43ec8199d0f 100644 --- a/code/__DEFINES/alerts.dm +++ b/code/__DEFINES/alerts.dm @@ -23,6 +23,7 @@ #define ALERT_IRRADIATED "irradiated" #define ALERT_EMBEDDED_OBJECT "embeddedobject" #define ALERT_SHOES_KNOT "shoealert" +#define ALERT_RADIOACTIVE_AREA "radioactive_area" //antag related #define ALERT_HYPNOSIS "hypnosis" diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm index f5975008a16..5e6d7491d94 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm @@ -112,3 +112,5 @@ /// From /datum/element/immerse/proc/add_submerge_overlay(): (visual_overlay) #define COMSIG_MOVABLE_EDIT_UNIQUE_IMMERSE_OVERLAY "movable_edit_unique_submerge_overlay" +/// From base of area/Exited(): (area/left, direction) +#define COMSIG_MOVABLE_EXITED_AREA "movable_exited_area" diff --git a/code/__DEFINES/radiation.dm b/code/__DEFINES/radiation.dm index 2ab5860763a..0d44b072a09 100644 --- a/code/__DEFINES/radiation.dm +++ b/code/__DEFINES/radiation.dm @@ -43,7 +43,7 @@ Ask Mothblocks if they're around /// The minimum exposure time before uranium structures can irradiate #define URANIUM_RADIATION_MINIMUM_EXPOSURE_TIME (3 SECONDS) /// The minimum exposure time before the radioactive nebula can irradiate -#define NEBULA_RADIATION_MINIMUM_EXPOSURE_TIME (10 SECONDS) +#define NEBULA_RADIATION_MINIMUM_EXPOSURE_TIME (6 SECONDS) /// Return values of [proc/get_perceived_radiation_danger] // If you change these, update /datum/looping_sound/geiger as well. @@ -54,3 +54,13 @@ Ask Mothblocks if they're around /// The time before geiger counters reset back to normal without any radiation pulses #define TIME_WITHOUT_RADIATION_BEFORE_RESET (5 SECONDS) + +// Radiation exposure params + +// For the radioactive nebula outside +/// Base chance the nebula has of applying irradiation +#define RADIATION_EXPOSURE_NEBULA_BASE_CHANCE 20 +/// The chance we add to the base chance every time we fail to irradiate +#define RADIATION_EXPOSURE_NEBULA_CHANCE_INCREMENT 10 +/// Time it takes for the next irradiation check +#define RADIATION_EXPOSURE_NEBULA_CHECK_INTERVAL 5 SECONDS diff --git a/code/datums/components/radioactive_exposure.dm b/code/datums/components/radioactive_exposure.dm new file mode 100644 index 00000000000..0819b46f7df --- /dev/null +++ b/code/datums/components/radioactive_exposure.dm @@ -0,0 +1,78 @@ +/// For directly applying to carbons to irradiate them, without pulses +/datum/component/radioactive_exposure + dupe_mode = COMPONENT_DUPE_ALLOWED + + /// Base irradiation chance + var/irradiation_chance_base + /// Chance we have of applying irradiation + var/irradiation_chance + /// The amount the base chance is increased after every failed irradiation check + var/irradiation_chance_increment + /// Time till we attempt the next irradiation check + var/irradiation_interval + /// The source of irradiation, for logging + var/source + /// Area's where the component isnt removed if we cross to them + var/list/radioactive_areas + +/datum/component/radioactive_exposure/Initialize( + minimum_exposure_time, + irradiation_chance_base, + irradiation_chance_increment, + irradiation_interval, + source, + radioactive_areas + ) + + if(!iscarbon(parent)) + return COMPONENT_INCOMPATIBLE + + src.irradiation_chance_base = irradiation_chance_base + src.irradiation_chance = irradiation_chance_base + src.irradiation_chance_increment = irradiation_chance_increment + src.irradiation_interval = irradiation_interval + src.source = source + src.radioactive_areas = radioactive_areas + + // We use generally long times, so it's probably easier and more interpretable to just use a timer instead of processing the component + addtimer(CALLBACK(src, PROC_REF(attempt_irradiate)), minimum_exposure_time) + + RegisterSignal(parent, COMSIG_MOVABLE_EXITED_AREA, PROC_REF(on_exited)) + + var/mob/living/living_parent = parent + living_parent.throw_alert(ALERT_RADIOACTIVE_AREA, /atom/movable/screen/alert/radioactive_area) + +/// Try and irradiate them. If we chance fail, we come back harder +/datum/component/radioactive_exposure/proc/attempt_irradiate() + if(!SSradiation.wearing_rad_protected_clothing(parent) && SSradiation.can_irradiate_basic(parent)) + if(prob(irradiation_chance)) + SSradiation.irradiate(parent) + var/atom/atom = parent + atom.investigate_log("was irradiated by [source].", INVESTIGATE_RADIATION) + else + irradiation_chance += irradiation_chance_increment + else // we're immune, either through species, clothing, already being irradiated, etcetera + // we slowly decrease the prob chance untill we hit the base probability again + irradiation_chance = max(irradiation_chance - irradiation_chance_increment, irradiation_chance_base) + + // Even if they are immune, or got irradiated plan a new check in-case they lose their protection or irradiation + addtimer(CALLBACK(src, PROC_REF(attempt_irradiate)), irradiation_interval) + +/datum/component/radioactive_exposure/proc/on_exited(atom/movable/also_parent, area/old_area, direction) + SIGNAL_HANDLER + + if(istype(get_area(parent), radioactive_areas)) //we left to another area that is also radioactive, so dont do anything + return + + qdel(src) + +/datum/component/radioactive_exposure/Destroy(force, silent) + var/mob/living/carbon/human/human_parent = parent + human_parent.clear_alert(ALERT_RADIOACTIVE_AREA) + + return ..() + +/atom/movable/screen/alert/radioactive_area + name = "Radioactive Area" + desc = "This place is no good! We need to get some protection or get out fast!" + icon_state = ALERT_RADIOACTIVE_AREA diff --git a/code/datums/elements/radioactive.dm b/code/datums/elements/radioactive.dm index c949692930c..1ce915747aa 100644 --- a/code/datums/elements/radioactive.dm +++ b/code/datums/elements/radioactive.dm @@ -18,13 +18,13 @@ /datum/element/radioactive/New() START_PROCESSING(SSdcs, src) -/datum/element/radioactive/Attach(\ - datum/target, \ - range = 3, \ - threshold = RAD_LIGHT_INSULATION, \ - chance = URANIUM_IRRADIATION_CHANCE, \ - minimum_exposure_time = URANIUM_RADIATION_MINIMUM_EXPOSURE_TIME,\ -) +/datum/element/radioactive/Attach( + datum/target, + range = 3, + threshold = RAD_LIGHT_INSULATION, + chance = URANIUM_IRRADIATION_CHANCE, + minimum_exposure_time = URANIUM_RADIATION_MINIMUM_EXPOSURE_TIME, + ) . = ..() diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm index 9edbb68046d..f2417eade98 100644 --- a/code/datums/station_traits/negative_traits.dm +++ b/code/datums/station_traits/negative_traits.dm @@ -545,11 +545,13 @@ VAR_PROTECTED/send_care_package_time = 5 MINUTES ///The glow of 'fake' radioactive objects in space var/nebula_radglow = "#66ff33" + /// Area's that are part of the radioactive nebula + var/radioactive_areas = /area/space /datum/station_trait/nebula/hostile/radiation/New() . = ..() - for(var/area/target as anything in get_areas(/area/space)) + for(var/area/target as anything in get_areas(radioactive_areas)) RegisterSignals(target, list(COMSIG_AREA_ENTERED, COMSIG_AREA_INITIALIZED_IN), PROC_REF(on_entered)) RegisterSignal(target, COMSIG_AREA_EXITED, PROC_REF(on_exited)) @@ -574,25 +576,32 @@ var/datum/round_event_control/modified_event = locate(/datum/round_event_control/radiation_storm) in SSevents.control modified_event.weight = 0 -///They entered space? START BOMBING WITH RADS HAHAHAHA -/datum/station_trait/nebula/hostile/radiation/proc/on_entered(area/space, atom/movable/enterer) +///They entered space? START BOMBING WITH RADS HAHAHAHA. old_area can be null for new objects +/datum/station_trait/nebula/hostile/radiation/proc/on_entered(area/space, atom/movable/enterer, area/old_area) SIGNAL_HANDLER - if(!ismovable(enterer)) - return + if(iscarbon(enterer))//Don't actually make EVERY. SINGLE. THING. RADIOACTIVE. Just irradiate people + if(!istype(old_area, radioactive_areas)) //old area wasnt radioactive + enterer.AddComponent( \ + /datum/component/radioactive_exposure, \ + minimum_exposure_time = NEBULA_RADIATION_MINIMUM_EXPOSURE_TIME, \ + irradiation_chance_base = RADIATION_EXPOSURE_NEBULA_BASE_CHANCE, \ + irradiation_chance_increment = RADIATION_EXPOSURE_NEBULA_CHANCE_INCREMENT, \ + irradiation_interval = RADIATION_EXPOSURE_NEBULA_CHECK_INTERVAL, \ + source = src, \ + radioactive_areas = radioactive_areas, \ + ) - enterer.AddElement(/datum/element/radioactive, range = 0, minimum_exposure_time = NEBULA_RADIATION_MINIMUM_EXPOSURE_TIME) - //Don't actually make EVERY. SINGLE. THING. radioactive, just make them glow so people arent killed instantly - if(!SSradiation.can_irradiate_basic(enterer)) + else if(isobj(enterer)) //and fake the rest //outline clashes too much with other outlines and creates pretty ugly lines enterer.add_filter(GLOW_NEBULA, 2, list("type" = "drop_shadow", "color" = nebula_radglow, "size" = 2)) ///Called when an atom leaves space, so we can remove the radiation effect -/datum/station_trait/nebula/hostile/radiation/proc/on_exited(area/space, atom/movable/exiter) +/datum/station_trait/nebula/hostile/radiation/proc/on_exited(area/space, atom/movable/exiter, direction) SIGNAL_HANDLER - exiter.RemoveElement(/datum/element/radioactive, range = 0, minimum_exposure_time = NEBULA_RADIATION_MINIMUM_EXPOSURE_TIME) exiter.remove_filter(GLOW_NEBULA) + // The component handles its own removal /datum/station_trait/nebula/hostile/radiation/apply_nebula_effect(effect_strength = 0) //big bombad now diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm index 8b61846c1ed..08c88cd65f1 100644 --- a/code/datums/weather/weather_types/radiation_storm.dm +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -24,6 +24,10 @@ target_trait = ZTRAIT_STATION immunity_type = TRAIT_RADSTORM_IMMUNE + /// Chance we get a negative mutation, if we fail we get a positive one + var/negative_mutation_chance = 90 + /// Chance we mutate + var/mutate_chance = 40 /datum/weather/rad_storm/telegraph() ..() @@ -31,7 +35,7 @@ /datum/weather/rad_storm/weather_act(mob/living/L) - if(!prob(40)) + if(!prob(mutate_chance)) return if(!ishuman(L)) @@ -51,11 +55,7 @@ H.random_mutate_unique_features() if(prob(50)) - if(prob(90)) - H.easy_random_mutate(NEGATIVE+MINOR_NEGATIVE) - else - H.easy_random_mutate(POSITIVE) - H.domutcheck() + do_mutate(L) /datum/weather/rad_storm/end() if(..()) @@ -63,6 +63,13 @@ priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert", ANNOUNCER_RADIATIONPASSED) //SKYRAT EDIT CHANGE status_alarm(FALSE) +/datum/weather/rad_storm/proc/do_mutate(mob/living/carbon/human/mutant) + if(prob(negative_mutation_chance)) + mutant.easy_random_mutate(NEGATIVE+MINOR_NEGATIVE) + else + mutant.easy_random_mutate(POSITIVE) + mutant.domutcheck() + /datum/weather/rad_storm/proc/status_alarm(active) //Makes the status displays show the radiation warning for those who missed the announcement. var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS) if(!frequency) @@ -88,10 +95,14 @@ end_message = null + mutate_chance = 0.1 + ///Chance we pulse a living during the storm - var/radiation_chance = 20 + var/radiation_chance = 5 /datum/weather/rad_storm/nebula/weather_act(mob/living/living) + ..() + if(!prob(radiation_chance)) return @@ -103,7 +114,6 @@ max_range = 0, threshold = RAD_LIGHT_INSULATION, chance = URANIUM_IRRADIATION_CHANCE, - minimum_exposure_time = NEBULA_RADIATION_MINIMUM_EXPOSURE_TIME, ) /datum/weather/rad_storm/nebula/status_alarm(active) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 893c5e3684e..c4a02ecebbc 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -472,6 +472,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) */ /area/Exited(atom/movable/gone, direction) SEND_SIGNAL(src, COMSIG_AREA_EXITED, gone, direction) + SEND_SIGNAL(gone, COMSIG_MOVABLE_EXITED_AREA, src, direction) if(!gone.important_recursive_contents?[RECURSIVE_CONTENTS_AREA_SENSITIVE]) return diff --git a/icons/hud/screen_alert.dmi b/icons/hud/screen_alert.dmi index 78421d72472f84f3fc143077af5cba2fc2e970ce..7cc03330969107579106de22d727578ee5b494e2 100755 GIT binary patch delta 17292 zcmXtfbyOSg^K}xuIJCGHr?`7?cPmgFinSDq6<@5lLve}}cXutt-Mv6@cMJCB^ZlLo zpXBUjlboIV%*=i6+)d3u4a`N2r3Eur)6F0l=jz3LHtNPCdT06ud&l~nameW8O)O0X zPuyps_DM{?KlXDN$GTOQ6P&3n6qHr2GGeBOY09w?3QZ-1nqXYRoVPmu_%8H>AA)VK z=69a^jht`qI3BRe7$`a;9SQ~lRS_Fi5y9j`z{=(?#?z;l)OJgTRN7Ym73x^3WO4Q8 zFo}o)9qjB}3PG6}t<#3*I?wDv(H}Q6!~3??oi}7Alj|D91%=xof#wYZY)lKXn+l;qBZkE{=?R`#XMn(e2~=6g!5jYPGfla~x$ z^sLoJv`z9Gv9nSvEv`|Y#$9(D(DS0Ox*oOr2x}z91^;zgJ9c;3wo8Se=TrF3+#A*2 zH|P1hO&C%yx&sOj3-Y0K_Zt7EuzVl~KuWfgk4D_Hh*`}uQSQrJ-!aIq&|%u4p}hX# zS)-HU2?d}^kcc)BkN#lEJ2##P8fK>N*3p9iYJ^Q0pZB)|B0;S`?#Y2#?B_gl$^xw!=wxO%+;)R2uxqarpWnM1I2|?V=EfAsMf&rt_3{|kOJ8e zLb0-EQ#vXvcwaX`u4gNY#X>GNGK$6Og>LPOvSt&dy~4(+ZN&N&XWok;gY=%ez=8zA zco0LctL&W1U%EzOSnMu8dCD-!*uW540zDxK;!7GlJX|M(S8WH;KUUJ&MZVafu9#P6 zXJ>;{83qwu1;|YGQI2j{7C!Rf8HLM7&naWDi=-XhtPuSm)WjsYnf6#X5u@J~- zTC6)YZ@K5rY2s34%a7pbdFU6^2Uwxm@bHcvKz9^vqLOUKdz8ul$wz0Mc#&{|jU6ZR zozQvw5}`*IE!%59Qgc9OdqcBLr~PXQFIh}r=6!6?0aX3PBnI`p@2v(PNRKLB|F=x6 z{A1f`{u&rWkplecHimICi#|{g7nn16fkC2E+zbgsrp%-$l7L{d$3+Low0w0O~bgI zEivXmq+@%)3%~ zH(yYd^K`^x8{M#=VaCc2o5gQ0nO?WpY6U8gx7D2z0%Vp0Q&zQ#J;`sSH7w;ZIKt&= z-^%{t zH_=s!Ix@ks@F+}vn1!k_1<18pN$+Vq>IASVC!7zLcIJ_TE3Eg@N33t8+^ONkV0&YKd_-6O%>PY zLB?A3-5#Wqd#>)~b#GL6NmCC$vC6EB4{$v_6doXI=>nVzGQbSuM*Ho->0SDZebf=? zNz};kO%m-a(t)7q!N{vuukzS97S{!^JUp5Q#>T8Z^QG5O29}i-@f`jyG*RU3ljoz1j2l<*UHXEYw_Jz5a1ObzIM#C1)26Ty z+}&wmTWo)$R55@W`X~k+zQ7n3(HgKYy5B_SaK+RSl-*u2;AYLqMu4C%XQIBaZ-kCH z{#1OT*I6a}KF3uFifgp~kHh2k-Z#$chWWL5+5nJUUrb&7)jt2R)YHRu>LT6@Pw#y^ z#h@wowV;(m!TkLETCb7kG4PQf5MQRQ#S5%^`nX^z8aPfpGZ*7YP^3Q{fncrZm-tw8 zi7zR#K=yCOLIT-;uLefXvs6L#CUK>g^TjWq8DVPsE z31B?k0)+{)#)157c!J$U`u>=IS$GVgBHX0v{Pf`L;1fcKo9@Dvn<$xsSuggP1?yo z`jN;W&~#kZ&7I;e;@n>n*`P3V=1j`^Iba=!`I4;Y-LTw~2Hg|gvOJpO%819xQ3QKP zW7Lery;qClVt8w_v=B^uCzp{~NfoFOGzs^~8 zs1{1fiGx(s&j>zb!OxJqb1@h;h>f|tk9V_wLIdNQl0%AhW)v>g8C7XO~s&TZ%@GYCYx1UUM8x5wj3sd`WsECE57zsl`b@KjuO;%ayM~rqO51 zh_5Bd3BZ4OUrO@aDM4iqcPd90KLeS1n;BV{e`hKYB(O|ipee@yFu$2=KsM8~j?WO1 zcU9=(%OiFN>l>}XSC;edp%RB7XE`m=Q1kd@rW@yB)AiVMQ+K_=KH7a+E8UvW-VC9t zQs9~MBn5S6Nk`1s(A&`Krx<}ApOKpkYt=uPe2Q;b0U@S7?|tPK1xhMK96%}cnY?#o z6W-CtcTbk&`Qw1{l@4FzUDid4BDazsH(Q6Yn=kvz+ANn0vY2;FWttnCT;upmB$=ZK z1xo+dxBc53K_CU>BF6CCUUM@ttPqjUse7pSX1S9os5k+6i1G{*Kg@kGsKRq%qr#+f z&D|QPCM_;@iN0VkC-^4P6!#2kD~)qaQWonLz&Y z)8BKVc|pAiKfXzbO-N53SbFT44wZcy+@Ewkinm@)c`@<}_*aMR+C?`iU!23)jh+3* z0H)*;Fqi@ODf(U-{XGtM%EPKsWo4)%nSqpKnrIz6RPXWAM0CepA`fIM)?1Z>B+jHn z*CjuHopwF*Y`;rhTj!*M3I0YK@bFgP?@e~jX0cPyp0PT_)7LGa#f#& z;Ey@yA9D@av?qzk-hYubjA9z6{T$~_jKMupd#AuDp>1hho-;|ep}Wgt6#-#Rx6z(jSWq*!tG+hi0UdVcQ z+ykNgxl29?EclQ`y?a#M$8W+f1MTgG$N#*<6V&Yvt!?*WkPz!PJ!W08DLg${PF+e8 zFuA4xbCF#){+xyl3LB=^j>J=IH$!sk1Zigz(-!yJq$y_jDTmvXmw%IQE6#dvtD+DfzO$PZ4eDoVK$vj`-=IKD zS(FW4jRc7ktdgvQac5^;Z5EzC;4m;|=TuNw@*(@l6erRh$Vsh!0{wT#dLzI47`jOB_P#R=hG0oqAc;6bATwBhm5mvhNqWFR4!5BMJOhhhUMs;7BXMX$N9FM^7WiRU@F zSWI;8c5dNrv~z8YccwuxH9sHph=VBEjp+*U(-n8@Ilay`6P^UTc?ImDGaGp8%C8TiKi9o*>=v5KI7yqzBt{bTmL!TxWW1+{nvX6!&c)Xw<4qNpOvr0) zPL5gw&$RucZVc2|I~F!qv(|6!nI?5f(c;s#mas;RpTnDFeki={>LHm(ipN9S5nqRW z8i#A8MIP@+7V-htp5tBxG!F86@BtgU?6PG^C66K?yH&_bhjyT`j*5y?%ifW3*+3pL zy`P94XUp*DZ7oLB7of+}jxdrao&>GRYBXmtF8e!HU7^`E4q-{flE+!e=9a#D!gS>4 z$!_sX%0(C%u=?e`M|}43)dBx@kK5w@{amZyw;rXU@(%#Gsuq;<2J!)|3lk_Mg_BLt z`i6Di#l7lNbbrs}xNCURlRwqVKm0Gzu4sQNg+I3H;>sb;Y9Dc}Ng!zmSJ8(g!PUe*O2FmEfI}mmi*Fj0gVq4NM>IVw(^6t75ktIVQ-&ot>B-Gx`;sj60&d)Gz|JRc}^i!=er$+Eh3$~I= z*lh}621;_i2ESoU=n4&rQ?73lhbjXkmWRj^>~<^t*Xp zzUR&}=J!TQb^7l!ABjs!53BZ)GDT9JHH3jhX1Tk^*8y{Vq8$ zRDW$_`_R4gaA!{H1eJswHyp;uqlxu3NNdZhem$HcXVtVPvFyUr-l*2y}!~EQ? zxEb()XbKAfI?U7O*HomQ8gP$5&ec0fJW1(`ED}gX(R@pH5(i&nmF1o30RAJU``$j) zsY_-D@uEXhXXfrjru!Z7SCK7^CU>9dR$XVa}0#pK(g_DxfX>^0lY(p8gP8^h9{kFR|S< zgGW>02|Ass!2suo0gu3=cNGhI>Flf0S>~Fuz`hG{`t~>Z#nHie4~Y^i^x?TgKZ1F| znzWR1B5Yi7@`xLbdKe)zL}X;IrE(-Dt!g8*wLU3Ai2oPM{~yX=DbrM|zyjFG)JOm5 ztGi-lc6=TSNS;fhV;X+f{n?)Sq&yl9hn$O5v4a2ro8h8{mXE?)y7%Kef4Az-Pl{`w z38?Hq(s=vZEWPVm4k;F zgP}mLyWyX8Q`7(s#3Wbwgmu|obsL;+Q}v_6Lwpahyu(L7L~!aco4I8%7sIHVIkAdL zK5H;XnJP;v8Fcnr^1&m3p3SC0zi0DkpO_@=2h!9u%|l)IIzS^R9>~Umj3`e!SMavV z1x8a1=Y>+f23iy}nPPOTfg$QsRr80P_kf_?K?MY4*zoVmNrFA;k5Wuh>cY3NuVFR& zy$vG^Hv8D~9aC!MmC1(r)~yYn*V$Wc=qv1&nu&YCT7o7TwA{aIr|_rD&HlKHMC(PW zetk`#(2Ss9Ty4Or*^Gdo5yZoar{Io@C_&3QTV~Ef@|_CRT!74f)QZsA$w~UxPxuo^T#hPg ztWy=wkz!ZPQBk^p=$_&JqTm`TfYv{VCz^G}S$HwheHc0`0YnXIp> z_V>@LWgWWcuT=C)P*&f=tSfzKxh#t+>jNo2Z>ArvDU(F2S&NEx z$pe#HEb5J|Z}RhDF&eek{>$9~Z}L*->!DB2iD(=>v-4J}cJ)8{iK2Z)hb4)=3!+T# zcODR`4;=u{$_Lz0SBLrp#!R|uDmRvIwEA+M1{9=(6lyM*L4LP+?6yA$yCel%V|qCV zw3QXyYKRZ9r^j@ka&x(IT7l)Bn;SRMuihA-hYeEFgtp5NhoXU){N;l~ZboKirIrlk zy_j&He8BDS_VzYQ*QX@kNLO8*1q0)5acnF>pD#Tso($0pCvS}bK?uzD)idZh^s<&C zYz=>mgCHWj&cTL-Aer=I46zoA4Y{eUEmNDZ!w|}qjlQj|lh5*d7+@`HBID3y#PAnZ4Yk~e(a3|@g>I0aq4vaM93p}|tyznhVDd*f>DJu%&R((=Z7 z>lrw%f1g@;HD1<%34;0Td&&P)#eXbh*xw$`eYyQ|C4mTPe7y8zQdvdTP+nac9pRI0 zcm}>GI3o1qedh6PIezzK>GMk}9D0M#T^52v0w~Tz( zAP^NuL0Uq)#6+k2Nfl@I{nmePGPOM*zv}OKJ7Z6(>SA+Vr{8g+gC{2bGO~XCxcSYZve?dykWa}0B_{i2pAl2ZP zm8a0Wz+VDCJm1@DDENaWW?h|lRN2daB<}U6)x*AjM*{i%{Mo^sYhrAS0oprKR&{y! zFaupa?R<}n{++be>-F;MS4%#3Ia?pCuDv`vQg%(uHc~w{Cb$>Dp6$j>hHO1NhWWOD zmZsJle!J1b>z>1Fdcp3KFW7IPmCDWR!i$e>HorAC8`DlG>*)n^;2#*j+|KZ)<^Oq9 zcWoQK>)lCvQFaShU8UfILMg4LChD2at)|9{udnVF;1`#+qm9*xfm}{U-M%vt;$M=11l;L6tK<8JE+c5`0QU9d{FDMtEYi>Qd#&&P|k3)&-H~U96yZ;$lbOwDpFhnEv4fw4ltkR5aq46?Cz`*j{lSSKODe7L_as}{3c z_BDVRLYvP#SPO}n8);)nU(!DiY75O!twJ_ zV9M;T?eZ~J_hch<<(?~wnKFM)?bXmlysAEU-}(DdsiP7WC``6kqCY6N4F4Un=+8v1 z(K#^PQq&~Z^)7!a3{1>!^TDa|VwI0>!h!qKrIS-r0Y53&S&~?$0hn8BXhsH^H*CKU zPVK4;YPsjW2@oy%yMD_GnoaYWJIp#cgzG1|4^^j~dsKm0ya=~R3Bz+qMnU3K8X-op z!|Q$CxO>x-obtenwZdxXmC03Y&5@q_wo1+BFI{~tOpv?RJb3j94~B7cQ7Fg>Qd z^>%$_%64IGGN_3Ln?YzWYVqG9YyU&h^l;5K6&a@4U@m;1P*B91JWMw&Q?PioMo*Ur0RI%I`MWpn&3&#kIQ+I0Jg%8zMZrotDGVK7hbsY16Hd_CtX zlaBdQNg_b?@&>wnIwr&PU6k zQ}cz<4nucNK~94*n!d(SZ5_@g+>(2JO?JXg$OC{nc$E$D`eyT{n7trR{H#r);ULHB5 z#rr)}_pU#X(3?6la}P`w^Y3lO3jQEEb` zj|Ep2)e>YP?l?K>sDgrm0{rM%0IP#R|eqI&_*n5R$sp~>0luHJle$zjLgpRv4; zR*j^#>xH?#xK#K#-$_uX$!%{yd;YzB4(MHFf7tMYMkx7y9hTm^ps_nbQcO zZBUTeRbN0i;BsjO4*L7o4$XX)j0?kUSGne~VHK@EnW`;_#xNzB)#2e0?9_9Fie+wZ zak1>n{OgLZBF$23c7(Qkw zbR68TQ_#R2Ui~=9{JVVjFJ8Lse~g|3ETmP{OVw(j@Ps#UP-E{4a3NT_al=-{yx#m* znc#ec>b_2C6Jp~E(Pb!@nakd0Y`*_-)o7`a<1M1->p6z4j$>NB(~|T|`Ps&Q+cb+B zQ`TuPZTFEAg4FJqLUq-~Q9xyGCDt!@_FmAF;sLeh7kO02{tu_-8$Xf{ zg}PUl#neat;KlUf&KGM5mZGT(QYK7|xIyN*StZ0$%=;`@?^gx!-O-ewFyV#bS>OWvYD|XqHbkKv5qKh7Us1M*zcz?qa_1hA16NL^EChp?$e)~U%}SPWK0((SX~vh5hUr7*{tlfNZ(oS{`lwKsLmFv zf%TI%rk7aT2|EaHkV{dC@THZnl;}f`*bMIlk%QL!n49$R!Yfl-UCsu?$W!!ML_IBT z^3l;Or3ai>8MH~+vvy)MJQUc&{YAy8(FFzLrnSV_-HhYF$qLYXcQvgB7B8quHK)T` zy2=cRo3vmtY{L1kqO5-LZqBgvp@C>Wn<%)bJzvp-x}KnmRBK+v4JfiPAZtT!ViZut zZ#+wDXZO?Dwe!LRki9Oti2atJF6Y;_A+(dfH((JT@Q5%FPKNFMWtD!_3fY<$d=Qse zgYV8e44KLRbUZU#u9cNyZ$a*VOh3@UVM!3c6J5q7OH_zWo5P**In7v%*~NaH_Ev)K zes-jeP4@a&u;lPjq&=OJ z9(w-u2d8-cEN{HlV@x{D0_<%S?@`a+^jWE#T9d26<@JwTPU=vG`%(@manQtyH;%r( zeiH(e2(*+)+EfVc>L_Iq=6&ZlfwyK4*}GWF6&z(kkh{$xHC@a`O~g!dYK! z3}&EsLKdrT1XAR8|3Y>uEz@4gC|0&%T1C%EOi zWsR2G^ItZQ{4|>3cp{>H)?3sjJJp}cz6QHe#V7X&>T%gqduN5uzG!$nZ@a$Ex}`n> zS65-&5ycsq@sEt02d9O!-P2NjS471lE2NC*)O$$j@53__00`(pje1X|oF?uk1##bd z%Jl$fT8a~@&i-TFwNGI%7S&kYuk1X^XH!zEnK%^hSxW|k=!VT1b%HM)1z2#F?tj_L z*YM^`ebTP)?!IaguSg4rO$X@brxzEdXrcm9p?Ep4cO4NvoJ|Z5_V#%>FsPpU zqeI-yWAMS`csx>mAa&w*UCjh2(toNFod=c;kE_hyK@;mvpS8kLhQAh|V}(c+bnZ_N z1{N3ZbKhyL)G9u~b81IvFo1uX;e>blloW>l^(N+x2RTZLu3!YdpB>S~XJBsLcv{e6 z>^-JyO@*_^oGTmq-K}$AZy3+>gKrgL`g1Y3?9fmQ2epVXmhBgO!g=+dY8RwXGA&b7shNQ$62RPWf^-L3r zbC4;8BmJC3EXs&r$`t(#yei<5s&`hHy>EA)HC?Wcl3;1$@u~Wt;J0K+Ok?+JxgfVI z;RJPPT<$qZwIf=5S-1HD@c6~?JHQeb6 zWe7q(8*GSbGgcL+N3^MpBZPTO4{5+zsakr>#NVJlN&v7JWbO{bi*Bf2grCHA9%ESS z$4ncUs7(Vs5y!47#%{q?%Ip?r9SI=IMJh`yi%^`2VCUmzKGK%#0_OTXLfEzEgB=sc z8*l*$j20$Saz~{eyn|3(2eW%6;)5t3V_|8vCeE&h?mJ#`oZ&NMj@sN?(LE1#Uz=cmiR}g_n}^h1%{Ev@PXO-~su|)7x*M$jg&IGzj*tY|wU`%Z3(NgfA#S zrag(nTOawitxFrgc-pd!{fWb8%uAq@afnKxgLDwh?EGKAAotg~NOxyeX{zeMmvn3j zNWMhNPa#FcNE$kE5UTeb1=QyT5>0V4$F0ocvK{P z{eS`+XwbWE)|M)pd6qRz``2h~!5M z3QV57K{GayWAdHLaz$!~wEGi)O=BghjO~>|2B$Mb`OO2|_48_E3-juNunPgu`Me=+ za51e%7RE0=oR-=)T}+8^biCgS>xWgtX;#M7R85+cLWY{tJj1eh+K%B)_I5nLvx6E?bz5UlLWicrVm0++!4V|L=l_H;tXLPBqS3e$z z6n3|7;d3wSCZ9cy8r!>2;e6QYH|@MVwkPYunfnUfN_x?$u;xxYR1-|@B6 zrtTU4!_ra9mQU9cfKBL-5m$@3{w~f~bG*7ffzowr^xtf$IY?egxYC5X-U8&`MDO3f z0Uz|@$i*XhI-Y)6d35+B;D-?b@#`!^PcCmt|5Ytc%@fN-DuNF&tbTk2(u`M1SCjDt zeGM%i{W5!2SU6hf6w6kq^ae%b5N)Ci!4ORoPvV#l)#k?ya9t=MUn10{<9u-j_!x)P z%~)+cf?U001tgw$Ze8v94D~-MDENsX_|WXiUC*kjo2+#zB@WT6vV*5A_EQ)6C))a# z1k;)Y@rJb?DNqqzt`%yOl8){g+E)X+Rh<1?#RtB~teHY#0rn}HUbrB?A9xaEZUp%B z1{2e(m{cf$40qpVXeF*(wC?6*pRdk{nv!4r8|Q3$LkYC4B@5b)c@|dSVO&)2D(1Vp zTQ`-lpyO-I-NUK%khcu#!uZ~!-G{kvhw~b0q?3Z;_eFaVp={ zUGr`C15hJT@iP54gk}(e3C}%jzjUATZMc_;ih*A(8XSxqfFp^(v_GEF!D!!~UB4Iw z-(~_VdQND34htnDCwWqtin}PW)EX^g(}Z1j5QZC9+M4wjD^wiNil$+u?&b84k_Ayr z@Y0L)v-r>$+w>~|_@?K8zQe{|&JpLujpZCUZ-hWa1^`iaHU4~y>G31eNV0i#Z)I0$ z=xU~R%xCmY8JDJ@T2g$GoSqvp0^eo!PXXNA4%s|z)(x%7iV5caLC>0p(;Gue;erFk zbD;v$(f8=|J(QoN&crFA$wgm*2E>R1*F(*{eTk#Vka8J>Ioyg7d^+4LZ)5r^EFRQ( zno;pv`-fM}>O>`yS(yI-4qAt;hHNY=_wf#WG3EP3h0*+?%JjZ#1(Ub@EI|J)E9JR$PB zZ}*8>L@$;>YkhZ$!#ava>F*cYXes(Gcpm;G3a4kSU9z{W<;a=GYHZT8Hv3(t$}xMB zdf<@eM4Y6fGdNRBtKOb7fyvYWs1-VBqsR|Bz%jhI*a-}o@IJ$-@u9Fp5MX;+x#7I0 zKzw@>bmQHb}$jC zcQT+d6fo^CQkk?-2tQHjjTfG+P}M8YuDo0Ul4~3lIX}+=7jJkk+XfPbaj)ng-5$No z0&Z6vHr_buZc)_pLpfr`ZY9O2u_VVwkRl~A%|pV$<*5tQG};7i^*qOt!YojfP*0v0 z!j`XZfYvjheboJm0yS^;y$~a4PiQ+Bn(~9u+0-xmk?ZwODP!iuo}X`F=N>*{eFF5^ z8@2DN&NSmkr9(t%dVyr{p4Pri)P(;VI6QGgYsNK?{5fLEc=A5xQJDXcKWwV=)hoCP z6DGRVeQ5|Sw@_}YnjoUS0evVW>c4vQg)0Xgyk<# zfF$kv<{K+~U$Pa|h!JM`9{46*ohy;^T!(z1JKqywKFFdxOrt)VSrj`-MtTt~r3{0I zHjgn=>jeyy!MIOgno0yjzjn%wh?;PPfx*#)Mm0I#o$EnYufKQZi`BfoZipX|R8wyf zRb%LTC+vZ`vGM60DUOB8x5KrA!76^3AVVhK|HDXe`sNlcFkr?w5Dta2|IREu=_;h; z1yh|1!q3bhCl4%JN&3#d~BoL?8ZCPhY;f5XJ4 z7kgGSefB94M6Ta)YMvlF?kyapwhh%9DjQ)=LSI`W`2Al&?5Gtc<>ia7ULwQXTtotU zTYqaH<30*qnuH%qH{pne(1o-xh=T7u|J{iYNJY`aVJdNp{5Xeh!*+5Um+S#hmtAA` z&)lrG;cZDJQjZT=<8&v>lu0I$CN93H;v1H+j^dP;VIjd&wo^X4G#h@J#Iy5Q{+d2Q zk;Sgw?8~K&w^wc~%eNGapIEfKZ|=!T>9rBwF*3>zL3AqEQ}1|vr{#p3RVaBu>V&`F zH7ewDlC-<4QQQStI}22_ah(Hg#O=miVTAm2qu|&O>EfQ&=YssAvf`u!GaJ!tCrXgx zj_`H`2f&S(GNyTr(>`iS$&Gl2R*{^E!wW}2toxc7HcbPis^`|mql#Tw!v}qC(tW=c z{7L7kP|dg4I%L8NVdn6`cJ7LiBcb?1u#(^S<3IYblY#EzTd{m$L?DkhE*&)(3Z{|( zbUvcvSTAkVaHQ~lBJn=PMeJd4Jl}#hdg%<44cZI8Q$d2h@|UHUHTxskc_#i6>%^WP z{NOH))SJ1NEwg4)oB;-hdk2 z|8zI@C3$NvREx|3usF+HT@;|WMPL+{OEi@0-}H5nj;Quv&l%jY5wOSj9I*EXqg01p z*zN)8!Umd5S1sD|lZ`O{j*?E6N+Q4|i&*!a`D98WesLuq1~dK`nl8#JF$&x9ZJ*DR%~#U zo=x~ZS`xrTc}%D7a!D!)DT-qq8ScA2Wk8{}0k^K)3B?FV*k!GIdJN#ppAeR0puL^V z2-x18H68CO$lI>-6V@e$(8ffj6TZv!tdiKBEgX zrED9zFOMp|qcIi#M(`MWvSP_iwl-TQG`=!`Oab$I_bbdB3u6u3q43LU=UX(7tnc3p zL&u+Q5w6J4H!Gw1&sJVONt;w5%yN%O)J1i7H?$W~sB!UbFidVn-;_}~$w2)D0qlg#C(qXb4hz2$Gt7;ujj}mn%!#yxmSfBC>u`dO6 z-6-Ig?l^yr-_&9&T%NikU4`F(c!cS?4-YKg`z^kg^%#$KU+Z?3R^bgz9ea2>4eN#a z;iw_{ki)J&A($-K&IG0pUnXA_eE`oF*UW`M+x?TltiM4oPe9B+(w8fa_gv?n+SXCv zjnJdh^3%K#zd>y^Dz&kgu?PjFD`dvXJL!$Uk+=PFAh+9^|s`U|3Ind@85$mFYgs89Cf>Pis>@x!%EV ze@{&xis1xnJiYH>_>_bo38u;HMJh4j_siLPY)#lN9 z@#MThMIJ5iy2Ete5x5@rFVpS5B?vP&p$&J|N4Y_ly7OJ<@ZHV;;D;e(m&=4<{~r8% z7R<>bKB@AVWjQlTm%cg9k)Y~DZ(2K*6XB0e^55#49;=cKsmZ6@ODRbk zxxWdv96v4<^3^gaun^#g|9ZRuMOVDNz0-((%ow>8XbJDxss|_1_>B=}3V5eje##0B zn&jQ)s=F%a_zBeCX2qYJybL0LS^Qq_eo@Fj*f||Uxa}i3$gV_da#h|*Ros_|C>H@5 zA5@4OdqwR#gEld}LxniMBgGFzq{?=3;(EiJG-;gk^z;PR!{XZ7K1*`mC@{^N7(jTI z@4u%tAVj9Ba=h2oxAbiNBuPD2e?2e^-!J+LPT2pDRRX9Ok(f7uqb;gA#qn0{+CK=I zBWgqTUyZaeUf8ngG6W>D^&53aSpBnK7e&74D++Bdn70it+=B}p#Kg9jH}>hfOhg)E zUe3Q2I2%c6P4Xf>-U+Y&^sMLp$Ph^|{$&>9WTsER>i4`a=pX4?Pb0Vt?jrnGqms2T zCH$%SX%Kk%zP&{xa-Iwq!YV$%39fbFX72es{Ce?l6x{)CNt;56sdth52T0)tgwgzU z>rJnX(=ET6#rM)_Q9Na0_~UV>asJk3c+G&bkKm2-RY4%MR|@=jl&N>BOT+u;2fArP z*E~v$^r!=Qs90l6+#vhPE>e%xrrsB{xm?6uL7?W0ZM-MxBfr8ZkO4pY#6BW%=}U~@5bT!f{L#*A>@0q?DPz{WSEvwaB2-ctHw#OJ?+;^PIJ>C6?h_S0X%V(Q7jV`IYKL*%c~$ic}r9ysY3;XjpPRSgrWSeC{Axt ziD6DzHZuA=9T(p`B$QQ{G6ZPB@1Ej1dU0Xs_`0e|R=O7RtoQov@wTf*7Fh9CAqP$2 zYYXB_OL!mqwW*A1XC0}twK!oBGq@0@do6iiSU+guQ<-*L4m;L}qcv|UM2A1-EDUA}%vghCTU63&h$yJAPKTJ$;q|-c z`n~&h>elyPeNx#$D{^Gn_t^jPUW>INBiSQ}fSnLYcv^ANhnJ^<+kO zSlWiZtd$!`UX5fIX5?-)ZKZ5105*EcOi6y>4V~i~>HN$Gt2Bw_@jk%M=q&_eFG z^X8-924z6&%i%@rE_|w#9ga5jG|S@-Gyl)4z8Qprt@iMhXTEbVi~B{hqH^Ba?oS^J zc#1Zu2EtHuSuhr*Noj;k%O(D!U(+q-KAoydS*R0kD8DLCYIQN#30AntahQ8i2b1ZI+Pj%u&uc}?S^1)EXeWgl#KKA^ui&3*<)0b`W{$y3@kY?O zI*Y6ni~TA`6hcEPB^7x0Sc`qWlfGPalFwQ~txof6Ol=X@3O@2*Z{}NH#>esA~6?&ol{!dA5s#O{e8BR|;aX4JsnhAnF=#K_XwVM={9TRXJuV;NHtR zvL(0<$#({txEnis%y?I^(a~_^_N7j!+dY@o+1(@rTSoIewa#(Y??u}LbNLZR0QCV9 zb`35jolH&w`H%b$LTv$qXkI!0!^*ROOtL>YVi7zTX(%^pnKm$b51Y{z8>}5;0i}u_ z1bJ2paf6&=_~3gsLnIXf#zR-OK4(KdHquZ||A4HdQ25sNd-n&m%s)TYWDK6ZnBWTC z@>&?y8x@HA{eesq`yi01?gGg!vJZi2z6d%aJElp9o%b=WD=Pe}xn72LR_3va0l%(2 zjR3H*uNV78a6pv`js{l)2|;xL?a&qj0~?bPdE(e<-~H|2vdxE_d|Gkwg06hVzK9U? ztsHfO8~FTBNdbUAm{b&rl(ZPyM=F@##77a!H2!K`4;*&w!82h?Pc8Y;@=8YhhQA4gJJ^fKd=s2*Fr9gVaB7GdG?`)~IyuU3h*#<1nv=$`JH z?+e7N3v|`R*`Bo>{6O&zlA~p(2R?Y6FZ<)yA|NbKMN7QPcJuKG<;Bq5ub*PBzIAY2 zI7nYp$B%T*K3=E?!<2a}&^`cFp8fo^b?r~=r6h}qHu^cB@9nv@S!5&*A?Vf#vM2eCK!zF zdt-U5a$I9p0{8`TVFuhS&!Y$PGe*6WFlga)@q=UA3%O*YeHM+S4D@5OwD6kg8E_`@TvO)6v$A8zm4 zID}pjVFbBZbhK)-KP)kDM(I;?1FW`y1z59m*6jZaJ_5o0sS(t(a6Xy-EBqzWKb!AA zY6tg{YdIJUs_rcz#LLbx7&H#|q}D%*f5O7#m-~YuE2fu>QI$T}V?!j?mshOH{v6NQ zaiG&U#L?5!ZTS7431eKYQn9p@Ty$P<@-#rF!<2eiSr!x(k%qF}-Kp#3M$5E%XIP(C z{NH?`<;e5}g+4}0fA1&tRsfhiuP)^*u1fvBV2A^NcOL&Nv3_<~rZ|Aq>`g2me~-MO zAg0&N20LVfuRVe>j+v;cX#?wIP+dC?|N6ZbV6%)vOUH4Q9v%Lyt(b#`_C~2U=+p4@ zZpN5=4#maf<*2LcM0|5AZuCTC7((8oJ=Q*R^P(^^$e=(gYqZh*8vHmFb;rZhA|6$3E^f;#Xd1u>e3;va|%Wpa(`WrWHI9v3S>ngq&{oJ!b9{{dca-HGdz?qke zoE!(7;Y8+(C)$rtG>9Bq9&&Qjv($$|LkI*@pAvPv08~!!i?l!f@nz;K{WGtBrmz1q puYcnidj7q_)Ya9U32E8>6+aTY>_ZbthyVZp002ovPDHLkV1jl1s5Afo delta 16540 zcmX9_WmHsu*S$kagLETEryw9TfOL1q0D^!>N!J}(IwYmL8w3&QMg#-|MY_9tfOr1S zJ0E7np)ikc(UXP-$HSi^Z#1+7WPXt+4C}vD8TLM~NkKL5i4|A%THlMahRagiNiH zF0UZRlxSnOu^L)UcYe!oFcY!YJooOX&iH-vwWe=DF(#>2P{k}87LlMVLxVUAbC*-j zkdshj#{LxI;rgeSr>&>0m*>;aZ=3hNCx6Gp{g(trfB0|S--~xUwM@}SP1=Hu{LFme z;u?zhFx(XviWL{ARlUg5Sa}94DK4_7cel4)XYFiQD2_t+KaJ$E?a&pa!vFX;>SF(@ zLU}QoQEse88unQoVp|x~yk(iX#AQ(OD2%EN_Y!v(&M~c5)(?`?#)CQ_oc^6#{gO;{ zwPDjnWS65%RX~eR3!_xTE}np80l^~|{r$HAJ#QW?LmwCL<^f=Qq1eLFBs${397=!h z2QrK?D2y|$k(tEa2ehDCosD4W>!Y0R0=#%w+8L+PUAi7a3|r4y zdH)v2&MkP#DbnP7(b$>rQohm8m;wHnv#=%)} zOH|a1=!K+ubUBR&je)kGVhZ$_=U>##E15j|%tk6PR7&W=ksu7+duPL7`1u5o z^iVgtmDtJ2^cu1}Oj>z75#Pb|hz!1N1r#W|SG;e@d1iWY0J7TTG5|BajR?WClY9dZ z6Yzd>_#VS=$4l3D1@(nmf7}%W5G{VI&LY{ROMzbSaC(}3+5y0t|9;dmy~RawM)24} z8?oQq9n~(2=NK34CrR;gUCfL$IQ5GLD{xXxkhcn2KUh>pxx@!k{QFCZ7k;-L>`{r& z%}Jld7JTv&tn`oJG7M%mADs|j`P#&w^r_8pRsrruF&9p6`zlZ>KOIL`xR*H25!U>>G`WcT|W9*k1HuQphnA6BSNU zP=srh$;snOHX2e4*fvHsS*bG1j1-6U5@7{*Vad>gRr&#_>B^8AP1E0A(o&60+0b6r zFGlEs=~=cn_6fsM1G6%IbfXN*PeR@|mdkwFL57%~0r)edwQ=>keCpTvmRQAss93w5 zsITk>_2_TRQoUfQ2Hu2I#4J7de*5W<muJn0!~?sdX&-wJg0nu znfV0$0KHkg?TTJUk~!<~Nbx{vy0Vve0`7XL`Pj)bcBmEa8rLG&tjzkc|NTR_2iNA0 zEVsu_Z;yF5Hc|4-&S#vxOYAv%8>;&FsG}DQvUAdxYJ()YD*?v?N7oxm7TnZQ$lUrT z$CPx6a)HbD(l#tCOq(>_)P)AKRDk~L*RL^Swx2Go6FxmnX^V@l`{Sspu8zO&xylsN zznY{mG4Qc~Z3BG(R?l3br=;}qo_#_WyN~H6r{ZPqA#T4mi)3r}s^I8R;xjhP7afPK zVAPs38#g+J7Q|st<4O!qnU0~KCl~XZKiyZB?PPxP;l1P;tK^4P$3nhlWxj0Q;~fiV z9O+Wv3;TdC2wkF@yS>~uOmqL{3A{wYv02%<4fhU|wEc~7Q&AABYXsNBOF4sKz9Dnh zd!Wwuop+_#x(F81A?W>&fvpa#pJt-3LF^06&(yob)CLAa7BizNpHkz8w1b+TpCn=l z=?wCtHuwg-TL}24Cw#A9D=DHS+gOSNyZ9NewkaTjpWo&=Q7APgGft3Ij#4xdPX%S{ z3mIebJiLdBSNab7-i4LA*NT1MWhf$!VH>cl=YtuMP1@ns8^-)TNfwprqtHGQ0JV-k zZ{ANH3Cf`W1(Ou3ClpVk`}+;Kq7<1?sLU$D5>XNh3GXEr##Q&UsHBIT`)&j|am&>0 zIUbBtwI;^oErT`z&}SBNjnk+ZW}TioPo;bO1Jx8EorQ-ekJ)mzf&< z@^{-^E5~ZM+}R6A@bc>mp_cMByABlqjiBNkdC%6_%7EDK(@ta36=V?xKaR^nYG4-H zXA5#A-k-+jmqk)v<~f-N1U6%v3Tf4m*!qLU6gMcy!mr%9)Dgdg$&e4RFeuB4Kj6%hpAesO^aVi{F-PQW62M_5^!2`3Uy!o(9rA|+T>j1=9I3k0p%l%Q9 zo8o%Z6Mje<4C&nboc2;BkN>rp`%Gq&Js^paBW7CwCg%BR4ZhV&uY7o~!M)6nbR z;c5*;s--B6n(%WxNt<~l#_8y6YKwe==e_R*wBVz3ue$C!b-K&-V(EjsSjy`+zX4be z%*~3@Owt08J&vf$SF_y*IYGOB9X?fzqDm#q(9;S}os}X+&M@GV^M)a7@J*53<*QE~ zx&feVPpu5u19T%@Ib9E~Q`2fJ6j*zI$6+LgA^8BW%@WKmoPUeWgh~@X*zKA%~l~WBv`QZB6 z&~MBXC5e%s^%a|u;t17i%#jp!P^ejRtOqP3a~Qxr?)W-8s+DW3*}3#Rnye?VN9FXf zp{&1LF92RY9)EjlH~m)hxdrOnw7%Eauv8@KAk6%ly$kf%X*k1cf zBBq@8A1g`n^lx_9CBV1ydF)c~vMwnGpfaV1OY;H~NK}+v7m3rlJ>(+8v8t!As%K;J z012(@MG94;G}iCWG_Y;{3r>10ioaK{kg3mPEHFKy z5xJMjlbiyR>p&eFRQAwYmLgd$v;UweYD*)z&=&OeOvLF;zqb!lX(I@n80vm=CVrvC zK+TcU)$r)Jk?UO-U1@#|*bypw9N@;@T0^AYdoQ{`;e$EUKfjso!a`!Mb1BDs#PP~% z`~YK8>{h&)r7uye%S2Sib02zdiuW?ANYn3{=}$oaFIi_V@3f5T31^yLib`tGzHG0; z@7OdJ=WdT0{7rr`!~$aL1*Pzi=a$n?eApD!kIVh>PA!=dUC}6cL<7fb@}smK9I#*M zcfA=J-&%GN0i+zv`V{R63rz7a7}%lum8A8CxJXXXuSC}-kp3F&kK|&C@O3P08_HOD z%Vria$c7VPh~bT#38PIOwo8|XvJu4VxyHoyDS`Y3Ik$E;*qLEmmhrG;H!f#_^U@kU zedOAHv}mV1Pn9$;V}y6){m){QX$~lNvNGWi0x`wjr4@Amc<^@RNC7cnN|h)AS`0Xc zxX1916%|y|@9(%j5|L;c=-~W{g}}5p~-Y- z3+o{}-7wQAo2KzDS9TAzD*6x~Zg97GT@@-f-tM^KjeWjuurG%TfK4b++Zuk>oCP11K0`c+dhhOP>b-oe1+j%K zu+jO^Avz`Jx+HE8E)N$TbU$^jI4Zz*sgQkKDZB74ec-rjX+LOC2M6#*+^qNqsdTQo z3L$QIh`gZ0>lQu(z4cBICw=%5L7k((+%FCQ4=}v;rxW!1Z1XUf!}{nok_%%jE?ojAndu>`Wp^(_ZktsdD}do zk(QoMG9Gd#g?SC0B~w?NjT=IK$;^`IZkV>5WB3?l*k%*klEO+xc=gOCRBxIUOA$?Z z%Ezmxdjh)(Wrcw5?(nP|h*E4lz(|M%BOx9bU-}b%*!Xr_N#XpUGgnzRi*0pN47HuK z^q9V~z*J5T9U(~;+^N6#<I!j}Wg7MQHqe>>&w&QtdKmd*kj){HHo@MY>fcmkL-jniD zmZpp#fumb@?;<&uGSC4IMb@fP@Et!=kj0ISMoiwi^XbFMLS-1&*XJNoP4n+nL6Abf zQttA8V|`9e3(d}K+*>>@i$=`4`7dFtJW+JNZ0Xc6Urd%T+vUX*x5%cN8lL*fN}T%i z2j?nX_#b^sC6N4;eF^a>>;p$)B+3t4gnOr%C_1huY^@Z9RwwcYDQqIzf~S*M3?H-Z zW@`L`)F6Q^E6ClNuWJ29r zW+d7AKVDp?NxCWPyEZZ1u8oJhCG2}j&@m!$f;@#|9^lo7;76xH6BQ@J|sw)ietnu{f>fFh;jB_xTNUO}AaMWQ0w zii;s`1k?83-qY9ll9RTL(aAbE#VEsHuvOZIlmt=?F*0=`9Z3vJCiBVzzqxDWq0&N0 z&!0&P=)-jv#&XwDT%NRxR@miX6Y`aA|ETBy9k1Duku?5szw5YvvnK`{92e?$7Q#+Q zEkS{=MM$Pyy$tF8D1(@(_?R_|c@Eb%x@ow6`VW{0L2q$F{JP$GMSUMobAuTb8) zL+ZjpM3ZJ*Vq7iJhoYgu2=?sM1_Z6B4E#+9Ln`&~NzYMWx!*kj4(xDhB&47Jf}W==ek{3?QeY`rZjc3Gx6t7&iQ9`Toc^Ec=}OxUS0x|YW?z0 zuXRb#Ad_~wdPkqmAx&LY^%YbbNuTp${;A231Sv8HKLlCyiT~b{^Pa4 z@VMY=t&Pz&vxP*M!>u&sf zeSfk;H-7POa&Zy)`rYqm2$X(s6r$F1BMg;H@Xf`wLp8NJ|9HzZFy6!5!5U-9MMi4B zFk#5WLq0+$R3$q>)%EL__O*XUGQoDYjJ>^E;5^~u&58lYF7+L=k;szk&qD#dqEG-g`8T!0O*ux9{zQ>I-f#&As*0s!~iOy#~`G0@E#>D7a5`X+v z+;UYie`yNBdc!Yn{`)3!DrohEJ(|^Va<~RwLuJ|giFEwqW@cJ;+TG)r@DeQidYrct z5AgjvHJc!wMu^yA*?x}t5F_*Tu{KB&3s{Z=O(2DCv8`F6zw2}EbnjQV_k{NSbymf~ltOixb(Pj>tzTgN$}Yo2LQTPnA= z{*vqKhMK0Psex-B;P~3@nb2{>)&-*cq%hohAzsO0`1e7!;mxSB%_RCP05AYbveLTV zi#P?l#;oE;=vv|exB!K@tlJ{;#YVm4HAAS2U})QKUmv4SUcx|LgCiY~*XB>Q3mWfD zt}k#?cbPbw@uVilh!4K4h`;pwWn=mA5pfb-aNT+N;8*fISYcpJZ`9l&dU=t^GeqM2 zTCS#S8-aMp&VDzCwYIV3y4eY?^irEql6W%>yLZg*Y9By?#GY0p>t6i_x3a z&Ncek$h|;B>zm~s3Ufgkz1bv5Fyy?^+tzUQ7}96xfV`8~kp`azqAH%;=b(Ptcn|I4 zbyk^f5HRuE)0a=3ms>t&;_AZTCOQfm0%T_|Y=wdAL&QK=hQM%;?IZaO@A=))MaQ$1 zFaOm0h2(-g={ul48AcC3fAVhK80fkOnv3wr4q;4eopm30Qirc_f=?a<2NVCzQR*^vUGAlk^6$0}Mlgj>h zWhR}K#)!vxetXSl61z6LBvy5MH{Y3_>`5QpkMeDSv5P^D@#%wOLY#&Dei=$bMTXb_0r+@F1rg6<-$@lvoChiMEVb>Y3Y6&UV7#<5ljX%r2ci5^@htX z>pf*|I2$d-a>&L3lR&7Tvy+}oCC*9x9mm`OE{jHujE>GzQL%tJLpRm4`GaStr>Dn% z-sUorV0Sx=jioQGz}}$#o^++se|LyJ4%XCyK%Mb{5x4|SN@76YqtVeQ@tBx6@uLLE z(z#nohRkEj=9z#44EOiBOnRulyqq@I=lCDn=52ZvwD_B`fx3WM>4ke@1n&N2R`NWe zTG|G%=N2hW94R7hr7WsISJ2D+Md*Mx=aE8YR#+mGJbcGanom2{hOkwU*7A2_bIs4G zG|mbE@t7V~Gb~en=@e8p;?Uj=#jd^5iw~fu4a?;2>R9mO|L#tVpXDI+Z>4WoV12;x z^f2{4V0wFF?vyYtyv|NKabIV;=fHDx_nF~rk?~el&5v#I*vl4U?(J>6sd>3gf{53x z+Xc}8fQc{o3<~}Bb6O#uZm>w{Dajg1`YL%S2(W16-~w~?)|jR>``6IBeSsf25+?lW zf6&LA-S1nn|CM9^qU68iY?J1+ZP`0K9Ql~L3L&q%)r|MAU5el{9oemvkg(51-8ll+ zhH{Pqj+}ZuNOdZg9URq$)vhVsJ)VE#deF~*0rzcQeo>BAgIOIcSP0ZsHo>$Rzou@1 zVjngx#DW6=xKdcxij(}uE}faQUk++_l1gW?6@ zDdPk`1D4Hk9y2Cf5#zCsx$2-pY+h#rA#GCqX;uYhrJaCox(Qqd!kcagO#UQ`p?yV4 zR&Q!vs~a?ZO*)QiJ?53E+x_B2S`qlb712hNo0TrqNVA)Y_u1|1;SH^FdjMw(-tU); zl3)2Yjx=u8PWa;Jq4?6<5&b=R-@eh3scbs`^b})?e;OG|gmtZUGH4Yb;=WBNlTU~| zbuO1xd!|>J83+=A1MAGQ}wq+jnj~MJ9vXBl? z1G<&vk%qWhOsRF7ZQrLzAOfdPr?xe)i%<4;_j_CtMkGyIyjC4Sf|_fNSA)p-A--1= zR`Yc2_Jr=1+lk6M1s30$H03GM#dAO<)-c&fV9lFtNe}qHUv|5d&1>RmGnIccr|OMC z**&;mqKdWNon{9b41&IYe_(!YAO5)iM-tgR#rlq9J?o`$~(uDTT8O3qnzK{X#kGJ3jfm!z(0-slYw09lQPJ$K$IIvmnlI@Kj^ zt-fp1>)JGh{6s`WMJL_4;G+sl zp`}7UdkR%Po_zCP<8n09uKj%J?|)zcFbCTtD{ei0V=qMmO?nQ>%D4Fcmi#o6AZ@nB zf%m_9K1ajX!869uRj$KYSbu_JPhWsC7|Ar@_>!K8Dn4R^zeGJdCOmxHvXN3Fh;1Ca z-2ZdE-#89P>03_qVbe71P!ljs@NbUi#?y*JRR??kX*eZhj;@3V2M*?{pxZSXFTZD;Y~8R{sEk=Ytfudtr|rs8 zVHtYpBA<1d9xJ8MhC7tu=H)c#=%dtH8ADG{pi zR+1GIeY;SsA6z-}ePy*0e^=5nOQYE>b!N(2BG9Hw#lVI!TsSd8{9=lIiYBfpg6Ief z<}{|d|F?niQ?`KXI?OQV*5Cb!mRFi{Rv0w|w#G$rBvJAX(QcN>SHTU8W8zTGLWwffR6jO0ciL5| zfp|JDF&3qL#U$SC;iu64zw0Q6{f1Ll7xLJItK#%VJ9Y!)ICU{_rJRez?zFMrp&nk( zckGGzhSX3pRW|4S^?|SVH&ixG_hIB=E{W$DV3!Ow)b86)K+%=)5cUgwV^dm%_ztQ8 z2_?vkNycsv3VZ6Z!G(OYX&}C$Ee&6$7%gS{@py@H`L5t0@X2%U8WILtCek0@gBl2f zCF_1_@6$Y50}0TuJl>b_Md#13O`dJ6#-KW&=>OA~dK~vr@%hk?t-8O0q$NQt*YwsSDlAo;{{4JtdGKBm+ z87hVVK674PjJ6%WVh7Dt)P)wkg!!Z5O{uyB{LHYn*`x)q2>}kPuyiL^DOud;R}t-F zc=*&`j_;N3=tMG)zh=SyBImYmE`)tv`0%|H^v4II{N#tBYE@mP?1smeU~pe^4Wgri zb!BU@@Z+Aykl?6R7N9$oK>nih^7Bt>&q#-gPaYauMpy3U$Mnm$%EXokf&gbCp@-MB zhF9*Agji*|3}*63pw64Kq;}F>E7l5?Xnbyd7Fm0d$HHqjLJuWAm!mWpQW#QT7+46Q zU*ytHW9w3KAWP=1a7Lc92HEz1cnP4PrU5PiRLsFGG0Z zojJzigT%aus^Ld(XR+ml=++NhXh34&yvx`q{^Ew)b{wO1bM!2z6T*`=nqWbBP%dls zPJ$(MJr5=x63OHSkaQo=giNBZGYYol;R-}n;^gRD7&gJkv{KX-I5yJoeX;9Gat4{w zFzW0r=$s%=N({4ff)#l1^6Z`^KF?N==~^Uqr(-0@QoB3-*!^!$Sv$y~sH>}1N4(m z29i&VpMzyyj)GqUyeD1U8S)XHEx7~jNm{VNF_8d{(BKmRy}Rt)lM#7BfF))eH34(H z-dA^}qDd0UeNF3?LeA{7>KB%C@AZ|}~}AugVu0ymyPapxyewMe$tx3PX~7^c)4xt*f| zUAIpRMn|1^hxFc~GV4+<&^@ggptgg+B(Vi)I}@MLup#@xDGt%y@uvvP*78qEi|^O+ zd-EI;YD&YCI0k|^qyQ{`1O)1{DIOPh(LYFk{HaqS9_Iq1{$%#C%EVG^te7%lTf>yambcY}7izx8w0vsXgS^=4OQsKaeyp|CddZ zX(Es8)sP%=6{kGevVv{m<%KlKGxDEFh$0WXZ@cxy*=#!1iA6evCVy4xTi3B{O>?qB zY4;hW`F&r7l9VHj;-y@&a$OjUbKWf2j!So4X@!INivx3){LDtRc@k$z6};#|s>_UOv0}p?P5Py;GHVKfm&PC%eA_%BqHzYtz_YfTaxQ(o|HpP=&6r-^R`8c<;(@r`dL5p}?}|5*&0 zI;yNSM?1Yqh4e6gou``G!Os<-UGiZ>x-$0u$@A7dGp*kR$vN8>>^LKF z({rg-bO(5;1Ha#ClrNWA`dxyoErlluZG`=QBRZq*a_%dYA-gw(n8fJ5c1uoNj}H#` z3{wTb@{wcj%;@1(8LuYRMM(?>a%X_Y#FrajA1W?3D@FiTgqhS56+0TvD&Iz=+RU6% z=v@>c6^TLw6Ih&5+RxYygW3$r1I zFdP-jVb9!^AH?9XcUa#ZWt7+O-!E2cDD`7qXz-b-wLn4$sC=3P2 zTDKYfkyy19J|JtF-eb%tZ|z;F@Y!vHrlDZ!7T6I2_~b14QUYJM1#l6EEjf#eEngw! zs3}(^Z}kZTej?6G-F+buprn&5Kd)1m@)Ogp53Fh+2A4(50vY~X+qVe!I=eq=k+xp0 z)S>{}e>n7(TPq!otBTO*A5MHdDR%K>kf7*- zo7ZyoVi?H6rK?)q(=KOVHFe8fv7;_JQ!W??WDpncwJ$(oc-$=?%VoJ||I4J`Nah5^ zlPqeD&vw*P_H*PRe;;Le2yJZAl)`8{(eB()Et=+t_It15Sr@yKCkx7_>0tvpaf&h2CoXe{rLwxV^S-7?cN3R7;A<;{;SyZ`nHhX zDg1Hr3zky`Wlu?f&m7N3L-;etM**LA2Xl9vF$**R%O=qh{Se9aoS#$I=64?dRB{xm z*GRmc>ExrErAxfjxWp{cf$MkbUEaTca#2_hjp6l`@ot)6uk7M2vj15gM+5qN>-WJo zf~b3}FCRSE{d!TkkSc`z)Yqd_McJKCijj?zE#|=Rp1gHD!zjGfTWt!!b?Y@>xL zEW%L)D{wy@;w9YuQBuFT%3Gdvqr)oNFrZ=s?8Nqhpy{6!KfsViPVfs7Gg)oapqE@(#~t`5!Byk*q4g^xOb-TmQsPdOC=-D87UapE2Uzu}Ore!9E4$4k}~_~UsU-ncW&+jNn}k4tM!fksMQ<0N^K8n z%zrw2yi_P4EPNvlZrt8$uP;29zZh`;4dJJH%|$F%JKK6yvUD_v#eN{8@Ab5Xr6P)T z{M4Ez?G0R4nXCU2AavmG=;IZ`_jZjv9HBG%E+A1j8cWVtbSsz`&uv?DWy%8K6D6> zFJ79laek$_s%gi}4fqAXuQ9(Le5+$=Ra_K$x}m^7*DN9si=smXExZ@#o~rEZt~R`g zXp$r>^aSOrP>&B@LDmzq3M*El*Dt28$2udfMI}7$kKJh^1CZ49DVLAzVg(=i(-{3kncYj?dP#aS!8>{vo3+W(i z8eEkKIM&G-TWd`uUDLb!EX^V*Rs0#1K_gN-#B1~*8aZoI#t+ZGfsX_LU3$w&l|8uZ zQZF0y;X4Tx;oD{ycj;R2+*PtaSlZt6UMo8P3baAr5dy{cxEG7S#ctr|upI0kMII_& zu#azYmwx`C^=ZB9w%AjL*fY9WcOSDtK;~%+n?K@x8Tzf zaj*>3+R^xQdC?K9{R9uYkA&Rw4yrKqbmV&uXi%5at1f@vU%P&#Qk`j5uex#4`Q>_j zA9%eM*ghvfgLBC*LfX70+fJ*a6|AErCO`j7gy?F`yL#|M2c+E zZQ~@!-4i?2sL1K9+&;3=0gdwg|BwQ@OzlpO1m)icXwY9Cqg*P^b4m|NWM>VOtzyD$ zCiM{y+go!P!cU;kGk(uaHDyrNQ`vjWJaQwEg)3fg#Vdlt^|8NN#H|PzOO;ijFJ4g} ztZjcpdxRJrXn9;UgWg#>^1*X)(wC;T=Omy(ui-_o%eXyZnq6lprWyEK1Ei@wW@ zoj@g4aV}K76x<+_R&@+8`-g_{B*(IMKj<8|O~kZ_!QI0CClUBT26`ArQ3azz=*>^l zf2WoWPeWPiM#E~e`>?eAqfFM>H5k5{mo+? zzh+<8V<6(5xYT?K<3KvVPPgikqhoe!>o#q0TaFPFAg^ zJKU__`JNblkkI4|-QdY%(628^%I3Alh>-IFrmk&PEPa(<>O3EF|w@$>Od8d6I!Ht z2W9`&?qayc_>f0}|99~;%<~-82(RRYWchVDIN3`CTkWHZX%~ZAa}G;*#xUis`OppOyHRwq zz!R~Se{k~9ypkzs){yV9%XE49xlP+*{4Y|yAJQRZq0_Lmfi?V6bx6=SM2#~X( z)U-5Yat5-m`yyq#r7`4lH9{u88n7-Q{(z$j zlJwF{O)UBnuFfxYgTfH5yD{k6Zfx#agq|L1C|9^JiqiPV!AQTgfXVyLtpw!~Lz+&BOI-s_2F7^qkp0XHG&jTQXey&F z%Z=IBf5)O-+b;oME3M_|B~+E&dc*(~P{i_I2{(HeFcQUA-X?7b7;V^#No!_Bv4AA` z=Cqn!{@j{|a2iH>IzPzjcOsf$-Yz@{eMxIo!>@0Q>%F|DPb0CL$YCIJROENFR{q~% zW4~A2%$FY)2@4Y0dK`JtI+Y&$;Rhbp;E7^h2u0(@+t0en&OSv-_?my>6C1Ql=@>C| zUcJW#WIE_qaIb}}MVzobA(vJ!s=*sOx;u5+!447RRef#K)^!qrK4Z|KO#U`Ct8m_aam zT7Y*DjBrYUw0C}i)xZ}rEgz53IWdmkL2sj@teAY3i5lr}SzGaM@@ll={B%5PPWfv?TIE8vW+1UpY zJ`2`(d^<)As8K*c+`qm*L6~~C0fVs#-_>r$_E$};K}-O^I{R;#z>=11A)U`(_hx4X z_51t7*Vp6KyH<1I$eyucVNQFNxm;psDxX9akC-&Q!moYDI30NAT7Xg=#sot@{vv~} zj+KqxyV>K=GR$#ox5)SJ4S{8JA<5ubI3$U;KAXsLw4QPH4O9}0dN8;D+mQallueI8 z4oWlCP6%dk5jT5f=LtyL|of4YqEE!^!9G#8;iaDqaMhQ~WsP zJc6ci5}kZS>invJ>&nyQEu^I$?oll7%XopA&|{QD@K#BZEG;3){vBaok&HT32%8EL!Me5abZxjTYyh*2 zhMMmNqoQnu(!zspEs76cf#>$_?zn%8el6SUi`7A8rXHx1C!aTY7#zwFm;(?B<0yFx`1Y2HpEh{k4|sYbJG-G9S3e7D=-RR?zlq>oMvb=Jw3lhgf|a zucN<1jl6)AQ%xf63Z_D~3002HH&4+yXs9D+2H_?(7eTc2eJf7Uf_S@VcclV$*P=dl zKU@9DY%PRd|3pPol1^Ato(;RfB$Qa?#$1h4;=9nr-sKKX`B zg;Sxw+IH-u3=EZB{cPQw3fLRvnx8N0p8w0yzK3M6OBM6h{g4+~{K?s`b^@NvU?IJ)L( z8P=4R?2SV!PF1{QXn%F43`)%suuBD`BO4};&TYmiHcjLSeWfXv@og{;`no_0oR5rm zc2)ZBc+6&3tw|;FdT{RCyj+~;UXU7HbdIm0-+rie`{3>Lwtgl4-Q69-`Ne9s*He!H zZN1(r&-XnWQ-PL-+30Y=u&+cgc*CFGmHR3j&FS?VK1l*hV+xbsNUtACw>U)~A<9as*9opM5p~4Rd%9DOP{Zh1k}Z9mub+|pSOOy#5{qD^4KaF9 zJ%ZXi&}&6{RCsI^5aa5BzSdq|&7~Kpwu?j^7W!~Er`%`K<{8(A2Oxf4C2x$kDeqq| zMaV9r5(H)9WiT>ScKPJ!e>IJxsB&FN*usR2vP-0@-tY7USVz6FF75xDs=grWReYj? zew%t;NWN9_s%Kx*P?6_B*BK5ZIm@WcdR<6H9)Y(XxC!8>@V#0lJ=epwN6hwLk7a`z zvGi&m4b&~;%DDQf!FR&SDVDzcMC83f@@PeA*8~zrc}pIYsXS%j-p_p|yzHo!Kcjzt z(5{dI%6@-a{nhL6d@Hwstc0$!2n|wz(OkE&?G=d$_%Z74@|rw6Os&6b)5YL!+I^RY z$jsI*f0ezKFl#gH?0ugJ&rzQ4*}fGXg*I>c#%(@+HRV|#2Y=~K=55~0%o=9synsiQ z|NJ-uNn{*QwMT1Spr1y>^g)XN_G#J`i7__r8L;(D68%sEgR;hPCGEhG6$TL_`NI44@VlP}Etb<#@GJ>opmx;M$ zR~ZFW_JdMUSzdzyJczUnkYDfPyHKaRlcad18-H|3l z+S*IS;lY}XgG1doknK(XI#I7~Il-kN^yK1|itc1?;VUux9DYw%cTZ1>hX*hk_U}-; zzA4%CT++ggy5IxkxrKThdVhaW-g|`z;Tfk83_SYU>v{izwXSP)bSOqNxK!G#52U{; zWw9X#4W5Hue0`8EKMgR)5Gue`DFR>LkEMM@_49#&W%dW!yz^_ncW6k(tof=Ly((H- z?}80+=4Bo}_5xe2RK4ta`+w1xZvL&(ES($D^6qIksS6uBBQGm*!wl2ywuIlRj}4IW z6N@aOS%rd#0=9?Tua6CDRBL z{DaItZY6?*d&~Ye2(V>aNHlIIU~&GI1r?a(X_NIo+8Ng?9;%hXZZkV_OL1 zu&cU-C+*1P7A9^%u?p=(JkB3=1_e`Ugr_*M;uk!=Z zg3C1`smuWmrfZwkc+fwVa+L@Ah}gQjMLxG=mu@ZXsj8`s-Q;z^jvpbq3{R4VOEs+k OhLUA9IB7W{ugn*|O4 diff --git a/tgstation.dme b/tgstation.dme index af15fbf999e..a0b880ad217 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1078,6 +1078,7 @@ #include "code\datums\components\puzzgrid.dm" #include "code\datums\components\radiation_countdown.dm" #include "code\datums\components\radioactive_emitter.dm" +#include "code\datums\components\radioactive_exposure.dm" #include "code\datums\components\reagent_refiller.dm" #include "code\datums\components\redirect_attack_hand_from_turf.dm" #include "code\datums\components\regenerator.dm" From eb0896d59fc3a11d7d6731b5a2904ef07ebea520 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 19:26:45 +0200 Subject: [PATCH 15/69] [MIRROR] Plasmaman no dna theft trait addition [MDB IGNORE] (#22674) * Plasmaman no dna theft trait addition (#77021) ## About The Pull Request Fixes: #76972 - adds no dna stealing sting trait to plasmamen ## Why It's Good For The Game Plasmaman can't get stung and turn others into plasmamens. ## Changelog :cl: fix: Plasmaman DNA can no longer be stolen by changelings. /:cl: * Plasmaman no dna theft trait addition --------- Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com> --- code/modules/mob/living/carbon/human/species_types/plasmamen.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 4d52d15b181..bfa02ee3037 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -11,6 +11,7 @@ TRAIT_RADIMMUNE, TRAIT_RESISTCOLD, TRAIT_NOBLOOD, + TRAIT_NO_DNA_COPY, TRAIT_NO_TRANSFORMATION_STING, ) From c73d617173c512827c2855fca669b5225bc4dfd7 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 19:26:49 +0200 Subject: [PATCH 16/69] Automatic changelog for PR #22675 [ci skip] --- html/changelogs/AutoChangeLog-pr-22675.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22675.yml diff --git a/html/changelogs/AutoChangeLog-pr-22675.yml b/html/changelogs/AutoChangeLog-pr-22675.yml new file mode 100644 index 00000000000..e0c2f97d68c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22675.yml @@ -0,0 +1,6 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "Makes radiation nebula space work on high-pop by applying the radiation more directly" + - balance: "Internal nebula storm no longer gives 10 seconds of immunity and has a very, very small chance to apply mutations" + - balance: "Rudes nebula rad immunity from 10 seconds to 6 seconds (shouldn't differ too much since we use a different system now)" \ No newline at end of file From 4ec3b8b761425b971391a9e774b784e1ee5a65a5 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 19:27:14 +0200 Subject: [PATCH 17/69] Automatic changelog for PR #22674 [ci skip] --- html/changelogs/AutoChangeLog-pr-22674.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22674.yml diff --git a/html/changelogs/AutoChangeLog-pr-22674.yml b/html/changelogs/AutoChangeLog-pr-22674.yml new file mode 100644 index 00000000000..cafc4e59ce3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22674.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "Plasmaman DNA can no longer be stolen by changelings." \ No newline at end of file From 5ac6cecc22147605d9c209b693f473411abac702 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 19:27:59 +0200 Subject: [PATCH 18/69] [MIRROR] American touristbots will now order butter on a stick. [MDB IGNORE] (#22673) * American touristbots will now order butter on a stick. (#77036) ## About The Pull Request My good friendmin mrr.fiish was so delighted about me making his favourite country faire staplein game, that I decided to make it fairly commonly ordered by the American Touristbots. ## Why It's Good For The Game It makes my good friend mrr.fiish happy, and hopefully other Americans too. ## Changelog :cl: balance: Mmmh, butter on a stick. Now for americanbots. /:cl: * American touristbots will now order butter on a stick. --------- Co-authored-by: carshalash --- code/game/objects/items/food/misc.dm | 1 + code/modules/food_and_drinks/restaurant/customers/_customer.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index 65ac2ab3823..8a2c875ec53 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -264,6 +264,7 @@ icon_state = "butteronastick" trash_type = /obj/item/stack/rods food_flags = FOOD_FINGER_FOOD + venue_value = FOOD_PRICE_CHEAP /obj/item/food/butter/make_processable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/butterslice, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice") diff --git a/code/modules/food_and_drinks/restaurant/customers/_customer.dm b/code/modules/food_and_drinks/restaurant/customers/_customer.dm index 761a7e77144..93b2470e50a 100644 --- a/code/modules/food_and_drinks/restaurant/customers/_customer.dm +++ b/code/modules/food_and_drinks/restaurant/customers/_customer.dm @@ -74,6 +74,7 @@ /obj/item/food/burger/plain = 25, /obj/item/food/burger/cheese = 15, /obj/item/food/burger/superbite = 1, + /obj/item/food/butter/on_a_stick = 8, /obj/item/food/fries = 10, /obj/item/food/cheesyfries = 6, /obj/item/food/pie/applepie = 4, From 41465878c7f33063a91013b2d9da87d314a742b7 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 19:28:08 +0200 Subject: [PATCH 19/69] [MIRROR] Fixes typo with cardboard ID examine text [MDB IGNORE] (#22672) * Fixes typo with cardboard ID examine text (#77054) ## About The Pull Request I replaced a c with a d. ## Why It's Good For The Game Typos bad, fixes typo. ## Changelog :cl: grammar: Fixed a minor typo with cardboard IDs /:cl: * Fixes typo with cardboard ID examine text --------- Co-authored-by: Alexis --- code/game/objects/items/cards_ids.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index b94b31f3654..d7da468b47f 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -1663,7 +1663,7 @@ */ /obj/item/card/cardboard name = "cardboard identification card" - desc = "A card used to provice ID and det- Heeeey, wait a second, this is just a piece of cut cardboard!" + desc = "A card used to provide ID and det- Heeeey, wait a second, this is just a piece of cut cardboard!" icon_state = "cardboard_id" inhand_icon_state = "cardboard-id" worn_icon_state = "nothing" From 82d04dfeb1cb31f53560039b2e5b7b5c492b900c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 19:28:25 +0200 Subject: [PATCH 20/69] Automatic changelog for PR #22673 [ci skip] --- html/changelogs/AutoChangeLog-pr-22673.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22673.yml diff --git a/html/changelogs/AutoChangeLog-pr-22673.yml b/html/changelogs/AutoChangeLog-pr-22673.yml new file mode 100644 index 00000000000..21b7f236846 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22673.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - balance: "Mmmh, butter on a stick. Now for americanbots." \ No newline at end of file From 0a2473d6f5847b314abc297f585081af5b8ad495 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 21:01:49 +0200 Subject: [PATCH 21/69] [MIRROR] HoP's policy now states that they should answer to the captain instead of themselves [MDB IGNORE] (#22677) * HoP's policy now states that they should answer to the captain instead of themselves (#77068) ## About The Pull Request Title ## Why It's Good For The Game Silly oversight ## Changelog :cl: spellcheck: Head of Personnel's roundstart text now says that they should answer to the captain now instead of themselves. /:cl: * HoP's policy now states that they should answer to the captain instead of themselves --------- Co-authored-by: distributivgesetz --- code/modules/jobs/job_types/head_of_personnel.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 3cd7540f9e7..1eda33202ea 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -8,7 +8,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = SUPERVISOR_HOP + supervisors = SUPERVISOR_CAPTAIN req_admin_notify = 1 minimal_player_age = 10 exp_requirements = 180 From cab485a34fa68f63d5de29ee7b8816b4d99ec6f0 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 21:02:01 +0200 Subject: [PATCH 22/69] [MIRROR] Phobia warnings have the same glowy text now as they would in say messages [MDB IGNORE] (#22678) * Phobia warnings have the same glowy text now as they would in say messages (#77066) ## About The Pull Request Title. ## Why It's Good For The Game Fixes #48028 ## Changelog :cl: spellcheck: Phobia warnings have the same glowy text now as they would in messages. /:cl: * Phobia warnings have the same glowy text now as they would in say messages --------- Co-authored-by: distributivgesetz --- code/datums/brain_damage/phobia.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm index 2db262de750..afc50a3882a 100644 --- a/code/datums/brain_damage/phobia.dm +++ b/code/datums/brain_damage/phobia.dm @@ -109,9 +109,9 @@ return var/message = pick("spooks you to the bone", "shakes you up", "terrifies you", "sends you into a panic", "sends chills down your spine") if(reason) - to_chat(owner, span_userdanger("Seeing [reason] [message]!")) + to_chat(owner, span_userdanger("Seeing [span_phobia(reason)] [message]!")) else if(trigger_word) - to_chat(owner, span_userdanger("Hearing \"[trigger_word]\" [message]!")) + to_chat(owner, span_userdanger("Hearing \"[span_phobia(trigger_word)]\" [message]!")) else to_chat(owner, span_userdanger("Something [message]!")) var/reaction = rand(1,4) From 1d35835d795860b177090ce2665db249ca531f02 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 21:02:15 +0200 Subject: [PATCH 23/69] Automatic changelog for PR #22677 [ci skip] --- html/changelogs/AutoChangeLog-pr-22677.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22677.yml diff --git a/html/changelogs/AutoChangeLog-pr-22677.yml b/html/changelogs/AutoChangeLog-pr-22677.yml new file mode 100644 index 00000000000..4e4efff84bb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22677.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - spellcheck: "Head of Personnel's roundstart text now says that they should answer to the captain now instead of themselves." \ No newline at end of file From a5c1d9362dce6b7b054e2484e74b31bda421b46a Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 21:02:30 +0200 Subject: [PATCH 24/69] Automatic changelog for PR #22678 [ci skip] --- html/changelogs/AutoChangeLog-pr-22678.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22678.yml diff --git a/html/changelogs/AutoChangeLog-pr-22678.yml b/html/changelogs/AutoChangeLog-pr-22678.yml new file mode 100644 index 00000000000..893eb93f347 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22678.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - spellcheck: "Phobia warnings have the same glowy text now as they would in messages." \ No newline at end of file From d8f12f9b56dbb9578a278209088538febcc81d9e Mon Sep 17 00:00:00 2001 From: Cyprex <35031555+Cyprex@users.noreply.github.com> Date: Tue, 25 Jul 2023 22:15:49 +0200 Subject: [PATCH 25/69] Revert powernet electrocute damage to tg values (#22662) --- code/modules/power/powernet.dm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm index 4edd7d79d66..ac24b109913 100644 --- a/code/modules/power/powernet.dm +++ b/code/modules/power/powernet.dm @@ -95,13 +95,7 @@ newavail = 0 /datum/powernet/proc/get_electrocute_damage() - //SKYRAT EDIT BEGIN: Declamps burn damage w/ new effects. Original code: return clamp(20 + round(avail/25000), 20, 195) + rand(-5,5) - if(avail >= 1000 && avail <= 15000) - return round(avail/45000) + rand(-30,2) //Slight buff. Weaker electrical currents are somewhat mitigated. - if(avail >= 15000) - return round(avail/15000) + rand(-5,10) //You're dead. - if(avail >= 20000) - return round(avail/10000) + rand(0,20) //You're VERY dead. - //SKYRAT EDIT END + if(avail >= 1000) + return clamp(20 + round(avail/25000), 20, 195) + rand(-5,5) else return 0 From 6802771134c123c531c4d5d53f96b5c4f9514922 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 22:16:16 +0200 Subject: [PATCH 26/69] Automatic changelog for PR #22662 [ci skip] --- html/changelogs/AutoChangeLog-pr-22662.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22662.yml diff --git a/html/changelogs/AutoChangeLog-pr-22662.yml b/html/changelogs/AutoChangeLog-pr-22662.yml new file mode 100644 index 00000000000..b3fdd5877d5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22662.yml @@ -0,0 +1,4 @@ +author: "Cyprex" +delete-after: True +changes: + - balance: "Electric shocks from cables deal less damage." \ No newline at end of file From 0d7a1522ba48e25f573bccdc296f76a2525ac66c Mon Sep 17 00:00:00 2001 From: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com> Date: Tue, 25 Jul 2023 17:04:54 -0400 Subject: [PATCH 27/69] restrict imbuing to ashwalkers & icecats (#21708) * restrict imbuing to ashwalkers * golden change * clarity for now * additional change * weird sync issue test * icecats are important as well * I dislike everythin * zone changeone * less clarity, more immersive? * reagent forging on last level, only ashie and icekitty * mm * Update modular_skyrat/modules/reagent_forging/code/forge.dm * oversight --------- Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> --- .../modules/reagent_forging/code/forge.dm | 60 ++++++++++++++++--- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/modular_skyrat/modules/reagent_forging/code/forge.dm b/modular_skyrat/modules/reagent_forging/code/forge.dm index 90345c7dc1d..1aee837169a 100644 --- a/modular_skyrat/modules/reagent_forging/code/forge.dm +++ b/modular_skyrat/modules/reagent_forging/code/forge.dm @@ -160,7 +160,7 @@ . += span_notice("
[src] is currently [forge_temperature] degrees hot, going towards [target_temperature] degrees.
") - if(reagent_forging) + if(reagent_forging && (is_species(user, /datum/species/lizard/ashwalker) || is_species(user, /datum/species/human/felinid/primitive))) . += span_warning("[src] has a fine gold trim, it is ready to imbue chemicals into reagent objects.") return . @@ -388,27 +388,30 @@ if(!forced) to_chat(user, span_notice("Some careful placement and stoking of the flame will allow you to keep at least the embers burning...")) minimum_target_temperature = 25 // Will allow quicker reheating from having no fuel - temperature_loss_reduction = 2 + temperature_loss_reduction = 3 forge_level = FORGE_LEVEL_JOURNEYMAN if(SKILL_LEVEL_EXPERT) if(!forced) - to_chat(user, span_notice("With just the right heat treating technique, metal could be made to accept reagents...")) - create_reagent_forge() - temperature_loss_reduction = 3 + to_chat(user, span_notice("[src] has become nearly perfect, able to hold heat for long enough that even a piece of wood can outmatch the longevity of lesser forges.")) + temperature_loss_reduction = 4 minimum_target_temperature = 25 forge_level = FORGE_LEVEL_EXPERT if(SKILL_LEVEL_MASTER) if(!forced) - to_chat(user, span_notice("[src] has become nearly perfect, able to hold heat for long enough that even a piece of wood can outmatch the longevity of lesser forges.")) - temperature_loss_reduction = 4 + to_chat(user, span_notice("The perfect forge for a perfect metalsmith, with your knowledge it should bleed heat so slowly, that not even you will live to see [src] cool.")) + temperature_loss_reduction = MAX_TEMPERATURE_LOSS_DECREASE minimum_target_temperature = 25 forge_level = FORGE_LEVEL_MASTER if(SKILL_LEVEL_LEGENDARY) if(!forced) - to_chat(user, span_notice("The perfect forge for a perfect metalsmith, with your knowledge it should bleed heat so slowly, that not even you will live to see [src] cool.")) + if(is_species(user, /datum/species/lizard/ashwalker) || is_species(user, /datum/species/human/felinid/primitive)) + to_chat(user, span_notice("With just the right heat treating technique, metal could be made to accept reagents...")) + create_reagent_forge() + if(forge_level == FORGE_LEVEL_MASTER) + to_chat(user, span_warning("It is impossible to further improve the forge!")) temperature_loss_reduction = MAX_TEMPERATURE_LOSS_DECREASE minimum_target_temperature = 25 // This won't matter except in a few cases here, but we still need to cover those few cases forge_level = FORGE_LEVEL_LEGENDARY @@ -557,6 +560,16 @@ /// Handles weapon reagent imbuing /obj/structure/reagent_forge/proc/handle_weapon_imbue(obj/attacking_item, mob/living/user) + //This code will refuse all non-ashwalkers & non-icecats from imbuing + if(!ishuman(user)) + to_chat(user, span_danger("It is impossible for you to imbue!")) //maybe remove (ashwalkers & icecats only) after some time + return + + var/mob/living/carbon/human/human_user = user + if(!is_species(human_user, /datum/species/lizard/ashwalker) && !is_species(human_user, /datum/species/human/felinid/primitive)) + to_chat(user, span_danger("It is impossible for you to imbue!")) //maybe remove (ashwalkers & icecats only) after some time + return + in_use = TRUE balloon_alert_to_viewers("imbuing...") @@ -597,6 +610,16 @@ /// Handles clothing imbuing, extremely similar to weapon imbuing but not in the same proc because of how uhh... goofy the way this has to be done is /obj/structure/reagent_forge/proc/handle_clothing_imbue(obj/attacking_item, mob/living/user) + //This code will refuse all non-ashwalkers & non-icecats from imbuing + if(!ishuman(user)) + to_chat(user, span_danger("It is impossible for you to imbue!")) //maybe remove (ashwalkers & icecats only) after some time + return + + var/mob/living/carbon/human/human_user = user + if(!is_species(human_user, /datum/species/lizard/ashwalker) && !is_species(human_user, /datum/species/human/felinid/primitive)) + to_chat(user, span_danger("It is impossible for you to imbue!")) //maybe remove (ashwalkers & icecats only) after some time + return + in_use = TRUE balloon_alert_to_viewers("imbuing...") @@ -879,9 +902,28 @@ new /obj/item/stack/sheet/iron/ten(get_turf(src)) return ..() -/obj/structure/reagent_forge/ready +/obj/structure/reagent_forge/tier2 + forge_level = FORGE_LEVEL_NOVICE + +/obj/structure/reagent_forge/tier3 + forge_level = FORGE_LEVEL_APPRENTICE + +/obj/structure/reagent_forge/tier4 + forge_level = FORGE_LEVEL_JOURNEYMAN + +/obj/structure/reagent_forge/tier5 + forge_level = FORGE_LEVEL_EXPERT + +/obj/structure/reagent_forge/tier6 + forge_level = FORGE_LEVEL_MASTER + +/obj/structure/reagent_forge/tier7 forge_level = FORGE_LEVEL_LEGENDARY +/obj/structure/reagent_forge/tier7/imbuing/Initialize(mapload) + . = ..() + create_reagent_forge() + /particles/smoke/mild spawning = 1 velocity = list(0, 0.3, 0) From c74ee17be3cf9d461a725361627e16fe11e7aca8 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 23:05:22 +0200 Subject: [PATCH 28/69] Automatic changelog for PR #21708 [ci skip] --- html/changelogs/AutoChangeLog-pr-21708.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-21708.yml diff --git a/html/changelogs/AutoChangeLog-pr-21708.yml b/html/changelogs/AutoChangeLog-pr-21708.yml new file mode 100644 index 00000000000..755f3de059a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-21708.yml @@ -0,0 +1,6 @@ +author: "jjpark-kb" +delete-after: True +changes: + - balance: "Reagent Imbuing (from forging) is strictly for ashwalkers & icecats" + - balance: "Forges can only be fully upgraded (legendary smiths) by ashwalkers & icecats" + - balance: "Some of the forge upgrades have been moved around to accommodate reagent imbuing being ashwalker/icecat only" \ No newline at end of file From 3a4debc03ccf65402e39415bc8c5e5ab6dbc79c4 Mon Sep 17 00:00:00 2001 From: lessthanthree <83487515+lessthnthree@users.noreply.github.com> Date: Tue, 25 Jul 2023 14:41:44 -0700 Subject: [PATCH 29/69] ICES events uses same ticker as autotransfer [NO GBP] (#22671) * autotransfer changes * Update autotransfer.dm * Update autotransfer.dm * Update events.dm --------- Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> --- .../master_files/code/controllers/subsystem/events.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_skyrat/master_files/code/controllers/subsystem/events.dm b/modular_skyrat/master_files/code/controllers/subsystem/events.dm index 611cada85c7..e6e38564c68 100644 --- a/modular_skyrat/master_files/code/controllers/subsystem/events.dm +++ b/modular_skyrat/master_files/code/controllers/subsystem/events.dm @@ -1,9 +1,9 @@ /// Check if we have an upcoming transfer vote, or we're already evacuating. /datum/controller/subsystem/events/checkEvent() if(scheduled <= world.time) - if(SSautotransfer.can_fire == TRUE && ((SSautotransfer.targettime - world.realtime) <= 15 MINUTES + CONFIG_GET(number/vote_period))) + if(SSautotransfer.can_fire == TRUE && ((SSautotransfer.targettime - REALTIMEOFDAY) <= 15 MINUTES + CONFIG_GET(number/vote_period))) log_game("ICES: Event cancelled due to precondition check. Reason: Pending autotransfer vote.") - log_game("ICES: Info: AT [(SSautotransfer.targettime - world.realtime)] | VP [(15 MINUTES + CONFIG_GET(number/vote_period))]") + log_game("ICES: Info: AT [(SSautotransfer.targettime - REALTIMEOFDAY)] | VP [(15 MINUTES + CONFIG_GET(number/vote_period))]") message_admins("ICES: Event cancelled due to precondition check. Reason: Pending autotransfer vote.") reschedule() return From 6788600ea40d7ed015b1f68ec24c3f5cca147be5 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 23:42:09 +0200 Subject: [PATCH 30/69] Automatic changelog for PR #22671 [ci skip] --- html/changelogs/AutoChangeLog-pr-22671.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22671.yml diff --git a/html/changelogs/AutoChangeLog-pr-22671.yml b/html/changelogs/AutoChangeLog-pr-22671.yml new file mode 100644 index 00000000000..ce3dc9dcffe --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22671.yml @@ -0,0 +1,4 @@ +author: "LT3" +delete-after: True +changes: + - bugfix: "Random events and autotransfer subsystems should play nice with each other again" \ No newline at end of file From 6b6ae7ff1549bf88b6b6976518466d107ace4428 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 23:43:48 +0200 Subject: [PATCH 31/69] [MIRROR] Hologram banners no longer give inspiration effects [MDB IGNORE] (#22682) * Hologram banners no longer give inspiration effects (#77079) ## About The Pull Request Banners spawned via the holodeck are no longer eligible to give healing effects ## Why It's Good For The Game This makes it too easy to source the banners and gives you another healing option that isn't technically supposed to be possible. ## Changelog :cl: oranges balance: holodeck spawned banners no longer give the inspiration effects /:cl: * Hologram banners no longer give inspiration effects --------- Co-authored-by: oranges --- code/game/objects/items/religion.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 48d009b01e7..f58d3ad93cf 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -24,7 +24,7 @@ . += span_notice("Activate it in your hand to inspire nearby allies of this banner's allegiance!") /obj/item/banner/attack_self(mob/living/carbon/human/user) - if(!inspiration_available) + if(!inspiration_available || flags_1 & HOLOGRAM_1) return if(morale_time > world.time) to_chat(user, span_warning("You aren't feeling inspired enough to flourish [src] again yet.")) From 17c7c63d20a530cee5840c80be462920108e7eb4 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 23:44:14 +0200 Subject: [PATCH 32/69] Automatic changelog for PR #22682 [ci skip] --- html/changelogs/AutoChangeLog-pr-22682.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22682.yml diff --git a/html/changelogs/AutoChangeLog-pr-22682.yml b/html/changelogs/AutoChangeLog-pr-22682.yml new file mode 100644 index 00000000000..ebf0eb645e0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22682.yml @@ -0,0 +1,4 @@ +author: "oranges" +delete-after: True +changes: + - balance: "holodeck spawned banners no longer give the inspiration effects" \ No newline at end of file From 4caf32b43a726d5273360b2f5e3ab7319e1be6f0 Mon Sep 17 00:00:00 2001 From: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> Date: Tue, 25 Jul 2023 17:45:14 -0400 Subject: [PATCH 33/69] Hemophagus, The Hemophage Revamp, Part 4.5: Bases of Blood (#22638) Adds Bloodshot Base for the non-blood part of Bloodshot --- .../modules/food_and_drinks/recipes/drinks_recipes.dm | 7 ++++++- .../reagents/chemistry/reagents/alcohol_reagents.dm | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/modular_skyrat/modules/customization/modules/food_and_drinks/recipes/drinks_recipes.dm b/modular_skyrat/modules/customization/modules/food_and_drinks/recipes/drinks_recipes.dm index 10ad32e59a6..636e0071c27 100644 --- a/modular_skyrat/modules/customization/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/modular_skyrat/modules/customization/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -188,9 +188,14 @@ required_reagents = list(/datum/reagent/consumable/catnip_tea = 1, /datum/reagent/consumable/milk = 1) required_temp = 296 //Just above room temp (22.85'C) +/datum/chemical_reaction/drink/bloodshot_base + results = list(/datum/reagent/consumable/ethanol/bloodshot_base = 2) + required_reagents = list(/datum/reagent/consumable/ethanol/bloody_mary = 1, /datum/reagent/consumable/sugar = 1) + reaction_tags = REACTION_TAG_DRINK | REACTION_TAG_EASY | REACTION_TAG_OTHER + /datum/chemical_reaction/drink/bloodshot results = list(/datum/reagent/consumable/ethanol/bloodshot = 5) - required_reagents = list(/datum/reagent/blood = 3, /datum/reagent/consumable/ethanol/bloody_mary = 1, /datum/reagent/consumable/sugar = 1) + required_reagents = list(/datum/reagent/blood = 3, /datum/reagent/consumable/ethanol/bloodshot_base = 2) reaction_tags = REACTION_TAG_DRINK | REACTION_TAG_EASY | REACTION_TAG_OTHER diff --git a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 33aa6413c75..25af43017e7 100644 --- a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -599,6 +599,15 @@ return ..() +/datum/reagent/consumable/ethanol/bloodshot_base + name = "Bloodshot Base" + description = "The bootleg blend of nutrients and alcohol that goes into making Bloodshots. Doesn't taste too great on its own, for Hemophages at least." + color = "#c29ca1" + boozepwr = 25 // Still more concentrated than in Bloodshot. + taste_description = "nutritious mix with an alcoholic kick to it" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + + /datum/reagent/consumable/ethanol/bloodshot name = "Bloodshot" description = "The history of the 'Bloodshot' is based in a mix of flavor-neutral chems devised to help deliver nutrients to a Hemophage's tumorous organs. Due to the expense of the real thing and the clinical nature of it, this liquor has been designed as a 'improvised' alternative; though, still tasting like a hangover cure. It smells like iron, giving a clue to the key ingredient." From b0462bdeb6d688c1debd530c87f0fe14d7ed218b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 23:45:41 +0200 Subject: [PATCH 34/69] Automatic changelog for PR #22638 [ci skip] --- html/changelogs/AutoChangeLog-pr-22638.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22638.yml diff --git a/html/changelogs/AutoChangeLog-pr-22638.yml b/html/changelogs/AutoChangeLog-pr-22638.yml new file mode 100644 index 00000000000..e62941ae33e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22638.yml @@ -0,0 +1,4 @@ +author: "GoldenAlpharex" +delete-after: True +changes: + - qol: "The mix of sugar and Bloody Mary used to make Bloodshot is now its own reagent, called \"Bloodshot Base\", just to make it easier to ask for from Bartenders. Hemophages beware, however, it doesn't contain enough blood-regenerating reagents to appeal to the tumor on its own, so it won't be going through smoothly if you try to drink it." \ No newline at end of file From 8b2f50ece024fdcea0f81bf9f2e9b0fa7f3d7fed Mon Sep 17 00:00:00 2001 From: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Date: Tue, 25 Jul 2023 16:47:09 -0500 Subject: [PATCH 35/69] sec uniform stuff - chest coverage on adjust, desc tweak, formal uniform thing (#22642) belt Co-authored-by: Hatterhat --- .../modules/goofsec/code/sec_clothing_overrides.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm index 33df698074e..f38a497050b 100644 --- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm +++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm @@ -524,9 +524,11 @@ */ //Officer /obj/item/clothing/under/rank/security/officer + desc = "A tactical security uniform for officers, complete with a Lopland belt buckle." icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi' icon_state = "security_black" + alt_covers_chest = TRUE uses_advanced_reskins = TRUE unique_reskin = list( "Black Variant" = list( @@ -543,6 +545,9 @@ ), ) +/obj/item/clothing/under/rank/security/officer/formal + unique_reskin = null // prevents you from losing the unique sprite + //Warden /obj/item/clothing/under/rank/security/warden icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi' From 684e81677ef81e6082f5c45fe07efb43ba96a3f5 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 Jul 2023 23:47:36 +0200 Subject: [PATCH 36/69] Automatic changelog for PR #22642 [ci skip] --- html/changelogs/AutoChangeLog-pr-22642.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22642.yml diff --git a/html/changelogs/AutoChangeLog-pr-22642.yml b/html/changelogs/AutoChangeLog-pr-22642.yml new file mode 100644 index 00000000000..95dba31eb36 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22642.yml @@ -0,0 +1,6 @@ +author: "Hatterhat" +delete-after: True +changes: + - bugfix: "The security uniform no longer exposes your chest when all you did was roll the sleeves up." + - bugfix: "The security formal uniform no longer inherits altsprites from the base uniform, since it didn't have any." + - spellcheck: "The security uniform's description now mentions a Lopland belt buckle, and not a Nanotrasen belt buckle." \ No newline at end of file From 39bdedc0299db301ced5ae4c7be8393e6ba9589b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 02:24:07 +0200 Subject: [PATCH 37/69] [MIRROR] Splits ballistic firearms "mag_type" into "accepted_magazine_type" and "spawn_magazine_type", fixing a few funny magazine bugs [MDB IGNORE] (#22680) * Splits ballistic firearms "mag_type" into "accepted_magazine_type" and "spawn_magazine_type", fixing a few funny magazine bugs (#76973) ## About The Pull Request As the title says, mag type has been split into two variable that do different things: Accepted magazine type handles what magazines that gun will accept, type and any subtypes. If spawn magazine type isnt defined, then it will be made equal to accepted magazine type to prevent having to double define magazines on every gun ever. Spawn magazine type is separate from accepted magazine type, spawn magazine type is what magazine the gun will actually spawn with. This exists because there are a few weapons which are made to spawn with special magazines, that can't use normal magazines anymore. For example, the riot dart pre-loaded donk soft pistol can only ever be reloaded with the riot subtype of donk soft magazines at the moment. This isn't typically something people notice because new magazines are usually not a thing people come by with these specific weapons, but its a problem I noticed while coding some weapons. ## Why It's Good For The Game In short, certain weapons (mostly donksoft weapons, but there's a single traitor pistol subtype that spawns with fire ammo) will no longer be limited to the exact subtype of magazine they spawned with, allowing them to use the normal versions of those magazines as well. ## Changelog :cl: refactor: The mag_type variable on guns has been split between accepted_magazine_type and spawn_magazine_type, allowing weapons to safely spawn with subtypes of their normal magazines without breaking the weapon fix: Several weapons that spawned with special magazines, the riot dart pre-loaded donk pistol for example, will now be able to accept normal donksoft magazines that don't spawn loaded with riot darts. /:cl: * Splits ballistic firearms "mag_type" into "accepted_magazine_type" and "spawn_magazine_type", fixing a few funny magazine bugs * merge conflict * merge conflict continued --------- Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> --- .../machinery/porta_turret/portable_turret.dm | 2 +- code/game/objects/structures/mystery_box.dm | 2 +- .../antagonists/heretic/items/hunter_rifle.dm | 2 +- .../modules/capture_the_flag/ctf_equipment.dm | 32 ++++++------ code/modules/clothing/chameleon.dm | 2 +- .../mob/living/simple_animal/hostile/mimic.dm | 2 +- code/modules/projectiles/guns/ballistic.dm | 22 +++++--- .../projectiles/guns/ballistic/automatic.dm | 24 ++++----- .../projectiles/guns/ballistic/bows/_bow.dm | 2 +- .../guns/ballistic/bows/bow_types.dm | 2 +- .../projectiles/guns/ballistic/launchers.dm | 8 +-- .../projectiles/guns/ballistic/pistol.dm | 14 ++--- .../projectiles/guns/ballistic/revolver.dm | 8 +-- .../projectiles/guns/ballistic/rifle.dm | 16 +++--- .../projectiles/guns/ballistic/shotgun.dm | 24 ++++----- .../modules/projectiles/guns/ballistic/toy.dm | 24 +++++---- code/modules/religion/burdened/psyker.dm | 2 +- .../modules/aesthetics/guns/code/guns.dm | 10 ++-- .../armaments/code/armament_entries.dm | 2 +- .../armaments/assaultops_armament_station.dm | 2 +- .../code/equipment_items/guns.dm | 8 +-- .../code/vending_machine.dm | 4 +- .../code/armaments/hecu_armament_station.dm | 2 +- .../modules/black_mesa/code/guns.dm | 4 +- .../modules/black_mesa/code/m16_variations.dm | 2 +- .../modules/clock_cult/code/items/weaponry.dm | 4 +- .../code/objects/nri_surplus/ak25.dm | 2 +- .../modules/encounters/code/nri_raiders.dm | 2 +- .../modules/gunsgalore/code/guns/akm.dm | 4 +- .../modules/gunsgalore/code/guns/fg42.dm | 2 +- .../modules/gunsgalore/code/guns/m16.dm | 4 +- .../modules/gunsgalore/code/guns/mg34.dm | 8 +-- .../modules/gunsgalore/code/guns/mp40.dm | 2 +- .../modules/gunsgalore/code/guns/p90.dm | 2 +- .../modules/gunsgalore/code/guns/pps.dm | 2 +- .../modules/gunsgalore/code/guns/ppsh.dm | 2 +- .../modules/gunsgalore/code/guns/scar.dm | 2 +- .../modules/gunsgalore/code/guns/stg.dm | 2 +- modular_skyrat/modules/marines/code/gear.dm | 4 +- .../modules/marines/code/smartgun.dm | 4 +- .../modules/modular_weapons/code/automatic.dm | 4 +- .../modules/modular_weapons/code/pistol.dm | 4 +- .../modules/modular_weapons/code/revolver.dm | 4 +- .../modules/modular_weapons/code/rifle.dm | 2 +- .../moretraitoritems/code/ocelot_revolver.dm | 2 +- .../modules/nanotrasen_rep/code/m45a5.dm | 2 +- .../modules/novaya_ert/code/automatic.dm | 4 +- .../novaya_ert/code/surplus_weapons.dm | 4 +- .../projectiles/code/guns/misc/m6pdw.dm | 2 +- .../modules/robohand/code/robohand.dm | 4 +- .../sec_haul/code/guns/armory_spawns.dm | 2 +- .../modules/sec_haul/code/guns/cmg.dm | 2 +- .../modules/sec_haul/code/guns/guns.dm | 52 +++++++++---------- .../sec_haul/code/guns/pepperball_gun.dm | 2 +- 54 files changed, 183 insertions(+), 175 deletions(-) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 2100b103386..f82d18421ee 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -1109,7 +1109,7 @@ DEFINE_BITFIELD(turret_flags, list( /obj/item/gun/ballistic/get_turret_properties() . = ..() - var/obj/item/ammo_box/mag = mag_type + var/obj/item/ammo_box/mag = spawn_magazine_type var/obj/item/ammo_casing/primary_ammo = initial(mag.ammo_type) .["base_icon_state"] = "syndie" diff --git a/code/game/objects/structures/mystery_box.dm b/code/game/objects/structures/mystery_box.dm index 41164a8778f..63092cfeac3 100644 --- a/code/game/objects/structures/mystery_box.dm +++ b/code/game/objects/structures/mystery_box.dm @@ -187,7 +187,7 @@ GLOBAL_LIST_INIT(mystery_box_extended, list( if(grant_extra_mag && istype(instantiated_gun, /obj/item/gun/ballistic)) var/obj/item/gun/ballistic/instantiated_ballistic = instantiated_gun if(!instantiated_ballistic.internal_magazine) - var/obj/item/ammo_box/magazine/extra_mag = new instantiated_ballistic.mag_type(loc) + var/obj/item/ammo_box/magazine/extra_mag = new instantiated_ballistic.spawn_magazine_type(loc) user.put_in_hands(extra_mag) user.visible_message(span_notice("[user] takes [presented_item] from [src]."), span_notice("You take [presented_item] from [src]."), vision_distance = COMBAT_MESSAGE_RANGE) diff --git a/code/modules/antagonists/heretic/items/hunter_rifle.dm b/code/modules/antagonists/heretic/items/hunter_rifle.dm index 953154c59a3..8cfd4931d3e 100644 --- a/code/modules/antagonists/heretic/items/hunter_rifle.dm +++ b/code/modules/antagonists/heretic/items/hunter_rifle.dm @@ -11,7 +11,7 @@ icon_state = "moistprime" inhand_icon_state = "moistprime" worn_icon_state = "moistprime" - mag_type = /obj/item/ammo_box/magazine/internal/boltaction/lionhunter + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/lionhunter fire_sound = 'sound/weapons/gun/sniper/shot.ogg' /obj/item/gun/ballistic/rifle/lionhunter/Initialize(mapload) diff --git a/code/modules/capture_the_flag/ctf_equipment.dm b/code/modules/capture_the_flag/ctf_equipment.dm index 315dd2fb53f..ec269bc6407 100644 --- a/code/modules/capture_the_flag/ctf_equipment.dm +++ b/code/modules/capture_the_flag/ctf_equipment.dm @@ -37,7 +37,7 @@ // LASER RIFLE /obj/item/gun/ballistic/automatic/laser/ctf - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/rifle + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/rifle desc = "This looks like it could really hurt in melee." force = 50 weapon_weight = WEAPON_HEAVY @@ -70,7 +70,7 @@ inhand_icon_state = "shotgun_combat" worn_icon_state = "gun" slot_flags = null - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/shotgun + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/shotgun empty_indicator = TRUE fire_sound = 'sound/weapons/gun/shotgun/shot_alt.ogg' semi_auto = TRUE @@ -103,7 +103,7 @@ name = "designated marksman rifle" icon_state = "ctfmarksman" inhand_icon_state = "ctfmarksman" - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman fire_delay = 1 SECONDS /obj/item/ammo_box/magazine/recharge/ctf/marksman @@ -125,7 +125,7 @@ /obj/item/gun/ballistic/automatic/pistol/deagle/ctf desc = "This looks like it could really hurt in melee." force = 75 - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/deagle + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/deagle /obj/item/gun/ballistic/automatic/pistol/deagle/ctf/Initialize(mapload) . = ..() @@ -236,7 +236,7 @@ // Rifle /obj/item/gun/ballistic/automatic/laser/ctf/red - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/rifle/red + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/rifle/red /obj/item/ammo_box/magazine/recharge/ctf/rifle/red ammo_type = /obj/item/ammo_casing/laser/ctf/rifle/red @@ -252,7 +252,7 @@ // Shotgun /obj/item/gun/ballistic/shotgun/ctf/red - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/red + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/red /obj/item/ammo_box/magazine/recharge/ctf/shotgun/red ammo_type = /obj/item/ammo_casing/laser/ctf/shotgun/red @@ -268,7 +268,7 @@ // DMR /obj/item/gun/ballistic/automatic/laser/ctf/marksman/red - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman/red + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman/red /obj/item/ammo_box/magazine/recharge/ctf/marksman/red ammo_type = /obj/item/ammo_casing/laser/ctf/marksman/red @@ -302,7 +302,7 @@ // Rifle /obj/item/gun/ballistic/automatic/laser/ctf/blue - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/rifle/blue + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/rifle/blue /obj/item/ammo_box/magazine/recharge/ctf/rifle/blue ammo_type = /obj/item/ammo_casing/laser/ctf/rifle/blue @@ -316,7 +316,7 @@ // Shotgun /obj/item/gun/ballistic/shotgun/ctf/blue - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/blue + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/blue /obj/item/ammo_box/magazine/recharge/ctf/shotgun/blue ammo_type = /obj/item/ammo_casing/laser/ctf/shotgun/blue @@ -331,7 +331,7 @@ // DMR /obj/item/gun/ballistic/automatic/laser/ctf/marksman/blue - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman/blue + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman/blue /obj/item/ammo_box/magazine/recharge/ctf/marksman/blue ammo_type = /obj/item/ammo_casing/laser/ctf/marksman/blue @@ -361,7 +361,7 @@ // Rifle /obj/item/gun/ballistic/automatic/laser/ctf/green - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/rifle/green + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/rifle/green /obj/item/ammo_box/magazine/recharge/ctf/rifle/green ammo_type = /obj/item/ammo_casing/laser/ctf/rifle/green @@ -377,7 +377,7 @@ // Shotgun /obj/item/gun/ballistic/shotgun/ctf/green - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/green + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/green /obj/item/ammo_box/magazine/recharge/ctf/shotgun/green ammo_type = /obj/item/ammo_casing/laser/ctf/shotgun/green @@ -393,7 +393,7 @@ // DMR /obj/item/gun/ballistic/automatic/laser/ctf/marksman/green - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman/green + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman/green /obj/item/ammo_box/magazine/recharge/ctf/marksman/green ammo_type = /obj/item/ammo_casing/laser/ctf/marksman/green @@ -427,7 +427,7 @@ // Rifle /obj/item/gun/ballistic/automatic/laser/ctf/yellow - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/rifle/yellow + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/rifle/yellow /obj/item/ammo_box/magazine/recharge/ctf/rifle/yellow ammo_type = /obj/item/ammo_casing/laser/ctf/rifle/yellow @@ -443,7 +443,7 @@ // Shotgun /obj/item/gun/ballistic/shotgun/ctf/yellow - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/yellow + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/yellow /obj/item/ammo_box/magazine/recharge/ctf/shotgun/yellow ammo_type = /obj/item/ammo_casing/laser/ctf/shotgun/yellow @@ -459,7 +459,7 @@ // DMR /obj/item/gun/ballistic/automatic/laser/ctf/marksman/yellow - mag_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman/yellow + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman/yellow /obj/item/ammo_box/magazine/recharge/ctf/marksman/yellow ammo_type = /obj/item/ammo_casing/laser/ctf/marksman/yellow diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 8272a6bb2e5..60c7e43316f 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -980,7 +980,7 @@ if(istype(gun_to_set, /obj/item/gun/ballistic)) var/obj/item/gun/ballistic/ball_gun = gun_to_set - var/obj/item/ammo_box/ball_ammo = new ball_gun.mag_type(gun_to_set) + var/obj/item/ammo_box/ball_ammo = new ball_gun.spawn_magazine_type(gun_to_set) qdel(ball_gun) if(!istype(ball_ammo) || !ball_ammo.ammo_type) diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index f8277895ffc..2fec84385b2 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -233,7 +233,7 @@ GLOBAL_LIST_INIT(animatable_blacklist, list(/obj/structure/table, /obj/structure projectiletype = initial(M.projectile_type) if(istype(G, /obj/item/gun/ballistic)) Pewgun = G - var/obj/item/ammo_box/magazine/M = Pewgun.mag_type + var/obj/item/ammo_box/magazine/M = Pewgun.spawn_magazine_type casingtype = initial(M.ammo_type) if(istype(G, /obj/item/gun/energy)) Zapgun = G diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 0cc80fa45a3..e39ed1ece03 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -47,10 +47,12 @@ ///Whether our gun clicks when it approaches an empty magazine/chamber var/click_on_low_ammo = TRUE - ///Whether the gun will spawn loaded with a magazine + /// What type (includes subtypes) of magazine will this gun accept being put into it + var/obj/item/ammo_box/magazine/accepted_magazine_type = /obj/item/ammo_box/magazine/m10mm + /// Whether the gun will spawn loaded with a magazine var/spawnwithmagazine = TRUE - ///Compatible magazines with the gun - var/obj/item/ammo_box/magazine/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info + /// Change this if the gun should spawn with a different magazine type to what accepted_magazine_type defines. Will create errors if not a type or subtype of accepted magazine. + var/obj/item/ammo_box/magazine/spawn_magazine_type ///Whether the sprite has a visible magazine or not var/mag_display = TRUE ///Whether the sprite has a visible ammo display or not @@ -130,12 +132,16 @@ /obj/item/gun/ballistic/Initialize(mapload) . = ..() + if(!spawn_magazine_type) + spawn_magazine_type = accepted_magazine_type if (!spawnwithmagazine) bolt_locked = TRUE update_appearance() return if (!magazine) - magazine = new mag_type(src) + magazine = new spawn_magazine_type(src) + if(!istype(magazine, accepted_magazine_type)) + CRASH("[src] spawned with a magazine type that isn't allowed by its accepted_magazine_type!") if(bolt_type == BOLT_TYPE_STANDARD || internal_magazine) //Internal magazines shouldn't get magazine + 1. chamber_round() else @@ -151,7 +157,7 @@ AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_notes_ballistic)) /obj/item/gun/ballistic/fire_sounds() - var/max_ammo = magazine?.max_ammo || initial(mag_type.max_ammo) + var/max_ammo = magazine?.max_ammo || initial(spawn_magazine_type.max_ammo) var/current_ammo = get_ammo() var/frequency_to_use = sin((90 / max_ammo) * current_ammo) var/click_frequency_to_use = 1 - frequency_to_use * 0.75 @@ -303,7 +309,7 @@ ///Handles all the logic needed for magazine insertion /obj/item/gun/ballistic/proc/insert_magazine(mob/user, obj/item/ammo_box/magazine/AM, display_message = TRUE) - if(!istype(AM, mag_type)) + if(!istype(AM, accepted_magazine_type)) balloon_alert(user, "[AM.name] doesn't fit!") return FALSE if(user.transferItemToLoc(AM, src)) @@ -702,9 +708,9 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list( if(magazine) magazine.top_off() else - if(!mag_type) + if(!spawn_magazine_type) return - magazine = new mag_type(src) + magazine = new spawn_magazine_type(src) chamber_round() update_appearance() diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 74305fb811d..16b1b787366 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -53,7 +53,7 @@ actions_types = list() mag_display = TRUE empty_indicator = TRUE - mag_type = /obj/item/ammo_box/magazine/smgm9mm + accepted_magazine_type = /obj/item/ammo_box/magazine/smgm9mm pin = null bolt_type = BOLT_TYPE_LOCKING show_bolt_icon = FALSE @@ -71,7 +71,7 @@ icon_state = "c20r" inhand_icon_state = "c20r" selector_switch_icon = TRUE - mag_type = /obj/item/ammo_box/magazine/smgm45 + accepted_magazine_type = /obj/item/ammo_box/magazine/smgm45 fire_delay = 2 burst_size = 3 pin = /obj/item/firing_pin/implant/pindicate @@ -104,7 +104,7 @@ icon_state = "wt550" w_class = WEIGHT_CLASS_BULKY inhand_icon_state = "arg" - mag_type = /obj/item/ammo_box/magazine/wt550m9 + accepted_magazine_type = /obj/item/ammo_box/magazine/wt550m9 fire_delay = 2 can_suppress = FALSE burst_size = 1 @@ -125,7 +125,7 @@ desc = "An ancient 9mm submachine gun pattern updated and simplified to lower costs, though perhaps simplified too much." icon_state = "plastikov" inhand_icon_state = "plastikov" - mag_type = /obj/item/ammo_box/magazine/plastikov9mm + accepted_magazine_type = /obj/item/ammo_box/magazine/plastikov9mm burst_size = 5 spread = 25 can_suppress = FALSE @@ -139,7 +139,7 @@ name = "\improper Type U3 Uzi" desc = "A lightweight, burst-fire submachine gun, for when you really want someone dead. Uses 9mm rounds." icon_state = "miniuzi" - mag_type = /obj/item/ammo_box/magazine/uzim9mm + accepted_magazine_type = /obj/item/ammo_box/magazine/uzim9mm burst_size = 2 bolt_type = BOLT_TYPE_OPEN show_bolt_icon = FALSE @@ -154,7 +154,7 @@ w_class = WEIGHT_CLASS_BULKY inhand_icon_state = "m90" selector_switch_icon = TRUE - mag_type = /obj/item/ammo_box/magazine/m556 + accepted_magazine_type = /obj/item/ammo_box/magazine/m556 can_suppress = FALSE var/obj/item/gun/ballistic/revolver/grenadelauncher/underbarrel burst_size = 3 @@ -210,7 +210,7 @@ selector_switch_icon = TRUE w_class = WEIGHT_CLASS_BULKY slot_flags = 0 - mag_type = /obj/item/ammo_box/magazine/tommygunm45 + accepted_magazine_type = /obj/item/ammo_box/magazine/tommygunm45 can_suppress = FALSE burst_size = 1 actions_types = list() @@ -229,7 +229,7 @@ icon_state = "arg" inhand_icon_state = "arg" slot_flags = 0 - mag_type = /obj/item/ammo_box/magazine/m556 + accepted_magazine_type = /obj/item/ammo_box/magazine/m556 can_suppress = FALSE burst_size = 3 fire_delay = 1 @@ -244,7 +244,7 @@ base_icon_state = "l6" w_class = WEIGHT_CLASS_HUGE slot_flags = 0 - mag_type = /obj/item/ammo_box/magazine/mm712x82 + accepted_magazine_type = /obj/item/ammo_box/magazine/mm712x82 weapon_weight = WEAPON_HEAVY burst_size = 1 actions_types = list() @@ -314,7 +314,7 @@ ..() /obj/item/gun/ballistic/automatic/l6_saw/attackby(obj/item/A, mob/user, params) - if(!cover_open && istype(A, mag_type)) + if(!cover_open && istype(A, accepted_magazine_type)) balloon_alert(user, "open the cover!") return ..() @@ -332,7 +332,7 @@ inhand_y_dimension = 64 worn_icon_state = null weapon_weight = WEAPON_HEAVY - mag_type = /obj/item/ammo_box/magazine/m10mm/rifle + accepted_magazine_type = /obj/item/ammo_box/magazine/m10mm/rifle fire_delay = 30 burst_size = 1 can_unsuppress = TRUE @@ -350,7 +350,7 @@ icon_state = "oldrifle" w_class = WEIGHT_CLASS_BULKY inhand_icon_state = "arg" - mag_type = /obj/item/ammo_box/magazine/recharge + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge empty_indicator = TRUE fire_delay = 2 can_suppress = FALSE diff --git a/code/modules/projectiles/guns/ballistic/bows/_bow.dm b/code/modules/projectiles/guns/ballistic/bows/_bow.dm index 6d560804368..dc20a502592 100644 --- a/code/modules/projectiles/guns/ballistic/bows/_bow.dm +++ b/code/modules/projectiles/guns/ballistic/bows/_bow.dm @@ -10,7 +10,7 @@ base_icon_state = "bow" load_sound = 'sound/weapons/gun/general/ballistic_click.ogg' fire_sound = 'sound/weapons/gun/bow/bow_fire.ogg' - mag_type = /obj/item/ammo_box/magazine/internal/bow + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bow force = 15 pinless = TRUE attack_verb_continuous = list("whipped", "cracked") diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm index 2acdb20d454..355ed3575a8 100644 --- a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm +++ b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm @@ -14,7 +14,7 @@ worn_icon_state = "holybow" slot_flags = ITEM_SLOT_BACK obj_flags = UNIQUE_RENAME - mag_type = /obj/item/ammo_box/magazine/internal/bow/holy + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bow/holy /obj/item/ammo_box/magazine/internal/bow/holy name = "divine bowstring" diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index be81a0bfdab..82282d2efe6 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -6,7 +6,7 @@ name = "grenade launcher" icon_state = "dshotgun_sawn" inhand_icon_state = "gun" - mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/grenadelauncher fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg' w_class = WEIGHT_CLASS_NORMAL pin = /obj/item/firing_pin/implant/pindicate @@ -25,7 +25,7 @@ name = "multi grenade launcher" icon = 'icons/mob/mecha_equipment.dmi' icon_state = "mecha_grenadelnchr" - mag_type = /obj/item/ammo_box/magazine/internal/cylinder/grenademulti + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/grenademulti pin = /obj/item/firing_pin /obj/item/gun/ballistic/revolver/grenadelauncher/cyborg/attack_self() @@ -36,7 +36,7 @@ desc = "A prototype pistol designed to fire self propelled rockets." icon_state = "gyropistol" fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg' - mag_type = /obj/item/ammo_box/magazine/m75 + accepted_magazine_type = /obj/item/ammo_box/magazine/m75 burst_size = 1 fire_delay = 0 casing_ejector = FALSE @@ -47,7 +47,7 @@ A sticker near the cheek rest reads, \"ENSURE AREA BEHIND IS CLEAR BEFORE FIRING\"" icon_state = "rocketlauncher" inhand_icon_state = "rocketlauncher" - mag_type = /obj/item/ammo_box/magazine/internal/rocketlauncher + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/rocketlauncher fire_sound = 'sound/weapons/gun/general/rocket_launch.ogg' w_class = WEIGHT_CLASS_BULKY can_suppress = FALSE diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 83d172d73b2..220df569ecb 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -4,7 +4,7 @@ desc = "A small, easily concealable 9x25mm Mk.12 handgun. Has a threaded barrel for suppressors." // SKYRAT EDIT: Calibre rename icon_state = "pistol" w_class = WEIGHT_CLASS_SMALL - mag_type = /obj/item/ammo_box/magazine/m9mm + accepted_magazine_type = /obj/item/ammo_box/magazine/m9mm can_suppress = TRUE burst_size = 1 fire_delay = 0 @@ -29,7 +29,7 @@ spawnwithmagazine = FALSE /obj/item/gun/ballistic/automatic/pistol/fire_mag - mag_type = /obj/item/ammo_box/magazine/m9mm/fire + spawn_magazine_type = /obj/item/ammo_box/magazine/m9mm/fire /obj/item/gun/ballistic/automatic/pistol/suppressed/Initialize(mapload) . = ..() @@ -40,7 +40,7 @@ name = "\improper Ansem pistol" desc = "The spiritual successor of the Makarov, or maybe someone just dropped their gun in a bucket of paint. The gun is chambered in 10mm." icon_state = "pistol_evil" - mag_type = /obj/item/ammo_box/magazine/m10mm + accepted_magazine_type = /obj/item/ammo_box/magazine/m10mm empty_indicator = TRUE suppressor_x_offset = 12 @@ -49,7 +49,7 @@ desc = "A classic .45 handgun with a small magazine capacity." icon_state = "m1911" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/m45 + accepted_magazine_type = /obj/item/ammo_box/magazine/m45 can_suppress = FALSE fire_sound = 'sound/weapons/gun/pistol/shot_alt.ogg' rack_sound = 'sound/weapons/gun/pistol/rack.ogg' @@ -64,7 +64,7 @@ desc = "A robust .50 AE handgun." icon_state = "deagle" force = 14 - mag_type = /obj/item/ammo_box/magazine/m50 + accepted_magazine_type = /obj/item/ammo_box/magazine/m50 can_suppress = FALSE mag_display = TRUE fire_sound = 'sound/weapons/gun/rifle/shot.ogg' @@ -95,7 +95,7 @@ burst_size = 2 fire_delay = 1 projectile_damage_multiplier = 1.25 - mag_type = /obj/item/ammo_box/magazine/r10mm + accepted_magazine_type = /obj/item/ammo_box/magazine/r10mm actions_types = list(/datum/action/item_action/toggle_firemode) obj_flags = UNIQUE_RENAME // if you did the sidequest, you get the customization @@ -107,7 +107,7 @@ desc = "A modernized reproduction of an old Soviet machine pistol. It fires quickly, but kicks like a mule. Uses 9mm ammo. Has a threaded barrel for suppressors." //SKYRAT EDIT icon_state = "aps" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/m9mm_aps + accepted_magazine_type = /obj/item/ammo_box/magazine/m9mm_aps can_suppress = TRUE burst_size = 3 fire_delay = 3 //SKYRAT EDIT - Original: 1 diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 16d2408be02..f77288f9b24 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -2,7 +2,7 @@ name = "\improper .357 revolver" desc = "A suspicious revolver. Uses .357 ammo." icon_state = "revolver" - mag_type = /obj/item/ammo_box/magazine/internal/cylinder + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder fire_sound = 'sound/weapons/gun/revolver/shot_alt.ogg' load_sound = 'sound/weapons/gun/revolver/load_bullet.ogg' eject_sound = 'sound/weapons/gun/revolver/empty.ogg' @@ -100,7 +100,7 @@ /obj/item/gun/ballistic/revolver/c38 name = "\improper .38 revolver" desc = "A classic, if not outdated, lethal firearm. Uses .38 Special rounds." - mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38 + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38 icon_state = "c38" fire_sound = 'sound/weapons/gun/revolver/shot.ogg' @@ -154,7 +154,7 @@ icon_state = "nagant" can_suppress = TRUE - mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev762 + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev762 // A gun to play Russian Roulette! @@ -164,7 +164,7 @@ name = "\improper Russian revolver" desc = "A Russian-made revolver for drinking games. Uses .357 ammo, and has a mechanism requiring you to spin the chamber before each trigger pull." icon_state = "russianrevolver" - mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357 + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357 var/spun = FALSE hidden_chambered = TRUE //Cheater. gun_flags = NOT_A_REAL_GUN diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm index 28e5e7dc1d4..04e78453b22 100644 --- a/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/code/modules/projectiles/guns/ballistic/rifle.dm @@ -10,7 +10,7 @@ w_class = WEIGHT_CLASS_BULKY inhand_icon_state = "moistnugget" worn_icon_state = "moistnugget" - mag_type = /obj/item/ammo_box/magazine/internal/boltaction + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction bolt_wording = "bolt" bolt_type = BOLT_TYPE_LOCKING semi_auto = FALSE @@ -58,7 +58,7 @@ icon_state = "moistnugget" inhand_icon_state = "moistnugget" slot_flags = ITEM_SLOT_BACK - mag_type = /obj/item/ammo_box/magazine/internal/boltaction + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction can_bayonet = TRUE knife_x_offset = 37 knife_y_offset = 14 @@ -131,7 +131,7 @@ inhand_y_dimension = 32 inhand_icon_state = "speargun" worn_icon_state = "speargun" - mag_type = /obj/item/ammo_box/magazine/internal/boltaction/harpoon + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/harpoon fire_sound = 'sound/weapons/gun/sniper/shot.ogg' can_be_sawn_off = FALSE @@ -147,7 +147,7 @@ Tiger Co-op assassins, cryo-frozen Space Russians, and security personnel with \ little care for professional conduct while making 'arrests' point blank in the back of the head \ until the gun clicks. EXTREMELY moist." - mag_type = /obj/item/ammo_box/magazine/internal/boltaction/surplus + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/surplus can_jam = TRUE /obj/item/gun/ballistic/rifle/boltaction/prime @@ -178,7 +178,7 @@ inhand_x_dimension = 64 inhand_y_dimension = 64 fire_sound = 'sound/weapons/gun/sniper/shot.ogg' - mag_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun initial_caliber = CALIBER_SHOTGUN alternative_caliber = CALIBER_A762 initial_fire_sound = 'sound/weapons/gun/sniper/shot.ogg' @@ -199,7 +199,7 @@ icon_state = "musket_prime" inhand_icon_state = "musket_prime" worn_icon_state = "musket_prime" - mag_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun/prime + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun/prime projectile_damage_multiplier = 1 /// MAGICAL BOLT ACTIONS + ARCANE BARRAGE? /// @@ -208,7 +208,7 @@ name = "enchanted bolt action rifle" desc = "Careful not to lose your head." var/guns_left = 30 - mag_type = /obj/item/ammo_box/magazine/internal/enchanted + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/enchanted can_be_sawn_off = FALSE /obj/item/gun/ballistic/rifle/enchanted/dropped() @@ -258,7 +258,7 @@ rack_sound = 'sound/weapons/gun/sniper/rack.ogg' suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' recoil = 2 - mag_type = /obj/item/ammo_box/magazine/sniper_rounds + accepted_magazine_type = /obj/item/ammo_box/magazine/sniper_rounds internal_magazine = FALSE w_class = WEIGHT_CLASS_NORMAL slot_flags = ITEM_SLOT_BACK diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 626de9fe2c5..654acc12ad4 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -16,7 +16,7 @@ force = 10 flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BACK - mag_type = /obj/item/ammo_box/magazine/internal/shot + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot semi_auto = FALSE internal_magazine = TRUE casing_ejector = FALSE @@ -34,7 +34,7 @@ . = 1 /obj/item/gun/ballistic/shotgun/lethal - mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/lethal // RIOT SHOTGUN // @@ -44,7 +44,7 @@ icon_state = "riotshotgun" inhand_icon_state = "shotgun" fire_delay = 8 - mag_type = /obj/item/ammo_box/magazine/internal/shot/riot + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/riot sawn_desc = "Come with me if you want to live." can_be_sawn_off = TRUE @@ -60,7 +60,7 @@ icon_state = "cshotgun" inhand_icon_state = "shotgun_combat" fire_delay = 5 - mag_type = /obj/item/ammo_box/magazine/internal/shot/com + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/com w_class = WEIGHT_CLASS_HUGE //Dual Feed Shotgun @@ -77,7 +77,7 @@ worn_icon_state = "cshotgun" w_class = WEIGHT_CLASS_HUGE semi_auto = TRUE - mag_type = /obj/item/ammo_box/magazine/internal/shot/tube + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/tube /// If defined, the secondary tube is this type, if you want different shell loads var/alt_mag_type /// If TRUE, we're drawing from the alternate_magazine @@ -96,7 +96,7 @@ /obj/item/gun/ballistic/shotgun/automatic/dual_tube/Initialize(mapload) . = ..() - alt_mag_type = alt_mag_type || mag_type + alt_mag_type = alt_mag_type || spawn_magazine_type alternate_magazine = new alt_mag_type(src) /obj/item/gun/ballistic/shotgun/automatic/dual_tube/Destroy() @@ -139,7 +139,7 @@ inhand_y_dimension = 32 projectile_damage_multiplier = 1.2 weapon_weight = WEAPON_MEDIUM - mag_type = /obj/item/ammo_box/magazine/m12g + accepted_magazine_type = /obj/item/ammo_box/magazine/m12g can_suppress = FALSE burst_size = 1 fire_delay = 10 //Skyrat edit - Original: 0 @@ -160,7 +160,7 @@ /obj/item/gun/ballistic/shotgun/bulldog/Initialize(mapload) . = ..() - secondary_magazine_type = secondary_magazine_type || mag_type + secondary_magazine_type = secondary_magazine_type || spawn_magazine_type secondary_magazine = new secondary_magazine_type(src) update_appearance() @@ -259,7 +259,7 @@ force = 10 flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BACK - mag_type = /obj/item/ammo_box/magazine/internal/shot/dual + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/dual sawn_desc = "Omar's coming!" obj_flags = UNIQUE_RENAME rack_sound_volume = 0 @@ -289,13 +289,13 @@ name = "hunting shotgun" desc = "A hunting shotgun used by the wealthy to hunt \"game\"." sawn_desc = "A sawn-off hunting shotgun. In its new state, it's remarkably less effective at hunting... anything." - mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/slugs + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/dual/slugs /obj/item/gun/ballistic/shotgun/doublebarrel/breacherslug name = "breaching shotgun" desc = "A normal double-barrel shotgun that has been rechambered to fit breaching shells. Useful in breaching airlocks and windows, not much else." sawn_desc = "A sawn-off breaching shotgun, making for a more compact configuration while still having the same capability as before." - mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/breacherslug + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/dual/breacherslug /obj/item/gun/ballistic/shotgun/hook name = "hook modified sawn-off shotgun" @@ -306,7 +306,7 @@ righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi' inhand_x_dimension = 32 inhand_y_dimension = 32 - mag_type = /obj/item/ammo_box/magazine/internal/shot/bounty + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/bounty weapon_weight = WEAPON_MEDIUM semi_auto = TRUE flags_1 = CONDUCT_1 diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm index bd0c75e34b7..237d7cbbb10 100644 --- a/code/modules/projectiles/guns/ballistic/toy.dm +++ b/code/modules/projectiles/guns/ballistic/toy.dm @@ -4,7 +4,7 @@ icon_state = "saber" selector_switch_icon = TRUE inhand_icon_state = "gun" - mag_type = /obj/item/ammo_box/magazine/toy/smg + accepted_magazine_type = /obj/item/ammo_box/magazine/toy/smg fire_sound = 'sound/items/syringeproj.ogg' force = 0 throwforce = 0 @@ -21,12 +21,12 @@ /obj/item/gun/ballistic/automatic/pistol/toy name = "foam force pistol" desc = "A small, easily concealable toy handgun. Ages 8 and up." - mag_type = /obj/item/ammo_box/magazine/toy/pistol + accepted_magazine_type = /obj/item/ammo_box/magazine/toy/pistol fire_sound = 'sound/items/syringeproj.ogg' gun_flags = TOY_FIREARM_OVERLAY | NOT_A_REAL_GUN /obj/item/gun/ballistic/automatic/pistol/toy/riot - mag_type = /obj/item/ammo_box/magazine/toy/pistol/riot + spawn_magazine_type = /obj/item/ammo_box/magazine/toy/pistol/riot /obj/item/gun/ballistic/automatic/pistol/riot/Initialize(mapload) magazine = new /obj/item/ammo_box/magazine/toy/pistol/riot(src) @@ -37,7 +37,7 @@ desc = "A toy shotgun with wood furniture and a four-shell capacity underneath. Ages 8 and up." force = 0 throwforce = 0 - mag_type = /obj/item/ammo_box/magazine/internal/shot/toy + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/toy fire_sound = 'sound/items/syringeproj.ogg' clumsy_check = FALSE item_flags = NONE @@ -67,7 +67,7 @@ inhand_y_dimension = 32 worn_icon_state = "gun" worn_icon = null - mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow fire_sound = 'sound/items/syringeproj.ogg' slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL @@ -78,17 +78,18 @@ desc = "A bullpup three-round burst toy SMG, designated 'C-20r'. Ages 8 and up." can_suppress = TRUE item_flags = NONE - mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot + accepted_magazine_type = /obj/item/ammo_box/magazine/toy/smgm45 + spawn_magazine_type = /obj/item/ammo_box/magazine/toy/smgm45/riot casing_ejector = FALSE clumsy_check = FALSE gun_flags = TOY_FIREARM_OVERLAY | NOT_A_REAL_GUN /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted //Use this for actual toys pin = /obj/item/firing_pin - mag_type = /obj/item/ammo_box/magazine/toy/smgm45 + spawn_magazine_type = /obj/item/ammo_box/magazine/toy/smgm45 /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot - mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot + spawn_magazine_type = /obj/item/ammo_box/magazine/toy/smgm45/riot /obj/item/gun/ballistic/automatic/l6_saw/toy //This is the syndicate variant with syndicate firing pin and riot darts. name = "donksoft LMG" @@ -96,14 +97,15 @@ fire_sound = 'sound/items/syringeproj.ogg' can_suppress = FALSE item_flags = NONE - mag_type = /obj/item/ammo_box/magazine/toy/m762/riot + accepted_magazine_type = /obj/item/ammo_box/magazine/toy/m762 + spawn_magazine_type = /obj/item/ammo_box/magazine/toy/m762/riot casing_ejector = FALSE clumsy_check = FALSE gun_flags = TOY_FIREARM_OVERLAY | NOT_A_REAL_GUN /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted //Use this for actual toys pin = /obj/item/firing_pin - mag_type = /obj/item/ammo_box/magazine/toy/m762 + spawn_magazine_type = /obj/item/ammo_box/magazine/toy/m762 /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/riot - mag_type = /obj/item/ammo_box/magazine/toy/m762/riot + spawn_magazine_type = /obj/item/ammo_box/magazine/toy/m762/riot diff --git a/code/modules/religion/burdened/psyker.dm b/code/modules/religion/burdened/psyker.dm index 57ca59c8808..b11705f284c 100644 --- a/code/modules/religion/burdened/psyker.dm +++ b/code/modules/religion/burdened/psyker.dm @@ -129,7 +129,7 @@ icon_state = "lucky" force = 10 fire_sound = 'sound/weapons/gun/revolver/shot.ogg' - mag_type = /obj/item/ammo_box/magazine/internal/cylinder/revchap + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/revchap obj_flags = UNIQUE_RENAME custom_materials = null actions_types = list(/datum/action/item_action/pray_refill) diff --git a/modular_skyrat/modules/aesthetics/guns/code/guns.dm b/modular_skyrat/modules/aesthetics/guns/code/guns.dm index 4edcc2f22b7..39344c29ad2 100644 --- a/modular_skyrat/modules/aesthetics/guns/code/guns.dm +++ b/modular_skyrat/modules/aesthetics/guns/code/guns.dm @@ -267,7 +267,7 @@ suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' recoil = 2 weapon_weight = WEAPON_HEAVY - mag_type = /obj/item/ammo_box/magazine/sniper_rounds + accepted_magazine_type = /obj/item/ammo_box/magazine/sniper_rounds fire_delay = 6 SECONDS burst_size = 1 w_class = WEIGHT_CLASS_NORMAL @@ -341,7 +341,7 @@ can_unsuppress = TRUE recoil = 1.8 weapon_weight = WEAPON_HEAVY - mag_type = /obj/item/ammo_box/magazine/sniper_rounds + accepted_magazine_type = /obj/item/ammo_box/magazine/sniper_rounds fire_delay = 55 //Slightly smaller than standard sniper burst_size = 1 slot_flags = ITEM_SLOT_BACK @@ -381,12 +381,12 @@ icon_state = "bubba" worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi' worn_icon_state = "bubba" - mag_type = /obj/item/ammo_box/magazine/internal/boltaction/bubba + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/bubba can_be_sawn_off = FALSE /obj/item/gun/ballistic/rifle/boltaction/sporterized/empty bolt_locked = TRUE // so the bolt starts visibly open - mag_type = /obj/item/ammo_box/magazine/internal/boltaction/bubba/empty + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/bubba/empty /obj/item/ammo_box/magazine/internal/boltaction/bubba name = "sportiv extended internal magazine" @@ -411,7 +411,7 @@ fire_sound = 'sound/weapons/gun/pistol/shot_suppressed.ogg' fire_delay = 5 fire_sound_volume = 90 - mag_type = /obj/item/ammo_box/magazine/multi_sprite/ostwind/arg75 + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/ostwind/arg75 /obj/item/gun/ballistic/automatic/ar/modular/model75/give_manufacturer_examine() AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN) diff --git a/modular_skyrat/modules/armaments/code/armament_entries.dm b/modular_skyrat/modules/armaments/code/armament_entries.dm index cdb3dc77841..6b736ecacd9 100644 --- a/modular_skyrat/modules/armaments/code/armament_entries.dm +++ b/modular_skyrat/modules/armaments/code/armament_entries.dm @@ -114,7 +114,7 @@ SUBSYSTEM_DEF(armaments) if(istype(test_item, /obj/item/gun/ballistic)) var/obj/item/gun/ballistic/ballistic_test = test_item if(!ballistic_test.internal_magazine) - magazine = ballistic_test.mag_type + magazine = ballistic_test.spawn_magazine_type cached_base64 = icon2base64(getFlatIcon(test_item, no_anim = TRUE)) qdel(test_item) diff --git a/modular_skyrat/modules/assault_operatives/code/armaments/assaultops_armament_station.dm b/modular_skyrat/modules/assault_operatives/code/armaments/assaultops_armament_station.dm index 5925e2d7e2d..6356aa478b4 100644 --- a/modular_skyrat/modules/assault_operatives/code/armaments/assaultops_armament_station.dm +++ b/modular_skyrat/modules/assault_operatives/code/armaments/assaultops_armament_station.dm @@ -26,4 +26,4 @@ var/obj/item/storage/box/ammo_box/spawned_box = new(safe_drop_location) spawned_box.name = "ammo box - [spawned_ballistic_gun.name]" for(var/i in 1 to mags_to_spawn) - new spawned_ballistic_gun.mag_type (spawned_box) + new spawned_ballistic_gun.spawn_magazine_type (spawned_box) diff --git a/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm b/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm index 86c9d392b79..357c25e02f9 100644 --- a/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm +++ b/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm @@ -32,7 +32,7 @@ w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING - mag_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_rifle + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_rifle fire_sound = 'modular_skyrat/modules/sec_haul/sound/sfrifle_fire.ogg' can_suppress = TRUE suppressor_x_offset = 4 @@ -87,7 +87,7 @@ w_class = WEIGHT_CLASS_NORMAL slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING - mag_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_smg + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_smg fire_sound = 'modular_skyrat/modules/sec_haul/sound/smg_fire.ogg' can_suppress = TRUE burst_size = 1 @@ -142,7 +142,7 @@ w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING - mag_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_shotgun + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_shotgun fire_sound = 'modular_skyrat/modules/sec_haul/sound/shotgun_bm.ogg' can_suppress = TRUE suppressor_x_offset = 4 @@ -206,7 +206,7 @@ w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING internal_magazine = FALSE - mag_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_sniper + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_sniper fire_sound = 'modular_skyrat/modules/sec_haul/sound/sniper_fire.ogg' can_suppress = TRUE suppressor_x_offset = 6 diff --git a/modular_skyrat/modules/assault_operatives/code/vending_machine.dm b/modular_skyrat/modules/assault_operatives/code/vending_machine.dm index c9da48b3281..fc7995f97d8 100644 --- a/modular_skyrat/modules/assault_operatives/code/vending_machine.dm +++ b/modular_skyrat/modules/assault_operatives/code/vending_machine.dm @@ -42,14 +42,14 @@ if(istype(object, /obj/item/gun/ballistic)) var/obj/item/gun/ballistic/gun = object if(!gun.internal_magazine) - products.Add(gun.mag_type) + products.Add(gun.spawn_magazine_type) if(istype(object, /obj/item/storage)) var/obj/item/storage/storage = object for(var/storage_item in storage.contents) if(istype(storage_item, /obj/item/gun/ballistic)) var/obj/item/gun/ballistic/gun = storage_item if(!gun.internal_magazine) - products.Add(gun.mag_type) + products.Add(gun.spawn_magazine_type) //Add our items to the list of products build_inventory(products, product_records, FALSE) diff --git a/modular_skyrat/modules/black_mesa/code/armaments/hecu_armament_station.dm b/modular_skyrat/modules/black_mesa/code/armaments/hecu_armament_station.dm index 98dbdb595f2..e6839d93d26 100644 --- a/modular_skyrat/modules/black_mesa/code/armaments/hecu_armament_station.dm +++ b/modular_skyrat/modules/black_mesa/code/armaments/hecu_armament_station.dm @@ -21,4 +21,4 @@ var/obj/item/storage/box/ammo_box/spawned_box = new(safe_drop_location) spawned_box.name = "ammo box - [spawned_ballistic_gun.name]" for(var/i in 1 to mags_to_spawn) - new spawned_ballistic_gun.mag_type (spawned_box) + new spawned_ballistic_gun.spawn_magazine_type (spawned_box) diff --git a/modular_skyrat/modules/black_mesa/code/guns.dm b/modular_skyrat/modules/black_mesa/code/guns.dm index ace57cb5186..0cd636a574a 100644 --- a/modular_skyrat/modules/black_mesa/code/guns.dm +++ b/modular_skyrat/modules/black_mesa/code/guns.dm @@ -3,7 +3,7 @@ desc = "A special laser beam sniper rifle designed by a certain now defunct research facility." icon_state = "ctfmarksman" inhand_icon_state = "ctfmarksman" - mag_type = /obj/item/ammo_box/magazine/recharge/marksman + accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/marksman force = 15 weapon_weight = WEAPON_HEAVY fire_delay = 4 SECONDS @@ -42,7 +42,7 @@ righthand_file ='modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi' icon_state = "mp5" inhand_icon_state = "mp5" - mag_type = /obj/item/ammo_box/magazine/mp5 + accepted_magazine_type = /obj/item/ammo_box/magazine/mp5 bolt_type = BOLT_TYPE_LOCKING can_suppress = TRUE fire_delay = 1.25 diff --git a/modular_skyrat/modules/black_mesa/code/m16_variations.dm b/modular_skyrat/modules/black_mesa/code/m16_variations.dm index 0df517e498d..7b548db9035 100644 --- a/modular_skyrat/modules/black_mesa/code/m16_variations.dm +++ b/modular_skyrat/modules/black_mesa/code/m16_variations.dm @@ -11,7 +11,7 @@ slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY - mag_type = /obj/item/ammo_box/magazine/m16/vintage/oldarms + accepted_magazine_type = /obj/item/ammo_box/magazine/m16/vintage/oldarms fire_delay = 3.5 burst_size = 1 actions_types = list() diff --git a/modular_skyrat/modules/clock_cult/code/items/weaponry.dm b/modular_skyrat/modules/clock_cult/code/items/weaponry.dm index e8ac131fc00..18a66e6f4be 100644 --- a/modular_skyrat/modules/clock_cult/code/items/weaponry.dm +++ b/modular_skyrat/modules/clock_cult/code/items/weaponry.dm @@ -156,7 +156,7 @@ inhand_icon_state = "clockwork_bow" base_icon_state = "bow_clockwork" force = 10 - mag_type = /obj/item/ammo_box/magazine/internal/bow/clockwork + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bow/clockwork /// Time between bolt recharges var/recharge_time = 1.5 SECONDS /// Typecache of valid turfs to have the weapon's special effect on @@ -247,7 +247,7 @@ icon_state = "clockwork_rifle" inhand_icon_state = "clockwork_rifle" worn_icon_state = "clockwork_rifle" - mag_type = /obj/item/ammo_box/magazine/internal/boltaction/lionhunter/clockwork + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/lionhunter/clockwork fire_sound = 'sound/weapons/gun/sniper/shot.ogg' show_bolt_icon = FALSE diff --git a/modular_skyrat/modules/company_imports/code/objects/nri_surplus/ak25.dm b/modular_skyrat/modules/company_imports/code/objects/nri_surplus/ak25.dm index 46c3da110be..f94e0167a81 100644 --- a/modular_skyrat/modules/company_imports/code/objects/nri_surplus/ak25.dm +++ b/modular_skyrat/modules/company_imports/code/objects/nri_surplus/ak25.dm @@ -9,7 +9,7 @@ slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY - mag_type = /obj/item/ammo_box/magazine/ak25 + accepted_magazine_type = /obj/item/ammo_box/magazine/ak25 can_suppress = FALSE burst_size = 3 fire_delay = 2 diff --git a/modular_skyrat/modules/encounters/code/nri_raiders.dm b/modular_skyrat/modules/encounters/code/nri_raiders.dm index c684e3f1b2a..73c94f1505e 100644 --- a/modular_skyrat/modules/encounters/code/nri_raiders.dm +++ b/modular_skyrat/modules/encounters/code/nri_raiders.dm @@ -291,7 +291,7 @@ GLOBAL_VAR(first_officer) icon_state = "automag" icon = 'modular_skyrat/modules/sec_haul/icons/guns/automag.dmi' w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/automag + accepted_magazine_type = /obj/item/ammo_box/magazine/automag can_suppress = FALSE fire_sound = 'modular_skyrat/modules/sec_haul/sound/automag.ogg' rack_sound = 'sound/weapons/gun/pistol/rack.ogg' diff --git a/modular_skyrat/modules/gunsgalore/code/guns/akm.dm b/modular_skyrat/modules/gunsgalore/code/guns/akm.dm index bb6472978cd..5de5eebe72d 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/akm.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/akm.dm @@ -9,7 +9,7 @@ slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY - mag_type = /obj/item/ammo_box/magazine/akm + accepted_magazine_type = /obj/item/ammo_box/magazine/akm can_suppress = FALSE fire_delay = 2 actions_types = list() @@ -95,7 +95,7 @@ desc = "A timeless human design of a carbine chambered in the NRI's 5.6mm ammo. The internal modifications made to the firearm in order to accommodate for non-military use made it incompatible with conventional munitions and gave it the inability to fire fully automatic. It's purpose-built to fire low-grade civilian ammo, anything stronger would obliterate the rifling and render the firearm useless." icon_state = "akm_civ" inhand_icon_state = "akm_civ" - mag_type = /obj/item/ammo_box/magazine/akm/civvie + accepted_magazine_type = /obj/item/ammo_box/magazine/akm/civvie fire_delay = 5 dual_wield_spread = 15 spread = 5 diff --git a/modular_skyrat/modules/gunsgalore/code/guns/fg42.dm b/modular_skyrat/modules/gunsgalore/code/guns/fg42.dm index 06dd791855d..341508acce3 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/fg42.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/fg42.dm @@ -9,7 +9,7 @@ slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY - mag_type = /obj/item/ammo_box/magazine/fg42 + accepted_magazine_type = /obj/item/ammo_box/magazine/fg42 can_suppress = FALSE burst_size = 2 spread = 0 diff --git a/modular_skyrat/modules/gunsgalore/code/guns/m16.dm b/modular_skyrat/modules/gunsgalore/code/guns/m16.dm index 75e4a5fa144..2d154ddeeac 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/m16.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/m16.dm @@ -11,7 +11,7 @@ slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY - mag_type = /obj/item/ammo_box/magazine/m16 + accepted_magazine_type = /obj/item/ammo_box/magazine/m16 can_suppress = FALSE burst_size = 3 fire_delay = 2 @@ -64,7 +64,7 @@ icon_state = "m16_modern2" inhand_icon_state = "m16" worn_icon_state = "m16" - mag_type = /obj/item/ammo_box/magazine/m16/patriot + accepted_magazine_type = /obj/item/ammo_box/magazine/m16/patriot burst_size = 4 fire_delay = 0.5 diff --git a/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm b/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm index 87aef1ece58..3b876fea7c9 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm @@ -17,7 +17,7 @@ slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_HUGE spread = 15 - mag_type = /obj/item/ammo_box/magazine/mg34 + accepted_magazine_type = /obj/item/ammo_box/magazine/mg34 can_suppress = FALSE fire_delay = 1 bolt_type = BOLT_TYPE_OPEN @@ -64,7 +64,7 @@ return ..() /obj/item/gun/ballistic/automatic/mg34/attackby(obj/item/A, mob/user, params) - if(!cover_open && istype(A, mag_type)) + if(!cover_open && istype(A, accepted_magazine_type)) to_chat(user, span_warning("[src]'s dust cover prevents a magazine from being fit.")) return ..() @@ -84,7 +84,7 @@ fire_delay = 0.04 burst_size = 5 spread = 5 - mag_type = /obj/item/ammo_box/magazine/mg34/packapunch + accepted_magazine_type = /obj/item/ammo_box/magazine/mg34/packapunch /obj/item/ammo_box/magazine/mg34/packapunch max_ammo = 999 @@ -111,7 +111,7 @@ fire_sound_volume = 100 fire_delay = 0.5 fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mg42_fire.ogg' - mag_type = /obj/item/ammo_box/magazine/mg42 + accepted_magazine_type = /obj/item/ammo_box/magazine/mg42 spread = SPREAD_UNDEPLOYED /// If we are resting, the bipod is deployed. var/bipod_deployed = FALSE diff --git a/modular_skyrat/modules/gunsgalore/code/guns/mp40.dm b/modular_skyrat/modules/gunsgalore/code/guns/mp40.dm index 02fe35875c1..7f098b230f4 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/mp40.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/mp40.dm @@ -9,7 +9,7 @@ worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi' worn_icon_state = "mp40" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK - mag_type = /obj/item/ammo_box/magazine/mp40 + accepted_magazine_type = /obj/item/ammo_box/magazine/mp40 can_suppress = FALSE burst_size = 1 fire_delay = 1.7 diff --git a/modular_skyrat/modules/gunsgalore/code/guns/p90.dm b/modular_skyrat/modules/gunsgalore/code/guns/p90.dm index 5d8b81ae2dd..311a78776ce 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/p90.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/p90.dm @@ -9,7 +9,7 @@ worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi' worn_icon_state = "p90" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK - mag_type = /obj/item/ammo_box/magazine/p90 + accepted_magazine_type = /obj/item/ammo_box/magazine/p90 can_suppress = FALSE fire_delay = 1 fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/p90_fire.ogg' diff --git a/modular_skyrat/modules/gunsgalore/code/guns/pps.dm b/modular_skyrat/modules/gunsgalore/code/guns/pps.dm index 756ae551959..16767f45df3 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/pps.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/pps.dm @@ -7,7 +7,7 @@ righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi' inhand_icon_state = "pps" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK - mag_type = /obj/item/ammo_box/magazine/pps + accepted_magazine_type = /obj/item/ammo_box/magazine/pps can_suppress = FALSE fire_delay = 3 worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi' diff --git a/modular_skyrat/modules/gunsgalore/code/guns/ppsh.dm b/modular_skyrat/modules/gunsgalore/code/guns/ppsh.dm index cff87e32227..26baa571166 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/ppsh.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/ppsh.dm @@ -10,7 +10,7 @@ worn_icon_state = "ppsh" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY - mag_type = /obj/item/ammo_box/magazine/ppsh + accepted_magazine_type = /obj/item/ammo_box/magazine/ppsh can_suppress = FALSE spread = 20 fire_delay = 0.5 diff --git a/modular_skyrat/modules/gunsgalore/code/guns/scar.dm b/modular_skyrat/modules/gunsgalore/code/guns/scar.dm index 62f6bbf6888..0fe3204a406 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/scar.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/scar.dm @@ -11,7 +11,7 @@ slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY - mag_type = /obj/item/ammo_box/magazine/m16 + accepted_magazine_type = /obj/item/ammo_box/magazine/m16 can_suppress = FALSE fire_delay = 1.90 fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/scar_fire.ogg' diff --git a/modular_skyrat/modules/gunsgalore/code/guns/stg.dm b/modular_skyrat/modules/gunsgalore/code/guns/stg.dm index d40828f78f0..d4fe1c9381f 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/stg.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/stg.dm @@ -11,7 +11,7 @@ slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY - mag_type = /obj/item/ammo_box/magazine/stg + accepted_magazine_type = /obj/item/ammo_box/magazine/stg can_suppress = FALSE fire_delay = 1.5 burst_size = 1 diff --git a/modular_skyrat/modules/marines/code/gear.dm b/modular_skyrat/modules/marines/code/gear.dm index 4e6400d741b..3b533700993 100644 --- a/modular_skyrat/modules/marines/code/gear.dm +++ b/modular_skyrat/modules/marines/code/gear.dm @@ -15,7 +15,7 @@ can_bayonet = FALSE mag_display = TRUE mag_display_ammo = FALSE - mag_type = /obj/item/ammo_box/magazine/m44a + accepted_magazine_type = /obj/item/ammo_box/magazine/m44a w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BELT @@ -68,7 +68,7 @@ name = "\improper M2 auto-shotgun underbarrel" desc = "This shouldn't be heeere!" can_suppress = FALSE - mag_type = /obj/item/ammo_box/magazine/internal/shot/as2/ubsg + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/as2/ubsg /obj/item/gun/ballistic/shotgun/automatic/as2/ubsg/give_gun_safeties() return diff --git a/modular_skyrat/modules/marines/code/smartgun.dm b/modular_skyrat/modules/marines/code/smartgun.dm index a71de917a30..a31cf1a6bc0 100644 --- a/modular_skyrat/modules/marines/code/smartgun.dm +++ b/modular_skyrat/modules/marines/code/smartgun.dm @@ -17,7 +17,7 @@ slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_HUGE spread = 18 - mag_type = /obj/item/ammo_box/magazine/smartgun_drum + accepted_magazine_type = /obj/item/ammo_box/magazine/smartgun_drum can_suppress = FALSE fire_delay = 0.15 bolt_type = BOLT_TYPE_OPEN @@ -77,7 +77,7 @@ return ..() /obj/item/gun/ballistic/automatic/smart_machine_gun/attackby(obj/item/attack_item, mob/user, params) - if(!cover_open && istype(attack_item, mag_type)) + if(!cover_open && istype(attack_item, accepted_magazine_type)) to_chat(user, span_warning("[src]'s dust cover prevents a magazine from being fit.")) return ..() diff --git a/modular_skyrat/modules/modular_weapons/code/automatic.dm b/modular_skyrat/modules/modular_weapons/code/automatic.dm index 7fc9c0211a6..e9ccae147c9 100644 --- a/modular_skyrat/modules/modular_weapons/code/automatic.dm +++ b/modular_skyrat/modules/modular_weapons/code/automatic.dm @@ -41,7 +41,7 @@ icon_state = "mp5" inhand_icon_state = "arg" selector_switch_icon = TRUE - mag_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat can_suppress = FALSE fire_delay = 1.25 spread = 5 @@ -73,7 +73,7 @@ icon_state = "cfa-lynx" inhand_icon_state = "arg" selector_switch_icon = FALSE - mag_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx can_suppress = FALSE fire_delay = 1.90 //Previously 0.5. Changed due to it being the Blueshield's default firearm. spread = 2 diff --git a/modular_skyrat/modules/modular_weapons/code/pistol.dm b/modular_skyrat/modules/modular_weapons/code/pistol.dm index 6783bd32c8d..7333fa60324 100644 --- a/modular_skyrat/modules/modular_weapons/code/pistol.dm +++ b/modular_skyrat/modules/modular_weapons/code/pistol.dm @@ -7,7 +7,7 @@ desc = "An easily-concealable pistol chambered for 4.2x30mm." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/projectile.dmi' icon_state = "cfa-snub" - mag_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_snub + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_snub can_suppress = TRUE fire_sound_volume = 30 w_class = WEIGHT_CLASS_SMALL @@ -26,7 +26,7 @@ desc = "A heavy-duty sidearm chambered in 12x27mm." icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/projectile.dmi' icon_state = "cfa_ruby" - mag_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_ruby + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_ruby can_suppress = FALSE fire_sound_volume = 120 w_class = WEIGHT_CLASS_NORMAL diff --git a/modular_skyrat/modules/modular_weapons/code/revolver.dm b/modular_skyrat/modules/modular_weapons/code/revolver.dm index 9bfc43ee6bc..669f874026f 100644 --- a/modular_skyrat/modules/modular_weapons/code/revolver.dm +++ b/modular_skyrat/modules/modular_weapons/code/revolver.dm @@ -10,7 +10,7 @@ desc = "A revolving rifle chambered in .38. " icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/projectile40x32.dmi' icon_state = "revolving-rifle" - mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38 //This is just a detective's revolver but it's too big for bags.. + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38 //This is just a detective's revolver but it's too big for bags.. pixel_x = -4 // It's centred on a 40x32 pixel spritesheet. w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY // The entire purpose of this is that it's a bulky rifle instead of a revolver. @@ -28,7 +28,7 @@ name = "\improper .45 revolving rifle" desc = "A gold trimmed revolving rifle! It fires .45 bullets." icon_state = "revolving-rifle-gold" - mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45 //Gold! We're using .45 because TG's 10mm does 40 damage, this does 30. + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45 //Gold! We're using .45 because TG's 10mm does 40 damage, this does 30. w_class = WEIGHT_CLASS_BULKY inhand_icon_state = "revolving_gold" diff --git a/modular_skyrat/modules/modular_weapons/code/rifle.dm b/modular_skyrat/modules/modular_weapons/code/rifle.dm index 858db39cd23..eb40dc20330 100644 --- a/modular_skyrat/modules/modular_weapons/code/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/rifle.dm @@ -13,7 +13,7 @@ lefthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/inhands/weapons/64x_guns_left.dmi' righthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/inhands/weapons/64x_guns_right.dmi' worn_icon_state = "gun" - mag_type = /obj/item/ammo_box/magazine/cm68 + accepted_magazine_type = /obj/item/ammo_box/magazine/cm68 fire_delay = 5 can_suppress = FALSE burst_size = 1 diff --git a/modular_skyrat/modules/moretraitoritems/code/ocelot_revolver.dm b/modular_skyrat/modules/moretraitoritems/code/ocelot_revolver.dm index 70a1149dccb..84c9f6d697d 100644 --- a/modular_skyrat/modules/moretraitoritems/code/ocelot_revolver.dm +++ b/modular_skyrat/modules/moretraitoritems/code/ocelot_revolver.dm @@ -4,7 +4,7 @@ // this could probably be made funnier by reducing its damage multiplier but also making it so that every fired bullet has the wacky ricochets // but that's a different plate of cookies for a different glass of milk icon_state = "c38_panther" - mag_type = /obj/item/ammo_box/magazine/internal/cylinder + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder /obj/item/ammo_casing/a357/peacemaker name = ".357 Peacemaker bullet casing" diff --git a/modular_skyrat/modules/nanotrasen_rep/code/m45a5.dm b/modular_skyrat/modules/nanotrasen_rep/code/m45a5.dm index 634ea2e9872..8d14eab2b2f 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/m45a5.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/m45a5.dm @@ -6,7 +6,7 @@ icon = 'modular_skyrat/modules/blueshield/icons/M45A5.dmi' icon_state = "m45a5" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/m45a5 + accepted_magazine_type = /obj/item/ammo_box/magazine/m45a5 can_suppress = FALSE fire_delay = 4.25 //Originally 1.75 which was unintentionally extremely fast. fire_sound_volume = 60 diff --git a/modular_skyrat/modules/novaya_ert/code/automatic.dm b/modular_skyrat/modules/novaya_ert/code/automatic.dm index a7a808026a5..a3ed2765279 100644 --- a/modular_skyrat/modules/novaya_ert/code/automatic.dm +++ b/modular_skyrat/modules/novaya_ert/code/automatic.dm @@ -12,7 +12,7 @@ icon_state = "nri_smg" inhand_icon_state = "nri_smg" w_class = WEIGHT_CLASS_BULKY - mag_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx fire_delay = 1 burst_size = 5 dual_wield_spread = 5 @@ -32,7 +32,7 @@ 'PATRIOT DEFENSE SYSTEMS' is inscribed on the receiver, indicating it's been made with a plasteel printer." icon = 'modular_skyrat/modules/novaya_ert/icons/pistol.dmi' w_class = WEIGHT_CLASS_SMALL - mag_type = /obj/item/ammo_box/magazine/m9mm_aps + accepted_magazine_type = /obj/item/ammo_box/magazine/m9mm_aps burst_size = 3 fire_delay = 3 diff --git a/modular_skyrat/modules/novaya_ert/code/surplus_weapons.dm b/modular_skyrat/modules/novaya_ert/code/surplus_weapons.dm index abaa310dcc0..5e40743aa8e 100644 --- a/modular_skyrat/modules/novaya_ert/code/surplus_weapons.dm +++ b/modular_skyrat/modules/novaya_ert/code/surplus_weapons.dm @@ -69,7 +69,7 @@ /obj/item/gun/ballistic/revolver/cin_shotgun_revolver name = "\improper Tkach 'Ya-Sui' 12 GA revolver" desc = "An outdated sidearm rarely seen in use by some members of the CIN. A revolver type design with a three shell cylinder. That's right, shell, this one shoots twelve guage." - mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev12ga + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev12ga recoil = SAWN_OFF_RECOIL weapon_weight = WEAPON_HEAVY icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_guns/guns_32.dmi' @@ -122,7 +122,7 @@ w_class = WEIGHT_CLASS_HUGE slot_flags = ITEM_SLOT_BACK - mag_type = /obj/item/ammo_box/magazine/cin_amr + accepted_magazine_type = /obj/item/ammo_box/magazine/cin_amr can_suppress = FALSE can_bayonet = FALSE diff --git a/modular_skyrat/modules/projectiles/code/guns/misc/m6pdw.dm b/modular_skyrat/modules/projectiles/code/guns/misc/m6pdw.dm index 244870c17a0..df95f6072e9 100644 --- a/modular_skyrat/modules/projectiles/code/guns/misc/m6pdw.dm +++ b/modular_skyrat/modules/projectiles/code/guns/misc/m6pdw.dm @@ -10,7 +10,7 @@ lefthand_file = 'modular_skyrat/modules/projectiles/icons/inhands/lefthand.dmi' w_class = WEIGHT_CLASS_NORMAL spawnwithmagazine = FALSE - mag_type = /obj/item/ammo_box/magazine/multi_sprite/g17 + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/g17 can_suppress = FALSE fire_sound = 'sound/weapons/gun/pistol/shot_alt.ogg' rack_sound = 'sound/weapons/gun/pistol/rack.ogg' diff --git a/modular_skyrat/modules/robohand/code/robohand.dm b/modular_skyrat/modules/robohand/code/robohand.dm index 3faef4c18cc..a78c973c002 100644 --- a/modular_skyrat/modules/robohand/code/robohand.dm +++ b/modular_skyrat/modules/robohand/code/robohand.dm @@ -12,7 +12,7 @@ icon = 'modular_skyrat/modules/robohand/icons/3516.dmi' icon_state = "3516" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/m14mm + accepted_magazine_type = /obj/item/ammo_box/magazine/m14mm can_suppress = FALSE fire_sound = 'modular_skyrat/modules/robohand/sound/fire2.ogg' load_sound = 'modular_skyrat/modules/robohand/sound/reload.ogg' @@ -45,7 +45,7 @@ . = ..() /obj/item/gun/ballistic/automatic/pistol/robohand/insert_magazine(mob/user, obj/item/ammo_box/magazine/inserted_mag, display_message) - if(!istype(inserted_mag, mag_type)) + if(!istype(inserted_mag, accepted_magazine_type)) to_chat(user, span_warning("\The [inserted_mag] doesn't seem to fit into \the [src]...")) return FALSE if(!user.transferItemToLoc(inserted_mag, src)) diff --git a/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm b/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm index 09a8fcbb493..7d338480d8d 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm @@ -32,7 +32,7 @@ var/obj/item/storage/box/ammo_box/spawned_box = new(loc) spawned_box.name = "ammo box - [spawned_ballistic_gun.name]" for(var/i in 1 to mags_to_spawn) - new spawned_ballistic_gun.mag_type (spawned_box) + new spawned_ballistic_gun.spawn_magazine_type (spawned_box) /obj/effect/spawner/armory_spawn/shotguns icon_state = "random_shotgun" diff --git a/modular_skyrat/modules/sec_haul/code/guns/cmg.dm b/modular_skyrat/modules/sec_haul/code/guns/cmg.dm index 004fbe69210..99f8c2586bf 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/cmg.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/cmg.dm @@ -15,7 +15,7 @@ icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi' inhand_icon_state = "c20r" selector_switch_icon = TRUE - mag_type = /obj/item/ammo_box/magazine/multi_sprite/cmg + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/cmg fire_delay = 2 //Slightly buffed firespeed over the last cmg because the bullets are a bit weaker burst_size = 1 actions_types = list() diff --git a/modular_skyrat/modules/sec_haul/code/guns/guns.dm b/modular_skyrat/modules/sec_haul/code/guns/guns.dm index d851a155d0b..04a85fa0c87 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/guns.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/guns.dm @@ -8,7 +8,7 @@ icon = 'modular_skyrat/modules/sec_haul/icons/guns/glock.dmi' icon_state = "glock" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/multi_sprite/g17 + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/g17 can_suppress = FALSE fire_sound = 'sound/weapons/gun/pistol/shot_alt.ogg' rack_sound = 'sound/weapons/gun/pistol/rack.ogg' @@ -51,7 +51,7 @@ icon = 'modular_skyrat/modules/sec_haul/icons/guns/glock.dmi' icon_state = "glock_spec" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/multi_sprite/g18 + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/g18 can_suppress = FALSE fire_sound = 'sound/weapons/gun/pistol/shot_alt.ogg' rack_sound = 'sound/weapons/gun/pistol/rack.ogg' @@ -99,7 +99,7 @@ icon = 'modular_skyrat/modules/sec_haul/icons/guns/glock.dmi' icon_state = "glock_mesa" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/multi_sprite/ladon // C o m p a t i b i l i t y . + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/ladon // C o m p a t i b i l i t y . fire_sound = 'modular_skyrat/master_files/sound/weapons/glock17_fire.ogg' rack_sound = 'sound/weapons/gun/pistol/rack.ogg' lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg' @@ -125,7 +125,7 @@ icon_state = "pdh" inhand_icon_state = "pdh" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/multi_sprite/pdh + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pdh can_suppress = FALSE fire_sound = 'modular_skyrat/modules/sec_haul/sound/hpistol_fire.ogg' rack_sound = 'sound/weapons/gun/pistol/rack.ogg' @@ -143,7 +143,7 @@ desc = "A prestigious 12mm sidearm normally seen in the hands of SolFed special operation units due to its reliable and time-tested design. Now's one of those times that pays to be the strong, silent type." icon_state = "pdh_alt" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/multi_sprite/pdh + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pdh can_suppress = FALSE fire_sound = 'sound/weapons/gun/pistol/shot_suppressed.ogg' fire_delay = 8 @@ -178,7 +178,7 @@ desc = "A prestigious ballistic sidearm, from Armadyne's military division, normally given to high-ranking corporate agents. It has a 3 round burst mode and uses .357 Magnum ammunition." icon_state = "pdh_corpo" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/multi_sprite/pdh_corpo + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pdh_corpo can_suppress = FALSE fire_sound = 'modular_skyrat/modules/sec_haul/sound/hpistol_fire.ogg' burst_size = 3 @@ -209,7 +209,7 @@ desc = "A sidearm used by Armadyne corporate agents who didn't make the cut for the Corpo model. Chambered in .38 special." icon_state = "pdh_striker" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/multi_sprite/pdh_striker + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pdh_striker can_suppress = FALSE fire_sound = 'modular_skyrat/modules/sec_haul/sound/hpistol_fire.ogg' burst_size = 3 @@ -239,7 +239,7 @@ desc = "A modern ballistic sidearm, used primarily by law enforcement, chambered in 9x25mm." fire_delay = 1.95 icon_state = "pdh_peacekeeper" - mag_type = /obj/item/ammo_box/magazine/multi_sprite/pdh_peacekeeper + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pdh_peacekeeper fire_sound = 'modular_skyrat/modules/sec_haul/sound/pistol_fire.ogg' projectile_damage_multiplier = 0.5 @@ -278,7 +278,7 @@ icon_state = "ladon" inhand_icon_state = "ladon" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/multi_sprite/ladon + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/ladon can_suppress = FALSE fire_sound = 'modular_skyrat/modules/sec_haul/sound/pistol_fire.ogg' rack_sound = 'sound/weapons/gun/pistol/rack.ogg' @@ -325,7 +325,7 @@ icon = 'modular_skyrat/modules/sec_haul/icons/guns/makarov.dmi' icon_state = "makarov" w_class = WEIGHT_CLASS_SMALL - mag_type = /obj/item/ammo_box/magazine/multi_sprite/makarov + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/makarov can_suppress = TRUE rack_sound = 'sound/weapons/gun/pistol/rack.ogg' lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg' @@ -367,7 +367,7 @@ icon = 'modular_skyrat/modules/sec_haul/icons/guns/mk58.dmi' icon_state = "mk58" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/multi_sprite/mk58 + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/mk58 can_suppress = FALSE fire_sound = 'modular_skyrat/modules/sec_haul/sound/pistol_fire.ogg' rack_sound = 'sound/weapons/gun/pistol/rack.ogg' @@ -414,7 +414,7 @@ inhand_icon_state = "firefly" fire_delay = 1.95 w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/multi_sprite/firefly + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/firefly can_suppress = FALSE projectile_damage_multiplier = 0.5 @@ -459,7 +459,7 @@ icon_state = "croon" inhand_icon_state = "croon" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/multi_sprite/croon + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/croon can_suppress = FALSE fire_sound = 'sound/weapons/gun/smg/shot.ogg' rack_sound = 'sound/weapons/gun/smg/smgrack.ogg' @@ -507,7 +507,7 @@ icon_state = "dozer" inhand_icon_state = "dozer" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/multi_sprite/dozer + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/dozer can_suppress = TRUE mag_display = FALSE mag_display_ammo = FALSE @@ -561,7 +561,7 @@ inhand_icon_state = "dmr" w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE - mag_type = /obj/item/ammo_box/magazine/dmr + accepted_magazine_type = /obj/item/ammo_box/magazine/dmr fire_delay = 1.7 can_suppress = FALSE can_bayonet = FALSE @@ -599,7 +599,7 @@ lefthand_file = 'modular_skyrat/modules/sec_haul/icons/guns/inhands/lefthand.dmi' icon_state = "zeta" inhand_icon_state = "zeta" - mag_type = /obj/item/ammo_box/magazine/internal/cylinder/zeta + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/zeta fire_sound = 'modular_skyrat/modules/sec_haul/sound/revolver_fire.ogg' fire_delay = 3 @@ -638,7 +638,7 @@ lefthand_file = 'modular_skyrat/modules/sec_haul/icons/guns/inhands/lefthand.dmi' icon_state = "revolution" inhand_icon_state = "revolution" - mag_type = /obj/item/ammo_box/magazine/internal/cylinder/revolution + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/revolution fire_sound = 'modular_skyrat/modules/sec_haul/sound/revolver_fire.ogg' fire_delay = 1.90 projectile_damage_multiplier = 0.5 @@ -683,7 +683,7 @@ inhand_icon_state = "smartgun_worn" worn_icon = 'modular_skyrat/modules/sec_haul/icons/guns/smartgun.dmi' worn_icon_state = "smartgun_worn" - mag_type = /obj/item/ammo_box/magazine/smartgun + accepted_magazine_type = /obj/item/ammo_box/magazine/smartgun actions_types = null can_suppress = FALSE can_bayonet = FALSE @@ -780,7 +780,7 @@ worn_icon_state = "g11_worn" w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING - mag_type = /obj/item/ammo_box/magazine/multi_sprite/g11 + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/g11 can_suppress = FALSE fire_delay = 0.5 spread = 10 @@ -825,7 +825,7 @@ icon_state = "riotshotgun" worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi' inhand_icon_state = "shotgun" - mag_type = /obj/item/ammo_box/magazine/internal/shot/m23 + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/m23 w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING @@ -856,7 +856,7 @@ vary_fire_sound = TRUE fire_sound = 'modular_skyrat/modules/aesthetics/guns/sound/shotgun_light.ogg' fire_delay = 5 - mag_type = /obj/item/ammo_box/magazine/internal/shot/as2 + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/as2 w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING @@ -888,7 +888,7 @@ worn_icon_state = "norwind_worn" alt_icons = TRUE alt_icon_state = "norwind_worn" - mag_type = /obj/item/ammo_box/magazine/multi_sprite/norwind + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/norwind can_suppress = FALSE can_bayonet = TRUE mag_display = TRUE @@ -946,7 +946,7 @@ w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING inhand_icon_state = "vintorez" - mag_type = /obj/item/ammo_box/magazine/multi_sprite/vintorez + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/vintorez suppressed = TRUE can_unsuppress = FALSE can_bayonet = FALSE @@ -1005,7 +1005,7 @@ icon_state = "pcr" slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING w_class = WEIGHT_CLASS_BULKY - mag_type = /obj/item/ammo_box/magazine/multi_sprite/pcr + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pcr fire_delay = 1.80 can_suppress = FALSE spread = 10 @@ -1060,7 +1060,7 @@ worn_icon_state = "ostwind_worn" w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING - mag_type = /obj/item/ammo_box/magazine/multi_sprite/pitbull + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pitbull fire_delay = 4.20 can_suppress = FALSE burst_size = 3 @@ -1123,7 +1123,7 @@ alt_icon_state = "ostwind_worn" w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING - mag_type = /obj/item/ammo_box/magazine/multi_sprite/ostwind + accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/ostwind spread = 10 fire_delay = 2 can_suppress = FALSE diff --git a/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm b/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm index a3e6f017126..ffca51d4e67 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm @@ -4,7 +4,7 @@ icon = 'modular_skyrat/modules/sec_haul/icons/guns/pepperball.dmi' icon_state = "peppergun" w_class = WEIGHT_CLASS_NORMAL - mag_type = /obj/item/ammo_box/magazine/pepperball + accepted_magazine_type = /obj/item/ammo_box/magazine/pepperball can_suppress = FALSE fire_sound = 'sound/effects/pop_expl.ogg' rack_sound = 'sound/weapons/gun/pistol/rack.ogg' From f72839edc1671bda94cd9ed879ba255fabe383f8 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 02:24:21 +0200 Subject: [PATCH 38/69] [MIRROR] Dehardcodes HR core blacklist [MDB IGNORE] (#22681) * Dehardcodes HR core blacklist * Merge conflicts --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> --- code/__DEFINES/jobs.dm | 5 +++ code/controllers/subsystem/job.dm | 3 ++ code/modules/jobs/job_types/_job.dm | 4 +-- code/modules/jobs/job_types/ai.dm | 2 +- code/modules/jobs/job_types/assistant.dm | 2 +- .../jobs/job_types/atmospheric_technician.dm | 2 +- code/modules/jobs/job_types/bartender.dm | 2 +- code/modules/jobs/job_types/botanist.dm | 2 +- code/modules/jobs/job_types/captain.dm | 2 +- .../jobs/job_types/cargo_technician.dm | 2 +- .../jobs/job_types/chaplain/chaplain.dm | 2 +- code/modules/jobs/job_types/chemist.dm | 2 +- code/modules/jobs/job_types/chief_engineer.dm | 2 +- .../jobs/job_types/chief_medical_officer.dm | 2 +- code/modules/jobs/job_types/clown.dm | 2 +- code/modules/jobs/job_types/cook.dm | 2 +- code/modules/jobs/job_types/coroner.dm | 2 +- code/modules/jobs/job_types/curator.dm | 2 +- code/modules/jobs/job_types/cyborg.dm | 2 +- code/modules/jobs/job_types/detective.dm | 2 +- code/modules/jobs/job_types/geneticist.dm | 2 +- .../jobs/job_types/head_of_personnel.dm | 2 +- .../jobs/job_types/head_of_security.dm | 2 +- code/modules/jobs/job_types/janitor.dm | 2 +- code/modules/jobs/job_types/lawyer.dm | 2 +- code/modules/jobs/job_types/medical_doctor.dm | 2 +- code/modules/jobs/job_types/mime.dm | 2 +- code/modules/jobs/job_types/paramedic.dm | 2 +- code/modules/jobs/job_types/prisoner.dm | 2 +- code/modules/jobs/job_types/psychologist.dm | 2 +- code/modules/jobs/job_types/quartermaster.dm | 2 +- .../jobs/job_types/research_director.dm | 2 +- code/modules/jobs/job_types/roboticist.dm | 2 +- code/modules/jobs/job_types/scientist.dm | 2 +- .../jobs/job_types/security_officer.dm | 2 +- code/modules/jobs/job_types/shaft_miner.dm | 2 +- .../jobs/job_types/station_engineer.dm | 2 +- code/modules/jobs/job_types/virologist.dm | 2 +- code/modules/jobs/job_types/warden.dm | 3 +- .../file_system/programs/jobmanagement.dm | 36 ++++++------------- .../code/modules/jobs/job_types/clown.dm | 1 + .../modules/blueshield/code/blueshield.dm | 2 +- .../code/nanotrasen_consultant.dm | 2 +- 43 files changed, 60 insertions(+), 66 deletions(-) diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 374c0e890c6..71fc835d25e 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -227,6 +227,11 @@ #define JOB_ASSIGN_QUIRKS (1<<7) /// Whether this job can be an intern. #define JOB_CAN_BE_INTERN (1<<8) +/// This job cannot have more slots opened by the Head of Personnel (but admins or other random events can still do this). +#define JOB_CANNOT_OPEN_SLOTS (1<<9) + +/// Combination flag for jobs which are considered regular crew members of the station. +#define STATION_JOB_FLAGS (JOB_ANNOUNCE_ARRIVAL|JOB_CREW_MANIFEST|JOB_EQUIP_RANK|JOB_CREW_MEMBER|JOB_NEW_PLAYER_JOINABLE|JOB_REOPEN_ON_ROUNDSTART_LOSS|JOB_ASSIGN_QUIRKS|JOB_CAN_BE_INTERN) #define FACTION_NONE "None" #define FACTION_STATION "Station" diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 17977bd0bc3..1c4023c71db 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -104,6 +104,7 @@ SUBSYSTEM_DEF(job) new_overflow.allow_bureaucratic_error = FALSE new_overflow.spawn_positions = cap new_overflow.total_positions = cap + new_overflow.job_flags |= JOB_CANNOT_OPEN_SLOTS if(new_overflow.type == overflow_role) return @@ -111,6 +112,8 @@ SUBSYSTEM_DEF(job) old_overflow.allow_bureaucratic_error = initial(old_overflow.allow_bureaucratic_error) old_overflow.spawn_positions = initial(old_overflow.spawn_positions) old_overflow.total_positions = initial(old_overflow.total_positions) + if(!(initial(old_overflow.job_flags) & JOB_CANNOT_OPEN_SLOTS)) + old_overflow.job_flags &= ~JOB_CANNOT_OPEN_SLOTS overflow_role = new_overflow.type JobDebug("Overflow role set to : [new_overflow.type]") diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 711ebd3524b..5339c34fad5 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -103,7 +103,7 @@ /// List of family heirlooms this job can get with the family heirloom quirk. List of types. var/list/family_heirlooms - /// All values = (JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN) + /// All values = (JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN | JOB_CANNOT_OPEN_SLOTS) var/job_flags = NONE /// Multiplier for general usage of the voice of god. @@ -131,7 +131,7 @@ /// custom ringtone for this job var/job_tone - + /// Minimal character age for this job var/required_character_age diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm index b1e1eeb6572..f3f8b23837b 100644 --- a/code/modules/jobs/job_types/ai.dm +++ b/code/modules/jobs/job_types/ai.dm @@ -19,7 +19,7 @@ /datum/job_department/silicon, ) random_spawns_possible = FALSE - job_flags = JOB_NEW_PLAYER_JOINABLE | JOB_EQUIP_RANK | JOB_BOLD_SELECT_TEXT + job_flags = JOB_NEW_PLAYER_JOINABLE | JOB_EQUIP_RANK | JOB_BOLD_SELECT_TEXT | JOB_CANNOT_OPEN_SLOTS var/do_special_check = TRUE config_tag = "AI" diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index 1493c988fb0..a5a68b7152a 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -33,7 +33,7 @@ Assistant /obj/item/crowbar/large = 1 ) - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS rpg_title = "Lout" config_tag = "ASSISTANT" diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index b5c38f4fe58..77f52fd8ab6 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -35,7 +35,7 @@ /obj/item/grenade/gas_crystal/nitrous_oxide_crystal = 5, ) - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS rpg_title = "Aeromancer" /datum/outfit/job/atmos diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index ec526e10d91..0d33c968e56 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -29,7 +29,7 @@ /obj/item/stack/sheet/mineral/uranium = 10, ) - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS rpg_title = "Tavernkeeper" /datum/job/bartender/award_service(client/winner, award) diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index 9486cc6e4c3..d977b221b47 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -36,7 +36,7 @@ /obj/item/food/monkeycube/bee = 2 ) - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS rpg_title = "Gardener" /datum/outfit/job/botanist diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 1e4cd39f782..64212db6cc1 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -42,7 +42,7 @@ /obj/item/skillchip/sabrage = 5, ) - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT | JOB_CANNOT_OPEN_SLOTS rpg_title = "Star Duke" voice_of_god_power = 1.4 //Command staff has authority diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm index 318eb695e2d..a6c398feafd 100644 --- a/code/modules/jobs/job_types/cargo_technician.dm +++ b/code/modules/jobs/job_types/cargo_technician.dm @@ -33,7 +33,7 @@ /obj/item/gun/ballistic/automatic/wt550 = 1, ) rpg_title = "Merchantman" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS /datum/outfit/job/cargo_tech diff --git a/code/modules/jobs/job_types/chaplain/chaplain.dm b/code/modules/jobs/job_types/chaplain/chaplain.dm index 19e166ee8e5..be4516a0db7 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain.dm @@ -31,7 +31,7 @@ /obj/item/toy/plush/ratplush = 1 ) rpg_title = "Paladin" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS voice_of_god_power = 2 //Chaplains are very good at speaking with the voice of god diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index 5e5dbb1b38e..b53f95cd687 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -35,7 +35,7 @@ /obj/item/paper/secretrecipe = 1 ) rpg_title = "Alchemist" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS /datum/outfit/job/chemist diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index 6116b1dc931..b3b648e6d08 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -43,7 +43,7 @@ /obj/effect/spawner/random/engineering/tool_advanced = 3 ) rpg_title = "Head Crystallomancer" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT | JOB_CANNOT_OPEN_SLOTS voice_of_god_power = 1.4 //Command staff has authority diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index e7cdcfb3975..448c764d44e 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -40,7 +40,7 @@ ) family_heirlooms = list(/obj/item/storage/medkit/ancient/heirloom, /obj/item/scalpel, /obj/item/hemostat, /obj/item/circular_saw, /obj/item/retractor, /obj/item/cautery) rpg_title = "High Cleric" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT | JOB_CANNOT_OPEN_SLOTS voice_of_god_power = 1.4 //Command staff has authority diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index 28d102873be..7e9fa44d052 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -33,7 +33,7 @@ family_heirlooms = list(/obj/item/bikehorn/golden) rpg_title = "Jester" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS job_tone = "honk" diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm index 6be121085d2..66af08e4b8d 100644 --- a/code/modules/jobs/job_types/cook.dm +++ b/code/modules/jobs/job_types/cook.dm @@ -45,7 +45,7 @@ ) rpg_title = "Tavern Chef" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS /datum/job/cook/award_service(client/winner, award) winner.give_award(award, winner.mob) diff --git a/code/modules/jobs/job_types/coroner.dm b/code/modules/jobs/job_types/coroner.dm index 70e316298d8..41a2024c97a 100644 --- a/code/modules/jobs/job_types/coroner.dm +++ b/code/modules/jobs/job_types/coroner.dm @@ -39,7 +39,7 @@ family_heirlooms = list(/obj/item/clothing/head/helmet/skull, /obj/item/table_clock, /obj/item/shovel, /obj/item/storage/fancy/pickles_jar) - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS rpg_title = "Undertaker" diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index 5c27fc57f68..a3172c44407 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -31,7 +31,7 @@ family_heirlooms = list(/obj/item/pen/fountain, /obj/item/storage/dice) - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS voice_of_god_silence_power = 3 rpg_title = "Veteran Adventurer" diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm index 3080eb3e649..ae6b7c142cc 100644 --- a/code/modules/jobs/job_types/cyborg.dm +++ b/code/modules/jobs/job_types/cyborg.dm @@ -19,7 +19,7 @@ /datum/job_department/silicon, ) random_spawns_possible = FALSE - job_flags = JOB_NEW_PLAYER_JOINABLE | JOB_EQUIP_RANK + job_flags = JOB_NEW_PLAYER_JOINABLE | JOB_EQUIP_RANK | JOB_CANNOT_OPEN_SLOTS /datum/job/cyborg/after_spawn(mob/living/spawned, client/player_client) diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 4b44a3a4ae2..b6984e24b42 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -40,7 +40,7 @@ family_heirlooms = list(/obj/item/reagent_containers/cup/glass/bottle/whiskey) rpg_title = "Thiefcatcher" //I guess they caught them all rip thief... - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS job_tone = "objection" diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index 1c11925bcd3..0b97bcb36e6 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -29,7 +29,7 @@ family_heirlooms = list(/obj/item/clothing/under/shorts/purple) rpg_title = "Genemancer" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS /datum/outfit/job/geneticist diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 1eda33202ea..d648ae3536a 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -39,7 +39,7 @@ family_heirlooms = list(/obj/item/reagent_containers/cup/glass/trophy/silver_cup) rpg_title = "Guild Questgiver" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT | JOB_CANNOT_OPEN_SLOTS voice_of_god_power = 1.4 //Command staff has authority diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index d30eb59d64c..1c2a41c4dcd 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -34,7 +34,7 @@ family_heirlooms = list(/obj/item/book/manual/wiki/security_space_law) rpg_title = "Guard Leader" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT | JOB_CANNOT_OPEN_SLOTS voice_of_god_power = 1.4 //Command staff has authority diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index 1db17fb4cfd..a3f4d1aae19 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -28,7 +28,7 @@ /obj/item/lightreplacer = 10 ) rpg_title = "Groundskeeper" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS job_tone = "slip" diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm index 38d55e85c28..a25a1d86d3a 100644 --- a/code/modules/jobs/job_types/lawyer.dm +++ b/code/modules/jobs/job_types/lawyer.dm @@ -25,7 +25,7 @@ rpg_title = "Magistrate" family_heirlooms = list(/obj/item/gavelhammer, /obj/item/book/manual/wiki/security_space_law) - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS job_tone = "objection" diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index e8f064fd545..049ca748957 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -36,7 +36,7 @@ /obj/effect/spawner/random/medical/memeorgans = 1 ) rpg_title = "Cleric" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS /datum/outfit/job/doctor diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index 6b08c2b4d4e..43ed9a817dd 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -29,7 +29,7 @@ /obj/item/book/granter/action/spell/mime/mimery = 1, ) rpg_title = "Fool" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS voice_of_god_power = 0.5 //Why are you speaking voice_of_god_silence_power = 3 diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index 2b2e3b0fcb8..09bd837382a 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -35,7 +35,7 @@ /obj/item/reagent_containers/hypospray/medipen/survival/luxury = 5 ) rpg_title = "Corpse Runner" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS /datum/outfit/job/paramedic diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index d02a0b0b4b1..33369d44ce4 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -23,7 +23,7 @@ family_heirlooms = list(/obj/item/pen/blue) rpg_title = "Defeated Miniboss" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN | JOB_CANNOT_OPEN_SLOTS /datum/job/prisoner/New() . = ..() diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm index bf178b2de11..d35edfb1476 100644 --- a/code/modules/jobs/job_types/psychologist.dm +++ b/code/modules/jobs/job_types/psychologist.dm @@ -31,7 +31,7 @@ /obj/item/gun/syringe = 1 ) rpg_title = "Snake Oil Salesman" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS /datum/outfit/job/psychologist diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index e544e52ec63..bc23cdc2f86 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -33,7 +33,7 @@ /obj/item/circuitboard/machine/emitter = 3 ) rpg_title = "Steward" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT | JOB_CANNOT_OPEN_SLOTS ignore_human_authority = TRUE /datum/outfit/job/quartermaster diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 799a5e1793f..8a3071f21a9 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -41,7 +41,7 @@ family_heirlooms = list(/obj/item/toy/plush/slimeplushie) rpg_title = "Archmagister" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT | JOB_CANNOT_OPEN_SLOTS voice_of_god_power = 1.4 //Command staff has authority diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index 643e4b8a50a..46c62f54ad9 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -31,7 +31,7 @@ family_heirlooms = list(/obj/item/toy/plush/pkplush) rpg_title = "Necromancer" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS /datum/job/roboticist/New() diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index 2cbc2f288d0..2dc97c2f89d 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -33,7 +33,7 @@ /obj/item/camera_bug = 1 ) rpg_title = "Thaumaturgist" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS job_tone = "boom" diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 024eea87c04..59c94127ce8 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -38,7 +38,7 @@ /obj/item/melee/baton/security/boomerang/loaded = 1 ) rpg_title = "Guard" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY)) diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index f3daead56d0..1186615dcbf 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -26,7 +26,7 @@ family_heirlooms = list(/obj/item/pickaxe/mini, /obj/item/shovel) rpg_title = "Adventurer" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS /datum/outfit/job/miner diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index b98685902bd..bf90ab0200f 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -36,7 +36,7 @@ /obj/item/clothing/head/utility/hardhat/red/upgraded = 1 ) rpg_title = "Crystallomancer" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS /datum/outfit/job/engineer diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm index a844b8abcdc..20ebf3ac8dd 100644 --- a/code/modules/jobs/job_types/virologist.dm +++ b/code/modules/jobs/job_types/virologist.dm @@ -36,7 +36,7 @@ /obj/item/stack/sheet/mineral/uranium = 5, ) rpg_title = "Plague Doctor" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + job_flags = STATION_JOB_FLAGS /datum/outfit/job/virologist diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index d6d3e070173..f667e985810 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -39,8 +39,7 @@ /obj/item/storage/box/rubbershot = 10 ) rpg_title = "Jailor" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN - + job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT /datum/outfit/job/warden name = "Warden" diff --git a/code/modules/modular_computers/file_system/programs/jobmanagement.dm b/code/modules/modular_computers/file_system/programs/jobmanagement.dm index d3c0423ce1c..f5e13ec0921 100644 --- a/code/modules/modular_computers/file_system/programs/jobmanagement.dm +++ b/code/modules/modular_computers/file_system/programs/jobmanagement.dm @@ -14,21 +14,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) program_icon = "address-book" var/change_position_cooldown = 30 - ///Jobs blacklisted from having their slots edited. - var/static/list/blacklisted = list( - JOB_CAPTAIN, - JOB_HEAD_OF_PERSONNEL, - JOB_HEAD_OF_SECURITY, - JOB_RESEARCH_DIRECTOR, - JOB_CLOWN, // SKYRAT EDIT ADD START - JOB_BLUESHIELD, - JOB_NT_REP, // SKYRAT EDIT ADD END - JOB_CHIEF_ENGINEER, - JOB_CHIEF_MEDICAL_OFFICER, - JOB_AI, - JOB_CYBORG, - JOB_ASSISTANT, - ) //The scaling factor of max total positions in relation to the total amount of people on board the station in % var/max_relative_positions = 30 //30%: Seems reasonable, limit of 6 @ 20 players @@ -43,14 +28,18 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /datum/computer_file/program/job_management/proc/can_edit_job(datum/job/job) - if(!job || !(job.job_flags & JOB_CREW_MEMBER) || (job.title in blacklisted) || job.veteran_only) //SKYRAT EDIT CHAGNE + if(!istype(job)) + return FALSE + if(!(job.job_flags & JOB_CREW_MEMBER)) + return FALSE + if(job.job_flags & JOB_CANNOT_OPEN_SLOTS) + return FALSE + if(job.veteran_only) return FALSE return TRUE /datum/computer_file/program/job_management/proc/can_open_job(datum/job/job) - if(!can_edit_job(job)) - return FALSE if((job.total_positions <= length(GLOB.player_list) * (max_relative_positions / 100))) var/delta = (world.time / 10) - GLOB.time_last_changed_position if((change_position_cooldown < delta) || (opened_positions[job.title] < 0)) @@ -59,8 +48,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /datum/computer_file/program/job_management/proc/can_close_job(datum/job/job) - if(!can_edit_job(job)) - return FALSE if(job.total_positions > length(GLOB.player_list) * (max_relative_positions / 100)) var/delta = (world.time / 10) - GLOB.time_last_changed_position if((change_position_cooldown < delta) || (opened_positions[job.title] > 0)) @@ -77,7 +64,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if("PRG_open_job") var/edit_job_target = params["target"] var/datum/job/j = SSjob.GetJob(edit_job_target) - if(!j || !can_open_job(j)) + if(!can_edit_job(j) || !can_open_job(j)) return TRUE if(opened_positions[edit_job_target] >= 0) GLOB.time_last_changed_position = world.time / 10 @@ -89,7 +76,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if("PRG_close_job") var/edit_job_target = params["target"] var/datum/job/j = SSjob.GetJob(edit_job_target) - if(!j || !can_close_job(j)) + if(!can_edit_job(j) || !can_close_job(j)) return TRUE //Allow instant closing without cooldown if a position has been opened before if(opened_positions[edit_job_target] <= 0) @@ -102,7 +89,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if("PRG_priority") var/priority_target = params["target"] var/datum/job/j = SSjob.GetJob(priority_target) - if(!j || !can_edit_job(j)) + if(!can_edit_job(j)) return TRUE if(j.total_positions <= j.current_positions) return TRUE @@ -130,7 +117,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) var/list/pos = list() var/list/priority = list() for(var/datum/job/job as anything in SSjob.joinable_occupations) - if(job.title in blacklisted) + if(!can_edit_job(job)) continue if(job in SSjob.prioritized_jobs) priority += job.title @@ -147,4 +134,3 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) var/delta = round(change_position_cooldown - ((world.time / 10) - GLOB.time_last_changed_position), 1) data["cooldown"] = delta < 0 ? 0 : delta return data - diff --git a/modular_skyrat/master_files/code/modules/jobs/job_types/clown.dm b/modular_skyrat/master_files/code/modules/jobs/job_types/clown.dm index 893331f1d6e..bbc88c0b30a 100644 --- a/modular_skyrat/master_files/code/modules/jobs/job_types/clown.dm +++ b/modular_skyrat/master_files/code/modules/jobs/job_types/clown.dm @@ -1,2 +1,3 @@ /datum/job/clown vox_outfit = /datum/outfit/vox/clown + job_flags = STATION_JOB_FLAGS | JOB_CANNOT_OPEN_SLOTS diff --git a/modular_skyrat/modules/blueshield/code/blueshield.dm b/modular_skyrat/modules/blueshield/code/blueshield.dm index 687f9fec76d..edf2ba6ca2d 100644 --- a/modular_skyrat/modules/blueshield/code/blueshield.dm +++ b/modular_skyrat/modules/blueshield/code/blueshield.dm @@ -41,7 +41,7 @@ ) veteran_only = TRUE - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS + job_flags = STATION_JOB_FLAGS | JOB_CANNOT_OPEN_SLOTS /datum/outfit/job/blueshield name = "Blueshield" diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm index f396d5f2f1d..cf43df0bc2c 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm @@ -38,7 +38,7 @@ ) veteran_only = TRUE - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS + job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT | JOB_CANNOT_OPEN_SLOTS /datum/outfit/job/nanotrasen_consultant name = "Nanotrasen Consultant" From 6aea8ace286af8cf5d7f3ce71d1bb3240ccf5a50 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 02:24:34 +0200 Subject: [PATCH 39/69] Automatic changelog for PR #22680 [ci skip] --- html/changelogs/AutoChangeLog-pr-22680.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22680.yml diff --git a/html/changelogs/AutoChangeLog-pr-22680.yml b/html/changelogs/AutoChangeLog-pr-22680.yml new file mode 100644 index 00000000000..f4cb0f965fc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22680.yml @@ -0,0 +1,5 @@ +author: "SkyratBot" +delete-after: True +changes: + - refactor: "The mag_type variable on guns has been split between accepted_magazine_type and spawn_magazine_type, allowing weapons to safely spawn with subtypes of their normal magazines without breaking the weapon" + - bugfix: "Several weapons that spawned with special magazines, the riot dart pre-loaded donk pistol for example, will now be able to accept normal donksoft magazines that don't spawn loaded with riot darts." \ No newline at end of file From 6659f87453d2658fb36685a941c11525403d6e28 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 02:24:50 +0200 Subject: [PATCH 40/69] Automatic changelog for PR #22681 [ci skip] --- html/changelogs/AutoChangeLog-pr-22681.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22681.yml diff --git a/html/changelogs/AutoChangeLog-pr-22681.yml b/html/changelogs/AutoChangeLog-pr-22681.yml new file mode 100644 index 00000000000..24f75cb01c1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22681.yml @@ -0,0 +1,6 @@ +author: "Melbert" +delete-after: True +changes: + - bugfix: "Prisoner slots can no longer be controlled by Plexagon HR Core. (special things to distributivgesetz)" + - bugfix: "HoPs can open more assistant job slots if a non-assistant job is the overflow role" + - code_imp: "Dehardcode the HR core blacklist for jobs which cannot have more slots opened by the HoP" \ No newline at end of file From 71c9ae61945f7362f110588d067b839bdc300928 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 26 Jul 2023 00:40:14 +0000 Subject: [PATCH 41/69] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-21708.yml | 6 -- html/changelogs/AutoChangeLog-pr-22638.yml | 4 -- html/changelogs/AutoChangeLog-pr-22642.yml | 6 -- html/changelogs/AutoChangeLog-pr-22662.yml | 4 -- html/changelogs/AutoChangeLog-pr-22663.yml | 4 -- html/changelogs/AutoChangeLog-pr-22665.yml | 4 -- html/changelogs/AutoChangeLog-pr-22667.yml | 15 ---- html/changelogs/AutoChangeLog-pr-22668.yml | 4 -- html/changelogs/AutoChangeLog-pr-22669.yml | 4 -- html/changelogs/AutoChangeLog-pr-22670.yml | 5 -- html/changelogs/AutoChangeLog-pr-22671.yml | 4 -- html/changelogs/AutoChangeLog-pr-22673.yml | 4 -- html/changelogs/AutoChangeLog-pr-22674.yml | 4 -- html/changelogs/AutoChangeLog-pr-22675.yml | 6 -- html/changelogs/AutoChangeLog-pr-22677.yml | 4 -- html/changelogs/AutoChangeLog-pr-22678.yml | 4 -- html/changelogs/AutoChangeLog-pr-22680.yml | 5 -- html/changelogs/AutoChangeLog-pr-22681.yml | 6 -- html/changelogs/AutoChangeLog-pr-22682.yml | 4 -- html/changelogs/archive/2023-07.yml | 82 ++++++++++++++++++++++ 20 files changed, 82 insertions(+), 97 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-21708.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22638.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22642.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22662.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22663.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22665.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22667.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22668.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22669.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22670.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22671.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22673.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22674.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22675.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22677.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22678.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22680.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22681.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-22682.yml diff --git a/html/changelogs/AutoChangeLog-pr-21708.yml b/html/changelogs/AutoChangeLog-pr-21708.yml deleted file mode 100644 index 755f3de059a..00000000000 --- a/html/changelogs/AutoChangeLog-pr-21708.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "jjpark-kb" -delete-after: True -changes: - - balance: "Reagent Imbuing (from forging) is strictly for ashwalkers & icecats" - - balance: "Forges can only be fully upgraded (legendary smiths) by ashwalkers & icecats" - - balance: "Some of the forge upgrades have been moved around to accommodate reagent imbuing being ashwalker/icecat only" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22638.yml b/html/changelogs/AutoChangeLog-pr-22638.yml deleted file mode 100644 index e62941ae33e..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22638.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "GoldenAlpharex" -delete-after: True -changes: - - qol: "The mix of sugar and Bloody Mary used to make Bloodshot is now its own reagent, called \"Bloodshot Base\", just to make it easier to ask for from Bartenders. Hemophages beware, however, it doesn't contain enough blood-regenerating reagents to appeal to the tumor on its own, so it won't be going through smoothly if you try to drink it." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22642.yml b/html/changelogs/AutoChangeLog-pr-22642.yml deleted file mode 100644 index 95dba31eb36..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22642.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - bugfix: "The security uniform no longer exposes your chest when all you did was roll the sleeves up." - - bugfix: "The security formal uniform no longer inherits altsprites from the base uniform, since it didn't have any." - - spellcheck: "The security uniform's description now mentions a Lopland belt buckle, and not a Nanotrasen belt buckle." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22662.yml b/html/changelogs/AutoChangeLog-pr-22662.yml deleted file mode 100644 index b3fdd5877d5..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22662.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Cyprex" -delete-after: True -changes: - - balance: "Electric shocks from cables deal less damage." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22663.yml b/html/changelogs/AutoChangeLog-pr-22663.yml deleted file mode 100644 index 42ae2fd04bd..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22663.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "vinylspiders" -delete-after: True -changes: - - bugfix: "fixes the nitrogen breather quirk not giving the correct lungs or spawning the breathing dogtag" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22665.yml b/html/changelogs/AutoChangeLog-pr-22665.yml deleted file mode 100644 index 8c7087ff985..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22665.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Crates no longer stun you when you climb onto them." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22667.yml b/html/changelogs/AutoChangeLog-pr-22667.yml deleted file mode 100644 index 4ff8fb0b53e..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22667.yml +++ /dev/null @@ -1,15 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "items can be printed from autolathe & protolathe when the exact material amounts are present in them after upgrading" - - bugfix: "max printable amount now shows the correct value & updates when items are printed, materials are removed in the autolathe & protolathe" - - bugfix: "component printer material bar is not greyed out when there are sufficient materials to eject" - - bugfix: "rcd and other devices that uses the silo link upgrade now have the correct material usages" - - bugfix: "silo hold actually works" - - bugfix: "machines using local storage to hold materials will eject it's materials as sheets when deconstructed/destroyed" - - refactor: "Autolathe Material bars now display number of sheets available" - - refactor: "printing an item that does not have enough materials will fail silently with no error messages" - - refactor: "Drone dispenser will eject sheets upon deconstruction" - - refactor: "all things that store materials will auto ejects its sheets(if there is sufficient material) when destroyed" - - refactor: "inserting an item into the material container will display the units consumed as sheets not absolute units" - - refactor: "removed x25 & x50 print buttons from the autolathe" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22668.yml b/html/changelogs/AutoChangeLog-pr-22668.yml deleted file mode 100644 index e52d3a784c9..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22668.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Senefi" -delete-after: True -changes: - - rscadd: "Some Metastation Medbay lights have been moved and adjusted." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22669.yml b/html/changelogs/AutoChangeLog-pr-22669.yml deleted file mode 100644 index b8181d994d0..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22669.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Rhials" -delete-after: True -changes: - - qol: "Modifies the contents of some Mafia lockers. Go check 'em out!" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22670.yml b/html/changelogs/AutoChangeLog-pr-22670.yml deleted file mode 100644 index f5392c0a633..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22670.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "some fixes to spess IRS pirates." - - balance: "IRS armor is now bulky" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22671.yml b/html/changelogs/AutoChangeLog-pr-22671.yml deleted file mode 100644 index ce3dc9dcffe..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22671.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "LT3" -delete-after: True -changes: - - bugfix: "Random events and autotransfer subsystems should play nice with each other again" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22673.yml b/html/changelogs/AutoChangeLog-pr-22673.yml deleted file mode 100644 index 21b7f236846..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22673.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - balance: "Mmmh, butter on a stick. Now for americanbots." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22674.yml b/html/changelogs/AutoChangeLog-pr-22674.yml deleted file mode 100644 index cafc4e59ce3..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22674.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Plasmaman DNA can no longer be stolen by changelings." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22675.yml b/html/changelogs/AutoChangeLog-pr-22675.yml deleted file mode 100644 index e0c2f97d68c..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22675.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Makes radiation nebula space work on high-pop by applying the radiation more directly" - - balance: "Internal nebula storm no longer gives 10 seconds of immunity and has a very, very small chance to apply mutations" - - balance: "Rudes nebula rad immunity from 10 seconds to 6 seconds (shouldn't differ too much since we use a different system now)" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22677.yml b/html/changelogs/AutoChangeLog-pr-22677.yml deleted file mode 100644 index 4e4efff84bb..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22677.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - spellcheck: "Head of Personnel's roundstart text now says that they should answer to the captain now instead of themselves." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22678.yml b/html/changelogs/AutoChangeLog-pr-22678.yml deleted file mode 100644 index 893eb93f347..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22678.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - spellcheck: "Phobia warnings have the same glowy text now as they would in messages." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22680.yml b/html/changelogs/AutoChangeLog-pr-22680.yml deleted file mode 100644 index f4cb0f965fc..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22680.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - refactor: "The mag_type variable on guns has been split between accepted_magazine_type and spawn_magazine_type, allowing weapons to safely spawn with subtypes of their normal magazines without breaking the weapon" - - bugfix: "Several weapons that spawned with special magazines, the riot dart pre-loaded donk pistol for example, will now be able to accept normal donksoft magazines that don't spawn loaded with riot darts." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22681.yml b/html/changelogs/AutoChangeLog-pr-22681.yml deleted file mode 100644 index 24f75cb01c1..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22681.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Melbert" -delete-after: True -changes: - - bugfix: "Prisoner slots can no longer be controlled by Plexagon HR Core. (special things to distributivgesetz)" - - bugfix: "HoPs can open more assistant job slots if a non-assistant job is the overflow role" - - code_imp: "Dehardcode the HR core blacklist for jobs which cannot have more slots opened by the HoP" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-22682.yml b/html/changelogs/AutoChangeLog-pr-22682.yml deleted file mode 100644 index ebf0eb645e0..00000000000 --- a/html/changelogs/AutoChangeLog-pr-22682.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "oranges" -delete-after: True -changes: - - balance: "holodeck spawned banners no longer give the inspiration effects" \ No newline at end of file diff --git a/html/changelogs/archive/2023-07.yml b/html/changelogs/archive/2023-07.yml index 045c72cfe76..88ceaa6002b 100644 --- a/html/changelogs/archive/2023-07.yml +++ b/html/changelogs/archive/2023-07.yml @@ -1190,3 +1190,85 @@ here on out - bugfix: the pda item name will now match alt job titles - bugfix: fixes a bug that was causing some types of ammo boxes to spawn empty +2023-07-26: + Cyprex: + - balance: Electric shocks from cables deal less damage. + GoldenAlpharex: + - qol: The mix of sugar and Bloody Mary used to make Bloodshot is now its own reagent, + called "Bloodshot Base", just to make it easier to ask for from Bartenders. + Hemophages beware, however, it doesn't contain enough blood-regenerating reagents + to appeal to the tumor on its own, so it won't be going through smoothly if + you try to drink it. + Hatterhat: + - bugfix: The security uniform no longer exposes your chest when all you did was + roll the sleeves up. + - bugfix: The security formal uniform no longer inherits altsprites from the base + uniform, since it didn't have any. + - spellcheck: The security uniform's description now mentions a Lopland belt buckle, + and not a Nanotrasen belt buckle. + LT3: + - bugfix: Random events and autotransfer subsystems should play nice with each other + again + Melbert: + - bugfix: Prisoner slots can no longer be controlled by Plexagon HR Core. (special + things to distributivgesetz) + - bugfix: HoPs can open more assistant job slots if a non-assistant job is the overflow + role + - code_imp: Dehardcode the HR core blacklist for jobs which cannot have more slots + opened by the HoP + Rhials: + - qol: Modifies the contents of some Mafia lockers. Go check 'em out! + Senefi: + - rscadd: Some Metastation Medbay lights have been moved and adjusted. + SkyratBot: + - bugfix: items can be printed from autolathe & protolathe when the exact material + amounts are present in them after upgrading + - bugfix: max printable amount now shows the correct value & updates when items + are printed, materials are removed in the autolathe & protolathe + - bugfix: component printer material bar is not greyed out when there are sufficient + materials to eject + - bugfix: rcd and other devices that uses the silo link upgrade now have the correct + material usages + - bugfix: silo hold actually works + - bugfix: machines using local storage to hold materials will eject it's materials + as sheets when deconstructed/destroyed + - refactor: Autolathe Material bars now display number of sheets available + - refactor: printing an item that does not have enough materials will fail silently + with no error messages + - refactor: Drone dispenser will eject sheets upon deconstruction + - refactor: all things that store materials will auto ejects its sheets(if there + is sufficient material) when destroyed + - refactor: inserting an item into the material container will display the units + consumed as sheets not absolute units + - refactor: removed x25 & x50 print buttons from the autolathe + - bugfix: Plasmaman DNA can no longer be stolen by changelings. + - spellcheck: Phobia warnings have the same glowy text now as they would in messages. + - bugfix: Crates no longer stun you when you climb onto them. + - balance: Mmmh, butter on a stick. Now for americanbots. + - refactor: The mag_type variable on guns has been split between accepted_magazine_type + and spawn_magazine_type, allowing weapons to safely spawn with subtypes of their + normal magazines without breaking the weapon + - bugfix: Several weapons that spawned with special magazines, the riot dart pre-loaded + donk pistol for example, will now be able to accept normal donksoft magazines + that don't spawn loaded with riot darts. + - bugfix: some fixes to spess IRS pirates. + - balance: IRS armor is now bulky + - bugfix: Makes radiation nebula space work on high-pop by applying the radiation + more directly + - balance: Internal nebula storm no longer gives 10 seconds of immunity and has + a very, very small chance to apply mutations + - balance: Rudes nebula rad immunity from 10 seconds to 6 seconds (shouldn't differ + too much since we use a different system now) + - spellcheck: Head of Personnel's roundstart text now says that they should answer + to the captain now instead of themselves. + jjpark-kb: + - balance: Reagent Imbuing (from forging) is strictly for ashwalkers & icecats + - balance: Forges can only be fully upgraded (legendary smiths) by ashwalkers & + icecats + - balance: Some of the forge upgrades have been moved around to accommodate reagent + imbuing being ashwalker/icecat only + oranges: + - balance: holodeck spawned banners no longer give the inspiration effects + vinylspiders: + - bugfix: fixes the nitrogen breather quirk not giving the correct lungs or spawning + the breathing dogtag From 1c40dd816a8407c9024e6afd2942f04b5047cad4 Mon Sep 17 00:00:00 2001 From: Bloop <13398309+vinylspiders@users.noreply.github.com> Date: Tue, 25 Jul 2023 20:43:57 -0400 Subject: [PATCH 42/69] [NO GBP] Adds Skyrat edit comment in jobmanagement.dm (#22684) Forgot the Skyrat edit comments --- .../modular_computers/file_system/programs/jobmanagement.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/modular_computers/file_system/programs/jobmanagement.dm b/code/modules/modular_computers/file_system/programs/jobmanagement.dm index f5e13ec0921..973dbf3c764 100644 --- a/code/modules/modular_computers/file_system/programs/jobmanagement.dm +++ b/code/modules/modular_computers/file_system/programs/jobmanagement.dm @@ -34,8 +34,10 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) return FALSE if(job.job_flags & JOB_CANNOT_OPEN_SLOTS) return FALSE + // SKYRAT EDIT ADDITION START if(job.veteran_only) return FALSE + // SKYRAT EDIT ADDITION END return TRUE From e22b01e51f550516de8db8c07f4c2cac7d5ac012 Mon Sep 17 00:00:00 2001 From: Lunar248 <134661012+Lunar248@users.noreply.github.com> Date: Tue, 25 Jul 2023 21:05:05 -0400 Subject: [PATCH 43/69] Complete Freighter Remap (#22400) * New Freighter Testmap * Update space.dm * Update freightertest.dmm * Update space.dm * Removes Testmap, replaces Freighter * Update cargodiselost.dmm * Update cargodiselost.dmm * Update cargodiselost.dmm * Update cargodiselost.dmm * Update cargodiselost.dmm * Update cargodiselost.dmm * Subtyped Gear/Ammo Lockers Adds new subtypes for the Freighter QM's gear, and the ammo in the armoury. * Update cargodiselockers.dm * Update cargodiselockers.dm * Update tgstation.dme * Update cargodiselockers.dm * Update cargodiselost.dmm * Update cargodiselost.dmm * Fixed Subtypes * Update tgstation.dme * Update tgstation.dme * Update tgstation.dme * Update tgstation.dme * Update tgstation.dme * Update cargodiselost.dmm --- .../SpaceRuins/skyrat/cargodiselost.dmm | 10262 ++++++++-------- .../modules/mapping/code/areas/space.dm | 16 +- .../lockers/cargodiselost/cargodiselockers.dm | 38 + tgstation.dme | 1 + 4 files changed, 5408 insertions(+), 4909 deletions(-) create mode 100644 modular_skyrat/modules/mapping/code/lockers/cargodiselost/cargodiselockers.dm diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm index 3acaae44900..23c16bf7174 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm @@ -1,1080 +1,1276 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"am" = ( -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"av" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/mob/living/basic/syndicate/russian/ranged, -/obj/effect/turf_decal/tile/green{ +"ak" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/dark/smooth_half{ dir = 1 }, -/turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"aC" = ( -/obj/structure/rack, -/obj/effect/spawner/random/entertainment/money_large, -/obj/effect/turf_decal/tile/blue/fourcorners, +"al" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/food_or_drink/dinner, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"am" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/light/directional/south, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/bridge) -"aH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +"ao" = ( +/obj/effect/turf_decal/tile/blue/anticorner{ + dir = 4 + }, +/obj/structure/table/wood/fancy/blue, /obj/machinery/light/directional/north, -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/half/contrasted{ +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"ar" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"aJ" = ( +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 4 + }, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"aK" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"aN" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"aT" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"aZ" = ( +/obj/structure/ore_box, +/obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"aL" = ( -/obj/machinery/door/airlock/public{ - name = "Crew Quarters" +/area/ruin/space/has_grav/cargodise_freighter/mining) +"bj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"bt" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/light/directional/north, +/obj/structure/cable, /turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"bu" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"bA" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"bD" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Mess Hall" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"bM" = ( +/obj/structure/table/wood/fancy/blue, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"bU" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"cd" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"ci" = ( +/obj/structure/closet/secure_closet/miner/unlocked, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"cl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"ct" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"cO" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/storage/box/shipping, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"cP" = ( +/obj/machinery/computer/crew, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"cT" = ( +/obj/machinery/holopad, +/turf/open/floor/iron/dark/smooth_large, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"dc" = ( +/obj/effect/turf_decal/tile/yellow/half, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"dm" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"do" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"dp" = ( +/obj/machinery/atmospherics/components/binary/valve/digital/layer2{ + dir = 4; + name = "Waste Release" + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"dy" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"dC" = ( +/obj/machinery/power/smes, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"dJ" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"dK" = ( +/obj/structure/table/reinforced, +/obj/item/storage/belt/utility/full/engi, +/obj/item/crowbar/red, +/obj/item/crowbar/red, +/obj/item/crowbar/red, +/obj/item/crowbar/red, +/obj/item/crowbar/red, +/turf/open/floor/wood, /area/ruin/space/has_grav/cargodise_freighter/quarters) -"aR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +"dQ" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"dR" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"dS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"dT" = ( +/mob/living/simple_animal/hostile/pirate/melee{ + faction = list("hostile") + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"dZ" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/vending/imported/tiziran, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"ef" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/obj/machinery/light/directional/north, +/obj/structure/closet/firecloset/wall{ + pixel_y = 26 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"ei" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Bridge" + }, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor{ + id = "bridgelockdown" + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"ek" = ( +/obj/machinery/vending/hydronutrients, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"el" = ( /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 1 }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"aS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"eo" = ( +/obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"bd" = ( -/obj/machinery/griddle, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"bi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"bo" = ( -/obj/machinery/light/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 +/obj/machinery/vending/coffee, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"et" = ( +/obj/effect/mob_spawn/ghost_role/human/lostcargo, +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"ex" = ( +/obj/machinery/door/airlock/survival_pod/glass, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "lostfreighter" + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"ez" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"bq" = ( -/obj/structure/table, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"bs" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/large, -/obj/effect/spawner/random/decoration/statue, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"bt" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"eA" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"eC" = ( +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/obj/machinery/light/directional/east, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/mining) -"bM" = ( -/obj/machinery/vending/coffee, -/turf/open/floor/iron/cafeteria, +"eU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/kitchen) -"bZ" = ( -/obj/structure/window/reinforced/tinted/spawner/directional/east, -/obj/machinery/shower/directional/south, -/obj/effect/spawner/random/trash/soap, -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"cb" = ( -/obj/structure/window/reinforced/tinted/spawner/directional/east, -/obj/machinery/shower/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"cG" = ( -/obj/effect/turf_decal/loading_area, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"cL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"da" = ( -/obj/structure/window/reinforced/tinted/spawner/directional/east, -/obj/machinery/computer/crew{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"df" = ( -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"dg" = ( -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"dk" = ( -/obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/light/directional/south, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"dn" = ( -/obj/structure/table/reinforced, -/obj/item/modular_computer/laptop/preset/civilian, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"du" = ( -/obj/machinery/shower/directional/south, -/obj/effect/spawner/random/trash/soap, -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"dB" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay" - }, -/obj/machinery/door/poddoor{ - id = "lockdown" - }, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"dD" = ( -/obj/machinery/door/airlock/survival_pod/glass, -/obj/machinery/door/poddoor{ - id = "lockdown" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"dF" = ( -/obj/item/storage/cans/sixbeer, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"dL" = ( -/obj/structure/chair/wood, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"dO" = ( -/obj/structure/chair/office/light, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"eb" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"eJ" = ( -/obj/structure/table, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/storage/organbox{ - pixel_y = 6 - }, -/obj/item/storage/organbox{ - pixel_y = 6 - }, -/obj/item/storage/organbox{ - pixel_y = 6 - }, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"eR" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate{ - name = "Delivery - NSV Titan" - }, -/obj/effect/spawner/random/engineering/vending_restock, -/obj/effect/spawner/random/engineering/vending_restock, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"eS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/table, -/obj/item/bodybag/stasis, -/obj/item/storage/box/beakers/variety{ - pixel_y = 10 - }, -/obj/item/storage/box/bodybags{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/syringes/variety, -/obj/item/storage/box/medipens{ - pixel_x = -6 - }, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"fm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +"eX" = ( /obj/machinery/computer/order_console/mining{ forced_express = 1; express_cost_multiplier = 1 }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/mining) -"fy" = ( -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ +"eY" = ( +/obj/structure/closet/crate/secure/weapon{ + name = "Surplus Firearms" + }, +/obj/item/gun/ballistic/automatic/akm/civvie, +/obj/item/gun/ballistic/automatic/akm/civvie, +/obj/item/ammo_box/magazine/akm/civvie, +/obj/item/ammo_box/magazine/akm/civvie, +/obj/item/ammo_box/magazine/akm/civvie, +/obj/item/ammo_box/magazine/akm/civvie, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"fl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"fr" = ( +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"fz" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"fG" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Mess Hall" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"fO" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"fS" = ( +/obj/item/disk/ammo_workbench, +/obj/structure/table/reinforced, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"fV" = ( +/obj/structure/cable, +/obj/machinery/power/port_gen/pacman/super, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"fZ" = ( +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"gc" = ( +/obj/machinery/oven/range, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"ge" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"gf" = ( +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"gm" = ( +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron/dark/smooth_corner, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"gq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"gA" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"gM" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/yellow/anticorner, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"gS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"gT" = ( +/obj/effect/turf_decal/tile/brown{ dir = 4 }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"fB" = ( -/obj/machinery/light/directional/south, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"fG" = ( -/obj/machinery/door/firedoor/closed, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"fO" = ( -/obj/machinery/door/poddoor{ - id = "lockdown" - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"fX" = ( -/obj/machinery/door/airlock/public/glass, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"fY" = ( -/obj/structure/closet/crate/secure/freezer, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"gf" = ( -/obj/structure/reagent_dispensers/watertank/high{ - tank_volume = 8000 - }, -/obj/item/reagent_containers/cup/bucket, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"gi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"gD" = ( -/obj/machinery/smartfridge/food, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"gI" = ( -/obj/structure/closet/firecloset/wall{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"gL" = ( -/turf/closed/wall/mineral/titanium/spaceship, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"gN" = ( -/obj/structure/table/wood, -/obj/item/paper, -/obj/item/pen{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/item/radio, -/obj/effect/spawner/random/entertainment/musical_instrument, -/obj/effect/spawner/random/entertainment/toy_figure, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"gV" = ( -/turf/closed/wall/mineral/titanium/spaceship, /area/ruin/space/has_grav/cargodise_freighter/mining) -"ha" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/all_access, -/obj/effect/turf_decal/tile/green/half/contrasted{ +"gY" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark/smooth_half{ dir = 1 }, -/turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/primaryhall) "hg" = ( -/obj/structure/window/reinforced/tinted/spawner/directional/south, -/obj/structure/ore_box, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"hm" = ( -/obj/machinery/light/directional/south, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/all_access, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"hq" = ( -/obj/structure/bed, -/obj/item/bedsheet/dorms, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"hr" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"ht" = ( -/obj/structure/table/wood, -/obj/item/paper, -/obj/item/pen{ - pixel_x = -3 - }, -/obj/item/radio, -/obj/effect/spawner/random/entertainment/money_small, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"hx" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"hz" = ( -/obj/structure/table/wood, -/obj/item/paper, -/obj/item/pen{ - pixel_y = 5 - }, -/obj/item/radio, -/obj/effect/spawner/random/entertainment/musical_instrument, -/obj/effect/spawner/random/entertainment/cigar, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"hD" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, +/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"hr" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"hD" = ( +/obj/structure/closet/secure_closet/freezer/meat/all_access, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"hJ" = ( +/obj/machinery/door/airlock/silver{ + name = "Dorm 1" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"hK" = ( +/obj/effect/turf_decal/trimline/blue/line{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"hM" = ( /obj/structure/cable, -/obj/effect/turf_decal/tile/green/half/contrasted{ +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"hQ" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/suit_storage_unit{ + mask_type = /obj/item/clothing/mask/gas/explorer; + storage_type = /obj/item/tank/jetpack/oxygen/harness; + suit_type = /obj/item/mod/control/pre_equipped/traitor_elite + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"hT" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"is" = ( +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"iz" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/tile/brown/half{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"iA" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/structure/closet/crate, +/obj/item/circuitboard/machine/spaceship_navigation_beacon, +/obj/item/circuitboard/machine/spaceship_navigation_beacon, +/obj/item/circuitboard/machine/spaceship_navigation_beacon, +/obj/item/circuitboard/machine/spaceship_navigation_beacon, +/obj/item/circuitboard/machine/spaceship_navigation_beacon, +/obj/item/stack/cable_coil, +/obj/item/stack/sheet/iron/fifty, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"iE" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"iG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"iK" = ( +/obj/machinery/computer/camera_advanced, +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"hN" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/large{ - name = "Delivery - NSS Exodus" - }, -/obj/effect/spawner/random/exotic/languagebook, -/obj/effect/spawner/random/exotic/languagebook, -/obj/effect/spawner/random/exotic/languagebook, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"hP" = ( -/turf/closed/wall/mineral/titanium/spaceship, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"hQ" = ( -/obj/effect/spawner/random/entertainment/cigarette_pack, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"iT" = ( +/obj/machinery/computer/cryopod/directional/south, +/obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"hS" = ( -/obj/structure/window/reinforced/tinted/spawner/directional/east, -/obj/structure/closet/crate/freezer/blood, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"iU" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/smooth_corner, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"iX" = ( +/obj/structure/chair/sofa/corp/right{ + dir = 1 + }, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"jb" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"je" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"jl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"jo" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/vending/imported/yangyu, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"jp" = ( +/obj/effect/mob_spawn/ghost_role/human/lostcargoqm, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"jC" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/button/door/directional/north{ + id = "cargolockdown"; + name = "Loading Bay Blastdoors"; + pixel_y = -24 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"jP" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/electrical{ + pixel_y = 8 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 3; + pixel_y = -2 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"jR" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/no_charge, /obj/machinery/iv_drip, /turf/open/floor/iron/white, /area/ruin/space/has_grav/cargodise_freighter/trauma) -"hT" = ( -/obj/structure/table/wood, -/obj/item/paper, -/obj/item/pen/fountain{ - pixel_x = -6 - }, -/obj/item/radio, -/obj/effect/spawner/random/entertainment/money_small, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"hZ" = ( -/obj/machinery/vending/medical, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"ie" = ( -/obj/structure/table/wood, -/obj/item/paper, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/radio, -/obj/effect/spawner/random/entertainment/coin, -/obj/effect/spawner/random/entertainment/wallet_storage, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"iF" = ( -/obj/structure/closet/emcloset/anchored, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"iJ" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/vending/hydronutrients{ - pixel_x = 6 - }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"iS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"ja" = ( -/obj/structure/table/wood, -/obj/item/radio, -/obj/effect/spawner/random/entertainment/musical_instrument, -/obj/effect/spawner/random/entertainment/money_small, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"jh" = ( -/obj/structure/lattice/catwalk, -/turf/template_noop, -/area/space) -"jo" = ( -/obj/effect/turf_decal/tile/green, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"jq" = ( -/obj/structure/table/wood, -/obj/item/modular_computer/laptop/preset/civilian, -/obj/machinery/light/directional/north, -/obj/item/clipboard, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"js" = ( -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"jt" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = -7; - pixel_y = 14 - }, -/obj/item/paper, -/obj/item/pen/fountain{ - pixel_x = -6 - }, -/obj/item/paper_bin{ - pixel_x = 12; - pixel_y = 8 - }, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"jv" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"jM" = ( -/obj/machinery/door/airlock/shuttle/glass, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - id = "lockdown" - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"jO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"jR" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/gun/ballistic/automatic/cfa_rifle, -/obj/item/storage/bag/ammo, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/storage/belt/utility/syndicate, -/obj/item/gps/mining, -/obj/item/clothing/gloves/combat, -/obj/item/storage/backpack/duffelbag/syndie, -/obj/item/radio, -/obj/item/ammo_box/magazine/cm68, -/obj/item/ammo_box/magazine/cm68, -/obj/item/ammo_box/magazine/cm68, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"jX" = ( -/obj/structure/cable, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"ke" = ( -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"kw" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/internals, -/obj/item/tank/internals/oxygen/red, -/obj/item/tank/internals/oxygen/red, -/obj/item/tank/internals/oxygen/red, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"kA" = ( -/obj/machinery/vending/boozeomat/all_access, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"kB" = ( -/obj/machinery/cryopod{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"kI" = ( -/obj/machinery/portable_atmospherics/pump, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/brown/half/contrasted{ +"kg" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/cargo) -"kL" = ( -/obj/structure/bed, -/obj/item/bedsheet/qm, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"kQ" = ( -/obj/structure/table/reinforced, -/obj/effect/spawner/random/bureaucracy/briefcase, -/obj/effect/spawner/random/bureaucracy/folder, -/obj/item/clipboard, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"lh" = ( -/obj/machinery/door/airlock/medical{ - name = "Infirmary" - }, -/obj/machinery/door/poddoor{ - id = "lockdown" +"ki" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Mess Hall" }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"kk" = ( /obj/structure/cable, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"lk" = ( -/obj/structure/window/reinforced/tinted/spawner/directional/east, -/obj/machinery/door/window/brigdoor/right/directional/south, -/obj/structure/curtain, -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"ll" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"kt" = ( +/obj/machinery/seed_extractor, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"kz" = ( +/obj/effect/turf_decal/siding/wood{ dir = 4 }, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"kF" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"kH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"kM" = ( +/obj/machinery/cryopod{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"kX" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"la" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"lg" = ( +/obj/effect/turf_decal/tile/yellow/anticorner{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, /area/ruin/space/has_grav/cargodise_freighter/primaryhall) "lp" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/obj/structure/table/wood/fancy/blue, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/item/clipboard, +/obj/item/pen/fountain, +/turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/bridge) -"lv" = ( -/obj/machinery/door/window/brigdoor/right/directional/south, -/obj/structure/curtain, -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"lz" = ( +"lt" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 1 + }, /obj/machinery/door/firedoor/closed, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_half, /area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"lC" = ( -/obj/structure/closet/firecloset/full, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"lF" = ( -/obj/structure/cable, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"lL" = ( -/obj/structure/chair/wood{ - dir = 4 +"lx" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 1 }, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"lM" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"lH" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/cargodise_freighter/cargo) -"lP" = ( -/obj/structure/table/wood/poker, -/obj/effect/spawner/random/entertainment/deck, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) +"lJ" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) "lV" = ( -/obj/structure/chair/wood{ +/obj/machinery/hydroponics/constructable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/structure/cable, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"lX" = ( +/obj/effect/turf_decal/siding/dark{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"lX" = ( -/obj/structure/table/reinforced, -/obj/machinery/processor, -/turf/open/floor/iron/checker, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/kitchen, /area/ruin/space/has_grav/cargodise_freighter/kitchen) +"mb" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/utility) "mf" = ( -/obj/machinery/power/emitter/welded{ +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"mi" = ( +/obj/machinery/door/airlock/hydroponics/glass{ + name = "Hydroponics" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"mq" = ( +/obj/effect/turf_decal/siding/wood{ dir = 4 }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"ml" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/carpet, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/wood, /area/ruin/space/has_grav/cargodise_freighter/quarters) -"mz" = ( -/mob/living/simple_animal/hostile/looter/big, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 +"mv" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"mF" = ( -/obj/effect/turf_decal/caution/stand_clear/white, -/obj/effect/turf_decal/stripes/white/line, +/obj/machinery/light/directional/north, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/wood, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"mw" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"mS" = ( -/obj/structure/table/reinforced, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_y = 5 - }, -/turf/open/floor/iron/checker, /area/ruin/space/has_grav/cargodise_freighter/kitchen) -"nc" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"nl" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Excavation Equipment" - }, -/obj/machinery/door/poddoor{ - id = "lockdown" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"nr" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ +"mC" = ( +/obj/effect/turf_decal/trimline/blue/corner{ dir = 1 }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"ns" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay" +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 }, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"mL" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"mY" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/food_or_drink/booze, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"ne" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"nu" = ( +/obj/structure/fans/tiny/forcefield, /obj/machinery/door/poddoor{ - id = "lockdown" + id = "freighterbay" }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, +/turf/open/floor/plating, /area/ruin/space/has_grav/cargodise_freighter/cargo) -"nE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +"nv" = ( +/obj/structure/table/reinforced, +/obj/item/gun/ballistic/automatic/pistol/makarov, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"nw" = ( +/mob/living/simple_animal/hostile/looter, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"nz" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"nC" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"nD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"nL" = ( +/obj/machinery/autolathe/hacked, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"nP" = ( /mob/living/basic/syndicate/melee/anthro{ desc = "An anthromorphic bandit, geared up in tactical gear."; faction = list("hostile"); name = "Geared Pirate" }, -/obj/structure/cable, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"nM" = ( -/obj/structure/window/reinforced/spawner/directional/south, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"nU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"nY" = ( -/obj/machinery/door/window/brigdoor/right/directional/south{ +/area/ruin/space/has_grav/cargodise_freighter/exterior) +"nV" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/structure/closet/emcloset/wall{ + pixel_y = -26 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"oa" = ( +/obj/effect/turf_decal/tile/yellow/anticorner{ dir = 1 }, -/turf/open/floor/wood, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/smooth_corner, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"ok" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"oz" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/rack/shelf, +/obj/effect/spawner/random/entertainment/money_medium, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"oK" = ( +/obj/machinery/door/airlock/glass{ + name = "Crew Quarters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"oV" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"oY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"pb" = ( +/mob/living/simple_animal/hostile/looter, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"pf" = ( +/obj/effect/turf_decal/tile/yellow/anticorner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"pm" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"pp" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"pv" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"pW" = ( +/obj/machinery/ammo_workbench/unlocked, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"qd" = ( +/obj/effect/turf_decal/siding/dark/corner, +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks{ + dir = 4 + }, +/turf/open/floor/iron/kitchen, /area/ruin/space/has_grav/cargodise_freighter/kitchen) -"oh" = ( -/obj/effect/turf_decal/caution, +"qj" = ( +/obj/effect/mob_spawn/ghost_role/human/lostminer, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"ql" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"qE" = ( +/obj/machinery/door/airlock/maintenance/glass{ + name = "Utilities Room" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"qG" = ( +/obj/structure/chair/sofa/right/maroon{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"qK" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"qN" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"qR" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/structure/cable, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"qS" = ( +/obj/effect/turf_decal/tile/yellow/half, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"rb" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"rt" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"rB" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"rF" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/machinery/photocopier, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"rH" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"rR" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"rY" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"sc" = ( +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 1 + }, +/obj/item/gps/computer/space, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"so" = ( +/obj/effect/turf_decal/tile/yellow/half, +/mob/living/simple_animal/hostile/vox/melee, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"ss" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"sy" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"sJ" = ( +/turf/closed/wall/r_wall/syndicate, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"sU" = ( +/mob/living/simple_animal/hostile/vox/melee, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"sV" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"sW" = ( +/obj/structure/table/reinforced, +/obj/item/storage/medkit, +/obj/item/storage/medkit/surgery{ + pixel_x = 6; + pixel_y = 8 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"th" = ( +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"ti" = ( +/obj/item/stack/sheet/iron/twenty, +/obj/item/circuitboard/machine/ore_silo, +/obj/item/circuitboard/machine/ore_redemption{ + pixel_x = 5; + pixel_y = -6 + }, +/obj/item/storage/box/stockparts/deluxe, +/obj/item/storage/box/stockparts/deluxe, +/obj/structure/closet/crate, +/obj/item/storage/toolbox/mechanical, +/obj/item/stack/sheet/glass/fifty, +/obj/item/circuitboard/machine/protolathe/offstation, +/obj/effect/spawner/random/engineering/toolbox, +/obj/item/circuitboard/machine/circuit_imprinter/department/no_tax, +/obj/item/circuitboard/machine/rtg/advanced, +/obj/item/circuitboard/machine/rtg/advanced, +/obj/item/circuitboard/machine/rtg/advanced, +/obj/item/circuitboard/machine/spaceship_navigation_beacon, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"ty" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"tA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"tD" = ( +/obj/effect/turf_decal/trimline/blue/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured_half{ + dir = 4 + }, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"tH" = ( +/obj/structure/closet/secure_closet/personal/cabinet/freighterboss, +/turf/open/floor/carpet/orange, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"tL" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"tN" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"tS" = ( +/obj/machinery/suit_storage_unit/industrial/loader, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"tV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"tW" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/dorms_double, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"tY" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"oi" = ( -/obj/structure/fans/tiny/invisible, -/turf/open/floor/plating, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/mining) -"oo" = ( -/obj/structure/tank_holder/oxygen/yellow, -/turf/open/floor/engine, +"uo" = ( +/obj/machinery/computer{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"uq" = ( +/turf/closed/wall/r_wall/syndicate, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"uu" = ( +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/iron/smooth, /area/ruin/space/has_grav/cargodise_freighter/utility) -"oQ" = ( -/obj/effect/turf_decal/bot, +"ux" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"vb" = ( +/obj/effect/turf_decal/siding/wood/corner, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"vh" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"vx" = ( /obj/structure/closet/crate, -/obj/effect/spawner/random/decoration/paint, -/obj/effect/spawner/random/decoration/paint, -/obj/effect/spawner/random/decoration/paint, -/obj/effect/spawner/random/decoration/ornament, -/obj/effect/spawner/random/decoration/ornament, -/obj/effect/spawner/random/decoration/ornament, -/obj/effect/spawner/random/decoration/ornament, -/obj/effect/spawner/random/decoration/ornament, -/obj/effect/spawner/random/decoration/carpet, -/obj/effect/spawner/random/decoration/carpet, -/obj/effect/spawner/random/decoration/carpet, -/obj/effect/spawner/random/decoration/carpet, -/obj/effect/spawner/random/decoration/carpet, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"oZ" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/hydroponics/constructable, -/turf/open/floor/grass, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"pc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, +/obj/effect/spawner/random/engineering/material, +/obj/effect/spawner/random/engineering/material, +/obj/effect/spawner/random/engineering/material_rare, +/obj/effect/spawner/random/engineering/material_rare, +/obj/effect/spawner/random/engineering/material, +/obj/item/stack/sheet/mineral/uranium/five, +/obj/item/stack/sheet/mineral/uranium/five, +/obj/item/stack/sheet/mineral/uranium/five, +/obj/item/stack/sheet/mineral/uranium/five, /turf/open/floor/plating, /area/ruin/space/has_grav/cargodise_freighter/utility) -"pe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"pj" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate{ - name = "Delivery - Toy House" - }, -/obj/effect/spawner/random/entertainment/toy, -/obj/effect/spawner/random/entertainment/toy, -/obj/effect/spawner/random/entertainment/toy, -/obj/effect/spawner/random/entertainment/toy_figure, -/obj/effect/spawner/random/entertainment/toy_figure, -/obj/effect/spawner/random/entertainment/toy_figure, -/obj/effect/spawner/random/entertainment/toy_figure, -/obj/effect/spawner/random/entertainment/toy_figure, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"pu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"pv" = ( -/obj/machinery/ammo_workbench/unlocked, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"pD" = ( -/obj/machinery/door/window/brigdoor/right/directional/south{ +"vH" = ( +/turf/closed/mineral/random/high_chance, +/area/ruin/unpowered/no_grav) +"vJ" = ( +/obj/structure/chair/sofa/right/maroon{ dir = 4 }, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"pF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/mob/living/simple_animal/hostile/vox/melee, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"pH" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate, -/obj/effect/spawner/random/engineering/vending_restock, -/obj/effect/spawner/random/engineering/vending_restock, -/obj/effect/spawner/random/engineering/vending_restock, -/obj/effect/spawner/random/engineering/vending_restock, -/obj/effect/spawner/random/engineering/vending_restock, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"pM" = ( -/obj/machinery/power/shuttle_engine/propulsion{ - dir = 8 - }, -/turf/open/floor/plating, +/turf/open/floor/wood/parquet, /area/ruin/space/has_grav/cargodise_freighter/quarters) -"pN" = ( -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"pQ" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"qf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"qi" = ( -/obj/item/gps/computer/space, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"qm" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/solarpanel_small, -/obj/item/circuitboard/computer/solar_control, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"qq" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"qw" = ( -/mob/living/simple_animal/hostile/looter, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"qy" = ( -/obj/structure/closet/secure_closet/personal/wall{ - pixel_x = 28 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"qB" = ( -/obj/structure/chair/office/light{ - dir = 1 - }, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"qF" = ( -/obj/structure/closet/crate/goldcrate, -/obj/item/stack/sheet/mineral/plasma/five, -/obj/item/stack/sheet/plasteel/twenty, -/obj/item/stack/sheet/plastic/five, -/obj/item/stack/sheet/mineral/diamond, -/obj/effect/spawner/random/entertainment/money_large, -/obj/effect/spawner/random/entertainment/money_large, -/obj/effect/spawner/random/entertainment/money_large, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"qU" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/engineering{ - desc = "A rectangular steel crate. The delivery label is smudged and faded"; - name = "Delivery - ???" - }, -/obj/effect/spawner/random/engineering/material, -/obj/effect/spawner/random/engineering/material, -/obj/effect/spawner/random/engineering/material_cheap, -/obj/effect/spawner/random/engineering/material_cheap, -/obj/effect/spawner/random/engineering/material_cheap, -/obj/effect/spawner/random/engineering/material_cheap, -/obj/effect/spawner/random/engineering/material_cheap, -/obj/effect/spawner/random/engineering/tool_advanced, -/obj/effect/spawner/random/engineering/tool_advanced, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"qW" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"qY" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/closet/crate, -/obj/item/clothing/sextoy/dildo, -/obj/item/clothing/glasses/hypno, -/obj/item/reagent_containers/cup/bottle/hexacrocin, -/obj/item/key/lasso, -/obj/item/reagent_containers/cup/bottle/morphine, -/obj/item/gun/syringe/syndicate, -/obj/item/restraints/handcuffs/cable/zipties, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"re" = ( -/obj/machinery/light/directional/west, -/obj/machinery/computer/cryopod/directional/west, +"vL" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 + dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"rm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"rx" = ( -/obj/effect/turf_decal/loading_area{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"rz" = ( -/obj/effect/turf_decal/bot, -/obj/effect/spawner/random/exotic/syndie, -/obj/effect/spawner/random/exotic/syndie, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/item/clothing/suit/armor/riot, -/obj/item/shield/riot, -/obj/item/clothing/head/helmet/toggleable/riot, -/obj/effect/spawner/random/exotic/antag_gear, -/obj/effect/spawner/random/exotic/antag_gear_weak, -/obj/structure/closet/crate/secure/weapon{ - name = "Delivery - DS-2"; - req_access = list("syndicate") - }, -/obj/item/storage/belt/utility/atmostech, -/obj/item/storage/belt/utility/full/engi, -/obj/item/storage/belt/utility/syndicate, -/obj/item/storage/box/monkeycubes, -/obj/item/storage/box/monkeycubes, -/obj/item/paper{ - default_raw_text = "Admiral, due to increased Nanotrasen presence in your sector, we are providing some extra supplies to deal with it. The telecrystals are to be held for a contact that will come to collect them in the coming weeks, a solo operative. Please ensure they get the crystals, as their mission is gravely important."; - name = "CONFIDENTIAL - DS-2 Admiral's Eyes Only" - }, -/obj/item/stack/telecrystal{ - amount = 10 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"rE" = ( -/obj/structure/closet/crate/secure/loot, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"rI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/mob/living/simple_animal/hostile/looter/crusher, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"sa" = ( -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"se" = ( -/obj/structure/table/reinforced, -/obj/effect/spawner/random/entertainment/cigarette_pack, -/obj/effect/spawner/random/entertainment/lighter, -/obj/machinery/button/door/directional/north{ - id = "lockdown"; - name = "Loading Bay Blastdoors"; - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"sh" = ( -/obj/structure/chair, -/turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/cargodise_freighter/kitchen) -"sn" = ( -/obj/structure/closet/secure_closet/freezer/fridge/all_access, -/obj/item/storage/box/ingredients/vegetarian, -/obj/item/storage/box/ingredients/italian, -/obj/item/storage/box/ingredients/fruity, -/obj/item/storage/box/ingredients/fiesta, -/obj/item/storage/box/ingredients/american, -/obj/item/reagent_containers/condiment/flour{ - list_reagents = list(/datum/reagent/consumable/flour=600); - name = "Premium All-Purpose Flour (16KG)"; - volume = 600 - }, -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/condiment/enzyme{ - list_reagents = list(/datum/reagent/consumable/enzyme=500); - name = "universe-sized universal enyzyme"; - volume = 500 - }, -/obj/item/reagent_containers/condiment/rice{ - list_reagents = list(/datum/reagent/consumable/rice=150); - name = "Basmati Rice Sack (4KG)"; - volume = 150 - }, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"su" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"sv" = ( -/obj/structure/window/reinforced/tinted/spawner/directional/east, +"vM" = ( /obj/structure/table, /obj/item/storage/medkit/brute{ pixel_y = 12 @@ -1086,424 +1282,141 @@ pixel_y = 4 }, /obj/item/storage/medkit/toxin, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/cargodise_freighter/trauma) -"sw" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"sA" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"sC" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor{ - id = "lockdown" - }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"sF" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"sY" = ( -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"sZ" = ( -/obj/structure/cable, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"tc" = ( -/obj/structure/rack/shelf, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"th" = ( -/obj/machinery/door/airlock/survival_pod/glass, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"ti" = ( -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"ts" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"tI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/mob/living/simple_animal/hostile/looter, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"tJ" = ( -/obj/machinery/button/door/directional/north{ - id = "lockdown"; - name = "Loading Bay Blastdoors"; - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"tP" = ( -/obj/machinery/door/window/brigdoor/right/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"tQ" = ( -/obj/machinery/computer/atmos_alert{ - dir = 4 - }, -/obj/machinery/light/directional/west, -/obj/structure/cable, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"tT" = ( -/obj/effect/turf_decal/caution/stand_clear, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"uc" = ( -/turf/closed/wall/mineral/titanium/spaceship, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"ug" = ( -/obj/structure/safe, -/obj/item/mod/control/pre_equipped/traitor, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"uj" = ( -/obj/machinery/door/window/brigdoor/right/directional/south{ - dir = 8 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"ur" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"ut" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/large{ - name = "DO NOT OPEN" - }, -/obj/effect/spawner/random/entertainment/drugs, -/obj/effect/spawner/random/entertainment/drugs, -/obj/effect/spawner/random/contraband/narcotics, -/obj/item/reagent_containers/cocainebrick, -/obj/item/reagent_containers/cocainebrick, -/obj/item/reagent_containers/hashbrick, -/obj/item/reagent_containers/hashbrick, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"uv" = ( -/obj/machinery/power/emitter/welded{ - dir = 8 - }, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"uw" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks/fullupgrade{ - dir = 1 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"uU" = ( -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"uZ" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/all_access, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"vi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"vm" = ( -/obj/machinery/door/airlock/shuttle/glass, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - id = "lockdown" - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"vn" = ( -/obj/structure/closet/crate/secure/freezer, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/item/storage/box/ingredients/random, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"vr" = ( -/obj/structure/rack/shelf, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"vx" = ( -/obj/machinery/suit_storage_unit/pirate, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"vB" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate, -/obj/effect/spawner/random/maintenance/eight, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"vC" = ( -/obj/structure/closet/secure_closet/freezer/kitchen/all_access, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"vQ" = ( -/obj/structure/table/reinforced, -/obj/item/papercutter, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"vX" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin/carbon, -/obj/item/pen, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"wb" = ( -/obj/structure/table/reinforced, -/obj/item/modular_computer/pda/engineering, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) "wd" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/pen, -/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"wf" = ( -/obj/structure/closet/emcloset/wall{ - pixel_y = 26 - }, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"wl" = ( +/obj/effect/mob_spawn/ghost_role/human/lostcargo, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"wq" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"wj" = ( -/obj/machinery/computer/monitor{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"wm" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/radiation, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/vending/imported/mothic, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"wt" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"wv" = ( -/obj/machinery/light/directional/north, -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"ww" = ( -/obj/structure/closet/firecloset/full, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) +/area/ruin/space/has_grav/cargodise_freighter/kitchen) "wx" = ( -/obj/effect/turf_decal/loading_area{ +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"wy" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/beakers/variety, -/obj/item/storage/box/condimentbottles{ - pixel_y = 6 - }, -/obj/item/storage/box/drinkingglasses{ - pixel_x = 6 - }, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"wA" = ( -/mob/living/basic/giant_spider/hunter, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"wB" = ( -/mob/living/basic/giant_spider, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"wG" = ( -/obj/structure/table/reinforced, -/obj/effect/spawner/random/food_or_drink/booze, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"wN" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/secure/gear{ - name = "Delivery - Central Command Frontier Division"; - req_access = list("armory") - }, -/obj/effect/spawner/random/exotic/antag_gear_weak, -/obj/effect/spawner/random/exotic/antag_gear_weak, -/obj/effect/spawner/random/exotic/antag_gear_weak, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"wR" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"wS" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"wV" = ( -/obj/structure/fans/tiny/forcefield, -/obj/machinery/door/poddoor{ - id = "loadholemine" - }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"xb" = ( -/obj/item/kirbyplants/random, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/all_access, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/structure/table/wood/fancy/blue, +/obj/item/papercutter, +/obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/bridge) -"xn" = ( -/mob/living/simple_animal/hostile/vox/melee, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"xy" = ( -/obj/machinery/power/port_gen/pacman/super, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"xI" = ( -/obj/machinery/light/directional/west, -/obj/structure/cable, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"xP" = ( -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"xQ" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/secure/weapon{ - name = "Delivery - Interdyne Mining Co"; - req_access = list("syndicate") +"wB" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/light/directional/south, +/obj/structure/closet/emcloset/wall{ + pixel_y = -26 }, -/obj/effect/spawner/random/exotic/antag_gear, -/obj/effect/spawner/random/exotic/antag_gear, -/obj/effect/spawner/random/contraband/armory, -/obj/item/tank/internals/oxygen/red, -/obj/item/tank/internals/oxygen/red, -/obj/item/tank/internals/oxygen/red, -/obj/item/pickaxe/drill/jackhammer, -/obj/item/storage/box/minertracker, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"xR" = ( +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"wQ" = ( +/obj/structure/closet/crate, +/obj/structure/cable, +/obj/effect/spawner/random/engineering/material, +/obj/effect/spawner/random/engineering/material, +/obj/effect/spawner/random/engineering/material_rare, +/obj/effect/spawner/random/engineering/material_rare, +/obj/effect/spawner/random/engineering/material_rare, +/obj/effect/spawner/random/engineering/material, +/obj/item/stack/sheet/mineral/uranium/five{ + amount = 25 + }, +/obj/item/stack/sheet/mineral/uranium/five{ + amount = 25 + }, +/obj/item/stack/sheet/mineral/plasma/thirty, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"wT" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/item/kirbyplants/random, /obj/structure/closet/firecloset/wall{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 + pixel_x = 26 }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"ye" = ( -/turf/closed/wall/mineral/titanium/spaceship, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"yl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"wX" = ( /obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/light/directional/south, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"yn" = ( -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"yp" = ( -/mob/living/basic/giant_spider/badnana_spider, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"ys" = ( -/obj/machinery/cryopod{ +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"xh" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 8 +/obj/structure/rack/shelf, +/obj/effect/spawner/random/entertainment/money_small, +/obj/effect/spawner/random/entertainment/money_small, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"xl" = ( +/obj/machinery/door/firedoor/closed, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"xt" = ( +/obj/structure/chair/sofa/corp{ + dir = 1 + }, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"xw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"xC" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/qm/double, +/turf/open/floor/carpet/orange, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"xE" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, /turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"xF" = ( +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/exterior) +"xX" = ( +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"xZ" = ( +/obj/machinery/firealarm/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"yg" = ( +/obj/effect/turf_decal/tile/yellow/anticorner, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, /area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"yv" = ( -/obj/structure/mirror/directional/west, -/obj/structure/sink/directional/east, -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"yD" = ( -/obj/effect/turf_decal/bot, +"yj" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"yl" = ( /obj/structure/closet/crate/hydroponics{ name = "Delivery - Seed Vault" }, @@ -1527,1130 +1440,119 @@ /obj/effect/spawner/random/food_or_drink/seed, /obj/effect/spawner/random/food_or_drink/seed, /obj/effect/spawner/random/food_or_drink/seed, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/cargo) -"yF" = ( -/obj/machinery/light/directional/north, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"yG" = ( -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) +"yv" = ( +/obj/machinery/vending/engivend, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"yy" = ( +/obj/structure/closet/secure_closet/miner/unlocked, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"yD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"yM" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) "yT" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"yV" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) +/obj/machinery/door/airlock/mining/glass{ + name = "Mining EVA" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) "yW" = ( -/obj/machinery/light/directional/west, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"yX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"zf" = ( -/obj/machinery/door/firedoor/closed, -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"zz" = ( -/obj/structure/closet/firecloset/wall{ - pixel_y = 26 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"zD" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"zG" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"zK" = ( -/obj/machinery/recycler, -/obj/machinery/conveyor{ - dir = 4; - id = "cargodise" - }, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"zM" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"zP" = ( -/obj/structure/closet/secure_closet/miner/unlocked, -/obj/item/gps/mining, -/obj/item/tank/jetpack/oxygen/harness, -/obj/item/pickaxe/drill, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"zR" = ( -/obj/structure/chair/wood{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"zY" = ( -/obj/structure/table/reinforced, -/obj/effect/spawner/random/engineering/toolbox, -/obj/effect/spawner/random/engineering/toolbox, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Aa" = ( -/obj/structure/cable, -/obj/effect/turf_decal/caution/white, -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Ab" = ( -/obj/structure/chair{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Ae" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/radiation, -/obj/effect/spawner/random/engineering/material, -/obj/effect/spawner/random/engineering/material, -/obj/effect/spawner/random/engineering/material_rare, -/obj/effect/spawner/random/engineering/material_rare, -/obj/effect/spawner/random/engineering/material_rare, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Al" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Ax" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/hydroponics/constructable, -/turf/open/floor/grass, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Ay" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder{ - desc = "Used to grind things up into raw materials and liquids."; - pixel_y = 5 - }, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"AC" = ( -/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"AK" = ( -/mob/living/simple_animal/hostile/looter/ranged/space/laser, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"AM" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/hydroponics/constructable, -/turf/open/floor/grass, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"AN" = ( -/mob/living/simple_animal/hostile/looter/ranged/space/laser, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"AQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"AW" = ( -/obj/machinery/door/firedoor/closed, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"AX" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Ba" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/green/anticorner/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Bb" = ( -/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Bj" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"Bq" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/vending/hydroseeds, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Bx" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/all_access, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"BL" = ( -/obj/machinery/portable_atmospherics/pump, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"BN" = ( -/obj/item/storage/cans/sixsoda, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"BP" = ( -/obj/structure/tank_holder/anesthetic, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"BY" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Ca" = ( /obj/structure/table, -/obj/item/storage/box/gloves, -/obj/item/storage/box/masks, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"Ce" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"CK" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/medical, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"De" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/internals, -/obj/item/tank/internals/anesthetic, -/obj/item/tank/internals/anesthetic, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Dg" = ( -/obj/machinery/door/airlock{ - name = "Crew Bunk" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Di" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/light/directional/west, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Dk" = ( -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"Dn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/carpet/green, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Dt" = ( -/obj/structure/rack/gunrack, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"DL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/light/directional/north, -/obj/machinery/firealarm/directional/north, -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"DM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/all_access, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"DN" = ( -/obj/structure/table, -/obj/effect/spawner/random/food_or_drink/refreshing_beverage, -/turf/open/floor/iron/cafeteria, +/obj/machinery/reagentgrinder, +/turf/open/floor/iron/kitchen, /area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Ec" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Eg" = ( -/mob/living/simple_animal/hostile/pirate/melee{ - faction = list("hostile") - }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"Eh" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"Ek" = ( -/obj/machinery/door/airlock/qm{ - name = "Chief Bedroom" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - id = "lockdown" - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"En" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Eo" = ( -/obj/effect/turf_decal/caution/stand_clear, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Er" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"Ez" = ( -/obj/structure/table, -/obj/effect/spawner/random/food_or_drink/three_course_meal, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"EB" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"EH" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/mob/living/simple_animal/hostile/vox/melee, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"EO" = ( -/obj/structure/closet/secure_closet/miner/unlocked, -/obj/item/gps/mining, -/obj/item/tank/jetpack/oxygen/harness, -/obj/item/pickaxe/drill, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"Ff" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"Fx" = ( -/obj/machinery/light/directional/north, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"Fy" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/secure/plasma{ - name = "Delivery - NTSS Cyberiad" - }, -/obj/effect/spawner/random/engineering/material_rare, -/obj/effect/spawner/random/engineering/material_rare, -/obj/effect/spawner/random/engineering/material_rare, -/obj/effect/spawner/random/engineering/material_rare, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"FB" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"FF" = ( -/obj/machinery/power/shuttle_engine/propulsion{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"FL" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"FO" = ( -/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"FR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"FS" = ( -/obj/machinery/door/airlock/survival_pod/glass, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"FX" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/mapping_helpers/apc/no_charge, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"FY" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/closet/crate/secure/loot, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Gf" = ( -/turf/closed/wall/mineral/titanium/spaceship, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Gi" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"GA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"GT" = ( -/obj/machinery/computer{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"GU" = ( -/obj/machinery/power/smes, -/obj/structure/cable, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"GW" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Ha" = ( -/obj/machinery/oven, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Hf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Hj" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/all_access, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Hw" = ( -/obj/machinery/door/window/brigdoor/right/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Hy" = ( -/obj/machinery/door/window/brigdoor/right/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"HQ" = ( -/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"HZ" = ( -/obj/machinery/door/airlock{ - name = "Bathroom" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/firedoor, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Ib" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/medical, -/obj/effect/spawner/random/medical/medkit, -/obj/effect/spawner/random/medical/medkit, -/obj/effect/spawner/random/medical/medkit_rare, -/obj/effect/spawner/random/medical/surgery_tool_advanced, -/obj/effect/spawner/random/medical/surgery_tool_advanced, -/obj/effect/spawner/random/medical/surgery_tool_alien, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"IA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"IE" = ( -/mob/living/simple_animal/hostile/pirate/melee{ - faction = list("hostile") - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"IH" = ( -/obj/machinery/power/shuttle_engine/propulsion{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"II" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"IL" = ( -/obj/machinery/light/directional/north, -/obj/structure/cable, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"IV" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"IX" = ( -/obj/effect/turf_decal/bot, +"yY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/closet/crate/secure/gear{ - name = "Delivery - Enclave"; - req_access = list("brig") - }, -/obj/item/knife/combat, -/obj/item/reagent_containers/hypospray/medipen/stimpack, -/obj/item/clothing/glasses/hud/security/sunglasses/gars/giga, -/obj/item/clothing/under/syndicate/skyrat/enclave/real, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"IZ" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/secure/science{ - name = "Delivery - NSV Nebula"; - req_access = list("armory") - }, -/obj/item/raw_anomaly_core/random, -/obj/item/raw_anomaly_core/random, -/obj/item/raw_anomaly_core/random, -/obj/item/raw_anomaly_core/random, -/obj/item/raw_anomaly_core/random, -/obj/item/slime_extract/grey, -/obj/item/slime_extract/grey, -/obj/item/slime_extract/grey, -/obj/item/slime_extract/grey, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Jd" = ( -/obj/structure/closet/crate/radiation, -/obj/item/stack/sheet/mineral/uranium{ - amount = 25 - }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"Je" = ( -/obj/machinery/door/airlock/public/glass, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Jj" = ( -/obj/effect/turf_decal/arrows/red{ - dir = 1 - }, -/obj/structure/closet/crate/freezer, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/food/meat/slab, -/obj/item/organ/internal/heart{ - pixel_x = -8; - pixel_y = -8 - }, -/obj/item/organ/internal/liver{ - pixel_y = -10 - }, -/obj/item/organ/internal/lungs{ - pixel_x = -10; - pixel_y = 6 - }, -/obj/item/reagent_containers/blood/random{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/reagent_containers/blood/random{ - pixel_x = 9 - }, -/obj/item/reagent_containers/blood/random{ - pixel_x = 9 - }, -/obj/item/reagent_containers/blood/random{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/reagent_containers/blood/random{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Js" = ( -/obj/machinery/door/firedoor/closed, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 + name = "Delivery - Free Trade Union"; + req_access = list("cargo") }, +/obj/item/crafting_conversion_kit/mosin_pro, +/obj/item/storage/box/shipping, +/obj/item/cargo_teleporter, +/obj/item/clothing/gloves/cargo_gauntlet, +/obj/item/disk/ammo_workbench/advanced, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"JE" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, /area/ruin/space/has_grav/cargodise_freighter/cargo) -"JM" = ( -/obj/machinery/suit_storage_unit{ - mask_type = /obj/item/clothing/mask/gas/explorer; - storage_type = /obj/item/tank/jetpack/oxygen/harness; - suit_type = /obj/item/mod/control/pre_equipped/traitor_elite - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"JQ" = ( +"zj" = ( /obj/machinery/mineral/ore_redemption, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/mining) -"JR" = ( -/obj/structure/tank_holder/extinguisher, -/obj/effect/turf_decal/tile/green/half/contrasted{ +"zn" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark/textured_half{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"JV" = ( -/mob/living/simple_animal/hostile/pirate/melee{ - faction = list("hostile") - }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"JZ" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Kc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"Ke" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/hydroponics/constructable, -/turf/open/floor/grass, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Km" = ( -/obj/machinery/door/airlock/public{ - name = "Crew Quarters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"KA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"KC" = ( -/obj/structure/fans/tiny/forcefield, -/obj/machinery/door/poddoor{ - id = "loadhole" - }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"KF" = ( -/obj/structure/fans{ - pixel_y = 26 - }, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"KJ" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "cargodise" - }, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"KP" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"La" = ( -/obj/machinery/power/emitter/welded{ - dir = 8 - }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"Lc" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks/fullupgrade{ +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"zF" = ( +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Ld" = ( -/obj/structure/closet/emcloset/wall{ - pixel_x = 26 - }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"Lr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/light/directional/north, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Lz" = ( -/obj/item/stack/sheet/iron/twenty, -/obj/item/circuitboard/machine/ore_silo, -/obj/item/circuitboard/machine/ore_redemption{ - pixel_x = 5; - pixel_y = -6 - }, -/obj/item/storage/box/stockparts/deluxe, -/obj/item/storage/box/stockparts/deluxe, -/obj/structure/closet/crate, -/obj/item/storage/toolbox/mechanical, -/obj/item/stack/sheet/glass/fifty, -/obj/item/circuitboard/machine/protolathe/offstation, -/obj/effect/spawner/random/engineering/toolbox, -/obj/item/circuitboard/machine/circuit_imprinter/department/no_tax, -/obj/item/circuitboard/machine/rtg/advanced, -/obj/item/circuitboard/machine/rtg/advanced, -/obj/item/circuitboard/machine/rtg/advanced, -/obj/item/circuitboard/machine/spaceship_navigation_beacon, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"LC" = ( -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"LE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"zK" = ( +/obj/structure/toilet{ dir = 4 }, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"LN" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"LP" = ( -/obj/structure/closet/emcloset/wall{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Ma" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Md" = ( -/obj/machinery/door/airlock/qm{ - name = "Chief Bedroom" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Ml" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/light/directional/north, -/obj/machinery/door/window/brigdoor/right/directional/south{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Mp" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay" - }, -/obj/machinery/door/poddoor{ - id = "lockdown" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Mq" = ( -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/all_access, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"Mx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/mob/living/basic/pet/dog/dobermann{ - desc = "The freighter's loyal, canine companion!"; - dir = 8; - name = "Ace" - }, -/turf/open/floor/carpet, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Mz" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"MB" = ( -/obj/effect/mob_spawn/ghost_role/human/lostcargoqm{ - dir = 1 - }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"ME" = ( -/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"MH" = ( -/obj/effect/spawner/random/medical/patient_stretcher, -/obj/machinery/iv_drip, /turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"MJ" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/seed_extractor, -/turf/open/floor/wood, /area/ruin/space/has_grav/cargodise_freighter/kitchen) -"MK" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate, -/obj/item/circuitboard/machine/spaceship_navigation_beacon, -/obj/item/circuitboard/machine/spaceship_navigation_beacon, -/obj/item/circuitboard/machine/spaceship_navigation_beacon, -/obj/item/circuitboard/machine/spaceship_navigation_beacon, -/obj/item/circuitboard/machine/spaceship_navigation_beacon, -/obj/item/circuitboard/machine/spaceship_navigation_beacon, -/obj/item/stack/sheet/iron/twenty, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"ML" = ( -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"MN" = ( -/obj/structure/table/optable, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"MS" = ( -/obj/machinery/button/door/directional/north{ - id = "lockdown"; - name = "Loading Bay Blastdoors" - }, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"MY" = ( -/obj/machinery/door/firedoor/closed, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Ne" = ( -/obj/machinery/suit_storage_unit/mining/eva, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"Ng" = ( -/obj/structure/table/reinforced, -/obj/item/modular_computer/pda/clear, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"Nk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"Np" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/all_access, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Nu" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate, -/obj/effect/spawner/random/decoration/carpet, -/obj/effect/spawner/random/decoration/carpet, -/obj/machinery/light/directional/south, -/obj/effect/spawner/random/engineering/toolbox, -/obj/item/stack/sheet/mineral/wood/fifty, -/obj/item/storage/box/drinkingglasses, -/obj/item/circuitboard/machine/chem_dispenser/drinks/beer/fullupgrade, -/obj/effect/spawner/random/food_or_drink/refreshing_beverage, -/obj/effect/spawner/random/food_or_drink/refreshing_beverage, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"ND" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"NM" = ( -/obj/structure/fans/tiny/invisible, -/obj/structure/cable, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"NS" = ( -/obj/machinery/light/directional/south, -/obj/structure/safe/floor, -/obj/item/clothing/accessory/medal/gold, -/obj/item/coin/gold/doubloon, -/obj/item/coin/gold/doubloon, -/obj/item/coin/gold/doubloon, -/obj/item/stack/sheet/mineral/gold{ - amount = 20 - }, -/obj/structure/bed/dogbed, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"NX" = ( -/obj/structure/closet/firecloset/wall{ - pixel_x = 26 - }, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"NZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"Oa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Oe" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/security/wooden_tv, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"Oi" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/engineering/electrical, -/obj/item/circuitboard/computer/solar_control, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Oj" = ( -/obj/structure/cable, -/turf/open/floor/plating, +"zU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/smooth, /area/ruin/space/has_grav/cargodise_freighter/utility) -"Om" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"OE" = ( -/obj/effect/turf_decal/bot, -/obj/effect/spawner/random/medical/organs, -/obj/effect/spawner/random/medical/organs, -/obj/effect/spawner/random/medical/organs, -/obj/effect/spawner/random/medical/memeorgans, -/obj/effect/spawner/random/medical/memeorgans, -/obj/structure/closet/crate/secure/freezer{ - name = "Delivery - NSV Torch" - }, -/obj/item/organ/internal/heart/gland/heal, -/obj/item/organ/internal/brain/alien, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"OP" = ( -/turf/closed/mineral/random/high_chance, -/area/ruin/unpowered/no_grav) -"OX" = ( -/obj/machinery/computer/atmos_alert, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"Pl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +"zV" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/all_access, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Pq" = ( -/obj/item/storage/box/shipping, -/obj/item/storage/box/shipping, -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/paper, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Ps" = ( -/obj/effect/turf_decal/bot, -/obj/effect/spawner/random/exotic/tool, -/obj/structure/closet/crate/secure/engineering{ - req_one_access = list("syndicate") - }, -/obj/effect/spawner/random/exotic/tool, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Pu" = ( -/obj/machinery/door/firedoor/closed, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"PC" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, +/obj/structure/table/wood/fancy/blue, +/obj/item/paper_bin, /obj/item/pen, -/obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/bridge) -"PD" = ( -/obj/machinery/door/airlock/public/glass, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"PG" = ( -/obj/structure/window/reinforced/tinted/spawner/directional/east{ - pixel_x = 4 - }, -/obj/structure/mirror/directional/west, -/obj/structure/sink/directional/east, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"PH" = ( -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"PK" = ( -/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"PL" = ( -/obj/structure/extinguisher_cabinet/directional/south, -/obj/structure/cable, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"PO" = ( -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"PQ" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ +"zY" = ( +/obj/structure/bed/double{ dir = 1 }, -/turf/open/floor/iron/checker, +/obj/item/bedsheet/dorms_double{ + dir = 4 + }, +/turf/open/floor/wood/parquet, /area/ruin/space/has_grav/cargodise_freighter/kitchen) -"PV" = ( +"Aa" = ( +/turf/closed/wall/r_wall/syndicate, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Ac" = ( +/mob/living/simple_animal/hostile/vox/melee, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"Af" = ( +/obj/machinery/hydroponics/constructable, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"Ah" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Ai" = ( /obj/structure/closet/crate/secure/engineering, /obj/item/storage/toolbox/electrical, /obj/item/storage/toolbox/electrical, @@ -2662,2651 +1564,4207 @@ /obj/item/construction/plumbing/engineering, /turf/open/floor/plating, /area/ruin/space/has_grav/cargodise_freighter/utility) -"PW" = ( -/obj/structure/window/reinforced/tinted/spawner/directional/east, -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"PZ" = ( -/obj/structure/closet/secure_closet/freezer/meat/all_access, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Qc" = ( -/obj/machinery/door/airlock/hatch{ - name = "Turret Room" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"Qi" = ( -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Qj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"Qk" = ( -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"Ql" = ( -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Qo" = ( -/obj/machinery/vending/dinnerware, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Qt" = ( -/obj/machinery/door/airlock/survival_pod/glass, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Qv" = ( -/obj/effect/spawner/random/entertainment/arcade{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"QC" = ( -/obj/structure/fans/tiny/invisible, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"QU" = ( -/obj/machinery/button/door/directional/north{ - id = "loadholemine"; - name = "Loading Bay Blast Doors"; - pixel_x = 24; - pixel_y = 0 - }, -/mob/living/basic/giant_spider/nurse, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"QW" = ( -/obj/machinery/door/airlock/vault{ - name = "Vault" - }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"QY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Ra" = ( -/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Rb" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/reagent_dispensers/watertank/high{ - tank_volume = 8000 - }, -/obj/item/reagent_containers/cup/bucket, -/obj/item/reagent_containers/cup/beaker/bluespace, -/turf/open/floor/grass, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Rh" = ( -/obj/machinery/door/airlock/survival_pod/glass, -/obj/machinery/door/poddoor{ - id = "lockdown" +"Aj" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Ri" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Rt" = ( -/obj/effect/mob_spawn/ghost_role/human/lostminer{ - dir = 1 - }, /turf/open/floor/wood, /area/ruin/space/has_grav/cargodise_freighter/quarters) -"Rw" = ( -/obj/machinery/vending/medical/syndicate_access/cybersun{ - req_access = null +"Am" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"Ar" = ( +/obj/structure/closet/crate/freezer/blood, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/cargodise_freighter/trauma) -"Rx" = ( -/obj/machinery/atmospherics/components/tank/air{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"RA" = ( -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"RO" = ( -/obj/structure/table, -/obj/effect/spawner/random/entertainment/cigarette_pack, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"RY" = ( -/obj/structure/table/reinforced, -/obj/effect/spawner/random/entertainment/cigarette_pack, -/obj/effect/spawner/random/entertainment/lighter, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Sc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Sk" = ( -/mob/living/simple_animal/hostile/looter/crusher, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Sl" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"Sv" = ( -/obj/structure/closet/crate/secure/loot, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"SF" = ( -/obj/effect/mob_spawn/ghost_role/human/lostminer{ - dir = 1 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/wood, +"Ay" = ( +/obj/structure/table/wood, +/obj/item/toy/cards/deck, +/turf/open/floor/wood/parquet, /area/ruin/space/has_grav/cargodise_freighter/quarters) -"SQ" = ( -/obj/machinery/door/firedoor/closed, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"SS" = ( -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/all_access, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"SU" = ( -/obj/machinery/door/airlock/hatch{ - name = "Turret Room" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"SY" = ( -/obj/effect/mob_spawn/ghost_role/human/lostcargo{ - dir = 1 - }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"SZ" = ( -/obj/machinery/biogenerator, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Ta" = ( +"AA" = ( /obj/machinery/light/directional/west, +/obj/structure/closet/freighterammo, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"AE" = ( +/obj/structure/closet/crate/science{ + req_access = list("science"); + name = "Delivery - Nanotrasen Science Division" + }, +/obj/effect/spawner/random/exotic/technology, +/obj/effect/spawner/random/exotic/technology, +/obj/item/raw_anomaly_core/random, +/obj/item/raw_anomaly_core/random, +/obj/item/raw_anomaly_core/random, +/obj/effect/spawner/random/exotic/tool, +/obj/effect/spawner/random/exotic/tool, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"AN" = ( +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/cargodise_freighter/exterior) +"Ba" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Bb" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Be" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"Bl" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"Bs" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Bt" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Te" = ( -/obj/effect/mob_spawn/ghost_role/human/lostcargo{ +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"By" = ( +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"BE" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"BF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_half{ dir = 1 }, -/obj/machinery/light/directional/south, -/turf/open/floor/wood, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"BW" = ( +/obj/machinery/chem_master/condimaster, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"BZ" = ( +/obj/machinery/griddle, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Cg" = ( +/obj/machinery/door/airlock/mining/glass{ + name = "Loading Bay" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor{ + id = "cargolockdown" + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"Cj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"Ck" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/cargodise_freighter/quarters) -"Ti" = ( -/obj/structure/table, -/obj/item/storage/medkit{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/storage/medkit/surgery{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/clothing/gloves/color/plasmaman/cargo{ - pixel_y = -6 - }, -/obj/item/clothing/gloves/color/plasmaman/cargo{ - pixel_y = -6 - }, -/obj/item/clothing/gloves/color/plasmaman/cargo{ - pixel_y = -6 - }, -/obj/item/clothing/gloves/color/plasmaman/cargo{ - pixel_y = -6 - }, -/obj/item/clothing/gloves/color/plasmaman/cargo{ - pixel_y = -6 - }, -/obj/item/soap/syndie, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Tr" = ( -/obj/structure/marker_beacon/burgundy, -/obj/structure/lattice/catwalk, -/turf/template_noop, -/area/space) -"Ty" = ( -/obj/machinery/door/airlock/survival_pod/glass, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +"Cz" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"TF" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"TM" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/internals, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/tank/internals/emergency_oxygen/double, -/turf/open/floor/iron, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/cargo) -"Ud" = ( -/obj/structure/table, -/obj/item/storage/belt/utility/full/engi{ - pixel_y = 12 - }, -/obj/item/clothing/head/helmet/space/plasmaman/mining{ - pixel_x = -8 - }, -/obj/item/clothing/head/helmet/space/plasmaman/mining{ - pixel_x = -8 - }, -/obj/item/clothing/under/plasmaman/cargo{ - pixel_x = 2; - pixel_y = -12 - }, -/obj/item/clothing/under/plasmaman/cargo{ - pixel_x = 2; - pixel_y = -12 - }, -/obj/item/clothing/under/plasmaman/cargo{ - pixel_x = 2; - pixel_y = -12 - }, -/obj/item/clothing/head/helmet/space/plasmaman/cargo{ - pixel_x = 2 - }, -/obj/item/clothing/head/helmet/space/plasmaman/cargo{ - pixel_x = 2 - }, -/obj/item/clothing/head/helmet/space/plasmaman/cargo{ - pixel_x = 2 - }, -/obj/item/clothing/under/plasmaman/mining{ - pixel_x = -6; - pixel_y = -12 - }, -/obj/item/clothing/under/plasmaman/mining{ - pixel_x = -6; - pixel_y = -12 - }, -/obj/item/clothing/suit/utility/fire/atmos{ - pixel_x = 12; - pixel_y = -12 - }, -/obj/item/clothing/head/helmet/space/plasmaman/robotics{ - name = "freight boss plasma envirosuit helmet"; - pixel_x = 12 - }, -/obj/item/storage/belt/utility/full/engi{ - pixel_y = 12 - }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Ug" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/tank/internals/nitrogen/belt, -/obj/item/tank/internals/nitrogen/belt, -/obj/item/tank/internals/nitrogen/belt, -/obj/item/tank/internals/nitrogen/belt, -/obj/item/tank/internals/plasmaman/belt/full, -/obj/item/tank/internals/plasmaman/belt/full, -/obj/item/tank/internals/plasmaman/belt/full, -/obj/item/tank/internals/plasmaman/belt/full, -/obj/item/clothing/mask/breath/vox{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/clothing/mask/breath/vox{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/clothing/mask/breath/vox{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/clothing/mask/breath/vox{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/clothing/mask/breath/vox{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/clothing/mask/breath/vox{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +"CC" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Uk" = ( -/obj/machinery/door/airlock/freezer, -/obj/structure/fans/tiny/invisible, -/obj/structure/cable, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Um" = ( -/obj/machinery/light/directional/south, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Up" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/item/flashlight/seclite{ - pixel_y = 12 - }, -/obj/item/flashlight/seclite{ - pixel_y = 8 - }, -/obj/item/flashlight/seclite{ - pixel_y = 4 - }, -/obj/item/flashlight/seclite, +/obj/machinery/light/directional/north, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Uw" = ( -/obj/machinery/light/directional/east, -/obj/structure/cable, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"CH" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, +/mob/living/simple_animal/hostile/looter, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"CL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"Da" = ( +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Df" = ( +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "freighterkitchen" + }, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Dn" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/vending/wallmed/directional/east, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"Do" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Dr" = ( +/obj/machinery/door/airlock/silver{ + name = "Dorm 2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"DE" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 4 + }, +/obj/machinery/door/firedoor/closed, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"DG" = ( +/mob/living/simple_animal/hostile/vox/melee, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"DQ" = ( +/obj/structure/table, +/obj/item/storage/box/condimentbottles{ + pixel_y = 6 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_x = 6 + }, +/obj/item/storage/box/beakers/variety, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Ee" = ( +/obj/effect/turf_decal/tile/yellow/half, +/obj/machinery/door/firedoor/closed, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"UA" = ( +"Ef" = ( +/obj/structure/lattice, +/turf/template_noop, +/area/template_noop) +"Eo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"Er" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"Et" = ( +/obj/structure/cable, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"Ew" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Ey" = ( +/obj/structure/dresser, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"EC" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"EG" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 1 + }, /obj/structure/closet/emcloset/wall{ pixel_y = 26 }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"EI" = ( +/obj/machinery/door/airlock/survival_pod/glass, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "lostfreighter" + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"EL" = ( +/obj/machinery/door/airlock/vault{ + name = "Freighter Armoury" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor{ + id = "bridgelockdown" + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"EP" = ( +/turf/open/floor/carpet/orange, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"ES" = ( +/obj/structure/rack/gunrack, +/obj/item/gun/ballistic/automatic/akm, +/obj/item/gun/ballistic/automatic/akm{ + pixel_x = 3 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"Fb" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/yellow/anticorner{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Fm" = ( +/obj/machinery/computer{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Fu" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Fw" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half{ dir = 1 }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"UI" = ( -/obj/effect/spawner/random/engineering/flashlight, -/turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"UX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"Vb" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Vl" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate, -/obj/effect/spawner/random/engineering/material, -/obj/effect/spawner/random/engineering/material, -/obj/effect/spawner/random/engineering/material, -/obj/effect/spawner/random/engineering/material, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Vs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"Vu" = ( -/obj/structure/table, -/obj/item/crowbar/red{ - pixel_y = 12 - }, -/obj/item/crowbar/red{ - pixel_y = 8 - }, -/obj/item/crowbar/red{ - pixel_y = 4 - }, -/obj/item/crowbar/red, -/obj/item/crowbar/red{ - pixel_y = -4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Vx" = ( -/obj/structure/reagent_dispensers/watertank/high, -/turf/open/floor/plating, +"Fy" = ( +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/iron/smooth, /area/ruin/space/has_grav/cargodise_freighter/utility) -"Vy" = ( -/obj/machinery/vending/games, -/obj/machinery/light/directional/south, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"VB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/cable, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"VN" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/secure/gear, +"FP" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/mining) -"VZ" = ( -/obj/machinery/vending/dorms, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Wd" = ( +"FT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"FW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/structure/closet/emcloset/wall{ pixel_y = -26 }, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"We" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/all_access, -/obj/structure/cable, /turf/open/floor/wood, /area/ruin/space/has_grav/cargodise_freighter/quarters) -"Wh" = ( -/obj/effect/turf_decal/tile/green/half/contrasted{ +"Gg" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Gh" = ( +/turf/template_noop, +/area/template_noop) +"Gk" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Wl" = ( -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/smooth_corner{ dir = 8 }, -/turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Wq" = ( -/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"Ws" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Wt" = ( -/obj/machinery/vending/donksofttoyvendor, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"Wu" = ( -/obj/structure/tank_holder/extinguisher, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"Ww" = ( -/obj/machinery/door/airlock/qm{ - name = "Chief Bedroom" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/firedoor, -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/quarters) -"WL" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"WM" = ( -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"WP" = ( +"Gn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"WR" = ( -/obj/machinery/button/door/directional/north{ - id = "loadhole"; - name = "Loading Bay Blast Doors"; - pixel_y = -24 +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"Gr" = ( +/obj/machinery/door/airlock/silver{ + name = "Bathroom" }, -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/solarpanel_small, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Xd" = ( -/obj/structure/mop_bucket/janitorialcart{ +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Gs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/wood, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"GD" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"GL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/obj/item/mop/advanced, -/obj/item/reagent_containers/cup/bucket, -/obj/item/grenade/chem_grenade/cleaner, -/obj/item/grenade/chem_grenade/cleaner, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/reagent_containers/spray/cleaner, -/obj/effect/spawner/random/trash/soap, -/obj/item/lightreplacer, -/obj/item/storage/box/lights/mixed, -/obj/machinery/light/directional/north, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/smooth, /area/ruin/space/has_grav/cargodise_freighter/utility) -"Xk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/secure/science{ - name = "Delivery - NSS Exodus"; +"Hi" = ( +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Hj" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"Hk" = ( +/obj/structure/chair/sofa/left/maroon{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"Hn" = ( +/obj/effect/spawner/random/exotic/syndie, +/obj/effect/spawner/random/exotic/syndie, +/obj/item/clothing/suit/armor/riot, +/obj/item/shield/riot, +/obj/item/clothing/head/helmet/toggleable/riot, +/obj/effect/spawner/random/exotic/antag_gear, +/obj/effect/spawner/random/exotic/antag_gear_weak, +/obj/structure/closet/crate/secure/weapon{ + name = "Delivery - DS-2"; + req_access = list("syndicate") + }, +/obj/item/storage/belt/utility/atmostech, +/obj/item/storage/belt/utility/full/engi, +/obj/item/storage/belt/utility/syndicate, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/paper{ + default_raw_text = "Admiral, due to increased Nanotrasen presence in your sector, we are providing some extra supplies to deal with it. The telecrystals are to be held for a contact that will come to collect them in the coming weeks, a solo operative. Please ensure they get the crystals, as their mission is gravely important."; + name = "CONFIDENTIAL - DS-2 Admiral's Eyes Only" + }, +/obj/item/stack/telecrystal{ + amount = 10 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"Hp" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_corner, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Hr" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Hv" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"HC" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"HH" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"HJ" = ( +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"HO" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"HP" = ( +/obj/effect/turf_decal/tile/yellow/half, +/obj/machinery/door/firedoor/closed, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Ii" = ( +/obj/structure/closet/crate/secure/gear{ + name = "Delivery - Central Command Frontier Division"; req_access = list("armory") }, +/obj/effect/spawner/random/exotic/antag_gear_weak, +/obj/effect/spawner/random/exotic/antag_gear_weak, +/obj/effect/spawner/random/exotic/antag_gear_weak, /obj/effect/spawner/random/exotic/technology, -/obj/effect/spawner/random/exotic/technology, -/obj/item/raw_anomaly_core/random, -/obj/item/raw_anomaly_core/random, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Xl" = ( -/obj/structure/table, -/obj/effect/spawner/random/food_or_drink/soup, -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"Xm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/mob_spawn/corpse/human/miner/mod, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"Xn" = ( +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"Im" = ( +/obj/effect/turf_decal/trimline/blue/corner, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_corner, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Ip" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/entertainment/cigarette_pack, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"It" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/barricade/sandbags, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Iy" = ( +/obj/machinery/vending/medical/syndicate_access/cybersun{ + req_access = null + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/cargodise_freighter/trauma) -"Xp" = ( -/obj/machinery/light/directional/west, -/turf/open/floor/engine, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"Xr" = ( -/obj/effect/turf_decal/bot, -/mob/living/basic/giant_spider, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"Xs" = ( -/obj/item/kirbyplants/random, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"Xu" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"XB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +"IA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"IP" = ( +/obj/machinery/vending/dinnerware, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"IV" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 + dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"XD" = ( -/obj/machinery/power/shuttle_engine/propulsion{ - dir = 8 +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Ja" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"XJ" = ( -/obj/machinery/conveyor{ - dir = 6; - id = "cargodise" - }, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/mining) -"XP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"XS" = ( -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"XU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"Jd" = ( +/obj/machinery/vending/dorms, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"XV" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/mob/living/basic/syndicate/russian/ranged, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"XY" = ( -/obj/machinery/computer/camera_advanced{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"Yg" = ( -/obj/structure/cable, -/obj/effect/turf_decal/caution/stand_clear/white, -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Ym" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Yp" = ( -/turf/closed/wall/mineral/titanium/spaceship, -/area/ruin/space/has_grav/cargodise_freighter/bridge) -"Yt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/mob/living/simple_animal/hostile/looter, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Yy" = ( +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Jm" = ( +/obj/effect/turf_decal/tile/blue, /obj/structure/extinguisher_cabinet/directional/south, -/obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"YA" = ( +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Js" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Jx" = ( +/obj/machinery/door/airlock/mining/glass{ + name = "Mining EVA" + }, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor{ + id = "cargolockdown" + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"Jy" = ( +/obj/machinery/door/airlock/vault{ + name = "Freighter Vault" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"Jz" = ( +/obj/machinery/vending/clothing, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"JC" = ( +/obj/machinery/door/airlock/freezer{ + name = "Kitchen Storage" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"JD" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"JN" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"JQ" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon/burgundy, /turf/template_noop, -/area/space) -"YD" = ( -/turf/open/floor/wood, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"YF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, +/area/template_noop) +"Kb" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Ki" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"YK" = ( -/turf/open/floor/iron, /area/ruin/space/has_grav/cargodise_freighter/cargo) -"YP" = ( -/obj/effect/spawner/random/exotic/ripley, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ +"Kj" = ( +/obj/effect/turf_decal/tile/yellow/half{ dir = 8 }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"YR" = ( -/obj/machinery/computer/crew{ +/obj/machinery/door/firedoor/closed, +/turf/open/floor/iron/dark/smooth_half{ dir = 1 }, -/obj/effect/turf_decal/tile/blue/fourcorners, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Kr" = ( +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Kt" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"Kw" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/barricade/sandbags, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"KB" = ( +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"KR" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"KS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/cargodise_freighter/exterior) +"KY" = ( +/obj/machinery/power/shuttle_engine/propulsion{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/exterior) +"Lb" = ( +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Lk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Ll" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/entertainment/deck, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Lm" = ( +/obj/machinery/vending/hydroseeds, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"Ln" = ( +/obj/structure/closet/crate/goldcrate, +/obj/item/stack/sheet/mineral/plasma/five, +/obj/item/stack/sheet/plasteel/twenty, +/obj/item/stack/sheet/plastic/five, +/obj/item/stack/sheet/mineral/diamond, +/obj/effect/spawner/random/entertainment/money_large, +/obj/effect/spawner/random/entertainment/money_large, +/obj/effect/spawner/random/entertainment/money_large, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"Lp" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"LF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"LG" = ( +/turf/closed/wall/r_wall/syndicate, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"LH" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 1 + }, +/obj/machinery/door/firedoor/closed, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Mc" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"Mo" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/head/helmet/space/plasmaman/cargo{ + pixel_x = 2 + }, +/obj/item/clothing/under/plasmaman/cargo{ + pixel_x = 2; + pixel_y = -12 + }, +/obj/item/clothing/head/helmet/space/plasmaman/cargo{ + pixel_x = 2 + }, +/obj/item/clothing/under/plasmaman/cargo{ + pixel_x = 2; + pixel_y = -12 + }, +/obj/item/clothing/gloves/color/plasmaman/cargo{ + pixel_y = -6 + }, +/obj/item/clothing/gloves/color/plasmaman/cargo{ + pixel_y = -6 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"Mt" = ( +/obj/structure/closet/crate/secure/gear{ + name = "Delivery - Lopland Security"; + req_access = list("brig") + }, +/obj/item/knife/combat, +/obj/item/clothing/under/syndicate/skyrat/enclave/real, +/obj/item/reagent_containers/hypospray/medipen/stimpack, +/obj/item/clothing/glasses/hud/security/sunglasses/gars/giga, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"ME" = ( +/turf/closed/wall/r_wall/syndicate, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"MG" = ( +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"MM" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"MS" = ( +/obj/machinery/light/directional/west, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/no_charge, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"MZ" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Ni" = ( +/obj/structure/table, +/obj/machinery/processor, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Nk" = ( +/obj/structure/cable, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"Nm" = ( +/turf/closed/wall/r_wall/syndicate, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"Nr" = ( +/obj/structure/cable, +/obj/structure/closet/emcloset/wall{ + pixel_y = -26 + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"Ns" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"Nt" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"Ny" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"NC" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"NE" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"NH" = ( +/obj/structure/chair/sofa/corp/left{ + dir = 1 + }, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"NQ" = ( +/obj/structure/safe, +/obj/item/mod/module/jetpack/advanced, +/obj/item/mod/control/pre_equipped/standard, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"NV" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"NZ" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Bridge" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor{ + id = "bridgelockdown" + }, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/bridge) -"YV" = ( -/obj/machinery/door/firedoor/closed, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 +"Oa" = ( +/obj/structure/table/wood/fancy/orange, +/obj/item/clipboard, +/obj/item/pen/fountain, +/obj/item/flashlight/lamp/green{ + pixel_x = -7; + pixel_y = 14 }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Zl" = ( -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Zn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 }, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Oe" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"Zu" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/radiation{ - name = "Delivery - NSV Dagon" +/area/ruin/space/has_grav/cargodise_freighter/mining) +"Oj" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, -/obj/effect/spawner/random/engineering/material, -/obj/effect/spawner/random/engineering/material, -/obj/effect/spawner/random/engineering/material_rare, -/obj/effect/spawner/random/engineering/material_rare, -/obj/effect/spawner/random/engineering/material_rare, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Zw" = ( -/obj/machinery/photocopier, +/turf/open/floor/iron/dark/textured_half{ + dir = 4 + }, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Om" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, -/turf/open/floor/iron, -/area/ruin/space/has_grav/cargodise_freighter/cargo) -"Zy" = ( -/turf/template_noop, -/area/template_noop) -"Zz" = ( -/obj/machinery/computer/operating, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/cargodise_freighter/trauma) -"ZB" = ( -/turf/open/floor/iron/cafeteria, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"ZD" = ( /obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"Ox" = ( +/obj/machinery/vending/boozeomat/all_access, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Oy" = ( +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"OC" = ( +/obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/cargodise_freighter/primaryhall) -"ZN" = ( -/turf/open/floor/iron/checker, -/area/ruin/space/has_grav/cargodise_freighter/kitchen) -"ZS" = ( -/obj/machinery/autolathe/hacked, -/turf/open/floor/plating, -/area/ruin/space/has_grav/cargodise_freighter/utility) -"ZU" = ( -/obj/machinery/door/airlock/public{ - name = "Crew Quarters" +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/poddoor{ - id = "lockdown" +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"OF" = ( +/obj/machinery/biogenerator, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"OS" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"OT" = ( +/obj/machinery/power/shuttle_engine/large{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/exterior) +"OY" = ( +/obj/structure/rack/gunrack, +/obj/item/gun/ballistic/rifle/boltaction, +/obj/item/gun/ballistic/rifle/boltaction{ + pixel_x = 3 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"Pa" = ( +/obj/machinery/shower/directional/south, +/obj/item/soap, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Pe" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Pt" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"PH" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"PU" = ( +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"PW" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Qk" = ( +/obj/effect/turf_decal/tile/brown, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"Qn" = ( +/obj/machinery/button/door/directional/north{ + id = "bridgelockdown"; + name = "Bridge Blastdoors"; + pixel_y = -24 + }, +/mob/living/simple_animal/hostile/looter/ranged/space/laser, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"Qv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Qw" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"QA" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"QH" = ( +/obj/machinery/firealarm/directional/west, +/obj/structure/barricade/sandbags, +/turf/open/floor/iron/dark/smooth_large, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"QU" = ( +/obj/structure/table, +/obj/item/storage/organbox{ + pixel_y = 6 + }, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"QY" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/rack/shelf, +/obj/effect/spawner/random/entertainment/money_large, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Sc" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/vault) +"Sd" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 }, /obj/structure/cable, /turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"Sg" = ( +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Sh" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"St" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/structure/chair/sofa/left/maroon{ + dir = 8 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/wood/parquet, /area/ruin/space/has_grav/cargodise_freighter/quarters) +"Sx" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"SF" = ( +/obj/machinery/power/shuttle_engine/huge{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/cargodise_freighter/exterior) +"SN" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/clipboard, +/obj/item/pen/fountain, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"SP" = ( +/obj/machinery/atmospherics/components/tank/air{ + dir = 8 + }, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"SU" = ( +/turf/open/floor/iron/dark/textured_half{ + dir = 4 + }, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"SZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"Tf" = ( +/turf/open/floor/iron/dark/smooth_large, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Tg" = ( +/turf/closed/wall/r_wall/syndicate, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"Tm" = ( +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"TA" = ( +/obj/machinery/power/shuttle_engine/propulsion{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/cargodise_freighter/exterior) +"TC" = ( +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"TF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"TM" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"TU" = ( +/obj/structure/closet/crate/medical, +/obj/effect/spawner/random/medical/medkit, +/obj/effect/spawner/random/medical/medkit, +/obj/effect/spawner/random/medical/medkit_rare, +/obj/effect/spawner/random/medical/surgery_tool_advanced, +/obj/effect/spawner/random/medical/surgery_tool_advanced, +/obj/effect/spawner/random/medical/surgery_tool_alien, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"TZ" = ( +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Up" = ( +/obj/machinery/computer{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 4 + }, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Uq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/smooth, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"Ur" = ( +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"UB" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"UD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"UH" = ( +/obj/machinery/power/shuttle_engine/large{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/cargodise_freighter/exterior) +"UJ" = ( +/obj/machinery/light/directional/west, +/obj/machinery/vending/cigarette, +/turf/open/floor/wood, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"UL" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 1 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"UN" = ( +/obj/effect/turf_decal/tile/yellow/half, +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"UP" = ( +/obj/effect/turf_decal/trimline/blue/line, +/mob/living/simple_animal/hostile/pirate/melee{ + faction = list("hostile") + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 4 + }, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"US" = ( +/obj/machinery/door/airlock/survival_pod/glass, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "lostfreighter" + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"Vn" = ( +/turf/open/floor/iron/dark/smooth_half, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Vu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"VB" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/mob/living/simple_animal/hostile/looter, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"VD" = ( +/obj/structure/closet/secure_closet/freezer/kitchen/all_access, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"VL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/plating, +/area/ruin/space/has_grav/cargodise_freighter/utility) +"VR" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/button/door/directional/south{ + id = "freighterbay"; + name = "Bay Doors" + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"Wc" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor/closed, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Wi" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Wk" = ( +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Wl" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"Wp" = ( +/obj/structure/table/wood/fancy/orange, +/obj/item/modular_computer/laptop/preset/civilian, +/obj/item/storage/fancy/cigarettes/cigpack_robustgold, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Wq" = ( +/mob/living/simple_animal/hostile/looter/crusher, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"Ws" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/mask/breath/vox{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/clothing/mask/breath/vox{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/tank/internals/nitrogen/belt, +/obj/item/tank/internals/nitrogen/belt, +/obj/item/tank/internals/nitrogen/belt, +/obj/item/tank/internals/nitrogen/belt, +/obj/item/tank/internals/plasmaman/belt/full, +/obj/item/tank/internals/plasmaman/belt/full, +/obj/item/tank/internals/plasmaman/belt/full, +/obj/item/tank/internals/plasmaman/belt/full, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/turf/open/floor/wood, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"Wt" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Ww" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Wz" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"WB" = ( +/obj/machinery/button/door/directional/south{ + id = "freighterkitchen"; + name = "Kitchen Shutters" + }, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"WE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"WJ" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 4 + }, +/obj/structure/closet/emcloset/wall{ + pixel_x = 26 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"WO" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"WP" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"WQ" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"WS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"WT" = ( +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"WY" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Xf" = ( +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Xl" = ( +/obj/structure/closet/crate/solarpanel_small, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"Xz" = ( +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"XF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) +"XI" = ( +/obj/effect/turf_decal/trimline/blue/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"XT" = ( +/turf/open/floor/wood, +/area/ruin/space/has_grav/cargodise_freighter/quarters) +"XV" = ( +/mob/living/simple_animal/hostile/looter/ranged/space/laser, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"XZ" = ( +/obj/machinery/door/airlock/mining/glass{ + name = "Loading Bay" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor{ + id = "cargolockdown" + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"Yi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/wood/tile, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"Yo" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/mob/living/simple_animal/hostile/looter/ranged/space/laser, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/open/floor/catwalk_floor/iron_dark, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Yr" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/ruin/space/has_grav/cargodise_freighter/hydroponics) +"Yz" = ( +/turf/open/floor/iron/white, +/area/ruin/space/has_grav/cargodise_freighter/trauma) +"YB" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"YL" = ( +/obj/structure/closet/crate/secure/weapon{ + name = "Delivery - Interdyne Mining Co"; + req_access = list("syndicate") + }, +/obj/effect/spawner/random/exotic/antag_gear, +/obj/effect/spawner/random/exotic/antag_gear, +/obj/effect/spawner/random/contraband/armory, +/obj/item/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, +/obj/item/pickaxe/drill/jackhammer, +/obj/item/storage/box/minertracker, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/cargo) +"YM" = ( +/obj/structure/dresser, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"YO" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/mob/living/simple_animal/hostile/looter, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"YT" = ( +/obj/effect/turf_decal/tile/yellow/anticorner, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"YV" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/iron/kitchen, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"YY" = ( +/obj/machinery/cryopod{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Ze" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Freighter Boss's Quarters" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Zg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Zj" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/yellow/anticorner{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"Zk" = ( +/turf/closed/wall/r_wall/syndicate, +/area/ruin/space/has_grav/cargodise_freighter/bridge) +"Zq" = ( +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"Zz" = ( +/obj/effect/turf_decal/tile/yellow/anticorner{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"ZC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"ZN" = ( +/obj/machinery/door/airlock/glass{ + name = "Kitchen" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/kitchen) +"ZV" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/ruin/space/has_grav/cargodise_freighter/primaryhall) +"ZZ" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/cargodise_freighter/mining) (1,1,1) = {" -Zy -OP -OP -OP -OP -OP -OP -OP -OP -Zy -Zy -Zy -Zy -Zy -Zy -Zy -Zy -OP -Zy -Zy -Zy -Zy -Zy -Zy -Zy -Zy -Zy -Zy -OP -Zy -Zy -OP -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (2,1,1) = {" -OP -OP -OP -OP -OP -OP -OP -OP -Zy -Zy -Zy -OP -OP -OP -OP -ye -wS -ye -ye -ye -wS -ye -OP -OP -OP -OP -OP -Zy -Zy -OP -Zy -Zy -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (3,1,1) = {" -OP -OP -OP -OP -hP -pM -pM -hP -pM -pM -FF -Gf -FF -XD -ye -ye -uv -BL -BL -EB -La -ye -ye -FF -FF -uc -IH -IH -IH -IH -uc -Zy -OP +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +JQ +Gh +Gh +Gh +Gh +KS +KS +SF +Gh +Gh +Gh +Gh +JQ +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +vH +vH +vH +vH +Gh +Gh "} (4,1,1) = {" -OP -OP -OP -hP -hP -hP -hP -hP -hP -hP -Gf -Gf -Gf -ye -ye -Qk -IV -ke -LC -jv -Qk -Wu -ye -Gf -Gf -uc -uc -uc -uc -uc -uc -Zy -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Ef +Gh +Gh +KS +UH +AN +AN +AN +KS +UH +Gh +Gh +Ef +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +vH +vH +vH +vH +Gh +Gh "} (5,1,1) = {" -OP -OP -Zy -hP -bZ -lk -yv -yv -PG -Ra -kB -re -ys -ME -oo -Qk -IV -ke -LC -nM -Qk -Qk -ME -ZD -KP -FO -dg -kI -oh -FO -FO -FO -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Ef +Gh +Gh +AN +AN +AN +AN +AN +AN +AN +Gh +Gh +Ef +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +vH +Gh +Gh +Gh "} (6,1,1) = {" -OP -OP -Zy -hP -cb -lk -yG -Hw -PW -Ra -XU -sY -Zl -SU -Qk -Ld -IV -Lz -LC -nM -Ld -Qk -SU -XU -Zl -FO -nr -YK -JE -Rh -NM -th -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Gh +nU +OT +Gh +Ef +Gh +Tg +mb +mb +mb +mb +mb +mb +mb +Tg +Gh +Ef +Gh +KS +UH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +Gh +Gh +Gh "} (7,1,1) = {" -OP -OP -OP -hP -cb -lk -yT -Hy -PW -Ra -FB -ll -Zl -ME -ME -ME -ME -xy -LC -ME -ME -ME -ME -XU -Zl -FO -UA -aS -PL -FO -FO -FO -Zy +Gh +Gh +Gh +Gh +Gh +Gh +KY +xF +xF +KY +Sg +Tg +mb +mb +Fy +uu +nL +yv +fV +mb +NE +uq +Sg +TA +AN +AN +TA +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +Gh +Gh +Gh "} (8,1,1) = {" -OP -OP -Zy -hP -bZ -lk -yG -Hy -PW -Ra -XU -jO -Zl +Gh +Gh +Gh +Gh +Gh +Gh ME -lC -Oj -xI -XP -Oj -tQ -wj -GU -ME -QY -BY -dB -jX -Vb -nc -wt -YP -uc -Zy +Yr +Yr +Yr +Er +mb +mb +dJ +oY +aN +zU +is +hM +Et +NE +NE +GD +NE +NE +NE +uq +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (9,1,1) = {" -OP -Zy -Zy -hP -du -lv -yV -Hy -Qi -Ra -mz -jO -Zl -ME -Xd -Oj -LC -yX -LC -LC -LC -Mq -ME -Yt -BY -FO -Hj -Sc -YK -YK -kQ -uc -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Yr +Yr +Lm +ek +UD +kt +mb +pm +dp +SZ +VL +Ai +is +hM +NE +Ar +QU +vM +eA +NE +NE +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (10,1,1) = {" -Zy -Zy -Zy -Ra -Ra -Ra -Ra -HZ -Ra -Ra -df -jO -Zl -ME -FX -WP -yX -yX -LC -yX -yX -LC -ME -gI -BY -FO -nr -Sc -Sc -Sc -lM -uc -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Yr +Af +CL +bj +ql +Af +mb +bu +Uq +LF +GL +vx +is +BE +NE +ar +TF +Yz +Yz +Iy +NE +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +Gh "} (11,1,1) = {" -Zy -Zy -Zy -qq -dF -lL -yW -IA -Qv -Ra -XU -jO -hx -ME -ZS -pc -Vx -Rx -PV -Rx -yX -Jd -ME -Zn -Yg -FO -nr -xn -YK -Sc -En -KC -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Yr +rt +KB +Af +ge +Af +mb +nz +Am +Nt +dS +Be +is +dC +NE +jR +WS +Yz +Yz +gf +NE +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +vH +Gh "} (12,1,1) = {" -Zy -Zy -Zy -qq -dL -lP -zR -IA -yn -Ra -XU -jO -Zl -ME -ME -pQ -ME -ME -ME -ME -wR -ME -ME -DM -LN -fO -Eo -YK -YK -Sc -tT -KC -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Yr +Af +KB +lV +Yi +rB +mb +SP +ok +SP +Bl +wQ +ti +Nr +NE +Dn +ct +ez +dR +aT +NE +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +vH +Gh "} (13,1,1) = {" -Zy -Zy -Zy -qq -eb -lV -Mx -su -su -ZU -gi -YF -GW -Ta -SQ -KA -ML -PO -Ta -ML -XB -SQ -ML -av -Aa -fO -rx -YK -AN -Sc -cG -KC -Zy +Gh +Gh +JQ +Ef +Ef +Ef +Yr +Yr +OF +Yr +mi +mb +mb +mb +mb +mb +qE +mb +mb +mb +NE +NE +Hj +NE +NE +NE +NE +Ef +Ef +Ef +JQ +Gh +Gh +Gh +vH +vH +vH +Gh +Gh "} (14,1,1) = {" -Zy -Zy -Tr -Ra -Ra -Ra -Ra -IL -Rt -Ra -FB -YF -nE -YF -fG -YF -YF -YF -rI -YF -Ym -MY -Ym -Ym -LN -fO -Eo -YK -YK -Sc -tT -KC -Zy +Gh +Gh +Gh +Gh +Gh +Gh +kF +oa +ss +WO +ak +ss +ss +Kj +OC +kH +Yo +QH +Hr +Kj +ss +bA +ak +MM +ss +lg +kF +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +Gh +Gh +Gh "} (15,1,1) = {" -Zy -Zy -Zy -qq -gN -ml -Ra -We -SF -Ra -uU -YF -jo -Wh -Js -Wh -Wh -Wh -Wh -Wh -Wh -Js -Wh -Ec -mF -FO -nr -YK -YK -pF -En -KC -OP +Gh +Gh +Gh +Gh +Gh +Gh +kF +UL +tA +tA +iG +iG +iG +xl +iG +It +Kw +It +iG +xl +iG +iG +iG +tA +tA +UN +kF +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +Gh +Gh +Gh "} (16,1,1) = {" -Zy -OP -Zy -qq -hq -qy -Dg -IA -Rt -Ra -XU -YF -qW -Bb -Bb -Bb -Bb -Bb -Bb -Je -Mz -Bb -Bb -wv -tJ -FO -MS -YK -Zu -Sc -WR -uc -Zy +Gh +Gh +Gh +Gh +Gh +Gh +kF +Zz +Lp +WJ +WP +Lp +fz +DE +YO +cl +tV +Tf +gm +DE +Lp +Lp +WP +Lp +Lp +YT +kF +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +Gh +Gh +Gh "} (17,1,1) = {" -Zy -OP -OP -Ra -Ra -Ra -Ra -IA -SY -Ra -zz -YF -WL -Bb -PZ -BN -sn -Bb -Ay -ZN -ZN -uw -Bb -zf -lz -FO -Pq -YK -pH -Sc -OE -uc -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Gg +Gg +Gg +Gg +Gg +Gg +bD +Gg +Fb +PW +tV +gm +gM +lH +XZ +Ns +XZ +lH +lH +lH +lH +Ef +Ef +Ef +JQ +Gh +Gh +vH +vH +vH +Gh +Gh +Gh "} (18,1,1) = {" -OP -OP -OP -qq -ht -ml -Ra -IA -SY -Ra -wf -YF -Zl -Bb -PZ -lF -vC -Bb -lX -ZN -LE -PQ -Mz -zM -Zl -FO -zY -YK -wN -Sc -xQ -uc -Zy +Gh +Gh +Gh +Gh +Gh +Gh +hr +Lk +xw +JN +hJ +HC +Wi +Gg +Gg +LH +Wc +Ee +lH +lH +sy +tS +kg +Cz +kg +nC +lH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (19,1,1) = {" -Zy -OP -Zy -qq -hq -qy -Dg -IA -Te -Ra -XU -YF -Zl -Bb -fY -lF -vn -Bb -bd -ZN -Ws -mS -Mz -zM -Zl -FO -RY -Xu -Xk -Sc -Nu -uc -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Gg +tW +Ey +WQ +Gg +Zq +WE +YY +Gg +UL +tV +UN +lH +rb +xX +xX +xX +nw +xX +VR +lH +Ef +Ef +JQ +Gh +Gh +Gh +vH +vH +vH +Gh +Gh +Gh "} (20,1,1) = {" -Zy -Zy -Zy -Ra -Ra -Ra -Ra -IA -Ti -Ra -XU -YF -Zl -Bb -Bb -Uk -Bb -Bb -Ha -ZN -Ws -wy -Mz -hD -Zl -FO -Zw -YK -pj -Sc -Ps -uc -Zy +Gh +Gh +Gh +JQ +Ef +Ef +Gg +Gg +Gg +Gg +Gg +Jd +wd +iT +Gg +UL +tV +so +lH +CC +yl +xX +eY +xX +Hn +Mc +nu +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +Gh +Gh +Gh "} (21,1,1) = {" -Zy -Zy -Zy -qq -hz -ml -Ra -Lr -Ud -Ra -YV -Pu -lz -Bb -vr -sZ -vr -gf -kA -ZN -Ws -Qo -Bb -DL -Yy -FO -Jj -YK -Fy -Sc -De -uc -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Gg +zY +Ey +Fu +Gg +Jz +wd +kM +Gg +QA +tV +dc +lH +HO +xX +Ac +AE +xX +YL +Wl +nu +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +Gh +Gh +Gh "} (22,1,1) = {" -Zy -OP -Zy -qq -hq -qy -Dg -IA -Ug -Ra -XU -YF -Zl -Bb -yF -VB -Oa -Ws -Ws -Ws -Ws -ZN -Bb -xR -Zl -FO -hN -qw -vB -Sc -Ae -uc -Zy +Gh +Gh +Gh +Gh +Gh +Gh +hr +Kr +Ny +JN +Dr +Pt +wd +mw +Gg +PH +tV +UN +lH +dm +xX +xX +Ii +xX +TU +Wl +nu +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +Gh +Gh +Gh "} (23,1,1) = {" -Zy -Zy -Zy -Ra -Ra -Ra -Ra -IA -yn -Ra -Al -YF -Yy -Bb -ZN -ZN -Oa -ZN -ZN -JZ -ZN -SZ -Bb -Np -Zl -FO -qU -YK -ut -Sc -TM -uc -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Gg +Gg +Gg +Gg +Gg +IV +sU +mw +Gg +dQ +tV +Ew +lH +YB +xX +Ki +Mt +xX +Xl +Wl +nu +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +Gh +Gh +Gh +Gh "} (24,1,1) = {" -OP -Zy -Zy -qq -hT -ml -Ra -LP -Um -Ra -XU -YF -Zl -Bb -Bx -Lc -pN -wG -gD -Rb -MJ -YD -iJ -gi -Zl -FO -Oi -YK -bs -Sc -kw -uc -Zy +Gh +Gh +Gh +vH +vH +vH +Gg +Pa +Ur +zK +Gg +Pe +eU +Tm +ki +gS +tV +gS +Cg +Sh +Cj +Cj +yY +xX +Xl +Mc +nu +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +Gh +Gh +Gh +Gh "} (25,1,1) = {" -Zy -Zy -Zy -qq -hq -qy -Dg -IA -yn -aL -XU -YF -hm -Bb -ZB -ZB -Ma -ZB -ZB -nY -YD -YD -Bq -gi -Zl -FO -eR -YK -Vl -Sc -IX -uc -Zy +Gh +Gh +Gh +vH +vH +vH +Gg +Gg +Gr +Gg +Gg +Js +th +wX +hr +yj +tV +Ah +Ns +bt +kk +fl +Wq +xX +xX +iE +lH +Ef +Ef +JQ +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (26,1,1) = {" -OP -OP -Zy -Ra -Ra -Ra -Ra -IA -IA -Km -Zn -YF -Zl -Mz -ZB -AX -Ma -zG -Ma -Ke -YD -YD -Ax -gi -yl -Mp -Sc -Sc -Sc -Sc -Pl -uc -Zy +Gh +Gh +vH +vH +Gh +Gh +Gg +el +Bt +Bb +Bt +Lb +ZC +mw +fG +Vn +tV +Vn +XZ +sV +HH +rF +cO +jP +SN +wT +lH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (27,1,1) = {" -OP -OP -OP -qq -ie -ml -Ra -IA -Up -Ra -XU -YF -Zl -Mz -sh -bq -GA -Ez -FL -Ke -YD -YD -Ax -gi -Zl -FO -pe -YK -YK -YK -Sk -uc -Zy +Gh +Gh +vH +vH +Gh +Aa +Gg +Xz +wq +jo +dZ +vL +CH +rY +Gg +zF +tV +jC +Hv +Hv +Jx +Hv +Hv +Hv +Hv +Hv +Hv +Ef +Ef +Ef +JQ +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (28,1,1) = {" -OP -OP -OP -qq -hq -qy -Dg -IA -Vu -Ra -uZ -YF -Zl -Mz -sh -DN -ZB -RO -FL -Ke -YD -YD -Ax -gi -Zl -FO -Ml -rz -qm -yD -fB -uc -Zy +Gh +Gh +vH +vH +Gh +Gg +Gg +ZN +Gg +Gg +Gg +lX +YV +OS +Gg +lx +tV +UN +Hv +sc +Sd +pp +cd +oV +oV +tY +Hv +vH +vH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (29,1,1) = {" -OP -OP -OP -Ra -Ra -Ra -Ra -Lr -Vy -Ra -XU -YF -Zl -Mz -ZB -ZB -ZB -ZB -Ma -Ke -YD -YD -Ax -gi -Zl -FO -pu -YK -YK -YK -Ri -uc -Zy +Gh +Gh +vH +vH +vH +Gg +Ox +ty +aJ +qd +Gg +Oy +Ll +NH +Gg +EG +tV +UN +Hv +aZ +TC +nP +eX +TC +TC +iA +Hv +vH +vH +vH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (30,1,1) = {" -Zy -OP -Zy -qq -ja -ml -Ra -IA -VZ -Ra -XU -YF -Zl -fX -ZB -sh -Xl -Ab -Ma -Ke -YD -YD -Ax -gi -Zl -FO -pu -IZ -Ib -oQ -Ri -uc -Zy +Gh +Gh +vH +vH +vH +Gg +yW +ty +Da +Da +Df +Da +Ip +xt +Gg +pv +tV +UN +Hv +Om +Oe +yD +zj +TC +TC +JD +Hv +vH +vH +vH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (31,1,1) = {" -Zy -OP -Zy -qq -hq -qy -Dg -IA -Wt -Ra -FB -YF -Zl -Bb -bM -ZB -zD -ZB -Ma -Ke -YD -YD -Ax -aH -JV -FO -pu -YK -YK -YK -ti -uc -Zy +Gh +Gh +vH +vH +vH +Gg +By +ty +Da +Da +Df +Da +al +iX +Gg +EC +tV +qS +Hv +ci +TC +yD +XF +DG +TC +nV +Hv +vH +vH +vH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (32,1,1) = {" -Zy -Zy -Zy -Ra -Ra -Ra -Ra -Md -Ra -Ra -df -YF -qW -Bb -Bb -Mz -Mz -Mz -PD -oZ -TF -TF -AM -gi -Zl -FO -bo -FY -uj -sA -qY -uc -OP +Gh +Gh +Gh +vH +vH +Gg +Ni +ty +Ww +WB +Gg +Gg +Gg +Gg +Gg +UL +tV +UN +Hv +ci +TC +Qk +iz +bU +FP +ZZ +Hv +vH +vH +vH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (33,1,1) = {" -Zy -Zy -Zy -hP -jq -qB -Di +Gh +Gh +Gh +vH +vH +Gg +gc IA -Ww -aR -vi -YF -GW -ML -SQ -ML -ML -ML -KA -ML -ML -ML -ML -Hf -Zl -FO -nr -rE -Sv -Sv -Sv -uc -Zy +FT +FT +JC +Da +Da +IP +Gg +UL +tV +UN +Hv +yy +gT +qN +Hv +US +Hv +Hv +Hv +vH +vH +vH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (34,1,1) = {" -Zy -Zy -Zy -hP -jt -rm -Dn -MB -Ra -ha -sw -YF -YF -YF -Pu -YF -YF -YF -YF -tI -YF -YF -YF -YF -Zl -FO -ns -FO -FO -FO -FO -FO -Zy +Gh +Gh +Gh +Gh +vH +Gg +BZ +MZ +BW +DQ +Gg +hD +VD +Gg +Gg +lt +Wc +HP +Hv +Hv +eC +HJ +Hv +Wk +Wk +ex +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (35,1,1) = {" -Zy -Zy -Tr -hP -jR -sa -sa -ND -Ra -XU -sY -sY -YF -sY -AW -sY -sY -UI -YF -sY -sY -sY -sY -sw -GW -Ta -ML -Wl -dD -Ql -QC -Qt -Zy +Gh +Gh +JQ +Ef +Ef +Gg +Gg +Gg +Gg +Gg +Gg +Gg +Gg +Gg +oa +OC +tV +KR +Zj +Hv +Hv +yT +Hv +EI +UB +UB +UB +Ef +Ef +Ef +JQ +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (36,1,1) = {" -Zy -Zy -Zy -hP -kL -yn -yn -NS -Ra -fy -Wh -Wh -cL -Wh -Js -JR -PH -Wh -cL -AQ -vx -vx -vx -Uw -Gi -Gi -Wh -Ba -HQ -HQ -HQ -HQ -Zy +Gh +Gh +Gh +Gh +Gh +Gh +kF +iU +ss +ss +NC +TZ +Wz +Kj +OC +MG +tV +MG +lJ +Kj +Fw +Vu +ZV +ss +ss +lg +kF +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (37,1,1) = {" -Zy -OP -Zy -Yp -PK -sC -Ek -PK -PK -vm -sC -sC -jM -PK -PK -PK -AC -AC -nl -AC -AC -AC -AC -Wq -Wq -lh -Wq -Wq -gL -gL -Zy -Tr -Zy +Gh +Gh +Gh +Gh +Gh +Gh +kF +UL +tV +tV +tV +tV +tV +Wc +tV +tV +tV +tV +tV +Wc +tV +tV +tV +tV +tV +UN +kF +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (38,1,1) = {" -Zy -Zy -Zy -Yp -Yp -sF -Er -js -Xs -XS -XS -XS -dk -PK -ug -qF -AC -zP -Kc -Ne -Ne -Ne -AC -Zz -Ce -xP -Rw -Wq -gL -Zy -Zy -Zy -Zy +Gh +Gh +Gh +Gh +Gh +Gh +kF +Gk +Lp +WP +VB +BF +Xf +DE +PW +pb +tV +MG +Hp +DE +gY +BF +WY +Lp +Lp +YT +kF +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (39,1,1) = {" -Zy -Zy -Zy -Zy -Yp -aC -EH -bi -bi -bi -bi -bi -Om -QW -Dk -AK -AC -EO -qf -Bj -Bj -bt -AC -MN -Xn -FR -hZ -gL -OP -Zy -Zy -OP -Zy +Gh +Gh +Gh +Gh +Gh +Gh +vh +vh +vh +vh +vh +Jy +vh +vh +Zz +PW +tV +gm +YT +NV +NV +oK +NV +NV +UB +UB +UB +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (40,1,1) = {" -OP -Zy -Zy -Zy -Yp -tc -XS -Oe -XS -JM -XS -bi -xb -PK -Fx -Eg -AC -EO -Vs -am -am -RA -hg -BP -Xn -NZ -eJ -gL -Zy -Zy -OP -OP -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vh +vh +Ln +MS +Gn +Sc +vh +vh +lt +Wc +HP +NV +NV +mv +Gs +dK +NV +LG +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (41,1,1) = {" -Zy -Zy -OP -Zy -Yp -tc -XS -OX -XV -YR -XS -dO -dn -PK -pv -Dt -AC -iF -Vs -Xr -JQ -am -hg -eS -Xn -NZ -Ca -gL -Zy -Zy -OP -OP -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Nm +vh +do +Eo +Eo +jl +Qn +vh +UL +tV +UN +NV +qj +jb +Gs +sW +NV +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +Gh +Gh +Gh "} (42,1,1) = {" -Zy -Zy -Zy -Zy -Yp -ur -XS -Er -XY -Er -IE -bi -se -PK -PK -PK -AC -ww -Vs -am -fm -Vs -tP -NZ -NZ -NZ -MH -gL -Zy -Zy -OP -OP -Zy +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vh +NQ +Eo +dT +mL +xZ +vh +UL +tV +UN +NV +qj +jb +Gs +Mo +NV +sJ +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (43,1,1) = {" -Zy -Zy -Zy -Zy -Yp -vQ -XS -XS -XS -XS -iS -bi -Er -Qc -Xp -Wd -AC -KJ -wx -Vs -Vs -am -hg -sv -pD -hS -da -gL -Zy -OP -OP -OP -OP +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vh +vh +EL +vh +vh +vh +vh +lx +tV +qS +NV +wl +jb +Gs +Ws +NV +NV +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +Gh +Gh +Gh +Gh +Gh "} (44,1,1) = {" -Zy -OP -OP -Zy -Yp -vX -Ff -XS -Ff -XS -Ff -Er -NX -PK -mf -mf -AC -KJ -ts -hQ -Vs -Vs -UX -UX -Qj -RA -RA -gV -Zy -OP -OP -OP -OP +Gh +Gh +Gh +Gh +Gh +vH +vH +Gh +Nm +vh +je +ES +AA +OY +vh +la +tV +UN +NV +wl +jb +Gs +XT +UJ +NV +sJ +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (45,1,1) = {" -Zy -OP -OP -Zy -Yp -wd -GT -PC -GT -wb -GT -Ng -Yp -PK -lp -lp -AC -zK -ts -wA -Xm -MK -CK -wm -wB -am -SS -gV -Zy -OP -OP -OP -OP +Gh +Gh +Gh +vH +vH +vH +vH +Gh +Gh +vh +je +Ja +gq +fr +vh +UL +tV +UN +NV +et +Aj +mq +Sx +FW +Ck +NV +Ef +Ef +JQ +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +Gh +Gh "} (46,1,1) = {" -Zy -OP -OP -OP -Yp -PK -lp -lp -lp -lp -lp -PK -Yp -YA -jh -jh -gV -XJ -II -am +Gh +Gh +vH +vH +vH +vH +vH +Gh +Gh +vh +vh +pW +fS +nv +vh +pf +Qw +yg +NV +tL Nk -Sl -VN -wm -am -RA -Eh -gV -Zy -OP -OP -OP -Zy +Hk +vJ +fZ +Kt +ne +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +Gh +Gh "} (47,1,1) = {" -Zy -Zy -OP -OP -OP -YA -Zy -Zy -Zy -Zy -Zy -YA -Zy -Zy -Zy -Zy -gV -gV -AC -KF -am -am -yp -am -RA -AC -FS -AC -Zy -OP -OP -OP -Zy +Gh +Gh +vH +vH +vH +vH +vH +Gh +Gh +Nm +vh +vh +vh +kX +kX +NZ +ux +ei +kX +kX +qR +mY +Ay +fZ +fZ +ne +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (48,1,1) = {" -Zy -Zy -OP -OP -OP -OP -Zy -Zy -Zy -Zy -Zy -Zy -OP -OP -OP -Zy -Zy -gV -gV -qi -QU -RA -RA -RA -hr -AC -WM -AC -OP -OP -OP -OP -Zy +Gh +Gh +vH +vH +vH +vH +vH +Gh +Gh +Gh +Gh +Gh +Gh +kX +rH +nD +Do +tN +aK +kX +Kt +qG +St +kz +eo +ne +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +Gh +Gh +Gh +Gh +Gh "} (49,1,1) = {" -Zy -Zy -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -Zy -Zy -Zy -gV -gV -AC -wV -wV -wV -AC -AC -oi -AC -OP -OP -OP -OP -Zy +Gh +Gh +vH +vH +vH +vH +vH +Gh +vH +Gh +Gh +Gh +kX +kX +hQ +nD +XV +tN +oz +kX +kX +kX +kX +Ze +kX +kX +Ef +JQ +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +Gh "} (50,1,1) = {" -Zy -Zy -Zy -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -Zy -Zy -Zy -Zy -OP -OP -Zy -Zy -Zy -AC -Ty -AC -Zy -OP -OP -OP -Zy +Gh +Gh +Gh +vH +vH +vH +vH +Gh +Gh +Gh +JQ +Ef +kX +wx +xE +nD +nD +Zg +wB +kX +TM +Wp +Oa +fO +kX +Zk +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +vH +Gh "} (51,1,1) = {" -Zy -OP -Zy -Zy -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -Zy -OP -OP -OP -OP -OP -OP -OP -Zy -Zy -Zy -Zy -Zy -Zy -Zy +Gh +Gh +Gh +vH +vH +vH +vH +vH +Gh +Gh +Gh +Gh +ux +cP +rR +Im +hK +Hi +qK +kX +hg +vb +Ba +gA +kX +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +vH +vH +vH +vH +Gh "} (52,1,1) = {" -Zy -Zy -Zy -Zy -Zy -Zy -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -Zy -OP -OP -OP -OP -OP -OP -OP -OP -Zy -Zy -Zy -Zy -Zy -OP +Gh +Gh +Gh +vH +vH +vH +vH +vH +Gh +Gh +Gh +Gh +ux +zV +WT +UP +cT +tD +nD +NZ +Qv +Kb +EP +EP +kX +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} (53,1,1) = {" -Zy -Zy -Zy -Zy -OP -Zy -Zy -Zy -Zy -Zy -Zy -Zy -Zy -OP -OP -OP -Zy -Zy -Zy -Zy -OP -OP -OP -Zy -Zy -Zy -Zy -Zy -Zy -OP -Zy -Zy -Zy +Gh +vH +Gh +vH +vH +vH +vH +vH +Gh +Gh +Gh +Gh +ux +iK +rR +PU +XI +mC +Jm +kX +YM +Bs +tH +xC +kX +vH +vH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +"} +(54,1,1) = {" +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +JQ +Ef +Ef +kX +ao +hT +WT +zn +nD +am +kX +jp +yM +kX +kX +kX +vH +vH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +"} +(55,1,1) = {" +Gh +Gh +Gh +Gh +vH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +kX +kX +xh +WT +SU +WT +QY +kX +kX +ux +kX +Zk +Gh +vH +vH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +"} +(56,1,1) = {" +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Zk +kX +ef +WT +SU +WT +mf +kX +Zk +Gh +Ef +Gh +Gh +vH +vH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +"} +(57,1,1) = {" +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +kX +Wt +WT +Oj +WT +dy +kX +Gh +Gh +Ef +vH +vH +vH +vH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +"} +(58,1,1) = {" +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +kX +Fm +lp +Up +bM +uo +kX +vH +Gh +JQ +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +"} +(59,1,1) = {" +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Zk +ux +ux +ux +ux +ux +Zk +vH +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +"} +(60,1,1) = {" +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +"} +(61,1,1) = {" +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh +Gh "} diff --git a/modular_skyrat/modules/mapping/code/areas/space.dm b/modular_skyrat/modules/mapping/code/areas/space.dm index 7245aa6248e..583fbb8ef8c 100644 --- a/modular_skyrat/modules/mapping/code/areas/space.dm +++ b/modular_skyrat/modules/mapping/code/areas/space.dm @@ -232,31 +232,33 @@ /area/ruin/space/has_grav/cargodise_freighter/trauma name = "Freighter Trauma Center" - icon_state = "medbay1" /area/ruin/space/has_grav/cargodise_freighter/utility name = "Freighter Utility Room" - icon_state = "engine" /area/ruin/space/has_grav/cargodise_freighter/kitchen name = "Freighter Kitchen" - icon_state = "cafeteria" /area/ruin/space/has_grav/cargodise_freighter/bridge name = "Freighter Bridge" - icon_state = "bridge" /area/ruin/space/has_grav/cargodise_freighter/cargo name = "Freighter Cargo Bay" - icon_state = "cargo" /area/ruin/space/has_grav/cargodise_freighter/mining name = "Freighter Mining Office" - icon_state = "cargo" /area/ruin/space/has_grav/cargodise_freighter/quarters name = "Freighter Crew Quarters" - icon_state = "crew_quarters" + +/area/ruin/space/has_grav/cargodise_freighter/hydroponics + name = "Freighter Hydroponics" + +/area/ruin/space/has_grav/cargodise_freighter/vault + name = "Freighter Vault" + +/area/ruin/space/has_grav/cargodise_freighter/exterior + name = "Freighter Exterior" // Skyrat's Space Hotel diff --git a/modular_skyrat/modules/mapping/code/lockers/cargodiselost/cargodiselockers.dm b/modular_skyrat/modules/mapping/code/lockers/cargodiselost/cargodiselockers.dm new file mode 100644 index 00000000000..838fca7db3a --- /dev/null +++ b/modular_skyrat/modules/mapping/code/lockers/cargodiselost/cargodiselockers.dm @@ -0,0 +1,38 @@ +//Lockers used in cargodiselost.dmm + +//Ammo storage in freighter armoury +/obj/structure/closet/freighterammo + name = "Ammo Storage" + +//Freighter QM's gear locker +/obj/structure/closet/secure_closet/personal/cabinet/freighterboss + name = "Personal Closet" + +/obj/structure/closet/freighterammo/PopulateContents() + . = ..() + + new /obj/item/ammo_box/magazine/akm(src) + new /obj/item/ammo_box/magazine/akm(src) + new /obj/item/ammo_box/magazine/akm(src) + new /obj/item/ammo_box/magazine/akm(src) + new /obj/item/ammo_box/magazine/multi_sprite/makarov(src) + new /obj/item/ammo_box/magazine/multi_sprite/makarov(src) + new /obj/item/ammo_box/a762(src) + new /obj/item/ammo_box/a762(src) + new /obj/item/ammo_box/a762(src) + new /obj/item/ammo_box/a762(src) + +/obj/structure/closet/secure_closet/personal/cabinet/freighterboss/PopulateContents() + . = ..() + + new /obj/item/gun/ballistic/automatic/cfa_rifle(src) + new /obj/item/storage/bag/ammo(src) + new /obj/item/clothing/suit/armor/bulletproof(src) + new /obj/item/storage/belt/utility/syndicate(src) + new /obj/item/gps/mining(src) + new /obj/item/clothing/gloves/combat(src) + new /obj/item/storage/backpack/duffelbag/syndie(src) + new /obj/item/radio(src) + new /obj/item/ammo_box/magazine/cm68(src) + new /obj/item/ammo_box/magazine/cm68(src) + new /obj/item/ammo_box/magazine/cm68(src) diff --git a/tgstation.dme b/tgstation.dme index a0b880ad217..dde2de139bf 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6639,6 +6639,7 @@ #include "modular_skyrat\modules\mapping\code\areas\shuttles.dm" #include "modular_skyrat\modules\mapping\code\areas\space.dm" #include "modular_skyrat\modules\mapping\code\areas\station.dm" +#include "modular_skyrat\modules\mapping\code\lockers\cargodiselost\cargodiselockers.dm" #include "modular_skyrat\modules\mapping\code\lockers\interdyne_fob\cargo.dm" #include "modular_skyrat\modules\mapping\code\lockers\interdyne_fob\command.dm" #include "modular_skyrat\modules\mapping\code\lockers\interdyne_fob\engineering.dm" From e829b801855222c711715f54cff055eb07f0eaba Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 03:05:30 +0200 Subject: [PATCH 44/69] Automatic changelog for PR #22400 [ci skip] --- html/changelogs/AutoChangeLog-pr-22400.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22400.yml diff --git a/html/changelogs/AutoChangeLog-pr-22400.yml b/html/changelogs/AutoChangeLog-pr-22400.yml new file mode 100644 index 00000000000..f576c6edd70 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22400.yml @@ -0,0 +1,6 @@ +author: "Lunar248" +delete-after: True +changes: + - rscadd: "Completely revamps Freighter ghostrole, adding a new map, while trying to keep the spirit of the original." + - rscdel: "Removes the old Freighter map." + - bugfix: "Fixed the old area subtypes for the Freighter, and added new ones where they were missing before." \ No newline at end of file From 87f6aeabb923fcedce602cdde1776f99ac27db54 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 09:49:34 +0200 Subject: [PATCH 45/69] [MIRROR] Hulks cannot be aggressive grabbed by strong grabbers anymore [MDB IGNORE] (#22687) * Hulks cannot be aggressive grabbed by strong grabbers anymore (#76591) Hulks cannot be aggressive grabbed by strong grabbers anymore * Hulks cannot be aggressive grabbed by strong grabbers anymore --------- Co-authored-by: carlarctg <53100513+carlarctg@users.noreply.github.com> --- code/modules/mob/living/living.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 111c879fc4b..5605e630df0 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -389,7 +389,7 @@ if(iscarbon(L)) var/mob/living/carbon/C = L if(HAS_TRAIT(src, TRAIT_STRONG_GRABBER)) - C.grippedby(src) + C.grabbedby(src) update_pull_movespeed() From 8bc6e2530ad1a0cf09ddef2ee1431230c76f6786 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 09:53:16 +0200 Subject: [PATCH 46/69] [MIRROR] [NO-GBP] Changing shuttle events now alerts admins [MDB IGNORE] (#22688) * [NO-GBP] Changing shuttle events now alerts admins (#76939) If an admin forces 10 alien queen shuttle events, you'd probably want to alert the other admins. Previously this just put it in the admin log without telling anyone, but it's probably more fitting to just pop it in asay for how infrequent it is and considering forcing other events does it too :cl: admin: Changing shuttle events now alerts admins /:cl: Thanks to @ Rex9001 for calling it out * [NO-GBP] Changing shuttle events now alerts admins --------- Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com> --- code/modules/admin/verbs/change_shuttle_events.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/verbs/change_shuttle_events.dm b/code/modules/admin/verbs/change_shuttle_events.dm index a24aa456f23..4ec8a7cd7b8 100644 --- a/code/modules/admin/verbs/change_shuttle_events.dm +++ b/code/modules/admin/verbs/change_shuttle_events.dm @@ -31,12 +31,12 @@ if(result == "Clear") port.event_list.Cut() - log_admin("[key_name_admin(usr)] has cleared the shuttle events on: [port]") + message_admins("[key_name_admin(usr)] has cleared the shuttle events on: [port]") else if(options[result]) var/typepath = options[result] if(typepath in active) port.event_list.Remove(active[options[result]]) - log_admin("[key_name_admin(usr)] has removed '[active[result]]' from [port].") + message_admins("[key_name_admin(usr)] has removed '[active[result]]' from [port].") else port.event_list.Add(new typepath (port)) - log_admin("[key_name_admin(usr)] has added '[typepath]' to [port].") + message_admins("[key_name_admin(usr)] has added '[typepath]' to [port].") From 0f32f3c074ef7bea7ca60babc912e7b84855975d Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 09:59:27 +0200 Subject: [PATCH 47/69] Automatic changelog for PR #22687 [ci skip] --- html/changelogs/AutoChangeLog-pr-22687.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22687.yml diff --git a/html/changelogs/AutoChangeLog-pr-22687.yml b/html/changelogs/AutoChangeLog-pr-22687.yml new file mode 100644 index 00000000000..ee99b8eb07c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22687.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "Hulks cannot be aggressive grabbed by strong grabbers anymore" \ No newline at end of file From ebe3e61aee7379660c23592b76d2cd3371143ada Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 10:00:16 +0200 Subject: [PATCH 48/69] Automatic changelog for PR #22688 [ci skip] --- html/changelogs/AutoChangeLog-pr-22688.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22688.yml diff --git a/html/changelogs/AutoChangeLog-pr-22688.yml b/html/changelogs/AutoChangeLog-pr-22688.yml new file mode 100644 index 00000000000..1dba0aab16b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22688.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - admin: "Changing shuttle events now alerts admins" \ No newline at end of file From 12e44cf9b97fe71c9379986c75006902e754745c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 10:09:26 +0200 Subject: [PATCH 49/69] [MIRROR] Fixes emissives blockers being broken on mobs [MDB IGNORE] (#22690) * Fixes emissives blockers being broken on mobs (#77088) ## About The Pull Request Fixes https://github.com/tgstation/tgstation/issues/76065 Fixes https://github.com/tgstation/tgstation/issues/73860 ![firefox_woFR1lmIQq](https://github.com/tgstation/tgstation/assets/13398309/e9b48e8d-4c0d-484f-b57e-94f06a456934) https://github.com/tgstation/tgstation/pull/74453 _cough_ So it turned out that no emissive blocker overlays were being added to mobs because `blocks_emissive` being `FALSE` no longer means that it doesn't block emissives. We have to check for `EMISSIVE_BLOCK_NONE` instead after the optimization from the linked PR. ## Why It's Good For The Game ![dreamseeker_I9MuQEUjcC](https://github.com/tgstation/tgstation/assets/13398309/3a507c28-59e3-4276-b4f1-0babdcf952f1)
Fixes the window mesh prisons ![dreamseeker_wkCElt1Znp](https://github.com/tgstation/tgstation/assets/13398309/b9bb22a0-99f2-4ffa-ae32-6bc734be8353) ![dreamseeker_vhqFYt5X11](https://github.com/tgstation/tgstation/assets/13398309/b7364472-71c9-43e0-9ba8-bbb4bd5b489d)
No more of the weird partial transparency with buttons and the like ![dreamseeker_IweBhZRpa3](https://github.com/tgstation/tgstation/assets/13398309/04938001-6201-45b0-9caa-5a305b40e116) ![dreamseeker_PK06VGj28o](https://github.com/tgstation/tgstation/assets/13398309/c482228b-988a-4861-8037-204471f2408e)
## Changelog :cl: fix: fixes mobs missing most of their emissive blockers /:cl: * Fixes emissives blockers being broken on mobs --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- .../mob/living/carbon/alien/adult/adult_update_icons.dm | 6 +++--- code/modules/mob/living/carbon/carbon_update_icons.dm | 4 ++-- code/modules/surgery/bodyparts/_bodyparts.dm | 2 +- code/modules/surgery/bodyparts/head.dm | 2 +- code/modules/surgery/bodyparts/head_hair_and_lips.dm | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm b/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm index ff0b37692bd..8c211151123 100644 --- a/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm +++ b/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm @@ -67,7 +67,7 @@ if(handcuffed) var/mutable_appearance/handcuff_overlay = mutable_appearance(dmi_file, cuff_icon, -HANDCUFF_LAYER) - if(handcuffed.blocks_emissive) + if(handcuffed.blocks_emissive != EMISSIVE_BLOCK_NONE) handcuff_overlay += emissive_blocker(handcuff_overlay.icon, handcuff_overlay.icon_state, src, alpha = handcuff_overlay.alpha) overlays_standing[HANDCUFF_LAYER] = handcuff_overlay @@ -86,7 +86,7 @@ if(!itm_state) itm_state = l_hand.icon_state var/mutable_appearance/l_hand_item = mutable_appearance(alt_inhands_file, "[itm_state][caste]_l", -HANDS_LAYER) - if(l_hand.blocks_emissive) + if(l_hand.blocks_emissive != EMISSIVE_BLOCK_NONE) l_hand_item.overlays += emissive_blocker(l_hand_item.icon, l_hand_item.icon_state, src, alpha = l_hand_item.alpha) hands += l_hand_item @@ -96,7 +96,7 @@ if(!itm_state) itm_state = r_hand.icon_state var/mutable_appearance/r_hand_item = mutable_appearance(alt_inhands_file, "[itm_state][caste]_r", -HANDS_LAYER) - if(r_hand.blocks_emissive) + if(r_hand.blocks_emissive != EMISSIVE_BLOCK_NONE) r_hand_item.overlays += emissive_blocker(r_hand_item.icon, r_hand_item.icon_state, src, alpha = r_hand_item.alpha) hands += r_hand_item diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index aee3cde3bcc..ba3df70da4c 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -433,7 +433,7 @@ remove_overlay(HANDCUFF_LAYER) if(handcuffed && !(handcuffed.item_flags & ABSTRACT)) //SKYRAT EDIT ADDED !(handcuffed.item_flags & ABSTRACT) var/mutable_appearance/handcuff_overlay = mutable_appearance('icons/mob/simple/mob.dmi', "handcuff1", -HANDCUFF_LAYER) - if(handcuffed.blocks_emissive) + if(handcuffed.blocks_emissive != EMISSIVE_BLOCK_NONE) handcuff_overlay.overlays += emissive_blocker(handcuff_overlay.icon, handcuff_overlay.icon_state, src, alpha = handcuff_overlay.alpha) overlays_standing[HANDCUFF_LAYER] = handcuff_overlay @@ -477,7 +477,7 @@ RETURN_TYPE(/list) . = list() - if(blocks_emissive) + if(blocks_emissive != EMISSIVE_BLOCK_NONE) . += emissive_blocker(standing.icon, standing.icon_state, src, alpha = standing.alpha) SEND_SIGNAL(src, COMSIG_ITEM_GET_WORN_OVERLAYS, ., standing, isinhands, icon_file) diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 2cefde2e486..be805f8a092 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -978,7 +978,7 @@ // For some reason this was applied as an overlay on the aux image and limb image before. // I am very sure that this is unnecessary, and i need to treat it as part of the return list // to be able to mask it proper in case this limb is a leg. - if(blocks_emissive) + if(blocks_emissive != EMISSIVE_BLOCK_NONE) var/atom/location = loc || owner || src var/mutable_appearance/limb_em_block = emissive_blocker(limb.icon, limb.icon_state, location, layer = limb.layer, alpha = limb.alpha) limb_em_block.dir = image_dir diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index f8d052b3c82..1ab9cfb1821 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -216,7 +216,7 @@ if(eyes.overlay_ignore_lighting) eye_left.overlays += emissive_appearance(eye_left.icon, eye_left.icon_state, src, alpha = eye_left.alpha) eye_right.overlays += emissive_appearance(eye_right.icon, eye_right.icon_state, src, alpha = eye_right.alpha) - else if(blocks_emissive) + else if(blocks_emissive != EMISSIVE_BLOCK_NONE) var/atom/location = loc || owner || src eye_left.overlays += emissive_blocker(eye_left.icon, eye_left.icon_state, location, alpha = eye_left.alpha) eye_right.overlays += emissive_blocker(eye_right.icon, eye_right.icon_state, location, alpha = eye_right.alpha) diff --git a/code/modules/surgery/bodyparts/head_hair_and_lips.dm b/code/modules/surgery/bodyparts/head_hair_and_lips.dm index ea54ae4581a..a93eb88f9a7 100644 --- a/code/modules/surgery/bodyparts/head_hair_and_lips.dm +++ b/code/modules/surgery/bodyparts/head_hair_and_lips.dm @@ -91,7 +91,7 @@ var/image/lip_overlay = image('icons/mob/species/human/human_face.dmi', "lips_[lip_style]", -BODY_LAYER, image_dir) lip_overlay.color = lip_color //Emissive blocker - if(blocks_emissive) + if(blocks_emissive != EMISSIVE_BLOCK_NONE) lip_overlay.overlays += emissive_blocker(lip_overlay.icon, lip_overlay.icon_state, location, alpha = facial_hair_alpha) //Offsets worn_face_offset?.apply_offset(lip_overlay) @@ -105,7 +105,7 @@ facial_hair_overlay = image(sprite_accessory.icon, sprite_accessory.icon_state, -HAIR_LAYER, image_dir) facial_hair_overlay.alpha = facial_hair_alpha //Emissive blocker - if(blocks_emissive) + if(blocks_emissive != EMISSIVE_BLOCK_NONE) facial_hair_overlay.overlays += emissive_blocker(facial_hair_overlay.icon, facial_hair_overlay.icon_state, location, alpha = facial_hair_alpha) //Offsets worn_face_offset?.apply_offset(facial_hair_overlay) @@ -125,7 +125,7 @@ hair_overlay = image(sprite_accessory.icon, sprite_accessory.icon_state, -HAIR_LAYER, image_dir) hair_overlay.alpha = hair_alpha //Emissive blocker - if(blocks_emissive) + if(blocks_emissive != EMISSIVE_BLOCK_NONE) hair_overlay.overlays += emissive_blocker(hair_overlay.icon, hair_overlay.icon_state, location, alpha = hair_alpha) //Offsets // SKYRAT ADD - Hair offset From 4d1023de593d82af38872c45b2f81aca8ee0773b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 10:15:49 +0200 Subject: [PATCH 50/69] [MIRROR] Check for surgery before wounds [MDB IGNORE] (#22689) * Check for surgery before wounds (#77090) ## About The Pull Request When trying to use an item on a mob, check for surgery before wounds. This fixes surgeries (such as compound fracture) that use consumables such as bone gel being impossible to complete because it tries to use the item on the wound as the 'quick' treatment instead of the surgery. Moved the surgery check to its own mob/living proc because it's now used in two places. Closes https://github.com/tgstation/tgstation/issues/76832 Closes https://github.com/tgstation/tgstation/issues/76711 ## Why It's Good For The Game Compound fracture surgery completes successfully instead of making the patient scream in pain and take brute damage. ## Changelog :cl: LT3 fix: Consumables like bone gel will first be used for surgery before wounds /:cl: * Check for surgery before wounds --------- Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> --- code/_onclick/item_attack.dm | 12 ++---------- code/modules/mob/living/carbon/carbon.dm | 11 +++++++---- code/modules/mob/living/living.dm | 16 ++++++++++++++++ 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index fde429c4d66..b3d15e0c476 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -156,16 +156,8 @@ return ..() || ((obj_flags & CAN_BE_HIT) && attacking_item.attack_atom(src, user, params)) /mob/living/attackby(obj/item/attacking_item, mob/living/user, params) - for(var/datum/surgery/operations as anything in surgeries) - if(user.combat_mode) - break - if(IS_IN_INVALID_SURGICAL_POSITION(src, operations)) - continue - if(!(operations.surgery_flags & SURGERY_SELF_OPERABLE) && (user == src)) - continue - var/list/modifiers = params2list(params) - if(operations.next_step(user, modifiers)) - return TRUE + if(can_perform_surgery(user, params)) + return TRUE if(..()) return TRUE diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 99e63a54d4a..ef684ed5444 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -66,14 +66,17 @@ else mode() // Activate held item -/mob/living/carbon/attackby(obj/item/I, mob/living/user, params) +/mob/living/carbon/attackby(obj/item/item, mob/living/user, params) if(!all_wounds || !(!user.combat_mode || user == src)) return ..() + if(can_perform_surgery(user, params)) + return TRUE + for(var/i in shuffle(all_wounds)) - var/datum/wound/W = i - if(W.try_treating(I, user)) - return 1 + var/datum/wound/wound = i + if(wound.try_treating(item, user)) + return TRUE return ..() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 5605e630df0..dd461b041b0 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -989,6 +989,22 @@ if(body_position == LYING_DOWN && !buckled && prob(getBruteLoss()*200/maxHealth)) makeTrail(newloc, T, old_direction) +/** + * Called by mob/living attackby() + * Checks if there's active surgery on the mob that can be continued with the item + */ +/mob/living/proc/can_perform_surgery(mob/living/user, params) + for(var/datum/surgery/operations as anything in surgeries) + if(user.combat_mode) + break + if(IS_IN_INVALID_SURGICAL_POSITION(src, operations)) + continue + if(!(operations.surgery_flags & SURGERY_SELF_OPERABLE) && (user == src)) + continue + var/list/modifiers = params2list(params) + if(operations.next_step(user, modifiers)) + return TRUE + return FALSE ///Called by mob Move() when the lying_angle is different than zero, to better visually simulate crawling. /mob/living/proc/lying_angle_on_movement(direct) From 0790099ea336638bd0fb1c5ed0b42906b1569d01 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 10:20:12 +0200 Subject: [PATCH 51/69] [MIRROR] Metastation APC wiring fix [MDB IGNORE] (#22691) * Metastation APC wiring fix (#77072) ## About The Pull Request Seems the APCs were moved at some point and the wires did not follow suit. Changed wire routing in the following rooms: - Shared engineering storage - Weight Room - Rec Room Fixes #77064 ## Why It's Good For The Game Station APCs were not wired at roundstart and with the wires obscured troubleshooting would be more difficult than a regular power out scenario. ## Changelog :cl:Senefi fix: Wired MetaStation APCs that were not attached to the station's power grid at round start. /:cl: * Metastation APC wiring fix --------- Co-authored-by: Senefi <20830349+Peliex@users.noreply.github.com> --- _maps/map_files/MetaStation/MetaStation.dmm | 759 ++++++++++---------- 1 file changed, 376 insertions(+), 383 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 77f9c1e799e..0f224ceb261 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -727,13 +727,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/station/construction/storage_wing) -"aoj" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "aok" = ( /turf/open/floor/iron, /area/station/cargo/storage) @@ -792,17 +785,6 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"apO" = ( -/obj/effect/turf_decal/box/white{ - color = "#52B4E9" - }, -/obj/machinery/portable_atmospherics/canister/anesthetic_mix, -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/machinery/light/cold/dim/directional/south, -/turf/open/floor/iron/kitchen_coldroom, -/area/station/medical/coldroom) "apS" = ( /obj/structure/sink/directional/east, /obj/effect/turf_decal/stripes/line{ @@ -1085,14 +1067,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/command/gateway) -"ave" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/bodycontainer/morgue{ - dir = 1 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "avq" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -1222,6 +1196,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison) +"axR" = ( +/obj/machinery/light_switch/directional/east, +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/machinery/fax{ + fax_name = "Psychology Office"; + name = "Psychology Office Fax Machine" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) "axW" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -2740,10 +2727,6 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/station/solars/port/fore) -"aYP" = ( -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "aYT" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -3978,20 +3961,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"buE" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/window/spawner/directional/west, -/obj/effect/turf_decal/trimline/dark_red/line{ - dir = 8 - }, -/obj/effect/turf_decal/arrows/red{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/commons/fitness) "buF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -4515,13 +4484,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron, /area/station/science/robotics/lab) -"bFK" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood/parquet, -/area/station/medical/psychology) "bFN" = ( /obj/machinery/chem_dispenser{ layer = 2.7 @@ -4863,14 +4825,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"bMq" = ( -/obj/structure/closet{ - name = "janitorial supplies" - }, -/obj/item/storage/box/bodybags, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "bMA" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -5503,16 +5457,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/virology) -"bYn" = ( -/obj/structure/sign/warning/secure_area/directional/south, -/obj/structure/table/reinforced, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/break_room) "bYo" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -5828,6 +5772,23 @@ /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, /area/station/science/ordnance/freezerchamber) +"chn" = ( +/obj/structure/sign/warning/secure_area/directional/south, +/obj/structure/table/reinforced, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) +"chx" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "chH" = ( /obj/structure/chair/stool/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8843,19 +8804,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) -"dqg" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 8 - }, -/obj/structure/sign/departments/psychology/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "dqo" = ( /obj/machinery/conveyor{ dir = 1; @@ -9220,6 +9168,14 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"dyh" = ( +/obj/structure/closet{ + name = "janitorial supplies" + }, +/obj/item/storage/box/bodybags, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "dyr" = ( /obj/machinery/status_display/door_timer{ id = "Cell 3"; @@ -9551,6 +9507,13 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/grass, /area/station/science/research) +"dGi" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "dGq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/stairs/left{ @@ -10183,27 +10146,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/port) -"dRL" = ( -/obj/structure/table/reinforced, -/obj/item/tank/internals/anesthetic{ - pixel_x = 3 - }, -/obj/item/tank/internals/anesthetic, -/obj/item/tank/internals/anesthetic{ - pixel_x = -3 - }, -/obj/item/clothing/mask/breath/medical{ - pixel_y = -3 - }, -/obj/item/clothing/mask/breath/medical, -/obj/item/clothing/mask/breath/medical{ - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) "dRN" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -11928,13 +11870,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"etC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/bed/roller, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "etK" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 @@ -11992,11 +11927,6 @@ "eut" = ( /turf/closed/wall, /area/station/science/robotics/lab) -"euL" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/light_switch/directional/west, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "euQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -12443,6 +12373,17 @@ /obj/item/clothing/mask/breath/medical, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +"eEV" = ( +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/machinery/light/cold/dim/directional/south, +/turf/open/floor/iron/kitchen_coldroom, +/area/station/medical/coldroom) "eFC" = ( /obj/machinery/bluespace_vendor/directional/south, /obj/effect/turf_decal/tile/neutral, @@ -12549,19 +12490,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/lounge) -"eIr" = ( -/obj/machinery/light_switch/directional/east, -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/machinery/fax{ - fax_name = "Psychology Office"; - name = "Psychology Office Fax Machine" - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/wood/parquet, -/area/station/medical/psychology) "eIy" = ( /obj/structure/cable, /obj/machinery/photocopier, @@ -14790,15 +14718,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) -"fBe" = ( -/obj/structure/sign/departments/chemistry/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Medbay Main Hallway - Virology Junction"; - network = list("ss13","medbay") - }, -/obj/machinery/light/cold/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "fBi" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/effect/decal/cleanable/dirt, @@ -16266,6 +16185,11 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) +"gfo" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "gfD" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -17052,6 +16976,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"gui" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "guo" = ( /obj/machinery/door/poddoor/incinerator_atmos_main, /turf/open/floor/engine, @@ -17567,14 +17499,6 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"gEN" = ( -/obj/machinery/light/directional/north, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "gES" = ( /obj/machinery/computer/shuttle/labor{ dir = 4 @@ -18073,24 +17997,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/storage) -"gNr" = ( -/obj/structure/rack, -/obj/item/reagent_containers/cup/bottle/ethanol{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bottle/carbon{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/bottle/chlorine{ - pixel_x = 1 - }, -/obj/machinery/light/cold/dim/directional/east, -/turf/open/floor/iron/dark/textured_edge{ - dir = 8 - }, -/area/station/medical/chem_storage) "gNy" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -19061,6 +18967,19 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/commons/lounge) +"hhU" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/structure/sign/departments/psychology/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "hio" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -19367,6 +19286,12 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) +"hnt" = ( +/obj/structure/cable, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/commons/fitness) "hnv" = ( /obj/effect/turf_decal/bot, /obj/structure/mecha_wreckage/ripley, @@ -20362,6 +20287,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"hGG" = ( +/obj/effect/turf_decal/trimline/dark_red/mid_joiner, +/obj/effect/turf_decal/trimline/dark_red/line, +/turf/open/floor/iron/white/smooth_half, +/area/station/commons/fitness) "hGL" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -24532,11 +24462,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"jas" = ( -/obj/structure/table/reinforced, -/obj/item/storage/backpack/duffelbag/med/surgery, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "jay" = ( /obj/structure/chair{ dir = 4 @@ -24626,6 +24551,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"jcI" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/structure/closet/secure_closet/psychology, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) "jcJ" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -24978,6 +24912,14 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) +"jhP" = ( +/obj/structure/closet/athletic_mixed, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "jhS" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -25824,12 +25766,6 @@ /obj/machinery/shower/directional/north, /turf/open/floor/iron, /area/station/science/xenobiology) -"jwd" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/mannequin/skeleton, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "jwg" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -26250,13 +26186,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"jCF" = ( -/obj/structure/bodycontainer/morgue{ - dir = 1 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "jCM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, @@ -26824,6 +26753,18 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"jNl" = ( +/obj/structure/table, +/obj/item/storage/medkit/regular{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/medkit/regular, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "jNm" = ( /obj/effect/landmark/blobstart, /obj/machinery/camera/directional/north{ @@ -27578,6 +27519,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/space, /area/space/nearstation) +"jZO" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "jZP" = ( /obj/effect/turf_decal/siding/purple{ dir = 5 @@ -31267,13 +31212,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"lus" = ( -/obj/structure/closet/athletic_mixed, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "luE" = ( /obj/structure/rack, /obj/item/integrated_circuit/loaded/hello_world, @@ -31460,6 +31398,13 @@ }, /turf/open/floor/iron/cafeteria, /area/station/security/prison) +"lyx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/bed/roller, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "lyF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35339,6 +35284,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/space_hut) +"mSf" = ( +/obj/structure/weightmachine/weightlifter, +/obj/effect/turf_decal/tile/dark_red/half/contrasted, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white/textured_edge{ + dir = 1 + }, +/area/station/commons/fitness) "mSk" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -35887,6 +35841,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"nbm" = ( +/obj/structure/cable, +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "nbJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36021,6 +35983,11 @@ "ndS" = ( /turf/closed/wall/r_wall, /area/station/hallway/secondary/command) +"ndZ" = ( +/obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/med/surgery, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "ned" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -37716,6 +37683,19 @@ /obj/structure/easel, /turf/open/floor/plating, /area/station/maintenance/disposal) +"nIL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/storage_shared) "nIP" = ( /obj/structure/table/glass, /obj/item/paper_bin{ @@ -38642,6 +38622,27 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"oap" = ( +/obj/structure/table/reinforced, +/obj/item/tank/internals/anesthetic{ + pixel_x = 3 + }, +/obj/item/tank/internals/anesthetic, +/obj/item/tank/internals/anesthetic{ + pixel_x = -3 + }, +/obj/item/clothing/mask/breath/medical{ + pixel_y = -3 + }, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/mask/breath/medical{ + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "oar" = ( /obj/structure/chair/office/light{ dir = 1 @@ -40143,6 +40144,24 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"oED" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/bottle/ethanol{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/carbon{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/bottle/chlorine{ + pixel_x = 1 + }, +/obj/machinery/light/cold/dim/directional/east, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/medical/chem_storage) "oEM" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -42659,15 +42678,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/commons/lounge) -"pBm" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/cold/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "pBs" = ( /obj/structure/sign/warning/cold_temp/directional/north{ name = "\improper CRYOGENICS" @@ -44780,11 +44790,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"qoK" = ( -/obj/structure/closet/crate/freezer/blood, -/obj/effect/turf_decal/siding/white, -/turf/open/floor/iron/kitchen_coldroom, -/area/station/medical/coldroom) "qoR" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -44812,6 +44817,14 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"qpu" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "qpD" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -45406,14 +45419,6 @@ /obj/machinery/telecomms/processor/preset_two, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) -"qCw" = ( -/obj/structure/cable, -/obj/structure/bodycontainer/morgue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "qCC" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -47001,6 +47006,13 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"rci" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "rcq" = ( /obj/machinery/atmospherics/pipe/layer_manifold/purple/visible, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{ @@ -47284,16 +47296,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/wood, /area/station/commons/lounge) -"rjl" = ( -/obj/structure/weightmachine/weightlifter, -/obj/effect/turf_decal/tile/dark_red/half/contrasted, -/obj/effect/landmark/start/hangover, -/obj/machinery/light/directional/north, -/obj/structure/cable, -/turf/open/floor/iron/white/textured_edge{ - dir = 1 - }, -/area/station/commons/fitness) "rjz" = ( /obj/machinery/power/shieldwallgen, /obj/structure/extinguisher_cabinet/directional/west, @@ -47568,6 +47570,15 @@ /obj/machinery/duct, /turf/open/floor/iron/white/smooth_large, /area/station/medical/surgery/theatre) +"rpw" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "rpx" = ( /obj/machinery/suit_storage_unit/engine, /obj/effect/turf_decal/bot{ @@ -48782,15 +48793,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/engine, /area/station/science/explab) -"rKF" = ( -/obj/machinery/status_display/evac/directional/west, -/obj/structure/closet/secure_closet/psychology, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/wood/parquet, -/area/station/medical/psychology) "rKG" = ( /obj/structure/cable, /obj/machinery/door/airlock/virology/glass{ @@ -49367,6 +49369,10 @@ /obj/item/pillow/random, /turf/open/floor/wood, /area/station/commons/dorms) +"rUp" = ( +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "rUE" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -49420,6 +49426,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) +"rUU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) "rVb" = ( /obj/structure/sink/directional/west, /obj/item/reagent_containers/cup/watering_can, @@ -49459,6 +49473,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/construction/storage_wing) +"rVL" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/spawner/random/maintenance, +/obj/item/storage/belt/utility, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/storage_shared) "rVY" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50375,14 +50401,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"snU" = ( -/obj/structure/bodycontainer/morgue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "soa" = ( /obj/machinery/light/small/directional/south, /obj/structure/sign/poster/official/random/directional/south, @@ -52868,6 +52886,21 @@ dir = 1 }, /area/station/engineering/atmos/pumproom) +"tho" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/window/spawner/directional/west, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 8 + }, +/obj/effect/turf_decal/arrows/red{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/structure/cable, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/commons/fitness) "thQ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -55444,11 +55477,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port) -"ubs" = ( -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/station/commons/fitness) "ubw" = ( /obj/structure/lattice, /obj/structure/window/reinforced/spawner/directional/north, @@ -55648,19 +55676,6 @@ }, /turf/open/floor/iron, /area/station/security/office) -"uew" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave{ - pixel_y = 6 - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/checker, -/area/station/engineering/storage_shared) "ueB" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -56722,6 +56737,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/server) +"uzg" = ( +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + pixel_y = 6 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/checker, +/area/station/engineering/storage_shared) "uzi" = ( /obj/structure/lattice, /obj/structure/chair/sofa/corp/left{ @@ -56805,31 +56832,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port) -"uAT" = ( -/obj/structure/table, -/obj/item/storage/medkit/regular{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/medkit/regular, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/light/cold/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) -"uBo" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Medbay Break Room"; - network = list("ss13","medbay") - }, -/obj/item/radio/intercom/directional/west, -/obj/machinery/vending/coffee, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/break_room) "uBp" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 @@ -57561,10 +57563,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron, /area/station/service/janitor) -"uNG" = ( -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "uNO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -57672,14 +57670,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"uQy" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/virology) "uQF" = ( /obj/structure/lattice, /obj/item/stack/rods, @@ -57879,18 +57869,6 @@ /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"uUL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/storage_shared) "uUX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable/layer3, @@ -58574,6 +58552,15 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +"vhb" = ( +/obj/machinery/chem_dispenser{ + layer = 2.7 + }, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "vhj" = ( /obj/structure/chair{ name = "Judge" @@ -59011,6 +58998,13 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"vnV" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) "vnZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/flasher/directional/west{ @@ -60603,17 +60597,6 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) -"vPV" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/effect/spawner/random/maintenance, -/obj/item/storage/belt/utility, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/storage_shared) "vPW" = ( /obj/item/extinguisher, /turf/open/floor/plating, @@ -61474,6 +61457,15 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"wep" = ( +/obj/structure/sign/departments/chemistry/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Medbay Main Hallway - Virology Junction"; + network = list("ss13","medbay") + }, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "weq" = ( /obj/structure/sign/warning/secure_area{ desc = "A warning sign which reads 'BOMB RANGE"; @@ -61514,15 +61506,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/central) -"weP" = ( -/obj/machinery/chem_dispenser{ - layer = 2.7 - }, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "weS" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -61665,6 +61648,11 @@ /obj/item/stock_parts/matter_bin, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"whb" = ( +/obj/structure/closet/crate/freezer/blood, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/kitchen_coldroom, +/area/station/medical/coldroom) "whr" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -63124,6 +63112,13 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"wLi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/commons/fitness) "wLu" = ( /obj/structure/chair/office{ dir = 8 @@ -63705,6 +63700,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"wUH" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Medbay Break Room"; + network = list("ss13","medbay") + }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/vending/coffee, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) "wUM" = ( /obj/structure/cable, /obj/structure/table, @@ -64197,6 +64205,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port) +"xeT" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/mannequin/skeleton, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "xff" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64781,14 +64795,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"xpb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/station/commons/fitness) "xpi" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -64896,13 +64902,6 @@ /obj/effect/landmark/navigate_destination, /turf/open/floor/engine/cult, /area/station/service/library) -"xrf" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "xrr" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -67127,12 +67126,6 @@ }, /turf/open/floor/plating, /area/station/medical/chemistry) -"yfm" = ( -/obj/effect/turf_decal/trimline/dark_red/mid_joiner, -/obj/effect/turf_decal/trimline/dark_red/line, -/obj/structure/cable, -/turf/open/floor/iron/white/smooth_half, -/area/station/commons/fitness) "yfn" = ( /obj/machinery/vending/dinnerware, /obj/structure/cable, @@ -84613,7 +84606,7 @@ shK jUb huF xjH -uQy +rUU eSR vYJ xjH @@ -86151,9 +86144,9 @@ jUb iEm kym jUb -qoK +whb cqD -apO +eEV bLQ tXx tzE @@ -86917,7 +86910,7 @@ ixv jml wRZ mPF -dRL +oap jUb oOZ omm @@ -87440,7 +87433,7 @@ wFa iov nwl vun -etC +lyx wGk ukN vDc @@ -87960,7 +87953,7 @@ pDU ngl duw hyn -uBo +wUH lYx hYN cyX @@ -88219,7 +88212,7 @@ abX xTO lEP lEP -bYn +chn tBJ tBJ tBJ @@ -88479,8 +88472,8 @@ vRN xoj rOF ryf -bFK -rKF +vnV +jcI qNk tSw wZA @@ -89509,7 +89502,7 @@ ikS cnc igP sjx -eIr +axR tSw tAH fKP @@ -90003,7 +89996,7 @@ aPm sZH wUG eGJ -pBm +rpw gQG gQG gQG @@ -90020,9 +90013,9 @@ jfN eMI ctO egZ -dqg +hhU xar -aoj +chx tSw fje swP @@ -90525,12 +90518,12 @@ nmQ nmQ nmQ nmQ -fBe +wep xwD dVt iHn ubd -aYP +rUp nmQ nmQ nmQ @@ -91044,7 +91037,7 @@ qXL oqk xZB hIJ -weP +vhb lrZ kiz nmQ @@ -91561,11 +91554,11 @@ aeF hNV lrZ kiz -uNG +jZO fck aec ett -gNr +oED piT wLz tSw @@ -92052,7 +92045,7 @@ qPJ klj gQG oBO -uAT +jNl pKP jet aix @@ -92075,9 +92068,9 @@ hZV kBR kBR nZm -bMq +dyh iJC -euL +gfo sru tSw juV @@ -92335,7 +92328,7 @@ kOM xsv wsF gSN -jCF +dGi tSw vpP tSw @@ -92849,7 +92842,7 @@ kOM kOM rmD gSN -qCw +nbm tSw nNJ iUm @@ -93100,7 +93093,7 @@ uId dVN ogk hZV -jwd +xeT lxT pYo kOM @@ -93620,7 +93613,7 @@ vvd kOM uYG wfa -snU +gui tSw dbX iUm @@ -93872,12 +93865,12 @@ joj dWI hZV eyy -jas +ndZ hjF kOM pTx gSN -ave +qpu tSw iDN iUm @@ -102764,8 +102757,8 @@ rrt aaa aaa iHc -yfm -xpb +hGG +wLi cMG qMe fqB @@ -103021,9 +103014,9 @@ rrt lMJ blx aag -rjl +mSf htk -ubs +hnt cfy jlJ eZN @@ -103280,7 +103273,7 @@ aaa iHc gpF pHe -buE +tho aag szp jjG @@ -103796,7 +103789,7 @@ iHc iHc aag aag -lus +jhP clE byz biF @@ -104054,7 +104047,7 @@ lMJ aaa nvn mOl -xrf +tgo mnl biF cxU @@ -104311,7 +104304,7 @@ lMJ aaa szp szp -gEN +rci sqH jAs aiw @@ -109232,7 +109225,7 @@ qjl wlx qPT jRb -uew +uzg qsv sKD lUz @@ -109746,7 +109739,7 @@ nJM lOg pom pom -uUL +nIL qsv bjH bbi @@ -110003,7 +109996,7 @@ uJz iHy vSC eKw -vPV +rVL qsv lfd eup From d79f54f3f7d8f5ac1a2d406372f4af64f3c87a05 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 10:25:18 +0200 Subject: [PATCH 52/69] [MIRROR] Mafia chaplain seance can no longer be used on living people [MDB IGNORE] (#22692) * Mafia chaplain seance can no longer be used on living people (#77070) ## About The Pull Request Small oversight in how the use flag was checked. Also there was a misleading code comment that I removed. ## Why It's Good For The Game Fixes #77042 ## Changelog :cl: fix: Mafia chaplains can now only use their seances on dead people now. /:cl: * Mafia chaplain seance can no longer be used on living people --------- Co-authored-by: distributivgesetz --- code/modules/mafia/_defines.dm | 2 +- code/modules/mafia/abilities/abilities.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mafia/_defines.dm b/code/modules/mafia/_defines.dm index abf158d57ad..835aff9d63d 100644 --- a/code/modules/mafia/_defines.dm +++ b/code/modules/mafia/_defines.dm @@ -68,7 +68,7 @@ #define CAN_USE_ON_OTHERS (1<<0) ///Flag that decides whether the Mafia ability can be used on themselves. #define CAN_USE_ON_SELF (1<<1) -///Flag that decides whether the Mafia ability can be used on dead players. This overwrites the first two, and only allows for dead. +///Flag that decides whether the Mafia ability can be used on dead players. #define CAN_USE_ON_DEAD (1<<2) #define MAFIA_PHASE_SETUP "No Game" diff --git a/code/modules/mafia/abilities/abilities.dm b/code/modules/mafia/abilities/abilities.dm index ec4b7071ae8..59ee7570c32 100644 --- a/code/modules/mafia/abilities/abilities.dm +++ b/code/modules/mafia/abilities/abilities.dm @@ -56,7 +56,7 @@ return FALSE if(potential_target) - if(!(use_flags & CAN_USE_ON_DEAD) && (potential_target.game_status == MAFIA_DEAD)) + if((use_flags & CAN_USE_ON_DEAD) && (potential_target.game_status != MAFIA_DEAD)) if(!silent) to_chat(host_role.body, span_notice("This can only be used on dead players.")) return FALSE From 429a7710e10ce03bc58b5c66e67947468c1b32d7 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 10:29:42 +0200 Subject: [PATCH 53/69] Automatic changelog for PR #22690 [ci skip] --- html/changelogs/AutoChangeLog-pr-22690.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22690.yml diff --git a/html/changelogs/AutoChangeLog-pr-22690.yml b/html/changelogs/AutoChangeLog-pr-22690.yml new file mode 100644 index 00000000000..376fb595cb8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22690.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "fixes mobs missing most of their emissive blockers" \ No newline at end of file From b056d9f67ade8329251ca263a718ce3af5e756a3 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 10:30:27 +0200 Subject: [PATCH 54/69] Automatic changelog for PR #22689 [ci skip] --- html/changelogs/AutoChangeLog-pr-22689.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22689.yml diff --git a/html/changelogs/AutoChangeLog-pr-22689.yml b/html/changelogs/AutoChangeLog-pr-22689.yml new file mode 100644 index 00000000000..89906b59bc9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22689.yml @@ -0,0 +1,4 @@ +author: "LT3" +delete-after: True +changes: + - bugfix: "Consumables like bone gel will first be used for surgery before wounds" \ No newline at end of file From 093832de96dba502a0308006c76a53380d9f9a21 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 10:30:55 +0200 Subject: [PATCH 55/69] Automatic changelog for PR #22691 [ci skip] --- html/changelogs/AutoChangeLog-pr-22691.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22691.yml diff --git a/html/changelogs/AutoChangeLog-pr-22691.yml b/html/changelogs/AutoChangeLog-pr-22691.yml new file mode 100644 index 00000000000..c2a2aa3a423 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22691.yml @@ -0,0 +1,4 @@ +author: "Senefi" +delete-after: True +changes: + - bugfix: "Wired MetaStation APCs that were not attached to the station's power grid at round start." \ No newline at end of file From 2f845c3e6a7a04be773fdb7bac149060e86b3804 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 10:31:49 +0200 Subject: [PATCH 56/69] Automatic changelog for PR #22692 [ci skip] --- html/changelogs/AutoChangeLog-pr-22692.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22692.yml diff --git a/html/changelogs/AutoChangeLog-pr-22692.yml b/html/changelogs/AutoChangeLog-pr-22692.yml new file mode 100644 index 00000000000..0730fdd4164 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22692.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "Mafia chaplains can now only use their seances on dead people now." \ No newline at end of file From 168c9e4e8a19bdbde7c6cadf57bd222d79b64630 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 10:37:12 +0200 Subject: [PATCH 57/69] [MIRROR] Fixes bluespace bodybag duping [MDB IGNORE] (#22693) * Fixes bluespace bodybag duping (#77067) ## About The Pull Request Folded bluespace bodybags had no prior checks to see if the person picking the item up was the one inside of the bag. This naturally broke things, because BYOND doesn't like it when you have an infinite cycle of locs, so it refuses to move the folded bluespace item onto your mob. This then leads to the bluespace bodybag duping bug, as the item is still in your hand even though it really isn't. ## Why It's Good For The Game Fixes #44902 ## Changelog :cl: fix: Fixed a rare bug that let you spam bluespace bodybags everywhere. /:cl: * Fixes bluespace bodybag duping --------- Co-authored-by: distributivgesetz --- code/game/objects/items/bodybag.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 1109890e653..7e67b23c3b7 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -20,6 +20,12 @@ if(isopenturf(target)) deploy_bodybag(user, target) +/obj/item/bodybag/attempt_pickup(mob/user) + // can't pick ourselves up if we are inside of the bodybag, else very weird things may happen + if(contains(user)) + return TRUE + return ..() + /** * Creates a new body bag item when unfolded, at the provided location, replacing the body bag item. * * mob/user: User opening the body bag. From 7b31b463601af1b08bbe58254d8ce3a5db55a0f1 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 10:49:36 +0200 Subject: [PATCH 58/69] Automatic changelog for PR #22693 [ci skip] --- html/changelogs/AutoChangeLog-pr-22693.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22693.yml diff --git a/html/changelogs/AutoChangeLog-pr-22693.yml b/html/changelogs/AutoChangeLog-pr-22693.yml new file mode 100644 index 00000000000..732903c78c5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22693.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "Fixed a rare bug that let you spam bluespace bodybags everywhere." \ No newline at end of file From 2c856ec21504bb64d0d997ea581af9887f360430 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 19:36:31 +0200 Subject: [PATCH 59/69] [MIRROR] Fixes tgui_open_uis tracking [MDB IGNORE] (#22700) * Fixes tgui_open_uis tracking (#77101) Fixes https://github.com/tgstation/tgstation/issues/77097 This breaks uis for everyone with fancy-tgui off and in cases where the window is closed by external action (byond closing it) which is pretty bad. * Fixes tgui_open_uis tracking --------- Co-authored-by: AnturK --- code/controllers/subsystem/tgui.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm index c2633c3023a..c12c1b2bb32 100644 --- a/code/controllers/subsystem/tgui.dm +++ b/code/controllers/subsystem/tgui.dm @@ -285,6 +285,7 @@ SUBSYSTEM_DEF(tgui) * required ui datum/tgui The UI to be added. */ /datum/controller/subsystem/tgui/proc/on_open(datum/tgui/ui) + ui.user?.tgui_open_uis |= ui LAZYOR(ui.src_object.open_uis, ui) all_uis |= ui From 6af0f8b94aeacc9f6e7941c1eecb4e24bf0133d7 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 19:39:02 +0200 Subject: [PATCH 60/69] [MIRROR] gives the syndicate medical borg a bonesetter, blood filter, and bone gel so it can actually fix wounds [MDB IGNORE] (#22694) * gives the syndicate medical borg a bonesetter, blood filter, and bone gel so it can actually fix wounds (#77053) ## About The Pull Request Does what it says on the tin. I thought it was really weird that the dedicated `'physical trauma aid unit'` for nukies didn't have the tools to fix fractures or even joint dislocations. Now they can do surgical wound tendings that normal medborgs can. ## Why It's Good For The Game Fixes a really weird discrepancy between syndicate and normal medborgs where an emagged medborg could fix a nukie's shattered ribcage but the thing they spent actual TC on couldn't. ## Changelog :cl: balance: Huzzah! Interdyne Associates have finally upgraded their medborgs' firmware. They'll now have bonesetters and bonegel available! /:cl: * gives the syndicate medical borg a bonesetter, blood filter, and bone gel so it can actually fix wounds --------- Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> --- code/modules/mob/living/silicon/robot/robot_model.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index 5fcc69ae91b..d04fab42c6b 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -897,11 +897,14 @@ /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/melee/energy/sword/cyborg/saw, + /obj/item/bonesetter, + /obj/item/blood_filter, /obj/item/roller/robo, /obj/item/crowbar/cyborg, /obj/item/extinguisher/mini, /obj/item/pinpointer/syndicate_cyborg, /obj/item/stack/medical/gauze, + /obj/item/stack/medical/bone_gel, /obj/item/gun/medbeam, /obj/item/borg/apparatus/organ_storage, ) From d1d1961d47fcde88df90e0299f598837e87752fa Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 19:39:18 +0200 Subject: [PATCH 61/69] [MIRROR] The "Kidnap" progression traitor objective now displays the number of telecrystals awarded for a successful live kidnapping. [MDB IGNORE] (#22698) * The "Kidnap" progression traitor objective now displays the number of telecrystals awarded for a successful live kidnapping. (#77094) ## About The Pull Request The "Kidnap" progression traitor objective now displays the number of telecrystals awarded for a successful live kidnapping. ## Why It's Good For The Game Quality of life. ## Changelog :cl: Licks-The-Crystal qol: The "Kidnap" progression traitor objective now displays the number of telecrystals awarded for a successful live kidnapping. /:cl: --------- Co-authored-by: Jacquerel * The "Kidnap" progression traitor objective now displays the number of telecrystals awarded for a successful live kidnapping. --------- Co-authored-by: zeckle/licks-the-crystal <79835169+mikederkan@users.noreply.github.com> Co-authored-by: Jacquerel --- code/modules/antagonists/traitor/objectives/kidnapping.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/objectives/kidnapping.dm b/code/modules/antagonists/traitor/objectives/kidnapping.dm index b07ac80f97f..55d633ced94 100644 --- a/code/modules/antagonists/traitor/objectives/kidnapping.dm +++ b/code/modules/antagonists/traitor/objectives/kidnapping.dm @@ -1,7 +1,7 @@ /datum/traitor_objective/target_player/kidnapping name = "Kidnap %TARGET% the %JOB TITLE% and deliver them to %AREA%" description = "%TARGET% holds extremely important information regarding secret NT projects - and you'll need to kidnap and deliver them to %AREA%, where our transport pod will be waiting. \ - You'll get additional reward if %TARGET% is delivered alive." + If %TARGET% is delivered alive, you will be rewarded with an additional %TC% telecrystals." abstract_type = /datum/traitor_objective/target_player/kidnapping @@ -168,6 +168,7 @@ replace_in_name("%TARGET%", target_mind.name) replace_in_name("%JOB TITLE%", target_mind.assigned_role.title) replace_in_name("%AREA%", initial(dropoff_area.name)) + replace_in_name("%TC%", alive_bonus) return TRUE /datum/traitor_objective/target_player/kidnapping/ungenerate_objective() From ff73cf6dd7e462db9cabf019b341b15022ca2ad9 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 19:39:28 +0200 Subject: [PATCH 62/69] Automatic changelog for PR #22694 [ci skip] --- html/changelogs/AutoChangeLog-pr-22694.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22694.yml diff --git a/html/changelogs/AutoChangeLog-pr-22694.yml b/html/changelogs/AutoChangeLog-pr-22694.yml new file mode 100644 index 00000000000..e11d0e71640 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22694.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - balance: "Huzzah! Interdyne Associates have finally upgraded their medborgs' firmware. They'll now have bonesetters and bonegel available!" \ No newline at end of file From 1615927a9e3739d350a80ef7ae2b6ac8737f0df0 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 19:39:39 +0200 Subject: [PATCH 63/69] [MIRROR] Expands storage of tactical medkits. Also puts premium medkit in nukie med bundle as should. [MDB IGNORE] (#22696) * Expands storage of tactical medkits. Also puts premium medkit in nukie med bundle as should. (#77018) ## About The Pull Request Premium medkits weren't able to hold stuff they were spawning with so i expanded it. Also @ necromanceranne seemed to forgot to put premium medkit to surgical bundle, so i fixed it. ## Why It's Good For The Game Less bluespace magic. ## Changelog :cl: qol: Tactical medkits now can hold stuff it spawns with. fix: Nukie Medical Bundle now spawns with premium tactical medkit as it should. /:cl: --------- Co-authored-by: Time-Green <7501474+Time-Green@ users.noreply.github.com> * Expands storage of tactical medkits. Also puts premium medkit in nukie med bundle as should. --------- Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Co-authored-by: Time-Green <7501474+Time-Green@ users.noreply.github.com> --- code/game/objects/items/storage/backpack.dm | 2 +- code/game/objects/items/storage/medkit.dm | 121 +++++++++++--------- 2 files changed, 68 insertions(+), 55 deletions(-) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 6e57eedeb6b..097e7b24690 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -746,7 +746,7 @@ /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle/PopulateContents() new /obj/item/mod/module/magboot(src) - new /obj/item/storage/medkit/tactical(src) + new /obj/item/storage/medkit/tactical/premium(src) new /obj/item/gun/ballistic/automatic/l6_saw/toy(src) new /obj/item/ammo_box/foambox/riot(src) diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm index 1f4f53f42fd..4c347c07725 100644 --- a/code/game/objects/items/storage/medkit.dm +++ b/code/game/objects/items/storage/medkit.dm @@ -19,7 +19,61 @@ throw_speed = 3 throw_range = 7 var/empty = FALSE - var/damagetype_healed //defines damage type of the medkit. General ones stay null. Used for medibot healing bonuses + /// Defines damage type of the medkit. General ones stay null. Used for medibot healing bonuses + var/damagetype_healed + /// you just type this in holdables list of medkits instead of copypasting bunch of text. + var/static/list/list_of_everything_medkits_can_hold = list( + /obj/item/healthanalyzer, + /obj/item/dnainjector, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, + /obj/item/reagent_containers/cup/tube, + /obj/item/reagent_containers/pill, + /obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/medigel, + /obj/item/reagent_containers/spray, + /obj/item/lighter, + /obj/item/storage/fancy/cigarettes, + /obj/item/storage/pill_bottle, + /obj/item/stack/medical, + /obj/item/flashlight/pen, + /obj/item/extinguisher/mini, + /obj/item/reagent_containers/hypospray, + /obj/item/sensor_device, + /obj/item/radio, + /obj/item/clothing/gloves, + /obj/item/lazarus_injector, + /obj/item/bikehorn/rubberducky, + /obj/item/clothing/mask/surgical, + /obj/item/clothing/mask/breath, + /obj/item/clothing/mask/breath/medical, + /obj/item/surgical_drapes, + /obj/item/scalpel, + /obj/item/circular_saw, + /obj/item/bonesetter, + /obj/item/surgicaldrill, + /obj/item/retractor, + /obj/item/cautery, + /obj/item/hemostat, + /obj/item/blood_filter, + /obj/item/shears, + /obj/item/geiger_counter, + /obj/item/clothing/neck/stethoscope, + /obj/item/stamp, + /obj/item/clothing/glasses, + /obj/item/wrench/medical, + /obj/item/clothing/mask/muzzle, + /obj/item/reagent_containers/blood, + /obj/item/tank/internals/emergency_oxygen, + /obj/item/gun/syringe/syndicate, + /obj/item/implantcase, + /obj/item/implant, + /obj/item/implanter, + /obj/item/pinpointer/crew, + /obj/item/holosign_creator/medical, + /obj/item/stack/sticky_tape, + ) /obj/item/storage/medkit/Initialize(mapload) . = ..() @@ -76,58 +130,7 @@ atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL //holds the same equipment as a medibelt atom_storage.max_slots = 12 atom_storage.max_total_storage = 24 - atom_storage.set_holdable(list( - /obj/item/healthanalyzer, - /obj/item/dnainjector, - /obj/item/reagent_containers/dropper, - /obj/item/reagent_containers/cup/beaker, - /obj/item/reagent_containers/cup/bottle, - /obj/item/reagent_containers/cup/tube, - /obj/item/reagent_containers/pill, - /obj/item/reagent_containers/syringe, - /obj/item/reagent_containers/medigel, - /obj/item/reagent_containers/spray, - /obj/item/lighter, - /obj/item/storage/fancy/cigarettes, - /obj/item/storage/pill_bottle, - /obj/item/stack/medical, - /obj/item/flashlight/pen, - /obj/item/extinguisher/mini, - /obj/item/reagent_containers/hypospray, - /obj/item/sensor_device, - /obj/item/radio, - /obj/item/clothing/gloves/, - /obj/item/lazarus_injector, - /obj/item/bikehorn/rubberducky, - /obj/item/clothing/mask/surgical, - /obj/item/clothing/mask/breath, - /obj/item/clothing/mask/breath/medical, - /obj/item/surgical_drapes, //for true paramedics - /obj/item/scalpel, - /obj/item/circular_saw, - /obj/item/bonesetter, - /obj/item/surgicaldrill, - /obj/item/retractor, - /obj/item/cautery, - /obj/item/hemostat, - /obj/item/blood_filter, - /obj/item/shears, - /obj/item/geiger_counter, - /obj/item/clothing/neck/stethoscope, - /obj/item/stamp, - /obj/item/clothing/glasses, - /obj/item/wrench/medical, - /obj/item/clothing/mask/muzzle, - /obj/item/reagent_containers/blood, - /obj/item/tank/internals/emergency_oxygen, - /obj/item/gun/syringe/syndicate, - /obj/item/implantcase, - /obj/item/implant, - /obj/item/implanter, - /obj/item/pinpointer/crew, - /obj/item/holosign_creator/medical, - /obj/item/stack/sticky_tape, //surgical tape - )) + atom_storage.set_holdable(list_of_everything_medkits_can_hold) /obj/item/storage/medkit/surgery/PopulateContents() if(empty) @@ -283,8 +286,9 @@ /obj/item/storage/medkit/tactical/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL - atom_storage.max_slots = 12 + atom_storage.max_slots = 21 atom_storage.max_total_storage = 24 + atom_storage.set_holdable(list_of_everything_medkits_can_hold) /obj/item/storage/medkit/tactical/PopulateContents() if(empty) @@ -311,6 +315,14 @@ desc = "May or may not contain traces of lead." grind_results = list(/datum/reagent/lead = 10) +/obj/item/storage/medkit/tactical/premium/Initialize(mapload) + . = ..() + atom_storage.allow_big_nesting = TRUE // so you can put back the box you took out + atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL + atom_storage.max_slots = 21 + atom_storage.max_total_storage = 34 + atom_storage.set_holdable(list_of_everything_medkits_can_hold) + /obj/item/storage/medkit/tactical/premium/PopulateContents() if(empty) return @@ -333,6 +345,7 @@ /obj/item/clothing/glasses/hud/health/night/science = 1, ) generate_items_inside(items_inside,src) + list_of_everything_medkits_can_hold += items_inside /obj/item/storage/medkit/coroner name = "compact coroner's medkit" From 4b206786d2bcdcdfac3af1996688f661a79ddd61 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 19:39:53 +0200 Subject: [PATCH 64/69] Automatic changelog for PR #22698 [ci skip] --- html/changelogs/AutoChangeLog-pr-22698.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22698.yml diff --git a/html/changelogs/AutoChangeLog-pr-22698.yml b/html/changelogs/AutoChangeLog-pr-22698.yml new file mode 100644 index 00000000000..cee2618b67b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22698.yml @@ -0,0 +1,4 @@ +author: "Licks-The-Crystal" +delete-after: True +changes: + - qol: "The \"Kidnap\" progression traitor objective now displays the number of telecrystals awarded for a successful live kidnapping." \ No newline at end of file From 8831f09880e8fd7457785cd055a057b39cca7a49 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 19:40:32 +0200 Subject: [PATCH 65/69] Automatic changelog for PR #22696 [ci skip] --- html/changelogs/AutoChangeLog-pr-22696.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22696.yml diff --git a/html/changelogs/AutoChangeLog-pr-22696.yml b/html/changelogs/AutoChangeLog-pr-22696.yml new file mode 100644 index 00000000000..d78e1adedcd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22696.yml @@ -0,0 +1,5 @@ +author: "SkyratBot" +delete-after: True +changes: + - qol: "Tactical medkits now can hold stuff it spawns with." + - bugfix: "Nukie Medical Bundle now spawns with premium tactical medkit as it should." \ No newline at end of file From 5f188e17ac3f8e356e8e617530373525befc54e2 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 20:14:41 +0200 Subject: [PATCH 66/69] [MIRROR] Syndicate Duffelbag Rerework [MDB IGNORE] (#22699) * Syndicate Duffelbag Rerework * Update backpack.dm --------- Co-authored-by: carlarctg <53100513+carlarctg@users.noreply.github.com> Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- code/datums/storage/storage.dm | 15 ++++++ code/datums/storage/subtypes/duffel_bag.dm | 51 +++++++++++++++------ code/game/objects/items/crayons.dm | 2 +- code/game/objects/items/storage/backpack.dm | 38 +++++++++++---- code/modules/unit_tests/crayons.dm | 2 +- 5 files changed, 81 insertions(+), 27 deletions(-) diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm index a35efc2083e..a9f73840f14 100644 --- a/code/datums/storage/storage.dm +++ b/code/datums/storage/storage.dm @@ -139,6 +139,9 @@ RegisterSignal(resolve_parent, COMSIG_TOPIC, PROC_REF(topic_handle)) + RegisterSignal(resolve_parent, COMSIG_ATOM_EXAMINE, PROC_REF(handle_examination)) + RegisterSignal(resolve_parent, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(handle_extra_examination)) + orient_to_hud() /datum/storage/Destroy() @@ -234,6 +237,18 @@ if(href_list["show_valid_pocket_items"]) handle_show_valid_items(source, user) +/datum/storage/proc/handle_examination(datum/source, mob/user, list/examine_list) + SIGNAL_HANDLER + + if(!isnull(can_hold_description)) + examine_list += span_notice("You can examine this further to check what kind of extra items it can hold.") + +/datum/storage/proc/handle_extra_examination(datum/source, mob/user, list/examine_list) + SIGNAL_HANDLER + + if(!isnull(can_hold_description)) + examine_list += handle_show_valid_items(source, user) + /datum/storage/proc/handle_show_valid_items(datum/source, user) to_chat(user, span_notice("[source] can hold: [can_hold_description]")) diff --git a/code/datums/storage/subtypes/duffel_bag.dm b/code/datums/storage/subtypes/duffel_bag.dm index 95067651e08..02c3e99b78e 100644 --- a/code/datums/storage/subtypes/duffel_bag.dm +++ b/code/datums/storage/subtypes/duffel_bag.dm @@ -3,42 +3,63 @@ max_slots = 21 // Syndi bags get some FUN extras -// You can fit any 3 bulky objects (assuming they're in the whitelist) +// You can fit any 2 bulky objects (assuming they're in the whitelist) // Should have traitorus stuff in here, not just useful big things // Idea is to allow for things we typically restrict in exchange for going loud /datum/storage/duffel/syndicate silent = TRUE - exception_max = 3 + exception_max = 2 /datum/storage/duffel/syndicate/New() . = ..() - var/static/list/exception_cache = typecacheof(list( + var/static/list/exception_type_list = list( + // Gun and gun-related accessories /obj/item/gun, + /obj/item/pneumatic_cannon, + // Melee + /obj/item/kinetic_crusher, //mostly + /obj/item/dualsaber, /obj/item/staff/bostaff, + /obj/item/fireaxe, + /obj/item/crowbar/mechremoval, + /obj/item/spear, + /obj/item/nullrod, + /obj/item/melee/cleric_mace, + /obj/item/melee/ghost_sword, + /obj/item/melee/cleaving_saw, + // Deployables + /obj/item/transfer_valve, + /obj/item/powersink, /obj/item/deployable_turret_folded, /obj/item/cardboard_cutout, - /obj/item/dualsaber, - /obj/item/fireaxe, - /obj/item/pneumatic_cannon, - /obj/item/spear, - /obj/item/powersink, - /obj/item/transfer_valve, + /obj/item/gibtonite, + // Sustenance /obj/item/food/cheese/royal, /obj/item/food/powercrepe, - /obj/item/melee/cleric_mace, + // Back Items /obj/item/tank/jetpack, /obj/item/watertank, + // Skub + /obj/item/skub, + // Bulky Supplies + /obj/item/mecha_ammo, + /obj/item/golem_shell, + // Clothing /obj/item/clothing/shoes/winterboots/ice_boots/eva, /obj/item/clothing/suit/space, /obj/item/clothing/suit/armor/heavy, /obj/item/clothing/suit/bio_suit, /obj/item/clothing/suit/utility, - /obj/item/nullrod, + // Storage /obj/item/storage/bag/money, - /obj/item/kinetic_crusher, - /obj/item/melee/ghost_sword, - /obj/item/melee/cleaving_saw, + // Heads! /obj/item/bodypart/head, - )) + ) + + // We keep the type list and the typecache list separate... + var/static/list/exception_cache = typecacheof(exception_type_list) exception_hold = exception_cache + + //...So we can run this without it generating a line for every subtype. + can_hold_description = generate_hold_desc(exception_type_list) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index ea28b01f407..580632a84ba 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -21,7 +21,7 @@ */ /obj/item/toy/crayon - name = "red crayon" + name = "crayon" desc = "A colourful crayon. Looks tasty. Mmmm..." icon = 'icons/obj/art/crayons.dmi' icon_state = "crayonred" diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 097e7b24690..fb4ac67596f 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -72,13 +72,13 @@ user.suicide_log() qdel(user) + /obj/item/storage/backpack/santabag name = "Santa's Gift Bag" desc = "Space Santa uses this to deliver presents to all the nice children in space in Christmas! Wow, it's pretty big!" icon_state = "giftbag0" inhand_icon_state = "giftbag" w_class = WEIGHT_CLASS_BULKY - storage_type = /datum/storage/backpack/santabag /obj/item/storage/backpack/santabag/Initialize(mapload) . = ..() @@ -392,6 +392,14 @@ /// If this bag is zipped (contents hidden) up or not /// Starts enabled so you're forced to interact with it to "get" it var/zipped_up = TRUE + // How much time it takes to zip up (close) the duffelbag + var/zip_up_duration = 0.5 SECONDS + // Audio played during zipup + var/zip_up_sfx = 'sound/items/zip_up.ogg' + // How much time it takes to unzip the duffel + var/unzip_duration = 2.1 SECONDS + // Audio played during unzip + var/unzip_sfx = 'sound/items/un_zip.ogg' /obj/item/storage/backpack/duffelbag/Initialize(mapload) . = ..() @@ -425,9 +433,9 @@ return ..() balloon_alert(user, "unzipping...") - playsound(src, 'sound/items/un_zip.ogg', 100, FALSE) + playsound(src, unzip_sfx, 100, FALSE) var/datum/callback/can_unzip = CALLBACK(src, PROC_REF(zipper_matches), TRUE) - if(!do_after(user, 2.1 SECONDS, src, extra_checks = can_unzip)) + if(!do_after(user, unzip_duration, src, extra_checks = can_unzip)) user.balloon_alert(user, "unzip failed!") return balloon_alert(user, "unzipped") @@ -442,9 +450,9 @@ return SECONDARY_ATTACK_CALL_NORMAL balloon_alert(user, "zipping...") - playsound(src, 'sound/items/zip_up.ogg', 100, FALSE) + playsound(src, zip_up_sfx, 100, FALSE) var/datum/callback/can_zip = CALLBACK(src, PROC_REF(zipper_matches), FALSE) - if(!do_after(user, 0.5 SECONDS, src, extra_checks = can_zip)) + if(!do_after(user, zip_up_duration, src, extra_checks = can_zip)) user.balloon_alert(user, "zip failed!") return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN balloon_alert(user, "zipped") @@ -622,14 +630,25 @@ resistance_flags = FIRE_PROOF /obj/item/storage/backpack/duffelbag/syndie - name = "tactical duffel bag" //SKYRAT EDIT CHANGE, was "suspicious-looking duffel bag". It's just a black duffel. - desc = "A large duffel bag for holding extra tactical supplies." + name = "suspicious looking duffel bag" + desc = "A large duffel bag for holding extra tactical supplies. It contains an oiled plastitanium zipper for maximum speed tactical zipping, and is better balanced on your back than an average duffelbag. Can hold two bulky items!" icon_state = "duffel-syndie" inhand_icon_state = "duffel-syndieammo" storage_type = /datum/storage/duffel/syndicate resistance_flags = FIRE_PROOF - special_desc_requirement = EXAMINE_CHECK_SYNDICATE // SKYRAT EDIT ADDITION - special_desc = "This duffel bag has the Syndicate logo stiched on the inside. It appears to be made from lighter yet sturdier materials." // SKYRAT EDIT ADDITION + // Less slowdown while unzipped. Still bulky, but it won't halve your movement speed in an active combat situation. + zip_slowdown = 0.3 + // Faster unzipping. Utilizes the same noise as zipping up to fit the unzip duration. + unzip_duration = 0.5 SECONDS + unzip_sfx = 'sound/items/zip_up.ogg' + +//SKYRAT EDIT CHANGE START - It's just a black duffel. +/obj/item/storage/backpack/duffelbag/syndie + name = "tactical duffel bag" + desc = "A large duffel bag for holding extra tactical supplies." + special_desc_requirement = EXAMINE_CHECK_SYNDICATE + special_desc = "This duffel bag has the Syndicate logo stiched on the inside. It appears to be made from lighter yet sturdier materials, and features an oiled plastitanium zipper for maximum speed tactical zipping." +//SKYRAT EDIT CHANGE END /obj/item/storage/backpack/duffelbag/syndie/hitman desc = "A large duffel bag for holding extra things. There is a Nanotrasen logo on the back." @@ -666,7 +685,6 @@ new /obj/item/cautery/advanced(src) new /obj/item/surgical_drapes(src) new /obj/item/reagent_containers/medigel/sterilizine(src) - new /obj/item/surgicaldrill(src) new /obj/item/bonesetter(src) new /obj/item/blood_filter(src) new /obj/item/stack/medical/bone_gel(src) diff --git a/code/modules/unit_tests/crayons.dm b/code/modules/unit_tests/crayons.dm index be7255fdaec..ca2dfc629d3 100644 --- a/code/modules/unit_tests/crayons.dm +++ b/code/modules/unit_tests/crayons.dm @@ -3,7 +3,7 @@ /datum/unit_test/crayon_naming/Run() for(var/obj/item/toy/crayon/crayon_path as anything in typesof(/obj/item/toy/crayon)) - if(ispath(crayon_path, /obj/item/toy/crayon/spraycan)) + if(is_path_in_list(crayon_path, list(/obj/item/toy/crayon/spraycan, /obj/item/toy/crayon))) continue var/obj/item/toy/crayon/real_crayon = new crayon_path if(!findtext(initial(real_crayon.name),real_crayon.crayon_color)) From 1a200ff24b3e733c8e1dc432b78d41eaf9949b0e Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 20:15:11 +0200 Subject: [PATCH 67/69] Automatic changelog for PR #22699 [ci skip] --- html/changelogs/AutoChangeLog-pr-22699.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22699.yml diff --git a/html/changelogs/AutoChangeLog-pr-22699.yml b/html/changelogs/AutoChangeLog-pr-22699.yml new file mode 100644 index 00000000000..a3aa8391d3a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22699.yml @@ -0,0 +1,9 @@ +author: "SkyratBot" +delete-after: True +changes: + - balance: "Syndicate duffelbags can fit 2 extra bulky items, down from three." + - balance: "Reduced syndicate duffelbag's unzipped slowdown from '1' to '0.3', and set its zipping-up sped to 0.5, same as unzipping." + - rscadd: "Added the following items to the Syndicate Duffelbag bulky exception list: Greentext, mech removal tool, gibtonite, skub, golem shells, mech ammo. Roughly sorted the list by item category." + - bugfix: "Fixed the syndie surgery duffelbag having more items than it can hold by removing the redundant surgical drill (Upgraded cauteries can turn into one anyways)" + - qol: "Any storage item with a can_hold description can be examined twice to see what it can hold now." + - bugfix: "The parent crayon's name is 'crayon' to prevent any weirdness with things that show the parent type's name." \ No newline at end of file From 4297456272d17b491188eb8e8037fae5268a0374 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 20:15:59 +0200 Subject: [PATCH 68/69] [MIRROR] Resizing mobs also affects their maptext height [MDB IGNORE] (#22695) * Resizing mobs also affects their maptext height (#77065) ## About The Pull Request I'll make this brief: the maptext height isn't currently being affected by mob resizing unlike pixel y, which means text may overlap with an upsized mob's sprite. However, it's a mild issue to be frank. ## Why It's Good For The Game Making runechat look nicer I guess. ## Changelog :cl: fix: the height of runechat messages should now scale correctly with the current size variable of living mob. /:cl: * Resizing mobs also affects their maptext height --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/mob/living/living_defines.dm | 6 ++++-- code/modules/mob/living/living_update_icons.dm | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index df5a648b69f..d5e1c03be4a 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -206,10 +206,12 @@ /// Is this mob allowed to be buckled/unbuckled to/from things? var/can_buckle_to = TRUE - ///The y amount a mob's sprite should be offset due to the current position they're in (e.g. lying down moves your sprite down) - var/body_position_pixel_x_offset = 0 ///The x amount a mob's sprite should be offset due to the current position they're in + var/body_position_pixel_x_offset = 0 + ///The y amount a mob's sprite should be offset due to the current position they're in or size (e.g. lying down moves your sprite down) var/body_position_pixel_y_offset = 0 + ///The height offset of a mob's maptext due to their current size. + var/body_maptext_height_offset = 0 /// FOV view that is applied from either nativeness or traits var/fov_view diff --git a/code/modules/mob/living/living_update_icons.dm b/code/modules/mob/living/living_update_icons.dm index c82c30d92b3..0da1480de54 100644 --- a/code/modules/mob/living/living_update_icons.dm +++ b/code/modules/mob/living/living_update_icons.dm @@ -18,6 +18,10 @@ changed = TRUE ntransform.Scale(resize) current_size *= resize + //Update the height of the maptext according to the size of the mob so they don't overlap. + var/old_maptext_offset = body_maptext_height_offset + body_maptext_height_offset = initial(maptext_height) * (current_size - 1) + maptext_height += body_maptext_height_offset - old_maptext_offset //Update final_pixel_y so our mob doesn't go out of the southern bounds of the tile when standing if(!lying_angle || !rotate_on_lying) //But not if the mob has been rotated. //Make sure the body position y offset is also updated From 531bfcdd40bac44be78de0b17789631e63007364 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 20:16:31 +0200 Subject: [PATCH 69/69] Automatic changelog for PR #22695 [ci skip] --- html/changelogs/AutoChangeLog-pr-22695.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-22695.yml diff --git a/html/changelogs/AutoChangeLog-pr-22695.yml b/html/changelogs/AutoChangeLog-pr-22695.yml new file mode 100644 index 00000000000..76c8b0011a8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-22695.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "the height of runechat messages should now scale correctly with the current size variable of living mob." \ No newline at end of file