From cd7cb01a1f846272dcf3dc2c37970eff377b58a4 Mon Sep 17 00:00:00 2001
From: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Date: Sat, 15 Mar 2025 17:35:21 -0400
Subject: [PATCH] Meet the Smith - New Supply Role (#28273)
* Smith role, access, access helpers, spawn point, comms, and IDs
* Area defines
* Hammertime
* Cyberiad Smith's office
* Forgot some atmos stuff
* Autolathable Hammers
* Formatting
* Toolbelts can hold hammers
* Initial work on smith machines
* Farragus Smith Office
* Placeholder sprites, mapping
* Smart hopper points and console messages
* More work on smithing machines
* Fixed mapping, added qualities, added smithed items, fixed sizing, fixed access
* Smith components, new materials
* New ores, material datums, furnace, power hammer, kinetic assembler, hammer act, item creation
* Missed one
* Grrr map conflicts begone
* Dirt begone
* Casts and smelting
* Linters
* Attack chain linters!
* Better grip to throw people into your industrial machines
* Placeholder spots in the DMIs
* UpdatePaths - Space ruins now spawn new space ores in their rocks
* Small changes - removed excess tgui code from hopper
* Fixed a button on emerald
* Attaching inserts and lenses. Tool bits are pain.
* Tool bit initial implementation
* Merge conflict resolution
* Attack chain grrr
* Fixed a pair of minor mapping issues
* Tool bit implementation, efficiency, failure rate
* Hot things burn hands
* Points fix on hopper
* New mining rocks for space exploration
* Areas on asteroids
* Machinery icons 1
Adds basic icons for the new machinery
* Vendor iconstate update
* Crucible touchups
* Hammer touchups
* Crucible Input Animation
Adds an animation when you deposit ores
* Added scanning the crucible with multitool to get mineral count
* clothing sprites part 1
* locker sprite
* job icons
* garment bag
* Smith locker mapping
* Insert and Bit removal fix
* Job menu alignment fix, Allowed_items and small spriting path fixes
* Adds new asteroid ruins to config
* Ore Sprites
* Hammer Sprite
* Item Sprites 1
* Sheets, Wall Ores and Trim
* Sheet iconstate names
* species uniforms
* Tabs
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
* Lens spelling fix
* Signalizes attaching and detaching modifications, fixes inserting items into smith machines, fixes cast bugs
* Fixed type lists
* Smithing machine bug fixes.
* Fixed adding modifications to items
* Crucible Lava Idle
Adds an idle animation for the crucible, but it needs overlay code to work.
* Fixed eguns
* Magma Crucible overlays and animations
* Machine broken/Off states
Adds broken, wires exposed (and on/off where appropriate) states to machines.
* Castivend recolor and Hot Items
* Overlays for all machines, new sprites for hot items, new checks, fixes
* Woe, farragus merge conflict
* update_appearance linters
* I have fat fingers.
* Forgot one
* transfer_item_to and qdel null check
* Usr to User
* Modsuits should not have inserts.
* Adds casting lip overlay
* Balance pass on movement debuffs and buffs
* Material movespeed changes
* Config Adjustments - USED FOR TESTMERGING. REVERT BEFORE FULL MERGE
* Math fixes for lenses and bits.
* Mobility suit no longer speeds you up, but negates suit-based slowdown like an oil slick potion. Fixed movement mods in material datums
* Bad var. Bad.
* Various fixes to bugs revealed in initial TM
* TYPO
* Lavaland base turf fix
* Paths in examine fix
* Adds an intercom to the workshop.
* Stamina-hybrid damage oversight fix for det revolver, uion, etc.
* Currently Operating Message fix
* Allows glass to show different turfs beneath. Adds plasmaglass section to workshop.
* Armor and upgrade fixes
* RCD tool bit equip fix
* Adds smith access to a few lists in access.dm that were missed in an oversight
* Indent fixes
* Fixes vending machine, allows tool bit use on mining equipment
* CI, you make me mad sometimes
* Removed duplicate code
* Name fix for CI again
* ORM now can handle space ores
* Adds space ores to Vetus drop and to trader inventories
* Fixes runtime with open hand attacking a lava furnace with nothing in it
* Adds crewvend kit to Castivend
* Fixes not being able to see new ores
* Adds drill and RCS to smith locker
* Map changes. Added cargo pad. Expanded catwalk. Moved vendors. Added recharger.
* Plant fixes
* Fixes doubled-up catwalk
* Emerald cargo windoor fix, small lavaland adjustment
* Small oversight for overlay fix
* Missing lightswitches
* Fixed stock parts mismatch in casting basin recipe
* Better support for power tools, grrr attackchain
* Better attack chain handling. Better handling for bit insertion
* Fixes handling of inserts with storage suits (like labcoats)
* sprites for bomber + plasmeme outfit
* Adds missing adjacency checks
* Buffs speed boost from upgrade - max upgrade reduces cycle to 2 seconds.
* Fixed floating lights, brightened the explorer's new room, expanded smith workshop slightly.
* Small hallway adjustment
* Illuminates metastation smith office
* Removes excessive decimals in magma crucible scan output
* Berserker should not have inserts.
* Buffs bit durability significantly, nerfs amplifier lens and densifier lense slightly
* Adds smith bomber jacket to loadout panel
* Adds random spawners for smithed items, adds random low-quality items to maints loot
* Adds traitor version of bulldog shotgun
* Revert "Adds traitor version of bulldog shotgun"
This reverts commit 1d39c59f07f7c9e1935aacb614921cc9dc7d69d0.
* Added check to assembler, moved desc changes to examine()
* plasmaman suit fix
* Fixed hot check when removing items from hammer and furnace
* Remaps lavaland workshop, fixed deltastation light switch
* Improper's the smith office name
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
* Compacts extra ore drops from Vetus
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
* better looping
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
* Better loop
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
* Multitools don't need tool bits.
* Better variable names, fixed missing parenthesis
* Recursive hammering, removed attack animations when inserting items or using multitool on smithing machines
* window
* Update deltastation.dmm
* Update deltastation.dmm
* Update deltastation.dmm
* Fixes small oversights
* Minor lavaland remap
* Reverts TM-required changes in preparation for full merge
* Begone, stray font!
* Damn you cable CI
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: ExusA <67055922+ExusA@users.noreply.github.com>
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
---
.../RandomRuins/SpaceRuins/asteroid1.dmm | 2 +-
.../RandomRuins/SpaceRuins/asteroid2.dmm | 2 +-
.../RandomRuins/SpaceRuins/asteroid3.dmm | 4 +-
.../RandomRuins/SpaceRuins/asteroid4.dmm | 4 +-
.../RandomRuins/SpaceRuins/asteroid5.dmm | 4 +-
.../SpaceRuins/asteroidmining1.dmm | 1277 +++++
.../SpaceRuins/asteroidmining2.dmm | 973 ++++
.../SpaceRuins/asteroidmining3.dmm | 1724 ++++++
.../SpaceRuins/clockwork_monastery.dmm | 4 +-
.../RandomRuins/SpaceRuins/deepstorage.dmm | 4 +-
.../RandomRuins/SpaceRuins/derelict4.dmm | 2 +-
.../RandomRuins/SpaceRuins/derelict5.dmm | 2 +-
.../RandomRuins/SpaceRuins/druglab.dmm | 2 +-
.../RandomRuins/SpaceRuins/golemtarget.dmm | 2 +-
.../RandomRuins/SpaceRuins/listeningpost.dmm | 2 +-
.../RandomRuins/SpaceRuins/meatpackers.dmm | 6 +-
.../RandomRuins/SpaceRuins/oldstation.dmm | 2 +-
.../SpaceRuins/syndicatedruglab.dmm | 2 +-
.../SpaceRuins/syndie_space_base.dmm | 2 +-
.../RandomRuins/SpaceRuins/syndiedepot.dmm | 2 +-
.../RandomRuins/SpaceRuins/way_home.dmm | 4 +-
_maps/map_files/generic/Lavaland.dmm | 2118 +++++---
_maps/map_files/stations/boxstation.dmm | 1147 ++--
_maps/map_files/stations/cerestation.dmm | 951 ++--
_maps/map_files/stations/deltastation.dmm | 1498 +++---
_maps/map_files/stations/emeraldstation.dmm | 975 ++--
_maps/map_files/stations/metastation.dmm | 4747 +++++++++--------
code/__DEFINES/access_defines.dm | 1 +
code/__DEFINES/construction_defines.dm | 4 +
code/__DEFINES/dcs/atom_signals.dm | 7 +
code/__DEFINES/job_defines.dm | 1 +
code/__DEFINES/tools_defines.dm | 1 +
code/_globalvars/lists/maint_loot_tables.dm | 1 +
code/datums/components/material_container.dm | 24 +
code/datums/dog_fashion.dm | 4 +
code/datums/ores.dm | 12 +
code/datums/ruins/space_ruins.dm | 18 +
code/datums/smith_datums.dm | 267 +
code/datums/station_traits/positive_traits.dm | 1 +
code/game/area/areas/mining_areas.dm | 4 +
code/game/area/ss13_areas/supply_areas.dm | 4 +
code/game/atom/atom_tool_acts.dm | 2 +
code/game/atoms.dm | 3 +
code/game/jobs/access.dm | 6 +-
code/game/jobs/departments.dm | 1 +
code/game/jobs/job/support.dm | 35 +-
code/game/jobs/job_globals.dm | 1 +
.../computer/arcade_games/recruiter.dm | 2 +-
code/game/machinery/machine_frame.dm | 67 +
code/game/machinery/smith_machines.dm | 1108 ++++
code/game/machinery/tcomms/nttc.dm | 3 +
.../machinery/vendors/departmental_vendors.dm | 23 +
code/game/objects/effects/landmarks.dm | 4 +
.../traders/trader_department_spawners.dm | 6 +-
code/game/objects/items.dm | 50 +
.../objects/items/stacks/sheets/mineral.dm | 36 +
.../items/stacks/sheets/sheet_types.dm | 1 +
code/game/objects/items/tools/crowbar.dm | 10 +
code/game/objects/items/tools/hammer.dm | 33 +
code/game/objects/items/tools/screwdriver.dm | 7 +
.../objects/items/tools/tool_behaviour.dm | 11 +
code/game/objects/items/tools/welder.dm | 3 +
code/game/objects/items/tools/wirecutters.dm | 10 +
code/game/objects/items/tools/wrench.dm | 10 +
code/game/objects/items/weapons/RCD.dm | 6 +
code/game/objects/items/weapons/cards_ids.dm | 8 +-
.../objects/items/weapons/storage/belt.dm | 3 +-
.../objects/items/weapons/storage/garment.dm | 17 +
.../objects/items/weapons/vending_items.dm | 4 +
.../closets/secure/cargo_lockers.dm | 14 +
.../game/turfs/simulated/floor/transparent.dm | 20 +-
code/game/turfs/simulated/minerals.dm | 50 +
code/modules/client/preference/character.dm | 18 +-
.../client/preference/loadout/loadout_suit.dm | 5 +
code/modules/clothing/clothing.dm | 53 +
code/modules/clothing/gloves/misc_gloves.dm | 16 +
code/modules/clothing/head/beret.dm | 11 +
code/modules/clothing/head/soft_caps.dm | 7 +
code/modules/clothing/shoes/misc_shoes.dm | 11 +
code/modules/clothing/spacesuits/plasmamen.dm | 6 +
code/modules/clothing/suits/armor_suits.dm | 4 +
code/modules/clothing/suits/job_suits.dm | 23 +
code/modules/clothing/suits/labcoat.dm | 2 +
code/modules/clothing/suits/misc_suits.dm | 50 +-
code/modules/clothing/suits/suit_storage.dm | 8 +-
code/modules/clothing/under/jobs/cargo.dm | 21 +
.../under/jobs/plasmamen/civilian_service.dm | 6 +
code/modules/crafting/smithed_items.dm | 1198 +++++
code/modules/lavaland/lavaland_theme.dm | 6 +-
code/modules/mapping/access_helpers.dm | 3 +
.../modules/mapping/windoor_access_helpers.dm | 3 +
code/modules/mining/equipment/mining_tools.dm | 10 +
.../mining/lavaland/loot/ancient_loot.dm | 8 +
.../mining/lavaland/necropolis_chests.dm | 1 +
code/modules/mining/machine_redemption.dm | 10 +-
code/modules/mining/ores_coins.dm | 41 +
code/modules/mod/mod_clothes.dm | 1 +
.../projectiles/ammunition/energy_lens.dm | 4 +
code/modules/projectiles/firing.dm | 5 +
.../guns/energy/kinetic_accelerator.dm | 1 +
code/modules/projectiles/guns/energy_guns.dm | 43 +
.../research/designs/autolathe_designs.dm | 8 +
.../research/designs/machine_designs.dm | 60 +
code/modules/surgery/tools.dm | 21 +
code/modules/telesci/rcs.dm | 10 +-
config/example/config.toml | 4 +
icons/effects/ore_visuals.dmi | Bin 17382 -> 28946 bytes
icons/mob/clothing/feet.dmi | Bin 24183 -> 24549 bytes
icons/mob/clothing/hands.dmi | Bin 7484 -> 11342 bytes
icons/mob/clothing/head/beret.dmi | Bin 3890 -> 3832 bytes
icons/mob/clothing/head/softcap.dmi | Bin 3209 -> 3431 bytes
icons/mob/clothing/species/drask/gloves.dmi | Bin 7845 -> 13264 bytes
.../mob/clothing/species/drask/head/beret.dmi | Bin 1726 -> 1850 bytes
icons/mob/clothing/species/drask/shoes.dmi | Bin 24309 -> 24638 bytes
.../mob/clothing/species/drask/suits/coat.dmi | Bin 6957 -> 8077 bytes
.../clothing/species/drask/under/cargo.dmi | Bin 5604 -> 7490 bytes
icons/mob/clothing/species/grey/gloves.dmi | Bin 1135 -> 1379 bytes
.../mob/clothing/species/grey/suits/coat.dmi | Bin 6417 -> 7488 bytes
.../mob/clothing/species/grey/under/cargo.dmi | Bin 6275 -> 7310 bytes
icons/mob/clothing/species/kidan/gloves.dmi | Bin 9561 -> 9873 bytes
.../mob/clothing/species/kidan/head/beret.dmi | Bin 3942 -> 3880 bytes
.../clothing/species/kidan/head/softcap.dmi | Bin 3420 -> 3505 bytes
.../mob/clothing/species/kidan/suits/coat.dmi | Bin 6364 -> 7502 bytes
.../clothing/species/kidan/under/cargo.dmi | Bin 5895 -> 7824 bytes
.../mob/clothing/species/plasmaman/helmet.dmi | Bin 45902 -> 48579 bytes
.../clothing/species/plasmaman/uniform.dmi | Bin 59449 -> 62987 bytes
icons/mob/clothing/species/vox/gloves.dmi | Bin 7890 -> 12183 bytes
icons/mob/clothing/species/vox/head/beret.dmi | Bin 3923 -> 3908 bytes
.../mob/clothing/species/vox/head/softcap.dmi | Bin 3319 -> 3658 bytes
icons/mob/clothing/species/vox/shoes.dmi | Bin 25183 -> 25563 bytes
icons/mob/clothing/species/vox/suits/coat.dmi | Bin 6759 -> 7932 bytes
.../mob/clothing/species/vox/under/cargo.dmi | Bin 5677 -> 7491 bytes
icons/mob/clothing/suits/coat.dmi | Bin 6745 -> 7919 bytes
icons/mob/clothing/suits/utility.dmi | Bin 2970 -> 3241 bytes
icons/mob/clothing/under/cargo.dmi | Bin 6066 -> 7928 bytes
icons/mob/corgi_head.dmi | Bin 19785 -> 34857 bytes
icons/mob/hud/job_assets.dmi | Bin 1307 -> 1381 bytes
icons/mob/hud/sechud.dmi | Bin 4846 -> 4857 bytes
icons/obj/card.dmi | Bin 16092 -> 16926 bytes
icons/obj/closet.dmi | Bin 48505 -> 48682 bytes
icons/obj/clothing/gloves.dmi | Bin 10024 -> 16389 bytes
icons/obj/clothing/head/beret.dmi | Bin 6285 -> 6861 bytes
icons/obj/clothing/head/softcap.dmi | Bin 3649 -> 3993 bytes
icons/obj/clothing/shoes.dmi | Bin 18365 -> 18589 bytes
icons/obj/clothing/species/plasmaman/hats.dmi | Bin 14800 -> 15190 bytes
.../clothing/species/plasmaman/uniform.dmi | Bin 11807 -> 12431 bytes
icons/obj/clothing/suits/coat.dmi | Bin 3513 -> 3934 bytes
icons/obj/clothing/suits/utility.dmi | Bin 1241 -> 2852 bytes
icons/obj/clothing/under/cargo.dmi | Bin 2095 -> 2551 bytes
.../obj/machines/large_smithing_machines.dmi | Bin 0 -> 14006 bytes
icons/obj/machines/magma_crucible.dmi | Bin 0 -> 17535 bytes
icons/obj/machines/mining_machines.dmi | Bin 4794 -> 5495 bytes
icons/obj/machines/smithing_machines.dmi | Bin 0 -> 4258 bytes
icons/obj/smithing.dmi | Bin 0 -> 4077 bytes
icons/obj/stacks/minerals.dmi | Bin 15328 -> 26441 bytes
icons/obj/stacks/ores.dmi | Bin 2146 -> 6424 bytes
icons/obj/tools.dmi | Bin 24817 -> 25219 bytes
icons/obj/vending.dmi | Bin 107144 -> 112019 bytes
icons/turf/areas.dmi | Bin 34397 -> 33693 bytes
icons/turf/floors/Chasms.dmi | Bin 2838 -> 7380 bytes
icons/turf/floors/lava.dmi | Bin 12319 -> 77757 bytes
icons/turf/floors/liquidplasma.dmi | Bin 30507 -> 157459 bytes
paradise.dme | 4 +
.../Scripts/28273_space_minerals.txt | 3 +
164 files changed, 14012 insertions(+), 5038 deletions(-)
create mode 100644 _maps/map_files/RandomRuins/SpaceRuins/asteroidmining1.dmm
create mode 100644 _maps/map_files/RandomRuins/SpaceRuins/asteroidmining2.dmm
create mode 100644 _maps/map_files/RandomRuins/SpaceRuins/asteroidmining3.dmm
create mode 100644 code/datums/smith_datums.dm
create mode 100644 code/game/machinery/smith_machines.dm
create mode 100644 code/game/objects/items/tools/hammer.dm
create mode 100644 code/modules/crafting/smithed_items.dm
create mode 100644 icons/obj/machines/large_smithing_machines.dmi
create mode 100644 icons/obj/machines/magma_crucible.dmi
create mode 100644 icons/obj/machines/smithing_machines.dmi
create mode 100644 icons/obj/smithing.dmi
create mode 100644 tools/UpdatePaths/Scripts/28273_space_minerals.txt
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm
index 9ecd90646cb..3017a8ec0df 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm
@@ -7,7 +7,7 @@
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"c" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/space/unpowered)
"l" = (
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm
index 5f438bb56c4..4fe9626edc9 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm
@@ -9,7 +9,7 @@
/turf/simulated/mineral,
/area/ruin/space/unpowered)
"d" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/space/unpowered)
"t" = (
/obj/structure/spawner/mining/basilisk,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm
index 3b700b3b0ff..cdb8d013d44 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm
@@ -9,7 +9,7 @@
/turf/simulated/mineral,
/area/ruin/space/unpowered)
"d" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/space/unpowered)
"e" = (
/obj/effect/decal/remains/human,
@@ -20,7 +20,7 @@
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"q" = (
-/turf/simulated/mineral/random/low_chance,
+/turf/simulated/mineral/random/low_chance/space,
/area/ruin/space/unpowered)
"r" = (
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
index 13a16bcd642..338f74f0621 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
@@ -6,7 +6,7 @@
/turf/simulated/mineral,
/area/ruin/space/unpowered)
"c" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/space/unpowered)
"d" = (
/turf/simulated/floor/plating/asteroid/airless,
@@ -55,7 +55,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/unpowered)
"Q" = (
-/turf/simulated/mineral/random/low_chance,
+/turf/simulated/mineral/random/low_chance/space,
/area/ruin/space/unpowered)
(1,1,1) = {"
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm
index 32bbba92f3e..cb2dfa9a034 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm
@@ -6,7 +6,7 @@
/turf/simulated/mineral,
/area/ruin/space/unpowered)
"c" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/space/unpowered)
"d" = (
/turf/simulated/floor/plating/asteroid/airless,
@@ -20,7 +20,7 @@
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"A" = (
-/turf/simulated/mineral/random/low_chance,
+/turf/simulated/mineral/random/low_chance/space,
/area/ruin/space/unpowered)
"S" = (
/mob/living/simple_animal/hostile/carp,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroidmining1.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroidmining1.dmm
new file mode 100644
index 00000000000..bd753f2c75d
--- /dev/null
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroidmining1.dmm
@@ -0,0 +1,1277 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/mineral/random/low_chance/space,
+/area/ruin/space/unpowered)
+"c" = (
+/turf/simulated/mineral/random/high_chance/space,
+/area/ruin/space/unpowered)
+"h" = (
+/turf/space,
+/area/space)
+"J" = (
+/turf/simulated/mineral,
+/area/ruin/space/unpowered)
+"T" = (
+/turf/simulated/mineral/random/space,
+/area/ruin/space/unpowered)
+
+(1,1,1) = {"
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+"}
+(2,1,1) = {"
+h
+h
+h
+h
+h
+h
+h
+h
+J
+J
+J
+J
+J
+J
+J
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+J
+J
+J
+J
+h
+"}
+(3,1,1) = {"
+h
+h
+h
+h
+h
+h
+J
+J
+J
+a
+a
+a
+a
+a
+J
+J
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+J
+J
+J
+a
+a
+J
+h
+"}
+(4,1,1) = {"
+h
+h
+h
+h
+h
+J
+J
+a
+a
+a
+c
+c
+c
+a
+a
+a
+J
+J
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+J
+J
+a
+a
+a
+a
+a
+J
+"}
+(5,1,1) = {"
+h
+h
+h
+h
+h
+h
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+J
+T
+T
+a
+a
+a
+a
+a
+a
+J
+"}
+(6,1,1) = {"
+h
+h
+h
+h
+h
+h
+h
+h
+h
+J
+J
+J
+a
+a
+a
+a
+a
+a
+J
+J
+J
+J
+h
+h
+h
+J
+J
+J
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+J
+"}
+(7,1,1) = {"
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+J
+a
+a
+T
+a
+a
+a
+a
+a
+a
+J
+J
+J
+J
+J
+J
+a
+a
+a
+a
+a
+T
+T
+T
+a
+a
+a
+J
+"}
+(8,1,1) = {"
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+J
+J
+J
+a
+a
+T
+T
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+T
+T
+T
+T
+a
+a
+a
+J
+"}
+(9,1,1) = {"
+h
+h
+h
+h
+h
+h
+h
+J
+J
+J
+J
+a
+a
+a
+a
+T
+T
+T
+T
+T
+T
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+T
+c
+c
+T
+T
+a
+a
+a
+J
+"}
+(10,1,1) = {"
+h
+h
+h
+h
+h
+h
+J
+J
+a
+a
+a
+a
+a
+a
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+c
+c
+T
+T
+a
+a
+a
+J
+"}
+(11,1,1) = {"
+h
+h
+h
+h
+h
+J
+a
+a
+a
+a
+a
+a
+T
+T
+T
+T
+c
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+c
+c
+c
+T
+T
+a
+a
+J
+J
+"}
+(12,1,1) = {"
+h
+h
+h
+h
+J
+a
+a
+a
+T
+T
+T
+T
+T
+T
+c
+c
+c
+T
+T
+T
+T
+T
+T
+T
+T
+T
+c
+c
+c
+T
+T
+c
+c
+c
+T
+T
+a
+a
+J
+h
+"}
+(13,1,1) = {"
+h
+h
+J
+J
+J
+a
+a
+T
+T
+T
+T
+T
+T
+T
+c
+c
+c
+T
+T
+T
+T
+c
+T
+T
+T
+T
+c
+c
+c
+T
+T
+T
+c
+c
+c
+T
+a
+a
+J
+h
+"}
+(14,1,1) = {"
+J
+J
+J
+a
+a
+a
+T
+c
+c
+c
+T
+T
+T
+T
+c
+T
+c
+T
+T
+c
+c
+c
+c
+c
+T
+c
+c
+T
+T
+c
+T
+T
+T
+T
+T
+a
+a
+a
+J
+h
+"}
+(15,1,1) = {"
+J
+J
+a
+a
+a
+c
+c
+c
+T
+T
+T
+c
+T
+c
+T
+T
+T
+T
+T
+c
+c
+c
+T
+T
+T
+T
+T
+c
+T
+T
+T
+T
+T
+T
+T
+a
+a
+a
+J
+h
+"}
+(16,1,1) = {"
+h
+J
+J
+a
+a
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+c
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+a
+a
+J
+h
+h
+"}
+(17,1,1) = {"
+h
+h
+J
+a
+a
+T
+T
+c
+c
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+h
+h
+"}
+(18,1,1) = {"
+h
+h
+J
+a
+a
+T
+T
+c
+c
+T
+c
+T
+T
+T
+T
+T
+c
+T
+T
+T
+T
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+h
+h
+"}
+(19,1,1) = {"
+h
+h
+J
+a
+a
+c
+T
+c
+c
+T
+T
+T
+T
+c
+c
+c
+c
+c
+T
+T
+T
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+h
+h
+"}
+(20,1,1) = {"
+h
+J
+J
+a
+a
+T
+c
+c
+T
+T
+T
+T
+T
+c
+c
+c
+c
+c
+T
+T
+a
+a
+a
+J
+a
+a
+a
+J
+J
+J
+h
+h
+h
+h
+h
+h
+J
+h
+h
+h
+"}
+(21,1,1) = {"
+h
+J
+J
+a
+a
+T
+T
+T
+T
+T
+T
+T
+T
+T
+T
+c
+c
+T
+T
+J
+a
+a
+a
+J
+J
+J
+J
+J
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+"}
+(22,1,1) = {"
+h
+h
+J
+a
+a
+T
+T
+c
+c
+T
+T
+T
+T
+T
+T
+T
+T
+c
+T
+a
+a
+a
+J
+J
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+"}
+(23,1,1) = {"
+h
+h
+J
+a
+a
+c
+c
+T
+c
+c
+T
+T
+c
+c
+T
+T
+T
+T
+T
+a
+a
+a
+J
+h
+h
+h
+h
+h
+h
+h
+h
+h
+J
+J
+J
+h
+h
+h
+h
+h
+"}
+(24,1,1) = {"
+h
+h
+J
+a
+a
+a
+T
+T
+T
+T
+T
+T
+c
+c
+T
+T
+J
+T
+T
+a
+a
+J
+J
+h
+h
+h
+h
+h
+h
+h
+h
+h
+J
+a
+J
+J
+h
+h
+h
+h
+"}
+(25,1,1) = {"
+h
+h
+h
+J
+a
+a
+a
+a
+T
+a
+a
+a
+a
+a
+a
+a
+a
+T
+T
+a
+a
+J
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+J
+J
+c
+J
+J
+J
+h
+h
+"}
+(26,1,1) = {"
+h
+h
+h
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+J
+J
+a
+a
+J
+h
+h
+"}
+(27,1,1) = {"
+h
+h
+h
+h
+J
+J
+a
+a
+a
+a
+a
+J
+J
+J
+J
+a
+a
+a
+a
+a
+J
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+J
+J
+J
+J
+h
+h
+"}
+(28,1,1) = {"
+h
+h
+h
+h
+h
+h
+J
+J
+J
+J
+J
+J
+h
+h
+h
+J
+J
+J
+J
+J
+J
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+J
+h
+h
+h
+"}
+(29,1,1) = {"
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+"}
+(30,1,1) = {"
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+"}
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroidmining2.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroidmining2.dmm
new file mode 100644
index 00000000000..f97f8ea74f2
--- /dev/null
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroidmining2.dmm
@@ -0,0 +1,973 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/space,
+/area/space)
+"f" = (
+/turf/simulated/mineral/random/space,
+/area/ruin/space/unpowered)
+"n" = (
+/turf/simulated/mineral/random/high_chance/space,
+/area/ruin/space/unpowered)
+"o" = (
+/turf/simulated/mineral/random/low_chance/space,
+/area/ruin/space/unpowered)
+"r" = (
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"A" = (
+/obj/structure/spawner/mining/hivelord,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"S" = (
+/obj/structure/spawner/mining/basilisk,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"V" = (
+/turf/simulated/mineral,
+/area/ruin/space/unpowered)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+V
+V
+V
+V
+V
+V
+V
+V
+V
+a
+a
+a
+a
+a
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+V
+V
+V
+V
+V
+V
+V
+V
+o
+o
+o
+o
+o
+o
+o
+o
+V
+V
+V
+V
+a
+a
+a
+"}
+(5,1,1) = {"
+a
+V
+V
+o
+o
+o
+o
+o
+o
+o
+o
+f
+f
+f
+f
+f
+f
+o
+o
+o
+o
+V
+a
+a
+a
+"}
+(6,1,1) = {"
+a
+V
+o
+o
+f
+n
+f
+f
+f
+f
+f
+n
+n
+n
+n
+n
+n
+f
+f
+f
+o
+V
+a
+a
+a
+"}
+(7,1,1) = {"
+a
+V
+o
+f
+n
+n
+n
+n
+f
+f
+f
+n
+n
+n
+f
+f
+f
+f
+f
+o
+o
+V
+a
+a
+a
+"}
+(8,1,1) = {"
+a
+V
+o
+o
+f
+n
+f
+n
+f
+f
+f
+f
+f
+f
+f
+o
+o
+o
+o
+o
+V
+V
+a
+a
+a
+"}
+(9,1,1) = {"
+a
+V
+V
+o
+o
+f
+n
+n
+f
+o
+o
+o
+o
+o
+o
+V
+V
+V
+V
+V
+A
+r
+a
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+V
+V
+o
+o
+o
+o
+o
+o
+V
+V
+V
+V
+V
+V
+r
+r
+r
+r
+r
+a
+a
+a
+a
+"}
+(11,1,1) = {"
+a
+a
+a
+V
+V
+V
+V
+V
+V
+V
+V
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(12,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(13,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+V
+V
+V
+V
+V
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(14,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+V
+V
+o
+o
+o
+o
+V
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+V
+o
+o
+f
+f
+f
+o
+V
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(16,1,1) = {"
+a
+a
+a
+a
+a
+a
+V
+V
+o
+o
+n
+n
+f
+f
+o
+V
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(17,1,1) = {"
+a
+a
+a
+a
+a
+a
+V
+o
+o
+n
+f
+f
+f
+o
+o
+V
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(18,1,1) = {"
+a
+a
+a
+a
+a
+V
+o
+o
+n
+n
+o
+o
+o
+V
+V
+r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(19,1,1) = {"
+a
+a
+a
+a
+a
+V
+V
+V
+o
+o
+o
+V
+V
+V
+r
+r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(20,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+V
+V
+V
+V
+V
+S
+r
+r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(21,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+r
+r
+r
+r
+r
+r
+r
+r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(22,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+r
+r
+r
+r
+a
+a
+a
+a
+a
+a
+"}
+(23,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+r
+r
+r
+r
+r
+r
+a
+a
+a
+a
+a
+"}
+(24,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+r
+r
+V
+V
+V
+V
+V
+V
+a
+a
+a
+a
+"}
+(25,1,1) = {"
+a
+a
+a
+a
+a
+V
+V
+V
+r
+r
+a
+a
+a
+V
+V
+V
+o
+o
+o
+o
+V
+V
+a
+a
+a
+"}
+(26,1,1) = {"
+a
+a
+a
+a
+V
+V
+o
+o
+V
+r
+a
+a
+a
+V
+o
+o
+o
+f
+o
+o
+o
+V
+a
+a
+a
+"}
+(27,1,1) = {"
+a
+a
+a
+a
+V
+o
+f
+f
+V
+r
+r
+a
+a
+V
+V
+o
+f
+f
+f
+o
+o
+V
+a
+a
+a
+"}
+(28,1,1) = {"
+a
+a
+a
+V
+o
+o
+n
+f
+V
+V
+r
+a
+a
+a
+V
+o
+o
+n
+n
+f
+o
+o
+V
+a
+a
+"}
+(29,1,1) = {"
+a
+a
+a
+V
+o
+n
+n
+f
+o
+V
+r
+a
+a
+a
+a
+V
+o
+o
+n
+f
+o
+o
+V
+a
+a
+"}
+(30,1,1) = {"
+a
+V
+V
+V
+o
+n
+f
+f
+V
+r
+r
+a
+a
+a
+a
+V
+V
+o
+n
+f
+o
+o
+V
+a
+a
+"}
+(31,1,1) = {"
+a
+V
+o
+o
+o
+n
+o
+o
+V
+r
+a
+a
+a
+a
+a
+a
+V
+V
+o
+o
+o
+V
+V
+a
+a
+"}
+(32,1,1) = {"
+a
+V
+o
+o
+f
+o
+o
+V
+V
+a
+a
+a
+a
+a
+a
+a
+a
+a
+V
+V
+V
+V
+a
+a
+a
+"}
+(33,1,1) = {"
+a
+a
+V
+o
+o
+o
+V
+V
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(34,1,1) = {"
+a
+a
+V
+V
+V
+V
+V
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(35,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroidmining3.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroidmining3.dmm
new file mode 100644
index 00000000000..8f3dae0f8a3
--- /dev/null
+++ b/_maps/map_files/RandomRuins/SpaceRuins/asteroidmining3.dmm
@@ -0,0 +1,1724 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/mineral,
+/area/space)
+"d" = (
+/turf/simulated/mineral/random/low_chance/space,
+/area/ruin/space/unpowered)
+"h" = (
+/turf/simulated/mineral/random/high_chance/space,
+/area/ruin/space/unpowered)
+"n" = (
+/turf/simulated/mineral/random/low_chance,
+/area/ruin/space/unpowered)
+"o" = (
+/turf/space,
+/area/ruin/space/unpowered)
+"s" = (
+/obj/structure/spawner/mining/hivelord,
+/turf/simulated/floor/plating/asteroid,
+/area/ruin/space/unpowered)
+"w" = (
+/mob/living/simple_animal/hostile/asteroid/basilisk,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"y" = (
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"E" = (
+/obj/structure/spawner/mining/basilisk,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"L" = (
+/turf/simulated/mineral,
+/area/ruin/space/unpowered)
+"Q" = (
+/turf/space,
+/area/space)
+"V" = (
+/turf/simulated/floor/plating/asteroid,
+/area/ruin/space/unpowered)
+"Y" = (
+/turf/simulated/mineral/random/space,
+/area/ruin/space/unpowered)
+
+(1,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+"}
+(2,1,1) = {"
+Q
+Q
+y
+y
+L
+L
+L
+L
+L
+L
+L
+L
+L
+L
+L
+y
+y
+y
+y
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+"}
+(3,1,1) = {"
+Q
+Q
+y
+y
+L
+d
+d
+d
+L
+L
+L
+L
+L
+L
+L
+L
+L
+L
+y
+y
+y
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+"}
+(4,1,1) = {"
+Q
+Q
+y
+y
+L
+L
+d
+d
+d
+d
+d
+d
+d
+d
+d
+L
+L
+L
+y
+y
+y
+y
+Q
+Q
+Q
+Q
+L
+L
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+"}
+(5,1,1) = {"
+Q
+Q
+y
+y
+y
+L
+L
+L
+L
+L
+L
+L
+L
+d
+d
+d
+L
+L
+y
+Q
+Q
+Q
+Q
+Q
+Q
+L
+n
+n
+L
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+"}
+(6,1,1) = {"
+Q
+y
+y
+y
+y
+y
+L
+L
+L
+L
+L
+L
+L
+L
+L
+L
+L
+y
+Q
+Q
+Q
+Q
+Q
+L
+L
+n
+n
+n
+L
+L
+y
+y
+y
+y
+y
+y
+y
+Q
+Q
+Q
+"}
+(7,1,1) = {"
+Q
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+Q
+V
+V
+V
+L
+n
+n
+n
+n
+Y
+d
+d
+L
+y
+y
+y
+y
+L
+L
+L
+Q
+Q
+"}
+(8,1,1) = {"
+Q
+V
+V
+V
+V
+V
+V
+V
+V
+V
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+V
+V
+V
+L
+L
+n
+n
+n
+n
+Y
+d
+d
+d
+d
+L
+L
+L
+L
+L
+d
+L
+Q
+Q
+"}
+(9,1,1) = {"
+V
+V
+L
+L
+L
+L
+L
+L
+L
+V
+V
+V
+o
+o
+o
+o
+V
+V
+V
+L
+n
+n
+n
+n
+n
+Y
+Y
+Y
+d
+d
+d
+d
+d
+d
+d
+d
+d
+L
+L
+Q
+"}
+(10,1,1) = {"
+V
+L
+n
+n
+n
+n
+n
+n
+L
+L
+L
+V
+V
+o
+o
+V
+V
+V
+L
+n
+n
+n
+n
+Y
+Y
+Y
+Y
+Y
+d
+d
+d
+d
+d
+d
+d
+d
+n
+n
+L
+Q
+"}
+(11,1,1) = {"
+V
+L
+n
+n
+n
+n
+n
+n
+n
+n
+n
+L
+V
+V
+V
+V
+L
+L
+L
+n
+n
+Y
+Y
+Y
+h
+h
+h
+h
+h
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+n
+n
+L
+Q
+"}
+(12,1,1) = {"
+V
+L
+n
+n
+n
+h
+h
+h
+n
+n
+n
+n
+L
+L
+L
+L
+n
+n
+n
+n
+n
+Y
+Y
+h
+h
+h
+h
+h
+h
+h
+h
+Y
+Y
+Y
+Y
+Y
+n
+n
+L
+Q
+"}
+(13,1,1) = {"
+V
+V
+L
+L
+n
+n
+n
+h
+h
+L
+n
+n
+L
+n
+n
+n
+n
+n
+n
+Y
+Y
+Y
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+Y
+Y
+Y
+n
+n
+L
+Q
+"}
+(14,1,1) = {"
+Q
+V
+V
+L
+L
+n
+n
+n
+h
+Y
+Y
+n
+n
+n
+n
+n
+n
+n
+Y
+Y
+Y
+h
+h
+h
+y
+y
+y
+y
+y
+h
+h
+h
+h
+Y
+Y
+h
+n
+n
+L
+Q
+"}
+(15,1,1) = {"
+Q
+Q
+V
+V
+L
+L
+n
+n
+n
+n
+n
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+h
+h
+y
+h
+h
+h
+h
+h
+y
+y
+h
+h
+Y
+Y
+h
+n
+n
+Y
+L
+"}
+(16,1,1) = {"
+Q
+Q
+Q
+V
+V
+L
+L
+n
+n
+n
+n
+n
+Y
+Y
+Y
+Y
+Y
+Y
+h
+h
+h
+h
+h
+y
+h
+y
+y
+y
+y
+E
+y
+h
+h
+Y
+Y
+h
+n
+n
+n
+L
+"}
+(17,1,1) = {"
+Q
+Q
+Q
+Q
+V
+V
+V
+L
+Y
+n
+n
+n
+Y
+Y
+Y
+Y
+Y
+h
+h
+h
+h
+h
+y
+E
+y
+y
+y
+w
+y
+y
+y
+h
+h
+Y
+Y
+h
+n
+n
+Y
+L
+"}
+(18,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+V
+s
+L
+n
+n
+n
+n
+Y
+Y
+Y
+h
+h
+h
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+h
+h
+Y
+Y
+Y
+n
+n
+L
+Q
+"}
+(19,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+V
+V
+V
+L
+L
+n
+n
+n
+Y
+Y
+h
+h
+y
+y
+w
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+h
+h
+Y
+Y
+Y
+n
+n
+L
+Q
+"}
+(20,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+V
+V
+V
+L
+n
+n
+n
+Y
+h
+h
+h
+y
+E
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+h
+h
+Y
+Y
+Y
+n
+n
+L
+Q
+"}
+(21,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+V
+V
+L
+L
+n
+n
+Y
+h
+h
+y
+y
+y
+y
+h
+y
+y
+w
+h
+y
+y
+y
+h
+h
+h
+h
+Y
+Y
+Y
+n
+n
+L
+Q
+"}
+(22,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+V
+V
+V
+L
+n
+n
+Y
+h
+h
+y
+h
+y
+y
+h
+h
+y
+y
+h
+y
+h
+h
+h
+h
+h
+Y
+Y
+Y
+Y
+n
+n
+L
+Q
+"}
+(23,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+V
+V
+V
+L
+n
+n
+Y
+h
+h
+y
+h
+y
+y
+h
+h
+y
+y
+h
+y
+h
+h
+h
+Y
+Y
+Y
+d
+d
+d
+n
+n
+L
+Q
+"}
+(24,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+V
+V
+V
+L
+n
+n
+Y
+h
+h
+y
+h
+y
+y
+h
+h
+y
+y
+y
+y
+h
+h
+Y
+Y
+d
+d
+d
+d
+d
+d
+d
+L
+Q
+"}
+(25,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+V
+V
+V
+s
+L
+n
+n
+Y
+h
+h
+y
+y
+y
+y
+h
+y
+E
+y
+y
+h
+h
+h
+Y
+d
+d
+d
+L
+L
+L
+L
+L
+y
+Q
+"}
+(26,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+V
+V
+V
+L
+n
+n
+n
+Y
+Y
+h
+h
+y
+E
+y
+y
+w
+y
+y
+h
+h
+h
+Y
+Y
+d
+d
+L
+L
+y
+y
+y
+y
+y
+Q
+"}
+(27,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+V
+V
+L
+n
+n
+n
+L
+Y
+Y
+h
+h
+h
+y
+y
+y
+y
+y
+y
+h
+h
+h
+Y
+Y
+d
+d
+L
+y
+y
+Q
+Q
+Q
+Q
+Q
+"}
+(28,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+L
+L
+n
+n
+Y
+L
+L
+Y
+Y
+Y
+h
+h
+h
+y
+h
+h
+y
+y
+h
+h
+Y
+Y
+Y
+d
+n
+L
+y
+Q
+Q
+Q
+Q
+Q
+Q
+"}
+(29,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+L
+L
+n
+n
+Y
+Y
+Y
+L
+Y
+Y
+Y
+Y
+Y
+h
+h
+h
+y
+y
+y
+h
+h
+h
+Y
+Y
+Y
+n
+n
+L
+y
+Q
+Q
+Q
+Q
+Q
+Q
+"}
+(30,1,1) = {"
+Q
+Q
+Q
+L
+L
+n
+n
+n
+Y
+d
+d
+Y
+L
+Y
+Y
+Y
+Y
+Y
+h
+h
+h
+h
+h
+h
+h
+h
+Y
+Y
+Y
+n
+n
+L
+y
+Q
+Q
+Q
+y
+Q
+Q
+Q
+"}
+(31,1,1) = {"
+Q
+Q
+L
+Y
+n
+n
+Y
+Y
+d
+d
+d
+d
+d
+Y
+Y
+Y
+Y
+Y
+Y
+h
+h
+h
+h
+h
+h
+h
+Y
+n
+n
+n
+L
+y
+Q
+Q
+Q
+y
+y
+y
+Q
+Q
+"}
+(32,1,1) = {"
+Q
+L
+Y
+n
+n
+Y
+d
+d
+L
+L
+L
+d
+d
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+n
+n
+Y
+L
+y
+Q
+Q
+Q
+L
+L
+L
+Q
+Q
+Q
+"}
+(33,1,1) = {"
+L
+n
+n
+n
+Y
+h
+d
+d
+L
+y
+y
+L
+n
+n
+n
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+n
+n
+L
+y
+y
+y
+L
+L
+L
+L
+L
+L
+Q
+Q
+"}
+(34,1,1) = {"
+L
+n
+Y
+Y
+h
+d
+d
+n
+L
+y
+y
+L
+n
+n
+n
+n
+n
+n
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+n
+n
+L
+y
+y
+y
+L
+L
+L
+L
+L
+L
+Q
+Q
+"}
+(35,1,1) = {"
+L
+n
+n
+n
+n
+n
+n
+n
+L
+y
+y
+y
+L
+L
+Y
+n
+n
+n
+n
+Y
+Y
+Y
+h
+h
+h
+Y
+n
+n
+L
+y
+y
+y
+L
+L
+L
+L
+L
+L
+Q
+Q
+"}
+(36,1,1) = {"
+L
+L
+Y
+n
+n
+n
+Y
+L
+L
+y
+Q
+y
+y
+L
+L
+Y
+n
+n
+n
+n
+Y
+Y
+Y
+Y
+h
+Y
+n
+n
+n
+L
+y
+E
+L
+L
+L
+L
+L
+Q
+Q
+Q
+"}
+(37,1,1) = {"
+Q
+a
+Y
+n
+n
+n
+L
+L
+y
+y
+Q
+Q
+y
+y
+L
+L
+n
+n
+n
+n
+n
+n
+Y
+h
+h
+Y
+n
+n
+n
+L
+y
+y
+L
+L
+L
+L
+L
+Q
+Q
+Q
+"}
+(38,1,1) = {"
+Q
+Q
+L
+L
+L
+L
+y
+y
+y
+Q
+Q
+Q
+Q
+y
+y
+L
+L
+L
+n
+n
+n
+n
+n
+n
+Y
+Y
+n
+n
+n
+L
+y
+y
+y
+L
+L
+L
+Q
+Q
+Q
+Q
+"}
+(39,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+y
+y
+y
+L
+L
+L
+L
+n
+n
+n
+n
+n
+n
+n
+n
+L
+y
+y
+y
+y
+L
+Q
+Q
+Q
+Q
+Q
+"}
+(40,1,1) = {"
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+L
+L
+L
+L
+L
+L
+L
+L
+L
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+Q
+"}
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/clockwork_monastery.dmm b/_maps/map_files/RandomRuins/SpaceRuins/clockwork_monastery.dmm
index a5da43b7880..11f6d9615fb 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/clockwork_monastery.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/clockwork_monastery.dmm
@@ -26,7 +26,7 @@
/turf/simulated/floor/clockwork,
/area/ruin/space/clockwork_monastery)
"ch" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/unpowered)
"cK" = (
/obj/structure/table/reinforced/brass,
@@ -394,7 +394,7 @@
/turf/simulated/floor/clockwork,
/area/ruin/space/clockwork_monastery)
"Ht" = (
-/turf/simulated/mineral/random/low_chance,
+/turf/simulated/mineral/random/low_chance/space,
/area/ruin/unpowered)
"HB" = (
/obj/structure/chair/sofa/pew/clockwork/right{
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
index f3c2cb0fd94..41f412746b3 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"ab" = (
-/turf/simulated/mineral/random/low_chance,
+/turf/simulated/mineral/random/low_chance/space,
/area/ruin/space/unpowered)
"ac" = (
/obj/structure/chair{
@@ -1660,7 +1660,7 @@
},
/area/ruin/space/deepstorage)
"iZ" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/space/unpowered)
"ja" = (
/obj/machinery/light/small,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
index d1faeb6bc0d..f4ea1745f2f 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
@@ -9,7 +9,7 @@
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"d" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/space/unpowered)
"e" = (
/turf/simulated/wall/mineral/titanium,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
index 86e017e714b..5c9e88add1f 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
@@ -218,7 +218,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"Dt" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/space/unpowered)
"Gx" = (
/obj/effect/decal/cleanable/blood,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm b/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm
index a349099a776..41abfb21689 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm
@@ -125,7 +125,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/methlab)
"K" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/space/methlab)
(1,1,1) = {"
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm b/_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm
index 7c70a1ef191..69cccd6b10c 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm
@@ -3,7 +3,7 @@
/turf/template_noop,
/area/template_noop)
"x" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/space/unpowered)
"H" = (
/turf/simulated/floor/plating/asteroid/airless,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
index 7d2518499e2..7474a3c3748 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
@@ -36,7 +36,7 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/syndicate_listening_station)
"cB" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/space/syndicate_listening_station/asteroid)
"du" = (
/obj/effect/decal/cleanable/dirt,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
index 7b21d55fd07..e37a0611c77 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
@@ -166,7 +166,7 @@
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/powered)
"aK" = (
-/turf/simulated/mineral/random,
+/turf/simulated/mineral/random/space,
/area/ruin/powered)
"aL" = (
/obj/item/multitool,
@@ -1796,7 +1796,7 @@
/turf/simulated/floor/plating/airless,
/area/ruin/unpowered/bmp_ship/fore)
"gi" = (
-/turf/simulated/mineral/random,
+/turf/simulated/mineral/random/space,
/area/ruin/unpowered/bmp_ship/midship)
"gj" = (
/obj/machinery/light{
@@ -2179,7 +2179,7 @@
},
/area/ruin/unpowered/bmp_ship/midship)
"uT" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/powered)
"BC" = (
/obj/structure/cable{
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
index 51560ac192d..e5ade18f4aa 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
@@ -3648,7 +3648,7 @@
/turf/simulated/floor/engine,
/area/ruin/ancientstation/proto)
"kH" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/unpowered)
"kI" = (
/obj/effect/decal/cleanable/dirt,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm
index 7cca9d8aac2..9095573f154 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm
@@ -224,7 +224,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/syndicate_druglab)
"yI" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/space/syndicate_druglab/asteroid)
"yV" = (
/obj/structure/machine_frame,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
index d2f4e540107..1c4e734a3e5 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
@@ -6838,7 +6838,7 @@
},
/area/ruin/unpowered/syndicate_space_base/main)
"OT" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/unpowered/syndicate_space_base/inner)
"OU" = (
/turf/template_noop,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
index 8d765029130..09d71deb411 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
@@ -1142,7 +1142,7 @@
},
/area/syndicate_depot/core)
"Te" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/syndicate_depot/outer)
(1,1,1) = {"
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/way_home.dmm b/_maps/map_files/RandomRuins/SpaceRuins/way_home.dmm
index 08847e70aa1..6192c613ff9 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/way_home.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/way_home.dmm
@@ -3,7 +3,7 @@
/turf/template_noop,
/area/template_noop)
"b" = (
-/turf/simulated/mineral/random,
+/turf/simulated/mineral/random/space,
/area/ruin/space/unpowered/no_grav/way_home)
"c" = (
/turf/simulated/floor/plating/asteroid/airless,
@@ -38,7 +38,7 @@
/turf/template_noop,
/area/template_noop)
"R" = (
-/turf/simulated/mineral/random/high_chance,
+/turf/simulated/mineral/random/high_chance/space,
/area/ruin/space/unpowered/no_grav/way_home)
(1,1,1) = {"
diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm
index 6a9bdf51e64..ea317711cc3 100644
--- a/_maps/map_files/generic/Lavaland.dmm
+++ b/_maps/map_files/generic/Lavaland.dmm
@@ -139,6 +139,17 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"aC" = (
+/obj/structure/shelf/supply,
+/obj/item/rcs,
+/obj/item/stack/sheet/cardboard{
+ amount = 10
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"aD" = (
/obj/structure/chair{
dir = 8
@@ -153,13 +164,27 @@
},
/area/mine/laborcamp)
"aI" = (
-/obj/structure/chair/sofa/bench/left,
/obj/machinery/newscaster/directional/east,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "darkyellowcorners"
+ dir = 1;
+ icon_state = "darkfull"
},
/area/mine/outpost/hallway/west)
+"aJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/lockers)
"aK" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -228,6 +253,20 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"bd" = (
+/obj/structure/table/reinforced,
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/smith,
+/obj/item/desk_bell,
+/obj/machinery/door/window/classic/normal{
+ polarized_glass = 1;
+ id = "smith_workshop";
+ name = "Smith's Workshop"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"bf" = (
/obj/machinery/suit_storage_unit/lavaland,
/obj/machinery/light{
@@ -274,7 +313,9 @@
/area/mine/laborcamp)
"bo" = (
/obj/structure/lattice/catwalk/mining,
-/obj/structure/marker_beacon/dock_marker,
+/obj/structure/marker_beacon/dock_marker{
+ name = "beacon"
+ },
/obj/structure/railing,
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
@@ -301,18 +342,6 @@
dir = 8
},
/area/mine/outpost/medbay)
-"br" = (
-/obj/machinery/computer/shuttle/mining{
- req_access = null;
- dir = 1
- },
-/obj/machinery/light,
-/obj/machinery/requests_console/directional/south,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "darkyellowcorners"
- },
-/area/mine/outpost/hallway/west)
"bs" = (
/obj/structure/stone_tile/surrounding_tile,
/obj/structure/stone_tile/surrounding_tile{
@@ -416,7 +445,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/junction{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -637,13 +668,14 @@
},
/area/mine/outpost/storage)
"cl" = (
-/obj/structure/lattice/catwalk/mining,
-/obj/item/food/fortunecookie{
- pixel_y = -5;
- pixel_x = -6
+/obj/structure/chair/sofa/bench/right{
+ dir = 8
},
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/outpost/catwalk)
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"cm" = (
/obj/structure/lattice/catwalk/mining,
/obj/effect/turf_decal/loading_area,
@@ -852,7 +884,9 @@
"cR" = (
/obj/structure/lattice/catwalk/mining,
/obj/structure/railing,
-/obj/structure/marker_beacon/dock_marker,
+/obj/structure/marker_beacon/dock_marker{
+ name = "beacon"
+ },
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/outpost/catwalk)
@@ -1080,6 +1114,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -1381,8 +1418,12 @@
},
/area/mine/outpost/medbay)
"dR" = (
-/turf/simulated/mineral/ancient{
- temperature = 293.15
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
},
/area/mine/outpost/engineering)
"dS" = (
@@ -1498,19 +1539,6 @@
},
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors/outpost/catwalk)
-"eg" = (
-/obj/machinery/light{
- dir = 4
- },
-/obj/item/kirbyplants/large,
-/obj/structure/sign/kiddieplaque/remembrance/mining{
- pixel_x = 32
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkfull"
- },
-/area/mine/outpost/hallway/west)
"eh" = (
/obj/structure/lattice/catwalk/mining,
/obj/structure/railing/corner{
@@ -1547,8 +1575,11 @@
/obj/structure/sign/nanotrasen{
pixel_x = 32
},
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/targetable)
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkyellowcorners"
+ },
+/area/mine/outpost/hallway/west)
"el" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -1559,19 +1590,18 @@
},
/area/mine/outpost/hallway/west)
"em" = (
-/obj/machinery/light/small{
+/obj/effect/spawner/random/cobweb/right/frequent,
+/obj/effect/turf_decal/stripes/red/line{
dir = 4
},
-/obj/machinery/light_switch{
- name = "North Switch";
- pixel_y = 24
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
},
-/obj/structure/closet/wardrobe/miner,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
},
-/area/mine/outpost/lockers)
+/area/mine/outpost/smith_workshop)
"en" = (
/obj/machinery/mineral/processing_unit_console,
/turf/simulated/wall,
@@ -1623,12 +1653,7 @@
},
/area/mine/outpost/cafeteria)
"es" = (
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
+/obj/machinery/economy/vending/cigarette,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -2016,9 +2041,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment/corner{
- dir = 8
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -2171,9 +2194,6 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 1
},
@@ -2195,7 +2215,7 @@
},
/area/mine/outpost/hallway/west)
"fA" = (
-/obj/structure/chair/sofa/bench/right,
+/obj/structure/chair,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkyellowcorners"
@@ -2209,9 +2229,6 @@
/turf/simulated/floor/plasteel/dark,
/area/mine/outpost/comms)
"fC" = (
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
/obj/structure/extinguisher_cabinet{
name = "north bump";
pixel_y = 30
@@ -2228,9 +2245,6 @@
/obj/machinery/light{
dir = 1
},
-/obj/structure/disposalpipe/junction{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -2298,10 +2312,15 @@
/turf/simulated/floor/plating,
/area/mine/outpost/production)
"fJ" = (
-/obj/structure/lattice/catwalk/mining,
-/obj/machinery/floodlight/anchored,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/outpost/catwalk)
+/obj/item/kirbyplants/large,
+/obj/structure/sign/nanotrasen{
+ pixel_y = 32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkyellowcorners"
+ },
+/area/mine/outpost/hallway/west)
"fK" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/structure/cable{
@@ -2414,20 +2433,15 @@
/obj/structure/chair/sofa/bench/left{
dir = 1
},
-/obj/machinery/economy/vending/wallmed/directional/south,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkyellowcorners"
},
/area/mine/outpost/hallway/west)
"gb" = (
-/obj/structure/chair/sofa/bench/right{
+/obj/structure/chair/sofa/bench{
dir = 1
},
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/power/apc/directional/south,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkyellowcorners"
@@ -2512,12 +2526,14 @@
"gm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/structure/cable{
icon_state = "1-8"
},
+/obj/structure/cable,
+/obj/machinery/power/apc/directional/south,
+/obj/structure/chair/sofa/bench/right{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkyellowcorners"
@@ -2615,6 +2631,21 @@
icon_state = "tranquillite"
},
/area/mine/outpost/cafeteria)
+"gx" = (
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"gy" = (
/obj/structure/stone_tile/cracked,
/obj/structure/stone_tile{
@@ -2775,6 +2806,35 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"gT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkyellowcorners"
+ },
+/area/mine/outpost/hallway/west)
+"gX" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"gZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/unary/tank/air{
@@ -2799,6 +2859,17 @@
icon_state = "darkredyellowfull"
},
/area/mine/laborcamp)
+"he" = (
+/obj/machinery/camera{
+ c_tag = "Mining Outpost - South Hallway";
+ dir = 5;
+ network = list("Mining Outpost")
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkyellowcorners"
+ },
+/area/mine/outpost/hallway/west)
"hf" = (
/obj/machinery/flasher_button{
id = "gulagshuttleflasher";
@@ -3316,6 +3387,15 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"jy" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"jC" = (
/obj/structure/stone_tile/block{
dir = 4
@@ -3416,6 +3496,17 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"kh" = (
+/obj/structure/shelf/supply,
+/obj/item/storage/backpack/duffel,
+/obj/item/storage/backpack/duffel,
+/obj/item/storage/backpack/duffel,
+/obj/item/multitool,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"kj" = (
/obj/structure/stone_tile/block{
dir = 8
@@ -3467,6 +3558,11 @@
/obj/effect/baseturf_helper/asteroid/basalt,
/turf/simulated/floor/mineral/titanium,
/area/shuttle/siberia)
+"kC" = (
+/obj/structure/lattice/catwalk/mining,
+/obj/effect/turf_decal/stripes/line,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"kG" = (
/obj/machinery/mineral/ore_redemption/labor{
input_dir = 4;
@@ -3476,6 +3572,14 @@
icon_state = "yellowfull"
},
/area/mine/laborcamp)
+"kH" = (
+/obj/structure/table,
+/obj/item/smithing_cast/sheet,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"kI" = (
/turf/simulated/wall/mineral/titanium,
/area/shuttle/siberia)
@@ -3571,9 +3675,14 @@
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"ln" = (
-/obj/structure/glowshroom,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/targetable)
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkyellowcorners"
+ },
+/area/mine/outpost/hallway/west)
"lo" = (
/obj/structure/lattice/catwalk/mining,
/obj/effect/decal/cleanable/dirt,
@@ -3603,6 +3712,12 @@
},
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
+"lt" = (
+/obj/structure/lattice/catwalk/mining,
+/obj/structure/railing,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/lava/mapping_lava,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"lu" = (
/obj/structure/stone_tile/block/cracked{
dir = 4
@@ -3679,6 +3794,15 @@
},
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
+"lO" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"lP" = (
/obj/structure/stone_tile/block/cracked{
dir = 4
@@ -3689,6 +3813,22 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"lR" = (
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"lT" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -4177,6 +4317,15 @@
icon_state = "tranquillite"
},
/area/mine/outpost/cafeteria)
+"nz" = (
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"nB" = (
/obj/structure/stone_tile{
dir = 1
@@ -4187,6 +4336,13 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"nC" = (
+/obj/structure/lattice/catwalk/mining,
+/obj/structure/railing{
+ dir = 10
+ },
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"nG" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -4401,6 +4557,13 @@
icon_state = "darkfull"
},
/area/mine/outpost/airlock)
+"op" = (
+/obj/structure/lattice/catwalk/mining,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"oq" = (
/obj/effect/turf_decal/loading_area,
/obj/effect/decal/cleanable/dirt,
@@ -4417,6 +4580,10 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"ow" = (
+/obj/effect/spawner/window/reinforced/plasma/grilled,
+/turf/simulated/floor/transparent/glass/reinforced/plasma,
+/area/mine/outpost/smith_workshop)
"ox" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -4471,6 +4638,14 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"oN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/alarm/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"oW" = (
/obj/machinery/door/airlock/security/glass{
name = "Labor Camp Security"
@@ -4560,6 +4735,25 @@
"pq" = (
/turf/simulated/floor/mineral/titanium,
/area/shuttle/siberia)
+"pu" = (
+/obj/machinery/requests_console/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
+"pv" = (
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"px" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -4649,6 +4843,9 @@
name = "south bump";
pixel_y = -28
},
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkpurplecorners"
@@ -4670,6 +4867,16 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
+"pW" = (
+/obj/structure/closet/secure_closet/miner,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkpurplecorners"
+ },
+/area/mine/outpost/lockers)
"qb" = (
/obj/structure/girder,
/turf/simulated/floor/plating,
@@ -4687,6 +4894,23 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
+"qu" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"qv" = (
/obj/structure/table/reinforced,
/turf/simulated/floor/plasteel{
@@ -4779,6 +5003,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/mine/laborcamp)
+"qZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"ra" = (
/obj/structure/lattice/catwalk/mining,
/obj/structure/railing{
@@ -4794,10 +5029,13 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
-"rf" = (
-/obj/structure/flora/ash/stem_shroom,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/targetable)
+"re" = (
+/obj/machinery/firealarm/directional/south,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"ri" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -4894,6 +5132,13 @@
/obj/effect/baseturf_helper/lava_land,
/turf/simulated/floor/mineral/titanium,
/area/shuttle/mining)
+"rN" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"rP" = (
/obj/structure/stone_tile{
dir = 1
@@ -4932,11 +5177,6 @@
},
/turf/simulated/floor/wood,
/area/mine/laborcamp)
-"sk" = (
-/obj/machinery/door/firedoor,
-/obj/effect/spawner/window/reinforced/plasma/grilled,
-/turf/simulated/floor/plating,
-/area/mine/outpost/lockers)
"sr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -4975,6 +5215,10 @@
/obj/effect/mapping_helpers/turfs/rust/maybe,
/turf/simulated/wall,
/area/lavaland/surface/outdoors/targetable)
+"sB" = (
+/obj/machinery/smithing/kinetic_assembler,
+/turf/simulated/floor/transparent/glass/reinforced/plasma,
+/area/mine/outpost/smith_workshop)
"sD" = (
/obj/structure/lavaland_billboard,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
@@ -5014,6 +5258,24 @@
icon_state = "darkredyellowfull"
},
/area/mine/laborcamp)
+"sR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkyellowcorners"
+ },
+/area/mine/outpost/hallway/west)
"sT" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -5039,6 +5301,9 @@
icon_state = "darkredyellowfull"
},
/area/mine/laborcamp)
+"sY" = (
+/turf/simulated/floor/transparent/glass/reinforced/plasma,
+/area/mine/outpost/smith_workshop)
"ta" = (
/obj/structure/stone_tile/block{
dir = 8
@@ -5084,12 +5349,28 @@
icon_state = "darkred"
},
/area/mine/laborcamp/security)
+"tk" = (
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"tp" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/cobweb2,
/obj/item/book/manual/wiki/security_space_law,
/turf/simulated/floor/wood,
/area/mine/laborcamp)
+"tr" = (
+/obj/structure/sign/nanotrasen{
+ pixel_y = 32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"tt" = (
/obj/machinery/newscaster/directional/east,
/turf/simulated/floor/plasteel{
@@ -5149,6 +5430,18 @@
icon_state = "darkpurplecorners"
},
/area/mine/outpost/lockers)
+"tO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"tS" = (
/obj/structure/lattice/catwalk/mining,
/obj/effect/decal/cleanable/dirt,
@@ -5159,9 +5452,8 @@
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/outpost/catwalk)
"tX" = (
-/obj/structure/sign/fire,
-/turf/simulated/wall,
-/area/lavaland/surface/outdoors/outpost/catwalk)
+/turf/simulated/wall/r_wall,
+/area/mine/outpost/hallway/west)
"tY" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -5180,6 +5472,26 @@
icon_state = "yellowsiding"
},
/area/mine/laborcamp)
+"ud" = (
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkyellowcorners"
+ },
+/area/mine/outpost/hallway/west)
+"ul" = (
+/obj/machinery/door/airlock/mining/glass{
+ name = "Hallway"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"um" = (
/obj/effect/spawner/window/reinforced/plasma/grilled,
/turf/simulated/floor/plating,
@@ -5202,17 +5514,19 @@
},
/turf/simulated/floor/plating,
/area/mine/outpost/mechbay)
-"ur" = (
-/obj/item/kirbyplants/large,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "darkyellowcorners"
- },
-/area/mine/outpost/hallway/west)
"uu" = (
/obj/structure/closet/crate,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/targetable)
+"uv" = (
+/obj/structure/lattice/catwalk/mining,
+/obj/machinery/camera{
+ c_tag = "Mining Outpost - Landing Pad South";
+ network = list("Mining Outpost");
+ dir = 1
+ },
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"uB" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -5226,6 +5540,13 @@
/obj/effect/decal/remains/human,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"uI" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/lattice/catwalk/mining,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"uM" = (
/obj/structure/flora/ash/rock/style_random,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
@@ -5331,12 +5652,31 @@
"vh" = (
/turf/simulated/wall,
/area/mine/outpost/medbay)
+"vi" = (
+/obj/machinery/economy/vending/smith,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"vj" = (
/obj/structure/lattice/catwalk/mining,
/obj/structure/railing,
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/outpost/catwalk)
+"vk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"vl" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -5456,22 +5796,16 @@
/turf/simulated/wall/indestructible/boss,
/area/lavaland/surface/outdoors)
"vM" = (
-/obj/structure/lattice/catwalk/mining,
-/obj/structure/closet/crate/internals,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/crowbar/red,
-/obj/item/crowbar/red,
-/obj/item/crowbar/red,
-/obj/item/crowbar/red,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/outpost/catwalk)
+/obj/machinery/computer/shuttle/mining{
+ req_access = null;
+ dir = 1
+ },
+/obj/machinery/light,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkyellowcorners"
+ },
+/area/mine/outpost/hallway/west)
"vN" = (
/obj/machinery/light/small{
dir = 4
@@ -5481,24 +5815,18 @@
/obj/item/stack/cable_coil,
/turf/simulated/floor/plating,
/area/mine/laborcamp)
-"vQ" = (
-/obj/machinery/door/airlock/mining/glass{
- name = "Hallway"
- },
-/obj/structure/disposalpipe/segment{
+"vP" = (
+/obj/machinery/light_switch{
+ pixel_x = 24;
+ name = "East Switch";
dir = 8
},
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
-/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station,
+/obj/machinery/telepad_cargo,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
},
-/area/mine/outpost/hallway/west)
+/area/mine/outpost/smith_workshop)
"vR" = (
/obj/structure/bookcase{
name = "bookcase (Adult)"
@@ -5602,6 +5930,24 @@
icon_state = "darkredyellowfull"
},
/area/mine/laborcamp)
+"wo" = (
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"wr" = (
/obj/structure/stone_tile/cracked{
dir = 8
@@ -5628,6 +5974,18 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"wI" = (
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"wK" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/stool{
@@ -5638,6 +5996,19 @@
dir = 1
},
/area/mine/laborcamp)
+"wM" = (
+/obj/machinery/smithing/lava_furnace{
+ pixel_y = -32;
+ pixel_x = 0
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"wO" = (
/turf/simulated/mineral/volcanic/lava_land_surface,
/area/mine/outpost/hallway/east)
@@ -5648,6 +6019,22 @@
icon_state = "darkfull"
},
/area/mine/outpost/hallway/east)
+"wY" = (
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/hologram/holopad,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"xa" = (
/obj/effect/spawner/window/reinforced/plasma/grilled,
/obj/structure/cable,
@@ -5665,6 +6052,24 @@
},
/turf/simulated/floor/wood,
/area/mine/laborcamp)
+"xh" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/disposalpipe/junction{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"xi" = (
/obj/machinery/light/small{
dir = 8
@@ -5757,6 +6162,10 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/wall/boss,
/area/lavaland/surface/outdoors)
+"xI" = (
+/obj/machinery/computer/security/telescreen/entertainment,
+/turf/simulated/wall,
+/area/mine/outpost/hallway/west)
"xJ" = (
/obj/structure/stone_tile/block{
dir = 4
@@ -5789,13 +6198,20 @@
/turf/simulated/floor/carpet,
/area/mine/outpost/quartermaster)
"xQ" = (
-/obj/structure/lattice/catwalk/mining,
-/obj/structure/railing,
/obj/structure/sign/fire{
pixel_x = 32
},
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/outpost/catwalk)
+/obj/structure/chair/sofa/bench{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"xS" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -5809,6 +6225,23 @@
/obj/effect/spawner/random/cobweb/left/rare,
/turf/simulated/floor/plating,
/area/mine/outpost/maintenance/south)
+"xV" = (
+/obj/effect/turf_decal/box/corners,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
+"xY" = (
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"ya" = (
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/wall/indestructible/boss,
@@ -5984,6 +6417,17 @@
/obj/effect/baseturf_helper/lava_land,
/turf/simulated/floor/carpet,
/area/mine/outpost/quartermaster)
+"yM" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"yO" = (
/obj/machinery/door/airlock/glass{
name = "Construction Site"
@@ -5996,6 +6440,13 @@
},
/turf/simulated/floor/plating,
/area/mine/outpost/maintenance/south)
+"yQ" = (
+/obj/structure/lattice/catwalk/mining,
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"yR" = (
/obj/effect/spawner/random/barrier/grille_maybe,
/obj/effect/spawner/random/dirt/maybe,
@@ -6067,6 +6518,13 @@
/obj/item/storage/bag/dice,
/turf/simulated/floor/plasteel,
/area/mine/laborcamp)
+"zg" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/obj/structure/lattice/catwalk/mining,
+/turf/simulated/floor/lava/mapping_lava,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"zh" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -6333,6 +6791,21 @@
},
/turf/simulated/floor/catwalk,
/area/mine/outpost/engineering)
+"AA" = (
+/obj/structure/extinguisher_cabinet{
+ name = "east bump";
+ pixel_x = 27
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"AB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/barricade/wooden,
@@ -6488,14 +6961,10 @@
/turf/simulated/floor/plating,
/area/mine/outpost/maintenance/south)
"By" = (
-/obj/structure/lattice/catwalk/mining,
-/obj/machinery/camera{
- c_tag = "Mining Outpost - Landing Pad South";
- dir = 8;
- network = list("Mining Outpost")
- },
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/outpost/catwalk)
+/obj/structure/sign/fire,
+/obj/effect/baseturf_helper/lava_land,
+/turf/simulated/wall,
+/area/mine/outpost/smith_workshop)
"BD" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -6546,7 +7015,9 @@
/area/lavaland/surface/outdoors)
"BY" = (
/obj/structure/lattice/catwalk/mining,
-/obj/structure/marker_beacon/dock_marker,
+/obj/structure/marker_beacon/dock_marker{
+ name = "beacon"
+ },
/obj/structure/railing{
dir = 4
},
@@ -6583,6 +7054,14 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"Cj" = (
+/obj/machinery/smithing/casting_basin,
+/obj/effect/turf_decal/box,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"Cl" = (
/obj/structure/table/reinforced,
/obj/item/clothing/head/that,
@@ -6623,13 +7102,22 @@
/obj/effect/mapping_helpers/turfs/rust/maybe,
/turf/simulated/wall/r_wall,
/area/mine/laborcamp/security)
-"Cu" = (
-/obj/structure/lattice/catwalk/mining,
-/obj/structure/railing{
- dir = 6
+"Cs" = (
+/obj/machinery/light{
+ dir = 8
},
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/outpost/catwalk)
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/machinery/button/windowtint{
+ id = "smith_workshop";
+ pixel_x = 6;
+ pixel_y = 24
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"Cw" = (
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel{
@@ -6637,6 +7125,15 @@
icon_state = "tranquillite"
},
/area/mine/outpost/cafeteria)
+"CC" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"CD" = (
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plasteel{
@@ -6681,6 +7178,9 @@
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station,
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkpurplecorners"
@@ -6726,12 +7226,11 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/outpost/catwalk)
-"CZ" = (
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/outpost/catwalk)
"Da" = (
/obj/structure/lattice/catwalk/mining,
-/obj/structure/marker_beacon/dock_marker,
+/obj/structure/marker_beacon/dock_marker{
+ name = "beacon"
+ },
/obj/structure/railing{
dir = 8
},
@@ -6772,9 +7271,6 @@
/turf/simulated/floor/plating,
/area/mine/laborcamp)
"Do" = (
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
/obj/structure/sign/electricshock{
pixel_y = 32
},
@@ -6832,6 +7328,24 @@
"DC" = (
/turf/simulated/wall,
/area/mine/outpost/custodial)
+"DF" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"DO" = (
/obj/machinery/door/airlock/glass{
name = "Labor Camp Library"
@@ -6851,6 +7365,12 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/hologram/holopad,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -7004,6 +7524,13 @@
/obj/item/toy/figure/crew/syndie,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"EF" = (
+/obj/machinery/light,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"EG" = (
/obj/machinery/light/small{
dir = 1
@@ -7039,10 +7566,6 @@
icon_state = "tranquillite"
},
/area/mine/outpost/cafeteria)
-"EO" = (
-/obj/item/toy/figure/crew/miner,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/targetable)
"EP" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
@@ -7116,6 +7639,31 @@
/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plating,
/area/mine/outpost/maintenance/south)
+"Fs" = (
+/obj/machinery/door/airlock/mining{
+ name = "Miner Lockers"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/lockers)
"Fv" = (
/obj/structure/stone_tile/block{
dir = 1
@@ -7175,6 +7723,18 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"FO" = (
+/obj/machinery/door/airlock/maintenance/external/glass{
+ name = "Catwalk Access"
+ },
+/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"FS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -7220,10 +7780,29 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/outpost/catwalk)
+"Ga" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/hologram/holopad,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"Gb" = (
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/mineral/random/high_chance/volcanic,
/area/lavaland/surface/outdoors/unexplored/danger)
+"Gc" = (
+/obj/structure/lattice/catwalk/mining,
+/obj/structure/railing,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"Gl" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -7281,6 +7860,12 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"Gv" = (
+/obj/effect/spawner/window/reinforced/polarized{
+ id = "smith_workshop"
+ },
+/turf/simulated/floor/plating,
+/area/mine/outpost/smith_workshop)
"Gw" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -7294,6 +7879,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -7365,6 +7953,15 @@
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/mine/laborcamp)
+"GW" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"He" = (
/obj/machinery/door/airlock/mining/glass{
name = "Hallway"
@@ -7380,13 +7977,6 @@
icon_state = "darkpurplecorners"
},
/area/mine/outpost/hallway/west)
-"Hf" = (
-/obj/structure/lattice/catwalk/mining,
-/obj/effect/turf_decal/loading_area{
- dir = 1
- },
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/outpost/catwalk)
"Hh" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -7401,6 +7991,33 @@
dir = 1
},
/area/mine/laborcamp)
+"Hi" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
+"Hj" = (
+/obj/structure/sign/kiddieplaque/remembrance/mining{
+ pixel_x = 32
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/item/kirbyplants/large,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"Hm" = (
/obj/structure/lattice/catwalk/mining,
/turf/simulated/floor/lava/mapping_lava,
@@ -7413,6 +8030,18 @@
},
/turf/simulated/floor/plating/lavaland_air,
/area/mine/outpost/hallway/east)
+"Hq" = (
+/obj/effect/spawner/random/cobweb/left/frequent,
+/obj/structure/table,
+/obj/machinery/recharger/wallcharger{
+ pixel_y = 25
+ },
+/obj/machinery/newscaster/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"Hw" = (
/obj/machinery/light/small{
dir = 4
@@ -7465,13 +8094,15 @@
},
/area/mine/outpost/cafeteria)
"HI" = (
-/obj/machinery/economy/vending/cigarette,
-/obj/effect/turf_decal/stripes/box,
+/obj/effect/turf_decal/box,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
},
-/area/mine/outpost/hallway/west)
+/area/mine/outpost/smith_workshop)
"HP" = (
/obj/structure/closet/secure_closet/brig/gulag,
/obj/effect/decal/cleanable/dirt,
@@ -7574,16 +8205,14 @@
},
/area/mine/laborcamp)
"IK" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
},
-/area/mine/outpost/lockers)
+/area/mine/outpost/smith_workshop)
"IQ" = (
/obj/structure/stone_tile{
dir = 4
@@ -7613,6 +8242,13 @@
icon_state = "darkfull"
},
/area/mine/laborcamp)
+"IX" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 1
+ },
+/obj/structure/lattice/catwalk/mining,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"IZ" = (
/obj/structure/stone_tile/block,
/obj/effect/mapping_helpers/no_lava,
@@ -7638,6 +8274,24 @@
},
/obj/item/beacon,
/obj/effect/baseturf_helper/lava_land,
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
+"Jd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -7658,6 +8312,14 @@
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/carpet,
/area/mine/outpost/quartermaster)
+"Ji" = (
+/obj/structure/table,
+/obj/machinery/economy/vending/wallmed/directional/east,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"Jk" = (
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/multi_tile/glass{
@@ -7677,11 +8339,6 @@
/obj/machinery/alarm/directional/north,
/turf/simulated/floor/plasteel,
/area/mine/outpost/mechbay)
-"Jn" = (
-/obj/structure/lattice/catwalk/mining,
-/mob/living/simple_animal/cockroach/brad,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/outpost/catwalk)
"Jv" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -7798,15 +8455,15 @@
/obj/machinery/power/apc/directional/east,
/turf/simulated/floor/carpet,
/area/mine/outpost/quartermaster)
-"Kc" = (
-/obj/structure/lattice/catwalk/mining,
-/obj/structure/railing,
-/obj/item/toy/cattoy{
- pixel_y = 11;
- pixel_x = -9
+"Kd" = (
+/obj/structure/chair/sofa/bench/left{
+ dir = 8
},
-/turf/simulated/floor/lava/mapping_lava,
-/area/lavaland/surface/outdoors/outpost/catwalk)
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"Kf" = (
/obj/structure/dispenser/oxygen,
/turf/simulated/floor/plasteel{
@@ -7827,6 +8484,13 @@
icon_state = "darkred"
},
/area/mine/laborcamp/security)
+"Ko" = (
+/obj/effect/turf_decal/box,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"Kq" = (
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
@@ -7855,14 +8519,9 @@
},
/area/mine/outpost/custodial)
"KA" = (
-/obj/machinery/camera{
- c_tag = "Mining Outpost - Landing Pad North";
- dir = 9;
- network = list("Mining Outpost")
- },
-/obj/structure/lattice/catwalk/mining,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/outpost/catwalk)
+/obj/structure/sign/fire,
+/turf/simulated/wall/r_wall,
+/area/mine/outpost/hallway/west)
"KB" = (
/obj/structure/stone_tile/block{
dir = 8
@@ -8000,24 +8659,18 @@
/turf/simulated/floor/plasteel,
/area/mine/laborcamp)
"Lr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkfull"
- },
-/area/mine/outpost/lockers)
-"Lw" = (
+/obj/machinery/magma_crucible,
+/turf/simulated/floor/transparent/glass/reinforced/plasma,
+/area/mine/outpost/smith_workshop)
+"Ly" = (
/obj/structure/lattice/catwalk/mining,
-/obj/structure/railing/corner,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/obj/structure/railing{
+ dir = 10
+ },
+/obj/structure/marker_beacon/dock_marker{
+ name = "beacon"
+ },
+/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors/outpost/catwalk)
"Lz" = (
/obj/machinery/hologram/holopad,
@@ -8039,7 +8692,9 @@
/area/mine/laborcamp)
"LM" = (
/obj/structure/lattice/catwalk/mining,
-/obj/structure/marker_beacon/dock_marker,
+/obj/structure/marker_beacon/dock_marker{
+ name = "beacon"
+ },
/obj/structure/railing{
dir = 1
},
@@ -8064,6 +8719,17 @@
icon_state = "darkpurplecorners"
},
/area/mine/outpost/airlock)
+"LQ" = (
+/obj/machinery/camera{
+ c_tag = "Mining Outpost - Smith's Workshop";
+ dir = 1;
+ network = list("Mining Outpost")
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"LS" = (
/obj/structure/lattice/catwalk/mining,
/obj/structure/railing{
@@ -8135,9 +8801,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment/corner{
- dir = 1
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -8150,6 +8814,16 @@
/obj/machinery/atmospherics/pipe/simple/visible/supply,
/turf/simulated/floor/catwalk,
/area/mine/laborcamp)
+"MG" = (
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"MK" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -8159,6 +8833,18 @@
icon_state = "darkyellowcorners"
},
/area/mine/outpost/hallway/west)
+"ML" = (
+/obj/machinery/light_switch{
+ name = "North Switch";
+ pixel_y = 24
+ },
+/obj/structure/closet/wardrobe/miner,
+/obj/machinery/alarm/directional/east,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/lockers)
"MQ" = (
/obj/item/stack/ore/iron,
/turf/simulated/floor/plating{
@@ -8188,17 +8874,6 @@
icon_state = "barber"
},
/area/mine/laborcamp)
-"Nb" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/light,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/catwalk,
-/area/mine/outpost/engineering)
"Nc" = (
/obj/machinery/light{
dir = 1
@@ -8223,6 +8898,16 @@
},
/turf/simulated/floor/plasteel,
/area/mine/outpost/mechbay)
+"Nl" = (
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"Np" = (
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station,
@@ -8278,6 +8963,19 @@
/obj/structure/flora/ash/rock/style_random,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/targetable)
+"NE" = (
+/obj/machinery/smithing/power_hammer{
+ pixel_x = 0;
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"NF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -8304,6 +9002,12 @@
/obj/effect/spawner/random/dirt/maybe,
/turf/simulated/floor/plating,
/area/mine/outpost/maintenance/south)
+"NL" = (
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 8
+ },
+/turf/simulated/floor/transparent/glass/reinforced/plasma,
+/area/mine/outpost/smith_workshop)
"NP" = (
/obj/machinery/computer/shuttle/mining,
/turf/simulated/floor/mineral/titanium/blue,
@@ -8312,10 +9016,6 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/mineral/random/volcanic,
/area/lavaland/surface/outdoors/targetable)
-"NT" = (
-/obj/structure/sign/nanotrasen,
-/turf/simulated/wall,
-/area/mine/outpost/lockers)
"NU" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
@@ -8366,6 +9066,12 @@
/obj/effect/turf_decal/caution,
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/mining)
+"Og" = (
+/obj/structure/lattice/catwalk/mining,
+/obj/machinery/floodlight/anchored,
+/obj/effect/turf_decal/stripes/line,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"Ol" = (
/obj/structure/stone_tile/surrounding_tile{
dir = 4
@@ -8400,6 +9106,15 @@
},
/turf/simulated/floor/wood,
/area/mine/laborcamp)
+"Ot" = (
+/obj/machinery/camera{
+ c_tag = "Mining Outpost - Landing Pad North";
+ dir = 8;
+ network = list("Mining Outpost")
+ },
+/obj/structure/lattice/catwalk/mining,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"Ow" = (
/obj/effect/turf_decal/delivery/hollow,
/obj/structure/closet/crate,
@@ -8440,6 +9155,21 @@
},
/turf/simulated/floor/wood,
/area/mine/laborcamp)
+"OK" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/lockers)
"OO" = (
/obj/structure/extinguisher_cabinet{
name = "east bump";
@@ -8508,12 +9238,17 @@
},
/area/mine/laborcamp)
"Pd" = (
-/obj/structure/chair/sofa/bench,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "darkyellowcorners"
+/obj/machinery/mineral/smart_hopper{
+ input_dir = 4
},
-/area/mine/outpost/hallway/west)
+/obj/effect/turf_decal/stripes/end{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"Pg" = (
/obj/structure/sign/securearea{
name = "\improper KEEP CLEAR: DOCKING AREA"
@@ -8558,25 +9293,16 @@
icon_state = "darkfull"
},
/area/mine/outpost/engineering)
-"Pu" = (
-/obj/machinery/door/airlock/mining{
- name = "Miner Lockers"
- },
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+"Pw" = (
+/turf/simulated/wall/boss,
+/area/lavaland/surface/outdoors/unexplored/danger)
+"Pz" = (
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
},
-/area/mine/outpost/lockers)
-"Pw" = (
-/turf/simulated/wall/boss,
-/area/lavaland/surface/outdoors/unexplored/danger)
+/area/mine/outpost/hallway/west)
"PD" = (
/obj/structure/sign/poster/official/random{
pixel_x = 32
@@ -8756,6 +9482,13 @@
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/siberia)
+"QC" = (
+/obj/machinery/requests_console/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"QE" = (
/obj/effect/spawner/window/reinforced/plasma/grilled,
/obj/structure/cable{
@@ -8782,6 +9515,16 @@
/obj/effect/spawner/random/fungus/maybe,
/turf/simulated/wall,
/area/mine/outpost/custodial)
+"QK" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/machinery/economy/vending/coffee,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/hallway/west)
"QO" = (
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/mineral/ancient/lava_land_surface_hard,
@@ -8796,6 +9539,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkpurplecorners"
@@ -8854,6 +9600,9 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/outpost/catwalk)
+"RB" = (
+/turf/simulated/wall,
+/area/mine/outpost/smith_workshop)
"RJ" = (
/obj/structure/stone_tile/slab/burnt,
/obj/structure/stone_tile/slab,
@@ -8970,6 +9719,26 @@
icon_state = "darkredfull"
},
/area/mine/outpost/hallway/west)
+"Sr" = (
+/obj/structure/sign/nanotrasen{
+ pixel_y = -32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
+"Sv" = (
+/obj/effect/spawner/window/reinforced/plasma/grilled,
+/turf/simulated/floor/plating,
+/area/mine/outpost/smith_workshop)
+"SB" = (
+/obj/effect/turf_decal/stripes/red/line,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"SD" = (
/obj/structure/lattice/catwalk/mining,
/obj/structure/railing{
@@ -9109,6 +9878,12 @@
/obj/effect/baseturf_helper/lava_land,
/turf/simulated/floor/plating,
/area/mine/outpost/maintenance/east)
+"Tq" = (
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkyellowcorners"
+ },
+/area/mine/outpost/hallway/west)
"Ts" = (
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/mineral/random/high_chance/volcanic,
@@ -9142,11 +9917,29 @@
},
/area/mine/outpost/hallway/west)
"TJ" = (
-/obj/structure/sign/nanotrasen{
- pixel_y = 32
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/targetable)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/machinery/door/airlock/mining/glass,
+/obj/effect/mapping_helpers/airlock/access/any/supply/smith,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/polarized{
+ id = "smith_workshop"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkyellowcorners"
+ },
+/area/mine/outpost/smith_workshop)
"TL" = (
/obj/machinery/atmospherics/unary/tank/air{
dir = 8
@@ -9255,6 +10048,18 @@
icon_state = "darkfull"
},
/area/mine/laborcamp)
+"Uv" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"Uw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 1
@@ -9285,7 +10090,9 @@
/area/lavaland/surface/outdoors/targetable)
"UI" = (
/obj/structure/lattice/catwalk/mining,
-/obj/structure/marker_beacon/dock_marker,
+/obj/structure/marker_beacon/dock_marker{
+ name = "beacon"
+ },
/obj/structure/railing{
dir = 4
},
@@ -9310,6 +10117,16 @@
/obj/structure/lattice/catwalk/mining,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors/outpost/catwalk)
+"UP" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 8
+ },
+/obj/effect/turf_decal/delivery/hollow,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkyellowcorners"
+ },
+/area/mine/outpost/hallway/west)
"UQ" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -9407,6 +10224,16 @@
/obj/machinery/light,
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/mining)
+"Vv" = (
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"Vw" = (
/obj/structure/lattice/catwalk/mining,
/obj/structure/railing/corner{
@@ -9492,6 +10319,15 @@
icon_state = "yellowsiding"
},
/area/mine/laborcamp)
+"VO" = (
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"VP" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -9628,6 +10464,13 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/outpost/catwalk)
+"WH" = (
+/obj/structure/lattice/catwalk/mining,
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/lava/mapping_lava,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"WJ" = (
/obj/machinery/flasher{
id = "labor";
@@ -9687,6 +10530,16 @@
},
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors/outpost/catwalk)
+"WT" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/miner,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/lockers)
"WV" = (
/obj/effect/spawner/random/dirt/maybe,
/obj/item/gps/ruin{
@@ -9696,18 +10549,19 @@
/turf/simulated/floor/plating,
/area/mine/outpost/maintenance/east)
"WX" = (
-/obj/machinery/alarm/directional/east,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
},
-/area/mine/outpost/lockers)
+/area/mine/outpost/smith_workshop)
"WZ" = (
/obj/structure/lattice/catwalk/mining,
-/obj/structure/marker_beacon/dock_marker,
+/obj/structure/marker_beacon/dock_marker{
+ name = "beacon"
+ },
/obj/structure/railing{
dir = 8
},
@@ -9748,9 +10602,6 @@
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"Xe" = (
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
/obj/structure/noticeboard{
pixel_y = 28
},
@@ -9789,18 +10640,18 @@
},
/area/mine/laborcamp)
"Xu" = (
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
/obj/machinery/firealarm/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
},
/area/mine/outpost/hallway/west)
+"Xx" = (
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"Xy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -9835,16 +10686,6 @@
icon_state = "darkpurplecorners"
},
/area/mine/outpost/airlock)
-"XI" = (
-/obj/structure/lattice/catwalk/mining,
-/obj/structure/railing/corner,
-/turf/simulated/floor/lava/mapping_lava,
-/area/lavaland/surface/outdoors/outpost/catwalk)
-"XK" = (
-/obj/structure/lattice/catwalk/mining,
-/obj/structure/bed/dogbed/brad,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/outpost/catwalk)
"XP" = (
/obj/machinery/door/airlock/external{
id_tag = "laborcamp_away2";
@@ -9867,6 +10708,26 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
+"XV" = (
+/obj/structure/lattice/catwalk/mining,
+/obj/structure/closet/crate/internals,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/crowbar/red,
+/obj/item/crowbar/red,
+/obj/item/crowbar/red,
+/obj/item/crowbar/red,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"XW" = (
/obj/machinery/recharge_station,
/obj/item/radio/intercom{
@@ -9899,6 +10760,21 @@
/obj/structure/glowshroom,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"Yd" = (
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"Yj" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
@@ -10032,6 +10908,16 @@
dir = 10
},
/area/mine/laborcamp)
+"YD" = (
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/smith_workshop)
"YE" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -10106,6 +10992,14 @@
icon_state = "darkyellowcorners"
},
/area/mine/outpost/hallway/west)
+"Zg" = (
+/obj/structure/lattice/catwalk/mining,
+/obj/structure/railing,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/dogbed/brad,
+/mob/living/simple_animal/cockroach/brad,
+/turf/simulated/floor/lava/mapping_lava,
+/area/lavaland/surface/outdoors/outpost/catwalk)
"Zh" = (
/obj/effect/mapping_helpers/turfs/rust/maybe,
/turf/simulated/wall,
@@ -10142,6 +11036,16 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/outpost/catwalk)
+"Zw" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/light,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkfull"
+ },
+/area/mine/outpost/engineering)
"Zz" = (
/obj/structure/lattice/catwalk/mining,
/obj/effect/decal/cleanable/dirt,
@@ -17374,16 +18278,16 @@ iF
iF
iF
iF
-iF
-iF
-iF
-rf
-iF
-iF
-iF
-iF
-iF
-iF
+bt
+dO
+dO
+dO
+dO
+dO
+dO
+dO
+gl
+ef
iF
iF
iF
@@ -17630,18 +18534,18 @@ iF
iF
iF
iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-uM
-iF
-iF
-iF
-jZ
+GJ
+eC
+Iw
+UI
+eA
+eA
+eA
+tA
+BY
+eh
+WR
+ef
iF
iF
iF
@@ -17887,18 +18791,18 @@ iF
iF
iF
iF
-iF
-jZ
-iF
-iF
-iF
-iF
-iF
-iF
-jZ
-Vy
-iF
-iF
+hC
+UO
+pg
+xC
+tb
+xC
+tb
+fc
+xo
+LM
+vZ
+dx
iF
iF
iF
@@ -18144,18 +19048,18 @@ iF
iF
iF
iF
-iF
-bt
-dO
-dO
-dO
-dO
-dO
-dO
-dO
-gl
-ef
-iF
+hC
+cR
+xC
+xC
+NY
+JX
+Oc
+ZG
+xC
+CX
+Hm
+dx
iF
iF
jZ
@@ -18401,18 +19305,18 @@ iF
iF
iF
iF
-GJ
-eC
-Iw
-UI
-eA
-eA
-eA
-tA
-BY
-eh
-WR
-ef
+hC
+vj
+tb
+NP
+Wo
+rM
+Oc
+Vu
+xC
+CX
+Hm
+dx
iF
iF
iF
@@ -18659,20 +19563,20 @@ iF
iF
iF
hC
-UO
-pg
+bo
xC
-tb
xC
-tb
-fc
-xo
-LM
+gJ
+Cf
+Oc
+Sb
+xC
+CX
vZ
-dx
-iF
-iF
+bH
iF
+Vy
+Vy
iF
iF
iF
@@ -18915,17 +19819,17 @@ iF
jZ
iF
iF
-hC
-cR
+VA
+cH
+WD
xC
-xC
-NY
-JX
-Oc
-ZG
-xC
-CX
-Hm
+tb
+fU
+tb
+fc
+xo
+LM
+vZ
dx
iF
jZ
@@ -19172,21 +20076,21 @@ iF
iF
iF
sD
-hC
-vj
-tb
-NP
-Wo
-rM
-Oc
-Vu
-xC
-CX
+ZT
+vZ
+Ry
+Da
+Pg
+fd
+Pg
+Zu
+WZ
+vz
Hm
dx
iF
-Vy
-Vy
+iF
+iF
iF
iF
iF
@@ -19429,26 +20333,26 @@ iF
iF
iF
jZ
-hC
-bo
-xC
-xC
-gJ
-Cf
-Oc
-Sb
-xC
-CX
vZ
-bH
-iF
-iF
-jZ
+vZ
+vZ
+IX
+bS
+vs
+zj
+cm
+vZ
+vZ
+Hm
+zg
+dO
+dO
+nC
+iF
iF
iF
iF
iF
-jZ
iF
iF
iF
@@ -19686,27 +20590,27 @@ nu
iF
iF
jZ
-VA
-cH
-WD
-xC
-tb
-fU
-tb
-fc
-xo
-LM
+uI
vZ
-dx
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
+vZ
+kC
+um
+cp
+um
+op
+uv
+RB
+RB
+ow
+Sv
+Sv
+yQ
+gl
+gl
+gl
+dO
+dO
+ef
iF
iF
iF
@@ -19943,28 +20847,28 @@ nu
nu
iF
iF
-ZT
+WH
vZ
-Ry
-Da
-Pg
-fd
-Pg
-Zu
-WZ
-vz
-XI
-Bo
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
+Ot
+Og
+um
+cp
+um
+XV
+vZ
+RB
+Hq
+sB
+YD
+Sv
+Sv
+Sv
+RB
+RB
+vZ
+Hm
+WR
+Ly
iF
iF
iF
@@ -20203,26 +21107,26 @@ iF
hC
vZ
KA
-Hf
-bS
-vs
-zj
-cm
+XZ
+XZ
+Sq
+XZ
+XZ
By
-Lw
-Cu
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
+RB
+QC
+sY
+nz
+VO
+Xx
+Xx
+oN
+RB
+vZ
+Hm
+vZ
+yQ
+ef
iF
iF
iF
@@ -20458,30 +21362,30 @@ gl
kt
kt
eC
-vZ
+Hm
tX
fJ
-um
-cp
-um
+MK
+fz
+bg
vM
-tX
-Qp
-CZ
-CZ
-nu
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
+RB
+Cs
+Xx
+sY
+tk
+vk
+NE
+GW
+Sr
+RB
+vZ
+vZ
+vZ
+vZ
+bH
iF
+uM
iF
iF
iF
@@ -20717,26 +21621,26 @@ El
El
PG
dJ
-XZ
-XZ
-Sq
-XZ
-XZ
+pu
+sT
+sT
+sT
+sT
+bd
+CC
+sY
+sY
+Xx
+pv
+lO
+xV
+EF
+RB
gi
gi
gi
gi
-NT
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
+Gc
iF
iF
iF
@@ -20974,27 +21878,27 @@ dS
hW
eu
ep
-ur
-MK
-fz
-bg
-br
-gi
+bx
+sT
+sT
+sT
+sT
+Gv
+Xx
+sY
+Xx
+Xx
+wY
+HI
+Ko
+Nl
+RB
tI
BD
gH
-sk
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
+gi
+Gc
+jZ
iF
iF
iF
@@ -21236,21 +22140,21 @@ dz
sT
sT
ga
-gi
+Gv
+Cj
+sY
+Cj
+kH
+Yd
+wM
+GW
+LQ
+RB
AO
Fe
bC
-sk
-nu
-iF
-iF
-iF
-iF
-iF
-iF
-jZ
-iF
-iF
+gi
+Gc
iF
iF
iF
@@ -21493,21 +22397,21 @@ Mu
Jb
sT
gb
-gi
+Gv
+wI
+NL
+MG
+vi
+gx
+lO
+xV
+rN
+RB
bG
Wf
rB
rk
-nu
-jZ
-iF
-iF
-iF
-iF
-iF
-iF
-iF
-iF
+bH
iF
iF
iF
@@ -21750,21 +22654,21 @@ fC
Gw
gf
gm
-Pu
+RB
IK
Lr
-bC
-sk
-nu
-iF
-iF
-iF
-iF
-jZ
-iF
-iF
-iF
-iF
+SB
+kh
+lR
+Uv
+jy
+EF
+RB
+WT
+aJ
+pW
+gi
+dx
iF
iF
iF
@@ -22007,21 +22911,21 @@ fD
bI
gg
Ai
-gi
+RB
em
WX
+xY
+aC
+wo
+vP
+Vv
+re
+RB
+ML
+OK
EB
-sk
-iF
-iF
-EO
-iF
-iF
-iF
-iF
-iF
-nu
-iF
+gi
+dx
iF
iF
iF
@@ -22264,23 +23168,23 @@ fy
DP
TH
Zf
+RB
+Gv
+Pd
+Gv
+Gv
+TJ
+RB
+RB
+RB
+RB
gi
-gi
-gi
+Fs
gi
rk
-TJ
-iF
-iF
-jZ
-jZ
-iF
+bH
uM
iF
-nu
-jZ
-iF
-iF
iF
iF
iF
@@ -22518,27 +23422,27 @@ zv
yr
bR
Do
-dp
+DF
sT
-fA
-XZ
-XK
-bH
+Tq
+Tq
+Tq
+UP
ln
+Tq
+sR
+he
+Tq
+ud
+Tq
+Tq
+gT
+fA
+um
+lt
iF
iF
iF
-nu
-nu
-iF
-nu
-iF
-iF
-iF
-iF
-jZ
-iF
-iF
iF
iF
"}
@@ -22771,33 +23675,33 @@ fF
dD
dm
Ph
-Nb
+zv
dR
bR
Xu
-dp
-sT
-Pd
-XZ
-Jn
-Kc
-iF
-jZ
-uM
-nu
-nu
-nu
-jZ
-nu
-nu
+xh
+tO
+tO
+tO
+tO
+tO
+Hi
+Ga
+qu
+yM
+yM
+gX
+AA
+qZ
+Jd
ek
-iF
+FO
+Zg
nu
iF
iF
iF
iF
-iF
"}
(50,1,1) = {"
aa
@@ -23029,20 +23933,20 @@ TL
dI
fo
ez
-dR
-HI
-es
+Zw
+bR
+tr
dp
-eg
+Hj
aI
-XZ
+es
cl
xQ
-jZ
-jZ
-nu
-nu
-nu
+Kd
+Ji
+QK
+sT
+Pz
Oq
dB
dB
@@ -23288,7 +24192,7 @@ dy
Vg
dR
bR
-vQ
+ul
CH
bR
bR
@@ -23297,9 +24201,9 @@ eM
eM
Zh
Zh
-nu
-nu
-nu
+bR
+xI
+bR
Oq
Yk
We
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index 0c393a8f9f8..adf942e0d04 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -4382,6 +4382,14 @@
icon_state = "darkred"
},
/area/station/security/lobby)
+"arm" = (
+/obj/machinery/conveyor{
+ dir = 1;
+ id = "packageSort1"
+ },
+/obj/structure/plasticflaps,
+/turf/simulated/floor/plating,
+/area/station/supply/sorting)
"arn" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -16002,6 +16010,15 @@
icon_state = "whitecorner"
},
/area/station/hallway/secondary/entry)
+"bcX" = (
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"bcZ" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -18549,7 +18566,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"bkv" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -19612,19 +19629,6 @@
"bnD" = (
/turf/simulated/floor/plasteel,
/area/station/public/locker)
-"bnE" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency/port)
"bnF" = (
/obj/machinery/economy/vending/clothing,
/turf/simulated/floor/plasteel,
@@ -19716,19 +19720,17 @@
/turf/simulated/wall,
/area/station/public/storage/tools/auxiliary)
"bnT" = (
-/obj/structure/table,
-/obj/machinery/door/poddoor/shutters{
- name = "Old Shop Shutters";
- id_tag = "oldshop"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/door/window{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Old Shop"
+/obj/machinery/door/airlock/mining{
+ name = "Expedition Headquarters"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
+/obj/effect/mapping_helpers/airlock/access/any/supply/expedition,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/autoname,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"bnW" = (
/obj/machinery/computer/station_alert,
/turf/simulated/floor/plasteel{
@@ -20115,6 +20117,10 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
+ },
/turf/simulated/floor/plating,
/area/station/public/storage/emergency/port)
"bpc" = (
@@ -20168,14 +20174,13 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/port/east)
"bpl" = (
-/obj/structure/rack{
- dir = 1
- },
-/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/cobweb/left/frequent,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"bpm" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=QM";
@@ -20187,14 +20192,13 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/nw)
"bpn" = (
-/obj/machinery/door_control{
- id = "oldshop";
- name = "Old Shop Shutters Control";
- pixel_x = 24
- },
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/port)
+/obj/machinery/firealarm/directional/east,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"bpo" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -20617,15 +20621,14 @@
/turf/simulated/floor/plasteel,
/area/station/public/locker)
"bqA" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
+/obj/effect/spawner/random/cobweb/left/rare,
+/obj/structure/closet/secure_closet/explorer,
+/obj/machinery/requests_console/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "brown"
},
-/obj/item/extinguisher,
-/obj/item/extinguisher,
-/obj/item/extinguisher,
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency/port)
+/area/station/supply/expedition)
"bqB" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
@@ -20671,11 +20674,9 @@
},
/area/station/service/hydroponics)
"bqJ" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"bqK" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
@@ -20962,6 +20963,13 @@
/area/station/service/library)
"brz" = (
/obj/structure/closet/walllocker/emerglocker/north,
+/obj/structure/rack{
+ dir = 8;
+ layer = 2.9
+ },
+/obj/item/extinguisher,
+/obj/item/extinguisher,
+/obj/item/extinguisher,
/turf/simulated/floor/plating,
/area/station/public/storage/emergency/port)
"brA" = (
@@ -20986,9 +20994,15 @@
},
/area/station/hallway/secondary/exit)
"brE" = (
-/obj/machinery/space_heater,
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency/port)
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/alarm/directional/east,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"brF" = (
/obj/structure/rack,
/obj/item/melee/baton/cattleprod,
@@ -21191,19 +21205,27 @@
/area/station/hallway/secondary/entry)
"bsm" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small{
- dir = 8
+/obj/effect/landmark/start/explorer,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/port)
+/area/station/supply/expedition)
"bsn" = (
-/obj/effect/spawner/random/cobweb/left/rare,
-/obj/machinery/atmospherics/portable/canister/air,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
+/obj/structure/closet/secure_closet/explorer,
+/obj/machinery/camera{
+ c_tag = "AI Satellite Atmospherics";
+ dir = 4;
+ network = list("SS13","MiniSat")
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"bso" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/wardrobe/miner,
@@ -21265,15 +21287,12 @@
/turf/simulated/floor/plating,
/area/station/public/storage/emergency/port)
"bsI" = (
-/obj/structure/extinguisher_cabinet{
- name = "south bump";
- pixel_y = -30
+/obj/structure/closet/secure_closet/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency/port)
+/area/station/supply/expedition)
"bsJ" = (
/obj/structure/sign/electricshock{
pixel_y = 32
@@ -21296,8 +21315,9 @@
/turf/simulated/wall/r_wall,
/area/station/hallway/primary/central/ne)
"bsM" = (
+/obj/machinery/power/apc/directional/east,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-8"
},
/turf/simulated/floor/plating,
/area/station/public/storage/emergency/port)
@@ -21319,26 +21339,12 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"bsQ" = (
-/obj/machinery/power/apc/directional/east,
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "browncorner"
},
-/obj/item/radio/intercom{
- name = "south bump";
- pixel_y = -28
- },
-/turf/simulated/floor/plating,
-/area/station/public/storage/emergency/port)
-"bsR" = (
-/obj/structure/rack{
- dir = 1
- },
-/obj/effect/spawner/random/maintenance,
-/obj/item/storage/secure/safe{
- pixel_y = 25
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
+/area/station/supply/expedition)
"bsS" = (
/obj/structure/table,
/obj/item/reagent_containers/condiment/enzyme{
@@ -21383,14 +21389,12 @@
},
/area/station/service/kitchen)
"bsW" = (
-/obj/structure/table,
-/obj/item/paper/crumpled,
-/obj/item/coin/iron{
- pixel_y = 7;
- pixel_x = -8
+/obj/machinery/recharge_station,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "brown"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
+/area/station/supply/expedition)
"bsX" = (
/obj/machinery/processor,
/obj/machinery/firealarm/directional/east,
@@ -21402,12 +21406,6 @@
/obj/machinery/alarm/directional/south,
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
-"bsZ" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/port)
"bta" = (
/obj/item/radio/intercom{
name = "north bump";
@@ -21802,6 +21800,10 @@
/obj/structure/table,
/obj/item/storage/box/lights/mixed,
/obj/item/storage/toolbox/emergency,
+/obj/structure/extinguisher_cabinet{
+ name = "south bump";
+ pixel_y = -30
+ },
/turf/simulated/floor/plating,
/area/station/public/storage/emergency/port)
"buk" = (
@@ -21817,7 +21819,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/junction,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/nw)
"bun" = (
@@ -21825,6 +21827,9 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "browncorner"
@@ -22128,12 +22133,14 @@
/area/station/public/locker)
"bvr" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/requests_console/directional/west,
+/obj/machinery/light{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"bvs" = (
/turf/simulated/wall,
/area/station/public/toilet/lockerroom)
@@ -22155,13 +22162,6 @@
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/station/public/locker)
-"bvw" = (
-/obj/effect/spawner/random/blood/often,
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
"bvx" = (
/obj/machinery/power/apc/directional/east,
/obj/structure/cable,
@@ -22176,6 +22176,7 @@
/area/station/hallway/primary/central/ne)
"bvF" = (
/obj/machinery/light/small,
+/obj/item/stack/rods,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bvI" = (
@@ -22424,6 +22425,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
+/mob/living/simple_animal/mouse/gray,
/turf/simulated/floor/plasteel,
/area/station/maintenance/port)
"bwx" = (
@@ -22439,17 +22441,21 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bwz" = (
-/obj/structure/closet,
-/obj/effect/spawner/random/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
+/obj/machinery/mineral/equipment_vendor/explorer,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"bwA" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
- dir = 8
+ dir = 1
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"bwB" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -22544,41 +22550,46 @@
/turf/simulated/wall,
/area/station/supply/storage)
"bxd" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "packageSort2"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/simulated/floor/plating,
+/turf/simulated/wall,
/area/station/supply/sorting)
"bxe" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "packageSort2"
- },
/obj/machinery/light{
dir = 8
},
-/turf/simulated/floor/plating,
-/area/station/supply/sorting)
-"bxf" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "packageSort2"
- },
-/obj/structure/plasticflaps,
-/obj/structure/disposalpipe/segment{
+/obj/machinery/disposal/delivery_chute,
+/obj/structure/disposalpipe/trunk{
dir = 4
},
/turf/simulated/floor/plating,
/area/station/supply/sorting)
+"bxf" = (
+/obj/machinery/requests_console/directional/north,
+/obj/structure/table,
+/obj/item/storage/box,
+/obj/item/paper_bin{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/item/storage/box,
+/obj/item/storage/box,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "arrival"
+ },
+/area/station/supply/sorting)
"bxg" = (
-/obj/structure/disposalpipe/trunk{
- dir = 8
+/obj/structure/table,
+/obj/item/rcs,
+/obj/item/stack/package_wrap,
+/obj/item/stack/package_wrap,
+/obj/item/stack/package_wrap,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "arrival"
},
-/obj/machinery/disposal/delivery_chute{
- dir = 8
- },
-/turf/simulated/floor/plating,
/area/station/supply/sorting)
"bxi" = (
/obj/machinery/door/firedoor,
@@ -22749,22 +22760,13 @@
/turf/simulated/floor/wood,
/area/station/public/vacant_office)
"byk" = (
-/obj/structure/chair/stool{
+/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/turf/simulated/floor/plasteel,
+/turf/simulated/wall,
/area/station/supply/sorting)
"byl" = (
-/obj/machinery/conveyor_switch/oneway{
- id = "packageSort2"
- },
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"bym" = (
@@ -22824,6 +22826,13 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/structure/chair/stool{
+ dir = 8
+ },
+/obj/item/radio/intercom{
+ name = "north bump";
+ pixel_y = 28
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"byD" = (
@@ -23046,6 +23055,10 @@
"bzE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"bzF" = (
@@ -23071,58 +23084,32 @@
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"bzH" = (
-/obj/structure/table,
-/obj/machinery/requests_console/directional/north,
-/obj/item/stack/tape_roll,
-/obj/item/dest_tagger{
- pixel_x = 4;
- pixel_y = 3
- },
-/obj/item/dest_tagger{
- pixel_x = 4;
- pixel_y = 3
- },
/obj/structure/disposalpipe/segment/corner{
dir = 2
},
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "arrival"
- },
+/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"bzI" = (
-/obj/item/storage/box,
-/obj/structure/table,
-/obj/item/storage/box,
-/obj/item/storage/box,
-/obj/item/radio/intercom{
- name = "north bump";
- pixel_y = 28
- },
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "arrival"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"bzJ" = (
/turf/simulated/wall,
/area/station/supply/office)
"bzK" = (
-/obj/structure/table,
-/obj/item/stack/package_wrap,
-/obj/item/stack/package_wrap,
-/obj/item/stack/package_wrap,
-/obj/item/rcs,
-/obj/machinery/alarm/directional/north,
/turf/simulated/floor/plasteel{
- dir = 5;
+ dir = 4;
icon_state = "arrival"
},
/area/station/supply/sorting)
@@ -23422,11 +23409,11 @@
},
/area/station/science/rnd)
"bBf" = (
-/obj/structure/closet/secure_closet/explorer,
+/obj/machinery/requests_console/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"bBg" = (
/obj/structure/closet/emcloset,
/obj/machinery/camera{
@@ -23483,11 +23470,11 @@
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"bBp" = (
-/obj/structure/table,
/obj/machinery/light{
dir = 4
},
/obj/machinery/recharger,
+/obj/structure/table,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "arrival"
@@ -23628,14 +23615,15 @@
},
/area/station/public/locker)
"bBU" = (
-/obj/structure/disposalpipe/broken{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 9
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
+/area/station/supply/expedition)
"bCf" = (
/turf/simulated/wall,
/area/station/maintenance/disposal)
@@ -24014,19 +24002,21 @@
/turf/simulated/floor/plasteel,
/area/station/supply/warehouse)
"bDJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
+/obj/machinery/light,
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"bDL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools/auxiliary)
"bDN" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
@@ -25296,10 +25286,14 @@
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"bIK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"bIM" = (
@@ -26608,9 +26602,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"bNW" = (
@@ -26640,6 +26632,12 @@
dir = 9
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"bOd" = (
@@ -27033,12 +27031,11 @@
/area/station/medical/reception)
"bPH" = (
/obj/machinery/newscaster/security_unit/directional/south,
-/obj/structure/closet/secure_closet/explorer,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"bPK" = (
/obj/structure/chair/stool{
dir = 1
@@ -29595,7 +29592,7 @@
dir = 9;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"cap" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -29610,16 +29607,18 @@
dir = 1;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"caq" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/table/reinforced,
+/obj/item/eftpos/register,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"cat" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/cobweb/right/frequent,
@@ -29631,7 +29630,7 @@
dir = 5;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"cau" = (
/obj/structure/table,
/obj/item/mmi,
@@ -30007,12 +30006,11 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/suit_storage_unit/expedition,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"cbT" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -30450,16 +30448,6 @@
icon_state = "freezerfloor"
},
/area/station/science/robotics)
-"cdE" = (
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = 32
- },
-/obj/machinery/suit_storage_unit/expedition,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "brown"
- },
-/area/station/supply/expedition)
"cdF" = (
/obj/machinery/computer/operating{
name = "Robotics Operating Computer";
@@ -30530,7 +30518,7 @@
dir = 8;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"cdS" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -30812,12 +30800,11 @@
dir = 4;
network = list("SS13","MiniSat")
},
-/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"cfe" = (
/turf/simulated/floor/plating{
desc = "
There is some old writing on this floor. You are barely able to read out a few lines from a tangled scribble.
In a chamber a great mirror lies, cut away it solemn cries. Travel bold as thou might, piercing vastness as a kite.
HONK!
";
@@ -32115,12 +32102,18 @@
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"ckx" = (
-/obj/machinery/economy/vending/exploredrobe,
+/obj/structure/shelf/supply,
+/obj/item/stack/sheet/metal/ten,
+/obj/item/stack/sheet/glass{
+ amount = 10;
+ pixel_x = -3;
+ pixel_y = 6
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"ckB" = (
/obj/machinery/light{
dir = 8
@@ -32191,9 +32184,8 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
-/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"ckL" = (
/obj/structure/table,
/obj/item/paper_bin,
@@ -32406,6 +32398,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark/start/shaft_miner,
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"clw" = (
@@ -32904,6 +32897,13 @@
/obj/effect/spawner/window/reinforced/plasma,
/turf/simulated/floor/plating,
/area/station/science/server/coldroom)
+"cnz" = (
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/mining,
+/obj/effect/mapping_helpers/airlock/access/any/supply/smith,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"cnA" = (
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
@@ -33035,13 +33035,13 @@
},
/area/station/medical/patients_rooms1)
"cnX" = (
-/obj/structure/closet/secure_closet/explorer,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"cnY" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -33096,7 +33096,6 @@
/turf/simulated/floor/plating,
/area/station/medical/patients_rooms_secondary)
"cog" = (
-/obj/machinery/mineral/equipment_vendor,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "brown"
@@ -33124,9 +33123,14 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
"con" = (
-/obj/effect/spawner/random/blood/often,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"coo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/table/wood,
@@ -33164,12 +33168,15 @@
/area/station/maintenance/asmaint2)
"coH" = (
/obj/effect/spawner/random/cobweb/right/frequent,
-/obj/structure/dispenser/oxygen,
+/obj/structure/sign/poster/random{
+ pixel_y = 32
+ },
+/obj/structure/closet/secure_closet/smith,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"coK" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -33574,12 +33581,11 @@
},
/area/station/supply/miningdock)
"cqB" = (
-/obj/machinery/suit_storage_unit/expedition,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"cqG" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/wardrobe/miner,
@@ -34858,12 +34864,11 @@
/area/station/maintenance/apmaint)
"cvm" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/suit_storage_unit/expedition,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"cvp" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/apmaint)
@@ -37737,13 +37742,15 @@
},
/area/station/science/misc_lab)
"cFM" = (
-/obj/structure/closet/secure_closet/explorer,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = 32
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"cFP" = (
/obj/structure/rack{
dir = 8;
@@ -37911,18 +37918,6 @@
icon_state = "darkblue"
},
/area/station/medical/surgery/secondary)
-"cGD" = (
-/obj/structure/table,
-/obj/machinery/door/poddoor/shutters{
- name = "Old Shop Shutters";
- id_tag = "oldshop"
- },
-/obj/machinery/door/window{
- name = "Old Shop";
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
"cGE" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -38219,14 +38214,18 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"cHC" = (
-/obj/machinery/mineral/equipment_vendor/explorer,
+/obj/structure/shelf/supply,
+/obj/item/hammer,
+/obj/item/hammer,
+/obj/item/hammer,
+/obj/item/storage/belt/utility,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"cHD" = (
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/south)
@@ -47950,6 +47949,20 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"dDY" = (
+/obj/machinery/door/airlock/mining{
+ name = "Expedition Headquarters"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/expedition,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/autoname,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"dEb" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/food/meat/slab,
@@ -48146,6 +48159,11 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/station/supply/sorting)
+"dHN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/space_heater,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/port)
"dHU" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -50358,6 +50376,7 @@
/area/station/command/office/captain/bedroom)
"eKd" = (
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/mineral/equipment_vendor,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
@@ -50487,14 +50506,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
-"eOg" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/economy/atm/directional/west,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "redcorner"
- },
-/area/station/security/lobby)
"eOh" = (
/obj/machinery/economy/vending/cigarette,
/obj/structure/window/reinforced,
@@ -50642,6 +50653,10 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/warden)
+"eSb" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"eSn" = (
/obj/structure/table,
/obj/structure/disposalpipe/junction/reversed{
@@ -51129,16 +51144,6 @@
icon_state = "darkgreen"
},
/area/station/medical/medbay3)
-"feD" = (
-/obj/machinery/light{
- dir = 4
- },
-/obj/machinery/firealarm/directional/east,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "brown"
- },
-/area/station/supply/expedition)
"feN" = (
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/north)
@@ -51414,6 +51419,10 @@
icon_state = "cautioncorner"
},
/area/station/hallway/primary/aft/north)
+"flB" = (
+/obj/effect/spawner/random/fungus/maybe,
+/turf/simulated/wall,
+/area/station/supply/expedition)
"flN" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -52250,6 +52259,12 @@
},
/turf/simulated/floor/engine,
/area/station/science/test_chamber)
+"fEL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/firecloset,
+/obj/effect/spawner/random/maintenance,
+/turf/simulated/floor/plating,
+/area/station/maintenance/port)
"fEO" = (
/obj/structure/chair/stool/bar{
dir = 8
@@ -52939,11 +52954,22 @@
icon_state = "white"
},
/area/station/maintenance/asmaint)
-"gaW" = (
-/obj/effect/spawner/random/blood/often,
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/wood,
-/area/station/maintenance/apmaint2)
+"gba" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/classic/normal{
+ name = "Smith Desk";
+ dir = 8
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/smith{
+ dir = 8
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id_tag = "smithdesk";
+ name = "Smith's Desk Shutters"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"gbs" = (
/obj/machinery/economy/vending/cigarette,
/turf/simulated/floor/plasteel{
@@ -56130,6 +56156,10 @@
dir = 1;
sort_type_txt = "2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"hJb" = (
@@ -56472,6 +56502,21 @@
},
/turf/simulated/floor/carpet/arcade,
/area/station/public/arcade)
+"hSx" = (
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/sorting)
"hSA" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -56748,11 +56793,9 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/machinery/mineral/mint{
- input_dir = 4
- },
+/obj/structure/dispenser/oxygen,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/port)
+/area/station/supply/expedition)
"ibl" = (
/obj/structure/disposalpipe/segment/corner{
dir = 1
@@ -57142,6 +57185,12 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/port/east)
+"ile" = (
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"ilh" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -58491,6 +58540,16 @@
name = "south bump";
pixel_y = -24
},
+/obj/structure/rack{
+ dir = 8;
+ layer = 2.9
+ },
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
/turf/simulated/floor/plating,
/area/station/public/storage/emergency/port)
"iZj" = (
@@ -59287,6 +59346,12 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/gravitygenerator)
+"jtD" = (
+/obj/effect/mapping_helpers/airlock/access/any/supply/expedition,
+/obj/machinery/door/airlock/maintenance,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/station/supply/expedition)
"jtO" = (
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
@@ -60023,6 +60088,14 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
+"jPg" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/economy/atm/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "redcorner"
+ },
+/area/station/security/lobby)
"jPk" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -60470,6 +60543,14 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/maintenance/disposal)
+"jZQ" = (
+/obj/structure/closet/secure_closet/explorer,
+/obj/machinery/newscaster/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"jZT" = (
/obj/machinery/door/airlock/engineering{
name = "Aft Starboard Solar Access"
@@ -60553,6 +60634,10 @@
},
/turf/simulated/floor/grass,
/area/station/security/permabrig)
+"kcZ" = (
+/obj/machinery/atmospherics/portable/canister/air,
+/turf/simulated/floor/plating,
+/area/station/maintenance/port)
"kdc" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -61400,6 +61485,13 @@
/obj/effect/mapping_helpers/turfs/rust/maybe,
/turf/simulated/wall/r_wall,
/area/station/engineering/gravitygenerator)
+"kyJ" = (
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "yellowcorner"
+ },
+/area/station/hallway/primary/aft/south)
"kzB" = (
/obj/effect/spawner/random/food_or_drink/three_course_meal,
/obj/structure/closet/crate/freezer,
@@ -61542,6 +61634,13 @@
icon_state = "yellowcorner"
},
/area/station/maintenance/asmaint2)
+"kBW" = (
+/obj/machinery/suit_storage_unit/expedition,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"kCd" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
@@ -61627,7 +61726,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"kEt" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -62455,7 +62554,6 @@
},
/area/station/science/robotics)
"kZX" = (
-/obj/effect/mapping_helpers/airlock/access/any/supply/expedition,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -62463,12 +62561,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining{
- name = "Expedition Headquarters"
- },
/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/door/airlock/mining,
+/obj/effect/mapping_helpers/airlock/access/any/supply/smith,
/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"laa" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -62957,14 +63054,21 @@
/turf/simulated/floor/wood,
/area/station/maintenance/apmaint2)
"lnv" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "packageSort2"
+/obj/machinery/alarm/directional/north,
+/obj/structure/table,
+/obj/item/dest_tagger{
+ pixel_x = 4;
+ pixel_y = 3
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/item/dest_tagger{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/item/stack/tape_roll,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "arrival"
},
-/turf/simulated/floor/plating,
/area/station/supply/sorting)
"lnQ" = (
/obj/effect/turf_decal/delivery/partial,
@@ -64298,10 +64402,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint2)
-"lVm" = (
-/obj/item/kirbyplants/large,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"lVr" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 10
@@ -65927,6 +66027,11 @@
icon_state = "cafeteria"
},
/area/station/medical/reception)
+"mOd" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/any/supply/smith,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"mOi" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/bananium,
@@ -65994,13 +66099,11 @@
},
/area/station/medical/medbay2)
"mQd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "brown"
},
-/obj/structure/grille/broken,
-/obj/item/stack/rods,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/port)
+/area/station/supply/expedition)
"mQt" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
@@ -66748,7 +66851,7 @@
dir = 8;
icon_state = "brown"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"nrS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -67583,7 +67686,6 @@
/area/station/public/toilet/unisex)
"nNh" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/mineral/equipment_vendor,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
@@ -68050,15 +68152,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
-"nZt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/entry/north)
"nZF" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
@@ -69452,7 +69545,7 @@
dir = 8
},
/turf/simulated/floor/plasteel,
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"oGf" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/economy/vending/sovietsoda,
@@ -69734,16 +69827,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/command/bridge)
-"oKs" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "packageSort2"
- },
-/obj/structure/disposalpipe/segment/corner{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/supply/sorting)
"oKv" = (
/obj/structure/rack,
/obj/item/extinguisher,
@@ -70706,6 +70789,9 @@
/obj/effect/mapping_helpers/airlock/access/all/security/doors,
/turf/simulated/floor/plasteel,
/area/station/security/processing)
+"pnc" = (
+/turf/simulated/wall,
+/area/station/supply/smith_office)
"pnT" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/computerframe{
@@ -71637,7 +71723,7 @@
dir = 8;
icon_state = "browncorner"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"pNL" = (
/obj/machinery/power/apc/directional/west,
/obj/structure/cable{
@@ -72453,6 +72539,19 @@
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"qjo" = (
+/obj/machinery/door_control{
+ id = "smithdesk";
+ name = "Smith's Desk Shutters Control";
+ pixel_x = 24;
+ pixel_y = 23;
+ req_access = list(49)
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
"qjs" = (
/obj/structure/weightmachine/stacklifter,
/obj/effect/decal/cleanable/dirt,
@@ -73018,14 +73117,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
-"qus" = (
-/obj/structure/table,
-/obj/item/toy/figure/crew/cargotech,
-/obj/structure/disposalpipe/segment/corner{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/supply/sorting)
"qvf" = (
/obj/structure/table,
/obj/item/melee/baton/cattleprod,
@@ -73479,6 +73570,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
+"qEe" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/entry/north)
"qEt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 5
@@ -73940,6 +74037,10 @@
/obj/machinery/light,
/turf/simulated/floor/carpet/royalblue,
/area/station/command/office/captain)
+"qQc" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"qQd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -74127,6 +74228,12 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
+"qVd" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"qVo" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -74995,6 +75102,10 @@
icon_state = "dark"
},
/area/station/telecomms/chamber)
+"rsw" = (
+/obj/item/kirbyplants/large,
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"rsz" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -75007,6 +75118,13 @@
},
/turf/simulated/floor/plating,
/area/station/command/office/hos)
+"rsA" = (
+/obj/effect/landmark/start/explorer,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"rtu" = (
/obj/structure/rack{
dir = 1
@@ -75422,13 +75540,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
-"rED" = (
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/station/hallway/primary/aft/south)
"rET" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -76371,6 +76482,14 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint2)
+"sfJ" = (
+/obj/structure/table,
+/obj/item/toy/figure/crew/cargotech,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "arrival"
+ },
+/area/station/supply/sorting)
"sgr" = (
/obj/machinery/door/airlock/engineering/glass{
heat_proof = 1;
@@ -76626,6 +76745,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
+"snM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/port)
"soj" = (
/obj/machinery/door/airlock/maintenance{
name = "Detective Maintenance";
@@ -77917,14 +78043,12 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"sZe" = (
-/obj/structure/rack{
- dir = 1
- },
-/obj/item/stack/spacecash/c10,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/port)
+/obj/machinery/economy/vending/exploredrobe,
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"sZg" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet,
@@ -78698,6 +78822,15 @@
/obj/effect/decal/cleanable/generic,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint2)
+"tzA" = (
+/obj/structure/disposalpipe/segment/corner,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/sorting)
"tzE" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -78907,6 +79040,10 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
+"tEr" = (
+/obj/effect/landmark/start/smith,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"tEt" = (
/obj/effect/spawner/random/barrier/grille_maybe,
/obj/structure/cable{
@@ -79306,6 +79443,18 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"tPw" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/sorting)
"tPD" = (
/obj/machinery/light{
dir = 4
@@ -79514,6 +79663,17 @@
},
/turf/simulated/floor/plating,
/area/station/security/prison/cell_block/a)
+"tSN" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/sorting)
"tSR" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -80230,6 +80390,9 @@
icon_state = "whitepurplefull"
},
/area/station/science/xenobiology)
+"umQ" = (
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"umT" = (
/turf/simulated/floor/carpet/grimey,
/area/station/command/office/hop)
@@ -80392,7 +80555,7 @@
dir = 4;
icon_state = "browncorner"
},
-/area/station/supply/expedition)
+/area/station/supply/smith_office)
"ury" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -82691,12 +82854,6 @@
},
/turf/simulated/floor/wood,
/area/station/command/office/ntrep)
-"vGS" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/entry/north)
"vHd" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
@@ -82843,6 +83000,15 @@
icon_state = "bluecorner"
},
/area/station/hallway/secondary/exit)
+"vKU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/entry/north)
"vLb" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
@@ -83174,13 +83340,14 @@
},
/area/station/science/hallway)
"vVK" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/port)
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"vWe" = (
/obj/structure/cable,
/obj/machinery/power/apc/directional/west,
@@ -83282,6 +83449,16 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/command/bridge)
+"vZu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = 32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/expedition)
"vZD" = (
/obj/machinery/computer/scan_consolenew{
dir = 4
@@ -84867,7 +85044,7 @@
/area/station/maintenance/apmaint)
"wQa" = (
/obj/machinery/requests_console/directional/west,
-/obj/effect/landmark/start/shaft_miner,
+/obj/machinery/mineral/equipment_vendor,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
@@ -85666,6 +85843,11 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/assembly_line)
+"xnt" = (
+/obj/effect/spawner/random/blood/often,
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/wood,
+/area/station/maintenance/apmaint2)
"xnF" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -86654,6 +86836,13 @@
/obj/structure/flora/junglebush,
/turf/simulated/floor/grass/jungle/no_creep,
/area/station/command/bridge)
+"xMk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/expedition)
"xMn" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -97710,7 +97899,7 @@ aJP
aRm
aOR
aQa
-vGS
+qEe
aMD
fay
fay
@@ -98738,7 +98927,7 @@ aJR
aRV
aOR
aQa
-nZt
+vKU
aRd
nff
aUm
@@ -108010,7 +108199,7 @@ bnK
cRC
bCs
bJt
-bnK
+kcZ
bnw
svp
bnK
@@ -108524,7 +108713,7 @@ blR
blR
bsc
bwy
-svp
+dHN
gfL
qsc
qsc
@@ -108781,7 +108970,7 @@ bpb
blR
blT
bwy
-bnw
+fEL
qsc
bDI
bzC
@@ -109551,7 +109740,7 @@ iFm
bsM
cEJ
blR
-bGX
+snM
bCj
qsc
cCh
@@ -109803,13 +109992,13 @@ tKX
bgA
biJ
bkf
-blR
-bnE
-bsM
-blR
-blR
-bwy
-cho
+wrU
+wrU
+wrU
+wrU
+wrU
+jtD
+wrU
qsc
bzB
bBj
@@ -110060,13 +110249,13 @@ aSu
bgE
fvs
jJs
-blR
+wrU
bqA
bsI
-blR
+jZQ
bsn
mQd
-mBl
+flB
qsc
qsc
qsc
@@ -110106,7 +110295,7 @@ gwb
uWp
tGO
cgQ
-gaW
+xnt
xRm
lnh
kym
@@ -110317,15 +110506,15 @@ qeM
ikL
bmx
bpj
-blR
+wrU
brE
bsQ
-blR
-bnK
-bwy
-blQ
+bKs
+qQc
+bcX
+wrU
bxe
-byy
+arm
byy
qZK
dHH
@@ -110574,13 +110763,13 @@ aMA
bgJ
rVo
epu
-blR
-blR
-blR
-blT
-blQ
+wrU
+wrU
+kBW
+bKs
+qVd
vVK
-blQ
+wrU
bxd
byk
byz
@@ -110832,15 +111021,15 @@ gIc
biG
bkg
blW
-blQ
+wrU
bpl
-bnK
+uAa
bsm
bBU
-blQ
-bxd
+dDY
+tSN
bDN
-wKl
+tPw
lje
bIG
bJE
@@ -110855,14 +111044,14 @@ bDX
bDX
rwR
bzJ
-wrU
-wrU
-wrU
-wrU
-wrU
-wrU
-wrU
-wrU
+pnc
+pnc
+pnc
+pnc
+pnc
+pnc
+pnc
+pnc
cog
nNh
coP
@@ -111089,15 +111278,15 @@ biF
dmv
bkg
blX
-blQ
-bsR
-svp
-bvw
+wrU
+kBW
+gyA
+rsA
bDJ
-blQ
-oKs
+wrU
+kCk
byl
-wbT
+hSx
lje
wKl
wKl
@@ -111112,16 +111301,16 @@ bUU
bUU
hLL
bsY
-wrU
+pnc
cao
cdQ
cfd
nrD
ckx
cHC
-wrU
-wrU
-wrU
+pnc
+cnz
+pnc
cha
cam
ckM
@@ -111346,16 +111535,16 @@ gIc
dmx
bkg
bql
-blQ
-bsZ
-bnK
+wrU
+bpl
+ile
bqJ
bwA
-blQ
+wrU
bxf
-bfx
+wKl
bzI
-kCk
+tzA
bIK
bzE
bzE
@@ -111378,7 +111567,7 @@ kEs
pNz
bvr
cnX
-wrU
+pnc
xfv
uvc
uId
@@ -111602,19 +111791,19 @@ gHr
gIc
dmx
bkg
-blQ
-mBl
+wrU
+flB
bsW
-svp
-bnK
+xMk
+bKs
sZe
-blQ
+wrU
lnv
-bfx
+wKl
bzH
bBo
bIJ
-qus
+wbT
box
wKl
bKC
@@ -111626,16 +111815,16 @@ bUV
bVL
bXj
fIS
-wrU
+pnc
caq
-uAa
-uAa
-gyA
+umQ
+umQ
+eSb
ckG
oFK
-bKs
+tEr
bBf
-wrU
+pnc
nIY
cqs
coL
@@ -111859,15 +112048,15 @@ gHr
djO
bmC
bks
-blQ
+wrU
iam
bpn
con
-svp
+vZu
bwz
-blQ
+wrU
bxg
-bfx
+sfJ
bzK
bBp
bCE
@@ -111883,16 +112072,16 @@ bUX
tum
bVt
bWU
-wrU
+pnc
cat
cbR
-cdE
+qjo
cvm
cqB
uro
-bKs
+umQ
bPH
-wrU
+pnc
eGZ
jWV
cqs
@@ -112116,13 +112305,13 @@ gHr
qZp
yhp
bkq
-blQ
-blQ
-blQ
+wrU
+wrU
+wrU
bnT
-cGD
-blQ
-blQ
+wrU
+wrU
+wrU
bfx
bfx
bfx
@@ -112140,16 +112329,16 @@ bUW
bPW
jPF
jPF
-wrU
-wrU
-wrU
-wrU
-wrU
-wrU
+pnc
+pnc
+pnc
+gba
+gba
+pnc
coH
-feD
+cqB
cFM
-wrU
+pnc
xQB
cgQ
rgs
@@ -112402,11 +112591,11 @@ bOw
bOw
bOw
bOw
-wrU
-wrU
-wrU
-wrU
-wrU
+pnc
+pnc
+mOd
+pnc
+pnc
xyI
coL
sPF
@@ -116017,7 +116206,7 @@ cBp
cAL
cDY
cvx
-rED
+kyJ
mqV
ePP
ePP
@@ -116456,7 +116645,7 @@ avd
axD
axA
ayj
-eOg
+jPg
azP
aBY
aCv
@@ -124202,7 +124391,7 @@ bqk
bqk
bqk
bAV
-lVm
+rsw
aUS
bAo
bHy
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index 28e2d33997f..4c20572b654 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -2541,16 +2541,27 @@
/turf/simulated/floor/grass,
/area/station/hallway/secondary/exit)
"auJ" = (
-/obj/structure/reagent_dispensers/fueltank,
/obj/machinery/power/apc/directional/north,
+/obj/structure/shelf/supply,
+/obj/item/hammer,
+/obj/item/hammer,
+/obj/item/hammer,
+/obj/item/storage/belt/utility,
+/obj/machinery/door_control{
+ id = "smithdesk";
+ name = "Smith's Desk Shutters Control";
+ pixel_x = 24;
+ pixel_y = 23;
+ req_access = list(49)
+ },
/obj/structure/cable/orange{
- icon_state = "0-2"
+ icon_state = "0-4"
},
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "yellow"
},
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"auK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/nonfunctional,
@@ -7368,6 +7379,20 @@
icon_state = "asteroidplating"
},
/area/station/maintenance/fsmaint)
+"biy" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/emergency,
+/obj/item/storage/toolbox/emergency{
+ pixel_y = 5;
+ pixel_x = 1
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/public/storage/tools/auxiliary)
"biz" = (
/obj/item/seeds/chili/ice,
/turf/simulated/floor/plating/asteroid/ancient/airless,
@@ -7800,16 +7825,14 @@
},
/area/station/medical/surgery/secondary)
"bkP" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/color/fyellow,
-/obj/item/clothing/suit/storage/hazardvest{
- pixel_y = 5
+/obj/structure/cable/orange{
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "yellow"
},
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"bkU" = (
/turf/simulated/wall,
/area/station/public/storage/tools)
@@ -8507,6 +8530,12 @@
icon_state = "darkgreen"
},
/area/station/medical/virology)
+"bpS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreen"
+ },
+/area/station/medical/virology)
"bpT" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -12527,6 +12556,15 @@
icon_state = "darkgreen"
},
/area/station/procedure/trainer_office)
+"bMt" = (
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel,
+/area/station/supply/lobby)
"bMw" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -15168,6 +15206,15 @@
icon_state = "darkyellow"
},
/area/station/command/bridge)
+"bYZ" = (
+/obj/machinery/alarm/directional/north,
+/obj/structure/cable/orange{
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/public/storage/tools/auxiliary)
"bZb" = (
/obj/machinery/computer/monitor{
dir = 8;
@@ -18523,6 +18570,9 @@
/obj/structure/cable/orange{
icon_state = "4-8"
},
+/obj/structure/cable/orange{
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"cBe" = (
@@ -19417,6 +19467,22 @@
icon_state = "dark"
},
/area/station/security/brig)
+"cHK" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Walkway"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "medlockdown";
+ layer = 2.6;
+ name = "Medical Lockdown"
+ },
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/spacebridge/dockmed)
"cHL" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -23439,7 +23505,9 @@
/area/station/maintenance/disposal/external/southeast)
"dhr" = (
/obj/item/solar_assembly,
-/obj/item/stack/sheet/glass,
+/obj/item/stack/sheet/glass{
+ amount = 10
+ },
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
@@ -27878,6 +27946,20 @@
icon_state = "whiteblue"
},
/area/station/medical/paramedic)
+"edo" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/disposal,
+/obj/item/radio/intercom{
+ name = "east bump";
+ pixel_x = 28
+ },
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "yellow"
+ },
+/area/station/supply/smith_office)
"edu" = (
/obj/machinery/door/poddoor{
name = "Containment Pen";
@@ -31942,19 +32024,22 @@
/turf/simulated/floor/wood,
/area/station/service/library)
"feO" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/orange{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/effect/turf_decal/delivery/hollow,
+/obj/structure/disposalpipe/junction{
dir = 4
},
-/obj/effect/turf_decal/delivery/hollow,
+/obj/structure/cable/orange{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
"feQ" = (
@@ -32294,6 +32379,18 @@
icon_state = "browncorner"
},
/area/station/supply/lobby)
+"fjY" = (
+/obj/structure/cable/orange{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "yellow"
+ },
+/area/station/supply/smith_office)
"fkc" = (
/obj/machinery/newscaster/directional/east,
/turf/simulated/floor/plasteel{
@@ -32819,6 +32916,18 @@
icon_state = "whitegreenfull"
},
/area/station/public/sleep)
+"frJ" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/public/storage/tools/auxiliary)
"frS" = (
/obj/structure/window/reinforced,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -35361,22 +35470,6 @@
},
/turf/simulated/floor/carpet/arcade,
/area/station/public/arcade)
-"fYt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "escape"
- },
-/area/station/hallway/secondary/entry/east)
"fYw" = (
/obj/structure/sign/radiation/rad_area,
/turf/simulated/wall/r_wall,
@@ -37632,13 +37725,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
-"gFd" = (
-/obj/machinery/shower{
- pixel_y = 24
- },
-/obj/effect/turf_decal/delivery/red/hollow,
-/turf/simulated/floor/noslip,
-/area/station/medical/virology)
"gFg" = (
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
@@ -39931,13 +40017,14 @@
},
/area/station/security/main)
"hle" = (
-/obj/machinery/light,
-/obj/structure/rack,
-/obj/item/storage/box/lights/mixed,
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
+ },
/turf/simulated/floor/plasteel{
icon_state = "yellow"
},
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"hli" = (
/obj/structure/cable/orange{
icon_state = "0-4"
@@ -40780,15 +40867,8 @@
/obj/structure/cable/orange{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/obj/structure/cable/orange{
- icon_state = "1-4"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -41209,6 +41289,14 @@
icon_state = "whitepurple"
},
/area/station/science/toxins/mixing)
+"hAz" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/engine{
+ slowdown = -0.3
+ },
+/area/station/hallway/spacebridge/dockmed)
"hAA" = (
/obj/structure/table/wood,
/obj/item/ashtray/bronze,
@@ -41913,14 +42001,10 @@
/turf/simulated/floor/wood,
/area/station/maintenance/apmaint)
"hIQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
+/obj/effect/landmark/start/smith,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"hIS" = (
/obj/machinery/alarm/directional/north,
/obj/structure/disposalpipe/segment{
@@ -44426,15 +44510,6 @@
icon_state = "whiteblue"
},
/area/station/maintenance/starboard)
-"imc" = (
-/obj/structure/sign/electricshock{
- pixel_x = 32
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellow"
- },
-/area/station/public/storage/tools/auxiliary)
"img" = (
/obj/structure/disposalpipe/segment/corner{
dir = 4
@@ -44479,22 +44554,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/port/south)
-"imx" = (
-/obj/structure/table,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty{
- pixel_x = 3;
- pixel_y = -2
- },
-/obj/item/stack/sheet/metal/fifty{
- pixel_y = 4;
- pixel_x = -4
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "yellow"
- },
-/area/station/public/storage/tools/auxiliary)
"imG" = (
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/asmaint)
@@ -44834,21 +44893,21 @@
/area/station/maintenance/port)
"iqv" = (
/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 2
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/door/window/classic/reversed{
+ name = "Smith's Desk";
dir = 4
},
-/obj/structure/cable/orange{
- icon_state = "4-8"
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/smith{
+ dir = 4
},
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id_tag = "smithdesk";
+ name = "Smith's Desk Shutters"
+ },
+/obj/structure/table/reinforced,
/turf/simulated/floor/plasteel,
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"iqy" = (
/obj/structure/closet/secure_closet/research_reagents,
/turf/simulated/floor/engine,
@@ -45906,6 +45965,18 @@
},
/turf/simulated/floor/wood,
/area/station/service/bar)
+"iEa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/maintenance/asmaint)
"iEd" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
@@ -45964,15 +46035,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/fore/east)
-"iEY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/station/public/storage/tools/auxiliary)
"iFb" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -47395,6 +47457,18 @@
icon_state = "darkredfull"
},
/area/station/medical/morgue)
+"iVq" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/economy/atm/directional/east,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/station/security/lobby)
"iVv" = (
/obj/structure/chair/stool{
dir = 1
@@ -47838,10 +47912,13 @@
},
/area/station/service/kitchen)
"jaz" = (
-/obj/structure/chair{
- dir = 1
- },
/obj/effect/landmark/start/assistant,
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "browncorner"
},
@@ -48154,6 +48231,24 @@
icon_state = "dark"
},
/area/station/hallway/primary/starboard/south)
+"jer" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Walkway"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "medlockdown";
+ layer = 2.6;
+ name = "Medical Lockdown"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/spacebridge/dockmed)
"jeu" = (
/obj/machinery/hologram/holopad,
/obj/structure/cable/orange{
@@ -49569,22 +49664,6 @@
},
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/maintcentral)
-"juZ" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Walkway"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/preopen{
- id_tag = "medlockdown";
- layer = 2.6;
- name = "Medical Lockdown"
- },
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
- },
-/area/station/hallway/spacebridge/dockmed)
"jvd" = (
/obj/effect/spawner/random/dirt/frequent,
/turf/simulated/floor/plasteel{
@@ -51095,6 +51174,16 @@
},
/turf/simulated/floor/wood,
/area/station/command/office/ntrep)
+"jKx" = (
+/obj/structure/closet/toolcloset,
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable/orange{
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/public/storage/tools/auxiliary)
"jKB" = (
/obj/structure/cable/orange{
icon_state = "4-8"
@@ -51185,19 +51274,6 @@
icon_state = "bluecorner"
},
/area/station/hallway/primary/starboard/south)
-"jLs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
- },
-/area/station/hallway/primary/port/south)
"jLv" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -52570,6 +52646,24 @@
icon_state = "neutralfull"
},
/area/station/public/dorms)
+"kcu" = (
+/obj/structure/rack,
+/obj/item/stack/rods/ten,
+/obj/item/stack/sheet/glass{
+ amount = 10
+ },
+/obj/item/stack/sheet/metal/ten,
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/public/storage/tools/auxiliary)
"kcw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -53331,9 +53425,15 @@
},
/area/station/supply/storage)
"kmP" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
/turf/simulated/floor/plasteel,
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"kmR" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -55286,6 +55386,10 @@
icon_state = "bcircuit"
},
/area/station/command/vault)
+"kJa" = (
+/obj/machinery/economy/atm/directional/west,
+/turf/simulated/floor/wood,
+/area/station/maintenance/gambling_den)
"kJb" = (
/obj/structure/disposalpipe/segment{
color = "#954535"
@@ -55555,7 +55659,9 @@
},
/area/station/medical/medbay2)
"kLA" = (
-/obj/item/stack/sheet/glass,
+/obj/item/stack/sheet/glass{
+ amount = 10
+ },
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/turf/space,
@@ -55647,18 +55753,6 @@
icon_state = "tranquillite"
},
/area/station/service/mime)
-"kMQ" = (
-/obj/structure/rack,
-/obj/item/airlock_electronics,
-/obj/item/apc_electronics{
- pixel_y = -4
- },
-/obj/machinery/firealarm/directional/south,
-/turf/simulated/floor/plasteel{
- dir = 10;
- icon_state = "yellow"
- },
-/area/station/public/storage/tools/auxiliary)
"kMV" = (
/obj/machinery/ai_status_display{
pixel_x = -32
@@ -58972,7 +59066,7 @@
/area/station/maintenance/storage)
"lAi" = (
/turf/simulated/floor/plasteel,
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"lAp" = (
/obj/machinery/light{
dir = 1
@@ -61169,6 +61263,14 @@
},
/turf/simulated/floor/plating,
/area/station/science/xenobiology)
+"mbc" = (
+/obj/structure/table,
+/obj/item/clothing/gloves/color/yellow/fake,
+/obj/item/clothing/suit/storage/hazardvest,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/public/storage/tools/auxiliary)
"mbd" = (
/obj/structure/cable/orange{
icon_state = "2-8"
@@ -61309,6 +61411,19 @@
},
/turf/simulated/floor/plating,
/area/station/hallway/primary/central/west)
+"mcc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/port/south)
"mck" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -64227,24 +64342,21 @@
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fore2)
"mQz" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/emergency{
- pixel_y = 5;
- pixel_x = 1
- },
-/obj/item/storage/toolbox/emergency{
- pixel_y = -2;
- pixel_x = -1
- },
/obj/machinery/camera{
c_tag = "Auxiliary Tool Storage";
dir = 8
},
+/obj/item/eftpos/register,
+/obj/structure/table,
+/obj/machinery/light_switch{
+ pixel_y = 24;
+ name = "north bump"
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "yellow"
},
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"mQF" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -65456,6 +65568,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/station/command/office/ce)
+"ngb" = (
+/obj/structure/rack,
+/obj/item/airlock_electronics,
+/obj/item/airalarm_electronics,
+/obj/item/apc_electronics,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/public/storage/tools/auxiliary)
"ngt" = (
/obj/structure/closet/secure_closet/hos,
/obj/machinery/light/small{
@@ -65544,10 +65665,6 @@
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
-"nii" = (
-/obj/machinery/economy/atm/directional/west,
-/turf/simulated/floor/wood,
-/area/station/maintenance/gambling_den)
"nik" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
@@ -69494,10 +69611,23 @@
/area/station/hallway/secondary/exit)
"oib" = (
/obj/machinery/door/firedoor,
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/classic/reversed{
+ name = "Smith's Desk";
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/smith{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id_tag = "smithdesk";
+ name = "Smith's Desk Shutters"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"oie" = (
/obj/machinery/light/small{
dir = 4
@@ -71202,6 +71332,14 @@
icon_state = "neutralcorner"
},
/area/station/hallway/secondary/entry/north)
+"oDs" = (
+/obj/structure/cable/orange{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/secondary/entry/west)
"oDx" = (
/obj/effect/landmark/start/assistant,
/obj/structure/chair/stool{
@@ -71898,15 +72036,6 @@
icon_state = "barber"
},
/area/station/service/barber)
-"oMu" = (
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "yellow"
- },
-/area/station/public/storage/tools/auxiliary)
"oMF" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -73705,6 +73834,9 @@
icon_state = "dark"
},
/area/station/science/robotics)
+"phE" = (
+/turf/simulated/wall,
+/area/station/supply/smith_office)
"phM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -75000,6 +75132,18 @@
},
/turf/simulated/floor/plating,
/area/station/command/office/hop)
+"pyS" = (
+/obj/structure/sign/electricshock{
+ pixel_x = 32
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "yellow"
+ },
+/area/station/supply/smith_office)
"pyV" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -75053,15 +75197,14 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -76265,6 +76408,12 @@
icon_state = "darkred"
},
/area/station/security/brig)
+"pOw" = (
+/obj/structure/closet/toolcloset,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/public/storage/tools/auxiliary)
"pOz" = (
/obj/machinery/kitchen_machine/oven,
/turf/simulated/floor/plasteel{
@@ -77101,6 +77250,12 @@
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plasteel/freezer,
/area/station/maintenance/gambling_den)
+"pWX" = (
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating/asteroid/ancient,
+/area/station/maintenance/asmaint)
"pWY" = (
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/fore/north)
@@ -77502,6 +77657,9 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/obj/effect/spawner/random/dirt/frequent,
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"qdf" = (
@@ -77694,18 +77852,6 @@
icon_state = "asteroidplating"
},
/area/station/maintenance/fsmaint)
-"qfO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/economy/atm/directional/east,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "redcorner"
- },
-/area/station/security/lobby)
"qga" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -79402,6 +79548,16 @@
icon_state = "white"
},
/area/station/maintenance/starboard)
+"qAj" = (
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/public/storage/tools/auxiliary)
"qAo" = (
/obj/machinery/light{
dir = 1
@@ -80858,13 +81014,6 @@
/obj/structure/sign/examroom,
/turf/simulated/floor/plating,
/area/station/medical/patients_rooms1)
-"qSl" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"qSm" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -81206,6 +81355,21 @@
icon_state = "darkpurple"
},
/area/station/science/robotics)
+"qWT" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Walkway"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "medlockdown";
+ layer = 2.6;
+ name = "Medical Lockdown"
+ },
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/spacebridge/dockmed)
"qWZ" = (
/obj/machinery/bodyscanner{
dir = 4
@@ -81321,25 +81485,6 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/supply_shuttle,
/turf/simulated/floor/plating,
/area/station/supply/storage)
-"qYA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
- },
-/area/station/hallway/primary/fore/west)
"qYE" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -81365,12 +81510,16 @@
/turf/simulated/floor/carpet/green,
/area/station/service/library)
"qYR" = (
-/obj/structure/closet/toolcloset,
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
+ },
+/obj/machinery/requests_console/directional/south,
+/obj/structure/closet/secure_closet/smith,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "yellow"
},
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"qYY" = (
/obj/structure/cable/orange{
icon_state = "1-2"
@@ -81821,14 +81970,6 @@
icon_state = "asteroidplating"
},
/area/station/maintenance/apmaint)
-"rez" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/simulated/floor/engine{
- slowdown = -0.3
- },
-/area/station/hallway/spacebridge/dockmed)
"reB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating{
@@ -84309,6 +84450,25 @@
icon_state = "red"
},
/area/station/security/range)
+"rNj" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/fore/west)
"rNm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -84690,6 +84850,13 @@
},
/turf/simulated/floor/carpet/royalblack,
/area/station/service/bar)
+"rRd" = (
+/obj/machinery/shower{
+ pixel_y = 24
+ },
+/obj/effect/turf_decal/delivery/red/hollow,
+/turf/simulated/floor/noslip,
+/area/station/medical/virology)
"rRe" = (
/obj/machinery/door/airlock/maintenance{
name = "Medbay Access"
@@ -87761,6 +87928,14 @@
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
/area/mine/unexplored/cere/civilian)
+"sCl" = (
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/secondary/entry/west)
"sCr" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -88203,9 +88378,17 @@
},
/area/station/hallway/primary/fore/west)
"sHw" = (
-/obj/effect/spawner/window/reinforced,
+/obj/machinery/door/airlock/mining/glass,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/any/supply/smith,
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"sHB" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc/directional/north,
@@ -88501,14 +88684,12 @@
},
/area/station/science/robotics)
"sLy" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "yellowcorner"
},
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"sLG" = (
/obj/machinery/light/small,
/turf/simulated/floor/plasteel{
@@ -91292,6 +91473,14 @@
},
/turf/simulated/floor/grass/jungle/no_creep,
/area/station/hallway/primary/port/south)
+"tuf" = (
+/obj/structure/cable/orange{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/secondary/entry/west)
"tug" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -91828,6 +92017,20 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"tAm" = (
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/public/storage/tools/auxiliary)
"tAw" = (
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plasteel,
@@ -91907,6 +92110,22 @@
icon_state = "purplecorner"
},
/area/station/hallway/primary/aft/east)
+"tBx" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "escape"
+ },
+/area/station/hallway/secondary/entry/east)
"tBG" = (
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/window/reinforced,
@@ -93779,6 +93998,9 @@
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -94845,12 +95067,6 @@
icon_state = "freezerfloor"
},
/area/station/medical/cloning)
-"ulc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgreen"
- },
-/area/station/medical/virology)
"uld" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -96535,6 +96751,12 @@
/obj/structure/chair/office/light,
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
+"uFE" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"uFL" = (
/obj/machinery/light{
dir = 1
@@ -96686,20 +96908,11 @@
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
"uHD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/orange{
- icon_state = "1-8"
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "yellow"
},
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"uHM" = (
/obj/structure/table,
/obj/item/storage/box/cups{
@@ -97319,21 +97532,6 @@
icon_state = "asteroidplating"
},
/area/station/maintenance/apmaint)
-"uPR" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Walkway"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/preopen{
- id_tag = "medlockdown";
- layer = 2.6;
- name = "Medical Lockdown"
- },
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/hallway/spacebridge/dockmed)
"uPU" = (
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plasteel{
@@ -97345,6 +97543,14 @@
/obj/structure/sign/botany,
/turf/simulated/wall,
/area/station/service/hydroponics)
+"uQb" = (
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/public/storage/tools/auxiliary)
"uQc" = (
/obj/machinery/newscaster/directional/south,
/obj/machinery/smartfridge/foodcart{
@@ -97397,11 +97603,14 @@
/area/station/maintenance/port2)
"uQs" = (
/obj/machinery/alarm/directional/east,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "yellow"
},
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"uQw" = (
/obj/effect/landmark/start/doctor,
/turf/simulated/floor/plasteel{
@@ -97810,6 +98019,13 @@
},
/turf/simulated/floor/plating,
/area/station/hallway/primary/starboard/south)
+"uVH" = (
+/obj/structure/rack,
+/obj/item/storage/box/lights/mixed,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/public/storage/tools/auxiliary)
"uWl" = (
/obj/structure/cable/orange{
icon_state = "2-8"
@@ -98719,6 +98935,15 @@
/obj/effect/spawner/window/reinforced/plasma/grilled,
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
+"vik" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/cable/orange{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plating/asteroid/ancient,
+/area/station/maintenance/asmaint)
"vit" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/orange{
@@ -101110,17 +101335,6 @@
icon_state = "dark"
},
/area/station/science/toxins/launch)
-"vLl" = (
-/obj/structure/closet/toolcloset,
-/obj/item/radio/intercom{
- name = "east bump";
- pixel_x = 28
- },
-/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "yellow"
- },
-/area/station/public/storage/tools/auxiliary)
"vLy" = (
/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
@@ -101951,6 +102165,12 @@
icon_state = "whitepurple"
},
/area/station/maintenance/apmaint)
+"vVN" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/public/storage/tools/auxiliary)
"vVP" = (
/obj/effect/spawner/random/dirt/frequent,
/turf/simulated/floor/plasteel{
@@ -104953,6 +105173,18 @@
/obj/machinery/hydroponics/soil,
/turf/simulated/floor/grass,
/area/station/service/hydroponics)
+"wFK" = (
+/obj/structure/shelf/supply,
+/obj/item/stack/sheet/glass{
+ amount = 10
+ },
+/obj/item/stack/sheet/metal/ten,
+/obj/machinery/firealarm/directional/south,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "yellow"
+ },
+/area/station/supply/smith_office)
"wGa" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/orange{
@@ -105288,7 +105520,7 @@
dir = 4;
icon_state = "yellow"
},
-/area/station/public/storage/tools/auxiliary)
+/area/station/supply/smith_office)
"wKi" = (
/obj/effect/spawner/airlock,
/turf/simulated/wall,
@@ -106051,6 +106283,9 @@
/area/station/supply/office)
"wUm" = (
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -110275,24 +110510,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/port)
-"xUV" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Walkway"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/preopen{
- id_tag = "medlockdown";
- layer = 2.6;
- name = "Medical Lockdown"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
- },
-/area/station/hallway/spacebridge/dockmed)
"xUW" = (
/obj/machinery/computer/shuttle/labor{
dir = 4
@@ -128830,7 +129047,7 @@ avf
aGB
qyA
qyA
-qfO
+iVq
qyA
crz
jKZ
@@ -128893,7 +129110,7 @@ nCV
aZZ
aZZ
aZZ
-jLs
+mcc
abh
gTt
cxo
@@ -134051,7 +134268,7 @@ sbn
sbn
oTL
qDR
-nii
+kJa
gLG
bRd
doZ
@@ -136542,7 +136759,7 @@ wvr
kop
bvz
wvr
-qYA
+rNj
chV
iEe
dzk
@@ -149749,12 +149966,12 @@ hUU
hUU
hUU
hUU
-aXn
-aXn
-aXn
-aXn
-aXn
-qHn
+jUJ
+jUJ
+jUJ
+jUJ
+jUJ
+jUJ
tbP
dbg
mqR
@@ -150006,12 +150223,12 @@ hUU
aXn
aXn
aXn
-aXn
-aXn
-aXn
-aXn
-aXn
-aXn
+jUJ
+pOw
+vVN
+kcu
+ngb
+jUJ
gUa
dbg
mqR
@@ -150263,14 +150480,14 @@ aXn
aXn
aXn
aXn
-aXn
-aXn
-aXn
-aXn
-aXn
-aXn
+jUJ
+bYZ
+uQb
+tAm
+qAj
+frJ
pzp
-dbg
+oDs
nDe
qHn
qHn
@@ -150520,14 +150737,14 @@ vRX
wLr
vpJ
vWF
-aXn
-aXn
-aXn
-aXn
-aXn
-aXn
+jUJ
+jKx
+mbc
+biy
+uVH
+jUJ
ecQ
-dbg
+sCl
mqR
syJ
jYp
@@ -150777,14 +150994,14 @@ mJk
cdj
fbs
wLr
-aXn
-aXn
-aXn
-aXn
-aXn
-aXn
+jUJ
+jUJ
+jUJ
+jUJ
+jUJ
+jUJ
eBl
-dbg
+sCl
sFj
dbg
eWu
@@ -151041,7 +151258,7 @@ gET
wUm
qdb
tZs
-dbg
+tuf
sFj
dbg
eWu
@@ -151295,7 +151512,7 @@ fRZ
abc
gak
wKu
-wKu
+iEa
mIS
vLT
vaz
@@ -151550,9 +151767,9 @@ vpJ
wLr
wLr
cAU
-qSl
-imG
-ggK
+eyB
+pWX
+vik
vpJ
xOp
jEo
@@ -156399,7 +156616,7 @@ ooM
bmR
wDU
oXl
-xUV
+jer
lVF
nos
ksp
@@ -156656,11 +156873,11 @@ bvt
bvt
bvt
qkV
-uPR
+qWT
oEj
bio
bio
-rez
+hAz
bio
oiB
bio
@@ -156913,7 +157130,7 @@ fXz
hCz
npl
jLn
-juZ
+cHK
lAC
xwI
xwI
@@ -157982,7 +158199,7 @@ nlJ
tJP
kQz
nFW
-fYt
+tBx
djw
fEC
xMQ
@@ -160210,12 +160427,12 @@ enH
oZX
koD
koD
-jUJ
-sHw
+phE
+phE
oib
iqv
-sHw
-jUJ
+phE
+phE
jCn
cEL
fmI
@@ -160467,12 +160684,12 @@ cJI
fjH
vyi
fZu
-jUJ
+phE
auJ
-oMu
uHD
-kMQ
-jUJ
+uHD
+wFK
+phE
jCn
cEL
fmI
@@ -160724,13 +160941,13 @@ mJE
nlT
jxd
gVo
-sHw
+phE
bkP
+uFE
lAi
-iEY
hle
-jUJ
-jUJ
+phE
+phE
ehQ
ftZ
tKj
@@ -160979,15 +161196,15 @@ sqG
mTo
sqG
feO
-jxd
+bMt
jaz
sHw
-imx
+fjY
kmP
hIQ
sLy
qYR
-fqw
+phE
fqw
nRe
rrj
@@ -161238,13 +161455,13 @@ oLo
vsv
dDJ
nEA
-jUJ
+phE
mQz
uQs
wKe
-imc
-vLl
-fqw
+pyS
+edo
+phE
vHH
vHH
eGO
@@ -165105,7 +165322,7 @@ fqw
nTw
lRL
bni
-gFd
+rRd
siv
bJe
uCk
@@ -168707,7 +168924,7 @@ bni
dzF
dzP
boq
-ulc
+bpS
aGe
dgD
iQz
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 2e532cc9860..d680873a4c2 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -2079,6 +2079,13 @@
icon_state = "red"
},
/area/station/maintenance/fore2)
+"aoz" = (
+/obj/machinery/economy/atm/directional/east,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "yellowcorner"
+ },
+/area/station/hallway/primary/port/north)
"aoA" = (
/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
@@ -12414,13 +12421,13 @@
},
/area/station/supply/storage)
"aTx" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -12459,10 +12466,7 @@
},
/area/station/supply/qm)
"aTB" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/apc/directional/north,
+/obj/machinery/alarm/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -12485,6 +12489,9 @@
/obj/structure/cable{
icon_state = "1-8"
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -12912,7 +12919,6 @@
},
/obj/machinery/requests_console/directional/north,
/obj/item/storage/firstaid/regular,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -13002,15 +13008,6 @@
icon_state = "neutralfull"
},
/area/station/supply/storage)
-"aVb" = (
-/obj/item/kirbyplants/large,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "brown"
- },
-/area/station/supply/office)
"aVf" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -13021,9 +13018,6 @@
},
/area/station/supply/qm)
"aVg" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/structure/chair/office/dark{
dir = 4
},
@@ -13220,8 +13214,10 @@
/turf/simulated/floor/plating,
/area/station/maintenance/gambling_den)
"aVX" = (
-/obj/structure/ore_box,
-/obj/effect/turf_decal/delivery/hollow,
+/obj/structure/table,
+/obj/machinery/kitchen_machine/microwave{
+ pixel_y = 6
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"aVZ" = (
@@ -13253,8 +13249,17 @@
/turf/simulated/floor/plasteel/dark,
/area/station/service/theatre)
"aWf" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/delivery,
+/obj/item/storage/toolbox/emergency{
+ pixel_x = 3;
+ pixel_y = -4
+ },
+/obj/item/storage/toolbox/emergency,
+/obj/item/shovel,
+/obj/item/shovel,
+/obj/item/pickaxe,
+/obj/item/pickaxe,
+/obj/structure/shelf/supply,
+/obj/effect/turf_decal/stripes/corner,
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"aWg" = (
@@ -13463,14 +13468,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
-"aWA" = (
-/obj/structure/plasticflaps{
- opacity = 1
- },
-/obj/effect/turf_decal/delivery,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
"aWC" = (
/obj/docking_port/stationary{
dir = 4;
@@ -13496,6 +13493,10 @@
/obj/item/paper_bin,
/obj/item/pen,
/obj/item/clipboard,
+/obj/machinery/power/apc/directional/north,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "brown"
@@ -14316,7 +14317,9 @@
},
/area/station/supply/office)
"aZj" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -14355,46 +14358,6 @@
icon_state = "neutralfull"
},
/area/station/engineering/atmos)
-"aZn" = (
-/obj/item/kirbyplants/large,
-/obj/machinery/light_switch{
- dir = 4;
- name = "west bump";
- pixel_x = -24
- },
-/turf/simulated/floor/plasteel{
- dir = 10;
- icon_state = "brown"
- },
-/area/station/supply/storage)
-"aZo" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "brown"
- },
-/area/station/supply/storage)
-"aZp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment/corner{
- dir = 2
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "purple"
- },
-/area/station/supply/storage)
-"aZq" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "purple"
- },
-/area/station/supply/storage)
"aZt" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -14432,7 +14395,6 @@
},
/area/station/supply/qm)
"aZA" = (
-/obj/machinery/alarm/directional/south,
/obj/machinery/camera{
c_tag = "Quartermaster Office";
dir = 1
@@ -14864,10 +14826,6 @@
"bbe" = (
/turf/simulated/wall,
/area/station/supply/miningdock)
-"bbf" = (
-/obj/machinery/status_display,
-/turf/simulated/wall,
-/area/station/supply/miningdock)
"bbi" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -14964,15 +14922,10 @@
},
/area/station/security/main)
"bbC" = (
-/obj/effect/turf_decal/arrows/black{
- dir = 4
- },
-/obj/effect/turf_decal/delivery/partial{
- dir = 4
- },
/obj/machinery/camera{
c_tag = "Supply Lobby"
},
+/obj/machinery/computer/supplycomp/public,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -15251,6 +15204,9 @@
/area/station/aisat)
"bcB" = (
/obj/effect/turf_decal/delivery/hollow,
+/obj/structure/railing/cap/normal{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -15258,6 +15214,9 @@
/area/station/supply/lobby)
"bcC" = (
/obj/effect/turf_decal/delivery,
+/obj/structure/railing/cap/reversed{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -15266,76 +15225,37 @@
/obj/machinery/light{
dir = 8
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
/obj/item/radio/intercom{
- name = "west bump";
- pixel_x = -28
- },
-/obj/structure/closet/secure_closet/miner,
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel{
- dir = 9;
- icon_state = "brown"
- },
-/area/station/supply/miningdock)
-"bcE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/secure_closet/miner,
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "purple"
- },
-/area/station/supply/miningdock)
-"bcF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
+ name = "north bump";
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "brown"
- },
-/area/station/supply/miningdock)
-"bcH" = (
-/obj/machinery/camera{
- c_tag = "Mining Access"
- },
-/obj/structure/closet/secure_closet/miner,
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel{
- dir = 5;
+ dir = 8;
icon_state = "brown"
},
/area/station/supply/miningdock)
"bcL" = (
/obj/structure/closet/secure_closet/cargotech,
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
+ },
/turf/simulated/floor/plasteel{
dir = 6;
- icon_state = "purple"
+ icon_state = "brown"
},
/area/station/supply/storage)
"bcM" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/computer/supplycomp/public,
-/obj/effect/turf_decal/delivery/hollow,
+/obj/effect/turf_decal/box,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "brown"
},
/area/station/supply/lobby)
-"bcN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/supply/lobby)
"bcP" = (
/turf/simulated/wall,
/area/station/hallway/primary/port/north)
@@ -15353,13 +15273,6 @@
icon_state = "dark"
},
/area/station/security/execution)
-"bdi" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "purple"
- },
-/area/station/supply/miningdock)
"bdk" = (
/turf/simulated/floor/engine/plasma,
/area/station/engineering/atmos)
@@ -15699,17 +15612,13 @@
/area/station/aisat)
"bea" = (
/obj/machinery/hologram/holopad,
-/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
/area/station/supply/lobby)
"beb" = (
-/obj/effect/turf_decal/arrows/black{
- dir = 1
- },
-/obj/effect/turf_decal/delivery/partial{
- dir = 1
+/obj/machinery/light{
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -15722,23 +15631,10 @@
/obj/structure/disposalpipe/junction{
dir = 8
},
-/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
/area/station/supply/lobby)
-"bed" = (
-/obj/effect/turf_decal/delivery/partial{
- dir = 1
- },
-/obj/effect/turf_decal/arrows/black{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "purple"
- },
-/area/station/supply/miningdock)
"bee" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -15748,24 +15644,16 @@
},
/area/station/service/hydroponics)
"beg" = (
-/obj/effect/landmark/start/shaft_miner,
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
+ },
/area/station/supply/miningdock)
"beh" = (
-/obj/effect/turf_decal/delivery/partial{
- dir = 1
- },
-/obj/effect/turf_decal/arrows/black{
- dir = 1
- },
/turf/simulated/floor/plasteel{
dir = 4;
- icon_state = "purple"
- },
-/area/station/supply/miningdock)
-"bei" = (
-/turf/simulated/floor/plasteel{
- dir = 9;
icon_state = "brown"
},
/area/station/supply/miningdock)
@@ -15777,12 +15665,6 @@
icon_state = "neutralfull"
},
/area/station/service/hydroponics)
-"bek" = (
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "brown"
- },
-/area/station/supply/miningdock)
"bem" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -15790,21 +15672,6 @@
icon_state = "brown"
},
/area/station/supply/storage)
-"ben" = (
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "purple"
- },
-/area/station/supply/miningdock)
-"beq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line,
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
-"ber" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
"bex" = (
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel{
@@ -16104,28 +15971,32 @@
},
/area/station/engineering/atmos/control)
"bfw" = (
-/obj/machinery/light{
- dir = 1
- },
/obj/machinery/firealarm/directional/west,
/obj/machinery/mineral/equipment_vendor,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "brown"
+ },
/area/station/supply/miningdock)
"bfx" = (
+/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
},
/area/station/supply/miningdock)
"bfz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start/shaft_miner,
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
+ },
/area/station/supply/miningdock)
"bfA" = (
/turf/simulated/floor/plasteel,
@@ -16136,23 +16007,28 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 4;
+ dir = 6;
icon_state = "brown"
},
/area/station/supply/miningdock)
"bfC" = (
-/obj/item/kirbyplants/large,
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel,
+/obj/effect/turf_decal/delivery/hollow,
+/obj/structure/closet/secure_closet/miner,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "purple"
+ },
/area/station/supply/miningdock)
"bfD" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "purple"
+/obj/machinery/light_switch{
+ dir = 1;
+ name = "south bump";
+ pixel_y = -24
},
+/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"bfE" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -16167,9 +16043,11 @@
/obj/structure/disposalpipe/segment/corner{
dir = 2
},
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
+/obj/effect/landmark/start/shaft_miner,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
},
+/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"bfG" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -16188,10 +16066,11 @@
/area/station/maintenance/fsmaint)
"bfK" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
+/obj/effect/landmark/start/shaft_miner,
+/obj/effect/turf_decal/caution{
+ dir = 8
},
+/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"bfL" = (
/obj/structure/reagent_dispensers/watertank,
@@ -16199,13 +16078,15 @@
/turf/simulated/floor/grass/jungle,
/area/station/maintenance/fsmaint)
"bfN" = (
-/obj/structure/table,
-/obj/machinery/kitchen_machine/microwave,
/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/light{
dir = 1
},
-/turf/simulated/floor/plasteel,
+/obj/structure/closet/secure_closet/miner,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "purple"
+ },
/area/station/supply/miningdock)
"bfO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -16226,16 +16107,6 @@
icon_state = "whitebluecorner"
},
/area/station/medical/medbay)
-"bfZ" = (
-/obj/effect/landmark/start/shaft_miner,
-/obj/effect/turf_decal/delivery/partial{
- dir = 1
- },
-/obj/effect/turf_decal/arrows/black{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
"bgb" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -16428,68 +16299,15 @@
icon_state = "neutralfull"
},
/area/station/supply/lobby)
-"bgE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/supply/lobby)
-"bgF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/supply/lobby)
"bgG" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
/area/station/supply/lobby)
-"bgH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/supply/lobby)
"bgJ" = (
/turf/simulated/wall,
/area/station/command/office/ce)
-"bgK" = (
-/obj/item/kirbyplants/large,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "purple"
- },
-/area/station/supply/miningdock)
"bgL" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -16504,23 +16322,6 @@
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel/dark,
/area/station/turret_protected/ai)
-"bgO" = (
-/obj/item/kirbyplants/large,
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "purple"
- },
-/area/station/supply/miningdock)
-"bgP" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "brown"
- },
-/area/station/supply/miningdock)
"bgQ" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -16532,7 +16333,10 @@
/area/station/public/storage/tools)
"bgR" = (
/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
/area/station/supply/miningdock)
"bgS" = (
/obj/effect/decal/cleanable/dirt,
@@ -16554,10 +16358,13 @@
},
/area/station/maintenance/fsmaint)
"bgW" = (
-/obj/structure/table,
-/obj/item/storage/box/donkpockets,
/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel,
+/obj/structure/closet/secure_closet/miner,
+/obj/machinery/alarm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "brown"
+ },
/area/station/supply/miningdock)
"bgY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -16894,146 +16701,117 @@
},
/area/station/supply/qm)
"bia" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/power/apc/directional/north,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plasteel{
- dir = 8;
+ dir = 9;
icon_state = "brown"
},
-/area/station/supply/miningdock)
+/area/station/supply/smith_office)
"bib" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
-"bic" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/disposalpipe/junction{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
},
-/obj/effect/landmark/start/shaft_miner,
-/obj/structure/cable{
- icon_state = "1-4"
+/obj/machinery/light_switch{
+ name = "North Switch";
+ pixel_y = 24
},
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
-"bid" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
-"bie" = (
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plasteel{
- dir = 4;
+ dir = 1;
icon_state = "brown"
},
-/area/station/supply/miningdock)
-"big" = (
+/area/station/supply/smith_office)
+"bic" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ icon_state = "1-4"
},
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "purple"
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
+"bid" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/area/station/supply/miningdock)
-"bih" = (
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/camera{
+ c_tag = "Mining Access"
},
+/obj/machinery/alarm/directional/north,
+/obj/structure/shelf/supply,
+/obj/item/hammer,
+/obj/item/hammer,
+/obj/item/hammer,
+/obj/item/storage/belt/utility,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
+"bie" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/supply/miningdock)
-"bii" = (
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/structure/shelf/supply,
+/obj/item/stack/sheet/glass{
+ amount = 10;
+ pixel_x = 3;
+ pixel_y = 3
},
-/obj/structure/disposalpipe/segment,
+/obj/item/stack/sheet/metal/ten,
/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
+ dir = 1;
+ icon_state = "brown"
},
+/area/station/supply/smith_office)
+"bii" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"bij" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/supply/miningdock)
-"bik" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"bil" = (
/turf/simulated/floor/plasteel{
@@ -17042,7 +16820,13 @@
/area/station/supply/miningdock)
"bim" = (
/obj/structure/table/reinforced,
-/obj/item/flashlight/lamp,
+/obj/item/folder/yellow,
+/obj/item/gps/mining,
+/obj/machinery/newscaster/directional/south,
+/obj/item/radio/intercom{
+ name = "east bump";
+ pixel_x = 28
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "purple"
@@ -17548,43 +17332,58 @@
},
/area/station/supply/lobby)
"bjG" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purple"
},
-/area/station/supply/miningdock)
+/area/station/supply/smith_office)
"bjH" = (
-/obj/structure/chair/office/dark{
- dir = 8
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
+/area/station/supply/smith_office)
"bjI" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
+"bjJ" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
},
/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
-"bjJ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "purple"
- },
-/area/station/supply/miningdock)
+/area/station/supply/smith_office)
"bjK" = (
-/obj/item/kirbyplants/large,
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/smith,
+/obj/machinery/door/airlock/mining/glass,
/turf/simulated/floor/plasteel{
- dir = 10;
+ dir = 5;
icon_state = "brown"
},
-/area/station/supply/miningdock)
+/area/station/supply/smith_office)
"bjL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
- icon_state = "purple"
+ icon_state = "neutralfull"
},
/area/station/supply/miningdock)
"bjM" = (
@@ -17598,21 +17397,24 @@
/area/station/supply/miningdock)
"bjN" = (
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
/turf/simulated/floor/plasteel{
- icon_state = "purple"
+ icon_state = "neutralfull"
},
/area/station/supply/miningdock)
"bjO" = (
-/obj/machinery/camera{
- c_tag = "Mining Dock";
- dir = 1
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel{
- icon_state = "brown"
+ icon_state = "neutralfull"
},
/area/station/supply/miningdock)
"bjP" = (
@@ -17624,29 +17426,6 @@
icon_state = "neutral"
},
/area/station/command/office/ce)
-"bjQ" = (
-/turf/simulated/floor/plasteel{
- icon_state = "brown"
- },
-/area/station/supply/miningdock)
-"bjR" = (
-/obj/structure/chair/office/dark{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "purple"
- },
-/area/station/supply/miningdock)
-"bjS" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/yellow,
-/obj/item/gps/mining,
-/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "brown"
- },
-/area/station/supply/miningdock)
"bjT" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -18102,23 +17881,26 @@
"blB" = (
/obj/structure/table/reinforced,
/obj/machinery/firealarm/directional/south,
-/obj/machinery/light_switch{
- dir = 4;
- name = "west bump";
- pixel_x = -24
+/obj/item/eftpos/register,
+/obj/machinery/door_control{
+ id = "smithdesk";
+ name = "Smith's Desk Shutters Control";
+ pixel_y = 6;
+ req_access = list(49);
+ pixel_x = -28
},
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "brown"
},
-/area/station/supply/miningdock)
-"blC" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
+/area/station/supply/smith_office)
"blD" = (
-/obj/effect/turf_decal/delivery/hollow,
+/obj/machinery/computer/shuttle/mining{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"blE" = (
@@ -18126,25 +17908,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/delivery/hollow,
-/obj/effect/landmark/start/shaft_miner,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/door/airlock/mining,
+/obj/effect/mapping_helpers/airlock/access/any/supply/smith,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
+/area/station/supply/smith_office)
"blF" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/table,
-/obj/item/storage/firstaid/regular,
-/obj/machinery/power/apc/directional/east,
/obj/machinery/light,
-/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "brown"
- },
-/area/station/supply/miningdock)
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"blG" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -18180,14 +17956,8 @@
/area/station/hallway/primary/port/east)
"blN" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/arrows/black{
- dir = 4
- },
-/obj/effect/turf_decal/delivery/partial{
- dir = 4
- },
/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
+/area/station/supply/smith_office)
"blO" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -18634,45 +18404,9 @@
},
/turf/simulated/floor/plasteel,
/area/station/service/kitchen)
-"bnf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
"bng" = (
/turf/simulated/wall,
/area/station/maintenance/starboard)
-"bnh" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/arrows/black{
- dir = 8
- },
-/obj/effect/turf_decal/delivery/partial{
- dir = 8
- },
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
-"bni" = (
-/obj/structure/extinguisher_cabinet{
- name = "west bump";
- pixel_x = -30
- },
-/obj/item/storage/toolbox/emergency{
- pixel_x = 3;
- pixel_y = -4
- },
-/obj/item/storage/toolbox/emergency,
-/obj/item/shovel,
-/obj/item/shovel,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/structure/shelf/supply,
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
"bnk" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp,
@@ -19107,8 +18841,12 @@
},
/area/station/hallway/primary/central/north)
"boD" = (
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel,
+/obj/structure/closet/secure_closet/miner,
+/obj/effect/turf_decal/delivery/hollow,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "brown"
+ },
/area/station/supply/miningdock)
"boE" = (
/obj/structure/cable{
@@ -19122,14 +18860,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/fsmaint)
-"boF" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
"boG" = (
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -20161,14 +19891,11 @@
/turf/space,
/area/space)
"bsC" = (
-/obj/machinery/light,
-/obj/structure/closet/wardrobe/miner,
-/obj/item/radio/intercom{
- name = "south bump";
- pixel_y = -28
- },
/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel,
+/obj/structure/closet/secure_closet/miner,
+/turf/simulated/floor/plasteel{
+ icon_state = "purple"
+ },
/area/station/supply/miningdock)
"bsD" = (
/obj/machinery/door/firedoor,
@@ -21588,13 +21315,6 @@
icon_state = "cafeteria"
},
/area/station/security/permabrig)
-"bxy" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/machinery/alarm/directional/south,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/light,
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
"bxz" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -25719,14 +25439,6 @@
/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/command/office/captain)
-"bJs" = (
-/obj/machinery/computer/security/mining{
- dir = 1
- },
-/obj/machinery/newscaster/directional/south,
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
"bJx" = (
/turf/simulated/floor/plasteel/stairs/medium{
dir = 8
@@ -26654,13 +26366,6 @@
icon_state = "neutral"
},
/area/station/command/office/ce)
-"bMn" = (
-/obj/machinery/computer/shuttle/mining{
- dir = 1
- },
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
"bMo" = (
/obj/item/radio/intercom{
name = "south bump";
@@ -27098,11 +26803,6 @@
/obj/structure/flora/junglebush,
/turf/simulated/floor/grass/jungle,
/area/station/maintenance/fsmaint)
-"bNB" = (
-/obj/machinery/mineral/ore_redemption,
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
"bNE" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable,
@@ -27925,7 +27625,6 @@
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
-/obj/effect/turf_decal/delivery,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -32061,6 +31760,14 @@
},
/turf/simulated/floor/plasteel/white,
/area/station/medical/surgery/secondary)
+"cen" = (
+/obj/effect/turf_decal/arrows{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/supply/lobby)
"cet" = (
/obj/machinery/door/airlock/security/glass,
/obj/machinery/door/firedoor,
@@ -37464,13 +37171,6 @@
icon_state = "neutralfull"
},
/area/station/engineering/control)
-"cwx" = (
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "redcorner"
- },
-/area/station/hallway/primary/starboard/east)
"cwy" = (
/obj/item/kirbyplants/large,
/obj/structure/sign/electricshock{
@@ -51664,6 +51364,7 @@
/obj/effect/mapping_helpers/airlock/windoor/access/all/supply/general{
dir = 1
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -52104,18 +51805,6 @@
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/south)
-"dCY" = (
-/obj/structure/plasticflaps{
- opacity = 1
- },
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/classic/reversed{
- name = "Glass Door"
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mule_bot,
-/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mining,
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
"dCZ" = (
/obj/machinery/light{
dir = 8
@@ -58602,24 +58291,25 @@
},
/area/station/hallway/secondary/entry/north)
"ffJ" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/item/radio/intercom{
+ name = "north bump";
+ pixel_y = 28
},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 10
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
+/obj/structure/closet/secure_closet/smith,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
"fga" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -59103,13 +58793,6 @@
icon_state = "whiteblue"
},
/area/station/medical/storage)
-"fuw" = (
-/obj/machinery/economy/atm/directional/east,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitebluecorner"
- },
-/area/station/medical/reception)
"fuH" = (
/obj/machinery/economy/vending/autodrobe,
/obj/machinery/light/small{
@@ -60563,12 +60246,12 @@
/area/station/maintenance/apmaint)
"gjk" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining,
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/door/airlock/mining/glass,
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"gka" = (
@@ -61537,6 +61220,12 @@
/obj/structure/sign/radiation/rad_area,
/turf/simulated/wall/r_wall,
/area/station/engineering/atmos)
+"gNd" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/miningdock)
"gNm" = (
/obj/structure/chair/sofa/corner{
color = "#A30FAF";
@@ -62215,16 +61904,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
-"hlx" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
- },
-/area/station/hallway/primary/central)
"hly" = (
/obj/structure/table/wood,
/turf/simulated/floor/plasteel/dark,
@@ -63524,6 +63203,24 @@
},
/turf/simulated/floor/plasteel/white,
/area/station/medical/surgery/secondary)
+"hXL" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/supply/miningdock)
"hYe" = (
/obj/structure/closet/secure_closet/personal/patient,
/obj/structure/cable{
@@ -63717,6 +63414,12 @@
icon_state = "neutralfull"
},
/area/station/supply/sorting)
+"ibh" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/miningdock)
"ibK" = (
/obj/machinery/atmospherics/unary/outlet_injector{
autolink_id = "waste_in";
@@ -64074,6 +63777,13 @@
/obj/machinery/newscaster/directional/north,
/turf/simulated/floor/plasteel/grimy,
/area/station/public/vacant_office)
+"ims" = (
+/obj/machinery/economy/atm/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurplecorner"
+ },
+/area/station/science/lobby)
"imG" = (
/obj/structure/table/glass,
/obj/machinery/computer/med_data/laptop{
@@ -65339,6 +65049,21 @@
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel,
/area/station/science/research)
+"iWf" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/supply/miningdock)
"iWz" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -65371,6 +65096,12 @@
icon_state = "whitebluecorner"
},
/area/station/medical/medbay)
+"iWM" = (
+/obj/structure/chair/office/dark{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/miningdock)
"iWN" = (
/obj/machinery/requests_console/directional/east,
/turf/simulated/floor/plasteel{
@@ -66537,7 +66268,6 @@
/obj/machinery/door/airlock/mining/glass,
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay,
-/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"jKW" = (
@@ -66629,12 +66359,11 @@
/turf/space,
/area/space/nearstation)
"jNg" = (
-/obj/machinery/newscaster/directional/south,
/obj/machinery/economy/vending/cargodrobe,
/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/light,
/turf/simulated/floor/plasteel{
- icon_state = "brown"
+ icon_state = "browncorner"
},
/area/station/supply/storage)
"jNp" = (
@@ -67229,6 +66958,16 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/fore/south)
+"kdT" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/central)
"kej" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/hatch{
@@ -67402,6 +67141,13 @@
/obj/item/mounted/frame/apc_frame,
/turf/simulated/floor/wood,
/area/station/maintenance/library)
+"khT" = (
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/station/hallway/primary/starboard/east)
"khY" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -70548,10 +70294,6 @@
icon_state = "arrival"
},
/area/station/hallway/secondary/entry/north)
-"lXJ" = (
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/plasteel/dark,
-/area/station/maintenance/abandonedbar)
"lYp" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -70793,11 +70535,13 @@
},
/area/station/medical/virology)
"mga" = (
-/obj/effect/landmark/start/shaft_miner,
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
-/turf/simulated/floor/plasteel,
+/obj/machinery/light,
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
+ },
/area/station/supply/miningdock)
"mgM" = (
/obj/structure/cable{
@@ -71334,6 +71078,10 @@
/obj/effect/landmark/start/doctor,
/turf/simulated/floor/plasteel/white,
/area/station/medical/surgery/secondary)
+"mwl" = (
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/station/supply/smith_office)
"mwK" = (
/obj/machinery/status_display{
pixel_x = -32
@@ -72970,9 +72718,16 @@
},
/area/station/service/kitchen)
"nnV" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/requests_console/directional/south,
-/turf/simulated/floor/plasteel,
+/obj/item/kirbyplants/large,
+/obj/structure/extinguisher_cabinet{
+ name = "west bump";
+ pixel_x = -30
+ },
+/obj/machinery/light,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "purple"
+ },
/area/station/supply/miningdock)
"nnW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -73137,6 +72892,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
+"nrA" = (
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/plasteel/dark,
+/area/station/maintenance/abandonedbar)
"nsl" = (
/obj/machinery/clonepod,
/turf/simulated/floor/plasteel{
@@ -73217,10 +72976,6 @@
icon_state = "cafeteria"
},
/area/station/security/permabrig)
-"nuO" = (
-/obj/structure/sign/vacuum/external,
-/turf/simulated/wall,
-/area/station/supply/qm)
"nuQ" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -73592,13 +73347,6 @@
icon_state = "dark"
},
/area/station/turret_protected/aisat)
-"nFz" = (
-/obj/machinery/economy/atm/directional/east,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
- },
-/area/station/hallway/primary/port/north)
"nFL" = (
/obj/machinery/door/airlock/security/glass,
/obj/machinery/door/firedoor,
@@ -73730,6 +73478,19 @@
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/ne)
+"nLx" = (
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp{
+ pixel_y = 3
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/light,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/supply/miningdock)
"nLL" = (
/obj/machinery/light{
dir = 1
@@ -73939,6 +73700,15 @@
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
+"nTF" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/supply/miningdock)
"nTR" = (
/obj/machinery/camera{
c_tag = "Central Ring Hallway West";
@@ -74312,6 +74082,14 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/controlroom)
+"odO" = (
+/obj/effect/turf_decal/delivery/hollow,
+/obj/structure/railing,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "brown"
+ },
+/area/station/supply/lobby)
"odQ" = (
/obj/effect/spawner/window/reinforced/plasma/grilled,
/turf/simulated/floor/plating,
@@ -74340,6 +74118,9 @@
},
/turf/simulated/floor/engine/air,
/area/station/engineering/atmos)
+"oeE" = (
+/turf/simulated/wall,
+/area/station/supply/smith_office)
"oeH" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
@@ -74539,9 +74320,6 @@
/area/station/security/permabrig)
"olR" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -74551,8 +74329,21 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/classic/normal{
+ name = "Smith's Desk";
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/smith{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id_tag = "smithdesk";
+ name = "Smith's Desk Shutters"
+ },
/turf/simulated/floor/plasteel,
-/area/station/supply/miningdock)
+/area/station/supply/smith_office)
"olZ" = (
/obj/machinery/computer/general_air_control/large_tank_control{
autolink_sensors = list("waste_sensor"="Tank");
@@ -74940,6 +74731,15 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/fore/south)
+"otJ" = (
+/obj/machinery/camera{
+ c_tag = "Mining Dock";
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/supply/miningdock)
"ouk" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel/white,
@@ -76396,6 +76196,22 @@
icon_state = "yellow"
},
/area/station/engineering/transmission_laser)
+"piH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
"piL" = (
/obj/machinery/suit_storage_unit/expedition,
/obj/effect/spawner/random/dirt/often,
@@ -76902,6 +76718,26 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/solar_maintenance/aft_port)
+"pzy" = (
+/obj/machinery/door/firedoor,
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/classic/normal{
+ name = "Smith's Desk";
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/smith{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/smith{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id_tag = "smithdesk";
+ name = "Smith's Desk Shutters"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"pzQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -77353,18 +77189,13 @@
},
/area/station/service/chapel)
"pKL" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/yellow,
-/obj/item/pen,
-/obj/machinery/door/window/classic/normal{
- dir = 4;
- name = "Mining Desk"
+/obj/machinery/door/airlock/mining/glass,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/supply/general,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
},
-/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mining{
- dir = 4
- },
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"pLq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -77677,6 +77508,17 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/command/bridge)
+"pTK" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/supply/miningdock)
"pTN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -79482,7 +79324,6 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay,
-/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"qWf" = (
@@ -79817,6 +79658,13 @@
icon_state = "whitegreen"
},
/area/station/medical/virology)
+"rdF" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/effect/landmark/start/shaft_miner,
+/turf/simulated/floor/plasteel,
+/area/station/supply/miningdock)
"rdK" = (
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/junglebush,
@@ -80281,13 +80129,6 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting,
/turf/simulated/floor/plasteel,
/area/station/supply/warehouse)
-"rnx" = (
-/obj/machinery/economy/atm/directional/west,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurplecorner"
- },
-/area/station/science/lobby)
"rnA" = (
/obj/structure/chair/stool{
dir = 8
@@ -81089,6 +80930,19 @@
icon_state = "barber"
},
/area/station/hallway/secondary/entry/south)
+"rJT" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+ pixel_y = 5
+ },
+/obj/item/pen{
+ pixel_y = 8
+ },
+/obj/machinery/requests_console/directional/south,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/supply/miningdock)
"rKU" = (
/obj/effect/turf_decal/box/white{
color = "#009dff"
@@ -82274,6 +82128,18 @@
icon_state = "freezerfloor"
},
/area/station/medical/cloning)
+"snm" = (
+/obj/item/kirbyplants/large,
+/obj/machinery/light_switch{
+ dir = 4;
+ name = "west bump";
+ pixel_x = -24
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
+ },
+/area/station/supply/storage)
"snn" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -82602,6 +82468,19 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central/nw)
+"ssv" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/mineral/ore_redemption{
+ input_dir = 4;
+ output_dir = 8
+ },
+/obj/machinery/door/window/classic/normal{
+ dir = 8;
+ name = "Ore Redemption Window"
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel,
+/area/station/supply/miningdock)
"ssy" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
@@ -82984,6 +82863,13 @@
},
/turf/simulated/floor/plating,
/area/station/medical/coldroom)
+"sDM" = (
+/obj/machinery/economy/atm/directional/east,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitebluecorner"
+ },
+/area/station/medical/reception)
"sDN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -84482,13 +84368,13 @@
/area/station/medical/chemistry)
"tsL" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external{
- id_tag = "mining_home";
- locked = 1;
- name = "Mining Dock Airlock"
- },
/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass{
+ id_tag = "mining_home";
+ name = "Mining Dock Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/locked,
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"ttb" = (
@@ -84528,8 +84414,10 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore2)
"tvu" = (
-/obj/structure/sign/vacuum/external,
-/turf/simulated/wall,
+/obj/machinery/computer/security/mining{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"tvI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -84620,6 +84508,14 @@
icon_state = "darkredcorners"
},
/area/station/security/prison/cell_block/a)
+"twE" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/supply/miningdock)
"twU" = (
/turf/simulated/floor/plasteel/white,
/area/station/science/testrange)
@@ -84651,22 +84547,29 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/processing)
+"txD" = (
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "brown"
+ },
+/area/station/supply/miningdock)
"txW" = (
/obj/machinery/newscaster/directional/south,
/turf/simulated/floor/plasteel,
/area/station/public/toilet/lockerroom)
"tyN" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/simulated/floor/plasteel,
+/obj/machinery/door/airlock/mining/glass,
+/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
/area/station/supply/miningdock)
"tyQ" = (
/obj/machinery/economy/vending/medical,
@@ -84719,6 +84622,10 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/space/nearstation)
+"tAo" = (
+/obj/effect/landmark/start/smith,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"tAt" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -85870,9 +85777,10 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"ubV" = (
-/obj/effect/landmark/start/shaft_miner,
/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
/area/station/supply/miningdock)
"ubW" = (
/obj/structure/cable{
@@ -86474,6 +86382,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/solar_maintenance/fore_port)
+"uqt" = (
+/obj/item/kirbyplants/large,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
"uqG" = (
/obj/machinery/door/poddoor{
density = 0;
@@ -86566,18 +86481,6 @@
icon_state = "rampbottom"
},
/area/station/public/fitness)
-"usX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/light_switch{
- dir = 8;
- name = "east bump";
- pixel_x = 24
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/supply/miningdock)
"utf" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -86777,6 +86680,11 @@
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
/area/station/maintenance/solar_maintenance/aft_starboard)
+"uAX" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/station/supply/miningdock)
"uBL" = (
/obj/machinery/door/window/brigdoor{
id = "Cell 5";
@@ -88044,6 +87952,21 @@
icon_state = "darkred"
},
/area/station/security/prisonershuttle)
+"vko" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/item/storage/box/donkpockets{
+ pixel_y = 4;
+ pixel_x = 11
+ },
+/obj/item/storage/firstaid/regular{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/miningdock)
"vkE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -88534,6 +88457,14 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central)
+"vAQ" = (
+/obj/structure/closet/wardrobe/miner,
+/obj/effect/turf_decal/delivery/hollow,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "brown"
+ },
+/area/station/supply/miningdock)
"vAX" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel/dark,
@@ -88618,6 +88549,21 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central/sw)
+"vDc" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/landmark/start/shaft_miner,
+/turf/simulated/floor/plasteel,
+/area/station/supply/miningdock)
+"vDf" = (
+/obj/item/kirbyplants/large,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/miningdock)
"vDg" = (
/obj/machinery/alarm/directional/south,
/turf/simulated/floor/plasteel{
@@ -91114,6 +91060,12 @@
icon_state = "darkred"
},
/area/station/security/prisonershuttle)
+"wQU" = (
+/obj/effect/landmark/start/shaft_miner,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/supply/miningdock)
"wRa" = (
/obj/machinery/camera{
c_tag = "Brig Secure Armory";
@@ -117741,7 +117693,7 @@ sEA
cXS
drn
irt
-lXJ
+nrA
dfU
dcT
deD
@@ -123096,7 +123048,7 @@ bGR
brV
brV
brV
-nFz
+aoz
bQw
brV
bUC
@@ -129555,7 +129507,7 @@ cIW
cKw
cMd
msD
-rnx
+ims
tQM
cSm
cZt
@@ -132875,7 +132827,7 @@ drp
bYv
mTf
bYv
-hlx
+kdT
tmq
tmq
cqo
@@ -134640,7 +134592,7 @@ baX
ozS
bdX
bft
-bcN
+bft
bec
bfu
blu
@@ -134897,8 +134849,8 @@ baY
aJd
bdY
bfu
-bcC
-bgE
+bfu
+bhW
bfu
blu
bhU
@@ -135407,12 +135359,12 @@ aUS
aTx
aXM
aZj
-aVb
+baY
aJd
bcB
-bfu
+cen
bea
-bgF
+aYc
bfu
blu
bhU
@@ -135666,10 +135618,10 @@ aNm
aNm
bba
aJd
-bcB
+odO
bfu
-bcC
-bgH
+bfu
+aYc
bfu
blu
bhU
@@ -135923,7 +135875,7 @@ aNm
aNm
bbb
aJd
-bcB
+odO
bfu
bfu
aYc
@@ -136436,11 +136388,11 @@ aWt
aXT
aZl
bbd
-aGK
+aJd
bcM
-bcC
+bfu
beb
-bgH
+aYc
bjF
ova
bdU
@@ -136694,13 +136646,13 @@ jKE
ayD
bbe
bbe
-bbi
+ssv
pKL
-bbi
+oeE
olR
-bbi
-bbe
-bbe
+pzy
+oeE
+oeE
boz
hgo
uGT
@@ -136948,16 +136900,16 @@ aZt
aUX
aWv
aXV
-aZn
-bbf
+snm
+bbe
bcD
-bed
bfx
-bgK
+txD
+oeE
bia
bjG
blB
-bbe
+oeE
boy
hgo
uGT
@@ -137205,16 +137157,16 @@ aTs
aUY
aWw
aBS
-aZo
+aBS
bbi
-bcE
-bfZ
+hYQ
+twE
beg
-bfA
+oeE
bib
bjH
blN
-bbi
+mwl
bov
hgo
pnr
@@ -137263,7 +137215,7 @@ ckv
cHN
ppu
cKX
-fuw
+sDM
cNW
vXU
qqT
@@ -137462,16 +137414,16 @@ aTt
aSG
aWx
nQX
-aZp
+nQX
tyN
-bcF
-bfz
+iWf
+pTK
bfz
blE
bic
-bfA
-bnf
-bNB
+tAo
+blN
+mwl
cpO
hgo
bsr
@@ -137719,16 +137671,16 @@ aTw
aUZ
eWa
aBT
-aZq
-aWA
-bdi
+aBT
+uAX
+nTF
ubV
mga
-bgS
+oeE
bid
bjI
-bnh
-dCY
+blN
+mwl
bov
hgo
uGT
@@ -137978,14 +137930,14 @@ aWy
aBS
jNg
bbe
-bcH
+vDf
beh
bfB
-bgO
+oeE
bie
bjJ
blF
-bbe
+oeE
jjp
dog
npJ
@@ -138238,11 +138190,11 @@ bbe
bbe
bbi
gjk
-bbi
+oeE
ffJ
-bbi
-bbe
-bbe
+piH
+uqt
+oeE
boC
bqA
qOr
@@ -138493,12 +138445,12 @@ aEW
bcL
bbe
bfw
-bei
+bil
bfD
-bgP
-big
+oeE
+mwl
bjK
-bni
+oeE
eNt
vDt
eNt
@@ -138750,10 +138702,10 @@ qnz
sOd
mPt
bfC
-ben
-hYQ
-bgT
-bih
+wQU
+vDc
+otJ
+bgS
bjL
nnV
eNt
@@ -139007,12 +138959,12 @@ jiG
aZv
eiQ
boD
-bek
+wQU
bfF
bgR
bii
+hXL
bjM
-boF
pbr
bQg
eNt
@@ -139264,9 +139216,9 @@ aYg
aZz
aSb
bfN
-ben
+wQU
+rdF
bil
-bfA
bij
bjN
bsC
@@ -139521,12 +139473,12 @@ aYh
aZA
aSb
bgW
-ben
+wQU
bfK
-usX
-bik
+bgT
+bfA
bjO
-bbe
+vAQ
eNt
wOW
qET
@@ -139777,13 +139729,13 @@ aWH
aYi
aZB
tRI
-bbi
-tsL
-bbi
-bbe
-bil
-bjQ
-bxy
+vko
+ibh
+ibh
+ibh
+nLx
+eNt
+eNt
eNt
boH
qET
@@ -140035,13 +139987,13 @@ fOa
aZC
tRI
aVX
-beq
-blC
-bbi
-bil
-bjR
-bJs
+bgS
+bfA
+iWM
+rJT
eNt
+bwA
+bwA
eJM
eNt
aaa
@@ -140290,15 +140242,15 @@ aVj
aWJ
aYj
aZD
-nuO
+aSb
aWf
-ber
+gNd
blD
tvu
bim
-bjS
-bMn
eNt
+bwA
+bwA
eJM
eNt
abj
@@ -144429,7 +144381,7 @@ vOc
hhU
vOc
vOc
-cwx
+khT
bVq
sUE
pYm
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
index 033aa5f5ebe..a0d419ab0e1 100644
--- a/_maps/map_files/stations/emeraldstation.dmm
+++ b/_maps/map_files/stations/emeraldstation.dmm
@@ -170,15 +170,9 @@
"acf" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/cobweb/left/frequent,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/item/radio/intercom{
- name = "custom placement";
- pixel_y = 24
- },
+/obj/structure/girder,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/maintenance/aft)
"aco" = (
/obj/effect/decal/cleanable/glass,
/turf/simulated/floor/plating,
@@ -1171,7 +1165,7 @@
dir = 4
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/maintenance/aft)
"anw" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -2682,6 +2676,14 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/asteroid_filtering)
+"aCA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/conveyor{
+ dir = 8;
+ id = "packageSort2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/assembly_line)
"aCB" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/turf/simulated/floor/plasteel,
@@ -2906,11 +2908,12 @@
/turf/simulated/floor/wood,
/area/station/service/bar)
"aFN" = (
-/obj/structure/disposalpipe/segment/corner{
+/obj/structure/disposalpipe/trunk{
dir = 1
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft)
+/obj/machinery/disposal,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"aFO" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance,
@@ -5221,13 +5224,6 @@
icon_state = "vault"
},
/area/station/security/armory/secure)
-"bbE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"bbI" = (
/obj/structure/table,
/obj/item/folder,
@@ -5272,6 +5268,9 @@
/obj/effect/spawner/random/cobweb/left/rare,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
+"bcs" = (
+/turf/simulated/wall,
+/area/station/supply/smith_office)
"bcy" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc/directional/south,
@@ -7973,6 +7972,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/machinery/conveyor{
+ dir = 8;
+ id = "packageSort2"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/assembly_line)
"bDh" = (
@@ -8218,13 +8221,12 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"bFq" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
/obj/machinery/light{
dir = 1
},
+/obj/structure/table,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/maintenance/aft)
"bFu" = (
/obj/machinery/light/small{
dir = 1
@@ -8239,6 +8241,20 @@
icon_state = "bluecorner"
},
/area/station/hallway/primary/starboard/south)
+"bFN" = (
+/obj/machinery/light_switch{
+ dir = 8;
+ name = "east bump";
+ pixel_x = 24;
+ pixel_y = -5
+ },
+/obj/structure/shelf/supply,
+/obj/item/hammer,
+/obj/item/hammer,
+/obj/item/hammer,
+/obj/item/storage/belt/utility,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"bFO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -11594,6 +11610,19 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/abandonedbar)
+"cna" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/airlock/mining,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/any/supply/smith,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"cni" = (
/obj/structure/table,
/obj/item/storage/box/monkeycubes/neaeracubes,
@@ -12853,6 +12882,10 @@
/obj/effect/mapping_helpers/airlock/access/all/medical/general,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
+"cBs" = (
+/obj/effect/mapping_helpers/turfs/rust,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
"cBu" = (
/obj/structure/table,
/obj/item/toy/eight_ball,
@@ -12894,11 +12927,11 @@
pixel_y = 5
},
/obj/machinery/door_control{
- id = "rdlab2";
+ id = "rndlab2";
name = "Research and Development Lab Shutters Control";
- pixel_x = 24;
pixel_y = 23;
- req_access = list(47)
+ req_access = list(7);
+ pixel_x = 24
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -13010,6 +13043,13 @@
/obj/effect/turf_decal/box,
/turf/simulated/floor/plasteel,
/area/station/engineering/equipmentstorage)
+"cCX" = (
+/obj/machinery/economy/atm/directional/east,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "purplecorner"
+ },
+/area/station/hallway/primary/starboard/south)
"cDa" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/drip,
@@ -13446,6 +13486,27 @@
icon_state = "redyellowfull"
},
/area/station/maintenance/apmaint)
+"cGZ" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "browncorner"
+ },
+/area/station/supply/lobby)
"cHe" = (
/obj/structure/table/glass,
/obj/item/paper_bin/nanotrasen,
@@ -13951,11 +14012,6 @@
},
/turf/simulated/floor/plating,
/area/station/security/lobby)
-"cMJ" = (
-/obj/structure/chair/stool,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"cMK" = (
/obj/item/clothing/head/cone{
pixel_x = -8;
@@ -18806,6 +18862,13 @@
/obj/machinery/economy/vending/bardrobe,
/turf/simulated/floor/wood,
/area/station/service/bar)
+"dMp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"dMr" = (
/obj/machinery/light/small{
dir = 1
@@ -18825,7 +18888,7 @@
/obj/structure/table/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
dir = 8;
- id_tag = "dormshop1"
+ id_tag = "smithdesk"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -20504,10 +20567,9 @@
/area/station/security/detective)
"efE" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "0-2"
- },
/obj/machinery/firealarm/directional/north,
+/obj/item/storage/belt/utility,
+/obj/structure/table,
/turf/simulated/floor/plasteel,
/area/station/maintenance/assembly_line)
"efF" = (
@@ -20856,12 +20918,6 @@
/obj/effect/mapping_helpers/turfs/rust/maybe,
/turf/simulated/wall/r_wall,
/area/station/command/vault)
-"ejN" = (
-/obj/machinery/economy/atm/directional/east,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
-/area/station/hallway/primary/central/ne)
"ejP" = (
/obj/machinery/camera{
c_tag = "Starboard Primary Hall East";
@@ -21265,7 +21321,6 @@
/turf/simulated/floor/engine,
/area/station/engineering/engine)
"enp" = (
-/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/spawner/nukedisc_respawn,
/turf/simulated/floor/plating,
@@ -21732,6 +21787,9 @@
/obj/machinery/camera{
c_tag = "Assembly Line East"
},
+/obj/structure/table,
+/obj/item/clothing/glasses/welding,
+/obj/item/storage/toolbox/mechanical,
/turf/simulated/floor/plasteel,
/area/station/maintenance/assembly_line)
"esK" = (
@@ -26995,17 +27053,6 @@
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
-"frE" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "Skynet_heavy"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/ai_status_display{
- pixel_y = -32
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"frF" = (
/obj/structure/table/wood,
/obj/item/clothing/head/cakehat,
@@ -27318,10 +27365,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/storage)
-"fuX" = (
-/obj/machinery/economy/atm/directional/west,
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/se)
"fve" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -28454,6 +28497,12 @@
/obj/machinery/status_display,
/turf/simulated/wall,
/area/station/hallway/secondary/exit)
+"fGP" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"fGQ" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -33689,11 +33738,16 @@
/turf/simulated/floor/grass,
/area/station/security/permabrig)
"gIK" = (
-/obj/structure/table/wood,
/obj/item/clothing/head/welding,
/obj/machinery/light{
dir = 1
},
+/obj/item/megaphone,
+/obj/structure/table,
+/obj/machinery/light_switch{
+ pixel_y = 24;
+ name = "north bump"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/assembly_line)
"gIL" = (
@@ -34804,21 +34858,12 @@
},
/area/station/maintenance/asmaint)
"gVK" = (
-/obj/structure/machine_frame,
-/obj/machinery/conveyor{
- dir = 4;
- id = "Skynet_heavy"
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
+/obj/machinery/power/apc/directional/north,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
-"gVP" = (
-/obj/structure/machine_frame,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/simulated/floor/plating,
-/area/station/maintenance/assembly_line)
+/area/station/supply/smith_office)
"gWb" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -37446,14 +37491,17 @@
},
/area/station/medical/cryo)
"hvG" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "Skynet_heavy"
+/obj/item/radio/intercom{
+ name = "east bump";
+ pixel_x = 28
+ },
+/obj/structure/shelf/supply,
+/obj/item/stack/sheet/metal,
+/obj/item/stack/sheet/glass{
+ amount = 10
},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/camera_assembly,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/supply/smith_office)
"hvI" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -37895,6 +37943,13 @@
icon_state = "dark"
},
/area/station/command/office/rd)
+"hzd" = (
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/assembly_line)
"hzk" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/generic,
@@ -41681,13 +41736,6 @@
icon_state = "dark"
},
/area/station/engineering/ai_transit_tube)
-"inF" = (
-/obj/item/kirbyplants/large,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "browncorner"
- },
-/area/station/supply/lobby)
"inL" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 8;
@@ -44551,11 +44599,6 @@
/obj/effect/mapping_helpers/turfs/burn,
/turf/simulated/floor/wood,
/area/station/maintenance/dorms/starboard)
-"iQa" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"iQi" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance,
@@ -44803,6 +44846,10 @@
icon_state = "1-2"
},
/obj/effect/turf_decal/box,
+/obj/machinery/conveyor{
+ dir = 8;
+ id = "packageSort2"
+ },
/turf/simulated/floor/plasteel,
/area/station/maintenance/assembly_line)
"iSy" = (
@@ -47588,6 +47635,23 @@
icon_state = "white"
},
/area/station/science/xenobiology)
+"jwe" = (
+/obj/structure/table/reinforced,
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/smith{
+ dir = 4
+ },
+/obj/machinery/door/window/classic/normal{
+ name = "Smith's Desk";
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id_tag = "smithdesk";
+ name = "Smith's Desk Shutters"
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"jwg" = (
/obj/effect/landmark/start/doctor,
/obj/structure/cable{
@@ -48796,13 +48860,9 @@
/turf/simulated/floor/plating,
/area/station/engineering/tech_storage)
"jHj" = (
-/obj/item/chair/stool,
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -48813,7 +48873,7 @@
dir = 4
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/maintenance/aft)
"jHk" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -50441,26 +50501,6 @@
icon_state = "white"
},
/area/station/science/xenobiology)
-"jYN" = (
-/obj/machinery/door/airlock/engineering/glass{
- locked = 1;
- name = "Assembly Line (KEEP OUT)"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"jYO" = (
/obj/effect/turf_decal{
dir = 10
@@ -50604,27 +50644,22 @@
/turf/simulated/floor/carpet,
/area/station/medical/psych)
"kam" = (
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/structure/reagent_dispensers/watertank,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
+ dir = 5
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/maintenance/aft)
"kav" = (
/obj/effect/decal/cleanable/glass,
/obj/structure/cable{
@@ -51507,12 +51542,14 @@
},
/area/station/engineering/engine)
"kiY" = (
-/obj/machinery/conveyor{
- id = "Skynet_heavy"
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/supply/smith_office)
"kja" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/generic,
@@ -54781,7 +54818,6 @@
/turf/simulated/floor/plating,
/area/station/medical/storage)
"kSm" = (
-/obj/structure/closet/secure_closet/miner,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -56477,16 +56513,11 @@
/turf/simulated/floor/plating,
/area/station/maintenance/dorms/port)
"llQ" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "Skynet_heavy"
- },
-/obj/item/stack/rods/ten,
-/obj/item/stack/cable_coil{
- amount = 5
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/supply/smith_office)
"lma" = (
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/storage)
@@ -57988,6 +58019,7 @@
/obj/machinery/ai_status_display{
pixel_y = -32
},
+/obj/item/kirbyplants/medium,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -58019,6 +58051,23 @@
icon_state = "dark"
},
/area/station/engineering/atmos)
+"lzQ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
"lAo" = (
/obj/structure/chair/office/light,
/obj/effect/landmark/start/geneticist,
@@ -58238,6 +58287,12 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/asteroid_filtering)
+"lCc" = (
+/obj/machinery/economy/atm/directional/east,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/central/ne)
"lCl" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -60333,12 +60388,17 @@
},
/area/station/public/construction)
"mbf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
+ },
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_y = -24;
+ name = "south bump";
+ pixel_x = 5
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/aft)
+/area/station/supply/smith_office)
"mbj" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -60645,10 +60705,6 @@
"meA" = (
/turf/simulated/wall/r_wall,
/area/station/engineering/engine/supermatter)
-"meR" = (
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"meX" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -61320,6 +61376,7 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
+/obj/machinery/light,
/turf/simulated/floor/plating,
/area/station/maintenance/assembly_line)
"mmf" = (
@@ -61803,13 +61860,6 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/engine)
-"mqU" = (
-/obj/effect/turf_decal/siding{
- dir = 5
- },
-/obj/machinery/economy/atm/directional/west,
-/turf/simulated/floor/engine,
-/area/station/hallway/spacebridge/security/west)
"mqW" = (
/obj/structure/table,
/obj/machinery/firealarm/directional/south,
@@ -62534,6 +62584,10 @@
"mzq" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
+/obj/machinery/conveyor{
+ dir = 8;
+ id = "packageSort2"
+ },
/turf/simulated/floor/plasteel,
/area/station/maintenance/assembly_line)
"mzw" = (
@@ -64679,6 +64733,12 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/engine/supermatter)
+"mVO" = (
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/lobby)
"mVS" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -64855,8 +64915,21 @@
},
/area/station/telecomms/computer)
"mXh" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/station/maintenance/assembly_line)
+/area/station/maintenance/aft)
"mXj" = (
/obj/machinery/light{
dir = 4
@@ -65656,6 +65729,13 @@
},
/turf/simulated/floor/lava/plasma/fuming,
/area/station/engineering/atmos/asteroid_core)
+"nfr" = (
+/obj/machinery/door/airlock/mining,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/any/supply/smith,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel,
+/area/station/supply/miningdock)
"nfM" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -65706,12 +65786,11 @@
},
/area/station/medical/cloning)
"ngf" = (
-/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/glasses/welding,
/obj/machinery/alarm/directional/north,
+/obj/effect/spawner/random/barrier/grille_maybe,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/maintenance/aft)
"ngk" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -66792,6 +66871,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fpmaint)
+"nqX" = (
+/obj/effect/landmark/start/assistant,
+/turf/simulated/floor/plasteel,
+/area/station/supply/lobby)
"nqZ" = (
/obj/structure/morgue,
/turf/simulated/floor/plating,
@@ -67587,19 +67670,27 @@
},
/area/station/medical/storage/secondary)
"nzM" = (
-/obj/structure/chair{
- dir = 8
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
-/obj/effect/landmark/start/assistant,
-/obj/item/radio/intercom{
- name = "east bump";
- pixel_x = 28
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "browncorner"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
},
-/area/station/supply/lobby)
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/door_control{
+ id = "smithdesk";
+ name = "Smith's Desk Shutters Control";
+ pixel_x = 24;
+ pixel_y = 23;
+ req_access = list(49)
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"nzO" = (
/obj/structure/mecha_wreckage/odysseus,
/obj/effect/mapping_helpers/turfs/damage,
@@ -67826,6 +67917,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
+"nBV" = (
+/obj/structure/closet/secure_closet/miner,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
+ },
+/area/station/supply/miningdock)
"nBZ" = (
/obj/structure/rack,
/obj/item/target/alien,
@@ -68117,6 +68215,13 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/north)
+"nEV" = (
+/obj/effect/turf_decal/siding{
+ dir = 5
+ },
+/obj/machinery/economy/atm/directional/west,
+/turf/simulated/floor/engine,
+/area/station/hallway/spacebridge/security/west)
"nFi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 5
@@ -68899,15 +69004,21 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/asteroid_filtering)
"nMg" = (
-/obj/machinery/light,
-/obj/machinery/newscaster/security_unit/directional/south,
-/obj/structure/disposalpipe/junction{
- dir = 8
+/obj/structure/table/reinforced,
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/smith{
+ dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "browncorner"
+/obj/machinery/door/window/classic/normal{
+ name = "Smith's Desk";
+ dir = 4
},
-/area/station/supply/lobby)
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id_tag = "smithdesk"
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"nMh" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -70136,15 +70247,6 @@
},
/turf/simulated/floor/plating,
/area/station/security/permabrig)
-"nXR" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/economy/atm/directional/east,
-/turf/simulated/floor/plasteel{
- icon_state = "bluecorner"
- },
-/area/station/hallway/primary/fore)
"nXS" = (
/obj/structure/chair{
dir = 1
@@ -70977,8 +71079,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/any/supply/smith,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/aft)
+/area/station/supply/smith_office)
"ofE" = (
/obj/machinery/alarm/directional/west,
/turf/simulated/floor/plasteel{
@@ -76959,13 +77064,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/security/fore)
-"plR" = (
-/obj/structure/table/wood,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/simulated/floor/plating,
-/area/station/maintenance/assembly_line)
"plV" = (
/obj/machinery/door/airlock/glass,
/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics,
@@ -77251,6 +77349,22 @@
icon_state = "white"
},
/area/station/science/toxins/mixing)
+"poZ" = (
+/obj/structure/disposalpipe/segment/corner,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/camera{
+ c_tag = "Assembly Line West"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"ppf" = (
/obj/structure/table,
/obj/item/poster/random_contraband{
@@ -78260,13 +78374,6 @@
icon_state = "red"
},
/area/station/security/prison/cell_block)
-"pAF" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "Skynet_heavy"
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"pAQ" = (
/turf/simulated/floor/plasteel{
icon_state = "yellow"
@@ -80472,17 +80579,6 @@
icon_state = "darkgreen"
},
/area/station/procedure/trainer_office)
-"pXC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/light_switch{
- pixel_y = 24;
- name = "north bump"
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"pXD" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/random{
@@ -80540,9 +80636,11 @@
},
/area/station/supply/office)
"pYq" = (
-/obj/item/mounted/frame/apc_frame,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/maintenance/aft)
"pYr" = (
/obj/structure/table,
/obj/item/clothing/head/soft{
@@ -82375,6 +82473,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/maintenance/assembly_line)
"qth" = (
@@ -82558,6 +82659,10 @@
icon_state = "freezerfloor"
},
/area/station/medical/cloning)
+"qvu" = (
+/obj/machinery/economy/atm/directional/west,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/se)
"qvB" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -84156,13 +84261,6 @@
icon_state = "whitepurple"
},
/area/station/science/xenobiology)
-"qMg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/assembly_line)
"qMj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -84176,10 +84274,6 @@
/obj/item/desk_bell{
anchored = 1
},
-/obj/machinery/door/window/classic/normal{
- name = "Cargo Desk";
- dir = 1
- },
/obj/structure/noticeboard{
desc = "A board for pinning important notices upon. Probably helpful for keeping track of requests.";
name = "requests board";
@@ -84190,6 +84284,10 @@
/obj/effect/mapping_helpers/airlock/windoor/access/all/supply/mail_sorting{
dir = 1
},
+/obj/machinery/door/window/classic/normal{
+ name = "Cargo Desk";
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/station/supply/office)
"qMp" = (
@@ -87284,15 +87382,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard)
-"rqJ" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "Skynet_heavy"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"rqP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/generic,
@@ -87822,12 +87911,6 @@
/obj/item/painter,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
-"rwL" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"rwZ" = (
/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer{
dir = 8
@@ -88356,7 +88439,7 @@
},
/obj/machinery/door/poddoor/shutters/preopen{
dir = 8;
- id_tag = "dormshop1"
+ id_tag = "smithdesk"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -89497,13 +89580,6 @@
/obj/effect/mapping_helpers/airlock/autoname,
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
-"rME" = (
-/obj/machinery/economy/atm/directional/east,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "purplecorner"
- },
-/area/station/hallway/primary/starboard/south)
"rMG" = (
/obj/structure/closet/secure_closet/engineering_electrical,
/obj/effect/spawner/random/cobweb/right/rare,
@@ -89757,14 +89833,12 @@
},
/area/station/public/shops)
"rPr" = (
-/obj/structure/grille/broken,
-/obj/item/stack/rods,
-/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft)
+/obj/machinery/requests_console/directional/south,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"rPw" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -90238,11 +90312,19 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"rTP" = (
+/obj/structure/disposalpipe/segment/corner,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "2-8"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/maintenance/aft)
"rUc" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -90939,6 +91021,7 @@
/area/station/service/kitchen)
"rZn" = (
/obj/machinery/economy/vending/snack,
+/obj/machinery/newscaster/security_unit/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -90978,14 +91061,11 @@
},
/area/station/medical/medbay)
"sao" = (
-/obj/structure/disposalpipe/segment/corner{
- dir = 2
+/obj/structure/chair{
+ dir = 8
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "browncorner"
- },
-/area/station/supply/lobby)
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"saq" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/preopen{
@@ -91149,15 +91229,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
-"sbP" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"scb" = (
/obj/machinery/alarm/directional/east,
/obj/machinery/camera{
@@ -91722,12 +91793,11 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"sih" = (
+/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/machinery/camera{
- c_tag = "Assembly Line West"
- },
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
-/area/station/maintenance/assembly_line)
+/area/station/maintenance/aft)
"sik" = (
/turf/simulated/wall,
/area/station/maintenance/fpmaint)
@@ -92093,16 +92163,8 @@
},
/area/station/hallway/secondary/exit)
"slj" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- initialize_directions = 11
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
"slp" = (
@@ -92431,6 +92493,14 @@
icon_state = "whitepurplecorner"
},
/area/station/science/robotics)
+"spC" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"spL" = (
/obj/structure/dresser,
/obj/item/toy/figure/crew/qm{
@@ -92674,6 +92744,9 @@
"ssD" = (
/turf/simulated/wall,
/area/station/maintenance/solar_maintenance/fore_port)
+"ssH" = (
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"ssJ" = (
/obj/machinery/door/airlock/medical{
locked = 1;
@@ -92924,18 +92997,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/dorms/fore)
"svc" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment/corner{
- dir = 4
- },
+/obj/machinery/light,
+/obj/item/kirbyplants/medium,
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
"svl" = (
@@ -93340,11 +93403,6 @@
/mob/living/simple_animal/cockroach,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
-"szl" = (
-/obj/structure/table,
-/obj/item/storage/belt/utility,
-/turf/simulated/floor/plating,
-/area/station/maintenance/assembly_line)
"szm" = (
/obj/item/shard{
icon_state = "small"
@@ -93445,6 +93503,15 @@
icon_state = "neutralfull"
},
/area/station/engineering/atmos/asteroid_filtering)
+"szY" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/economy/atm/directional/east,
+/turf/simulated/floor/plasteel{
+ icon_state = "bluecorner"
+ },
+/area/station/hallway/primary/fore)
"szZ" = (
/obj/effect/decal/cleanable/glass,
/obj/item/shard,
@@ -94515,18 +94582,12 @@
},
/area/station/hallway/secondary/exit)
"sKV" = (
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "browncorner"
@@ -99699,12 +99760,6 @@
icon_state = "dark"
},
/area/station/engineering/engine)
-"tLK" = (
-/obj/structure/table/wood,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/megaphone,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"tLY" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
@@ -99774,11 +99829,14 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard/south)
"tMy" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft)
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
+ },
+/obj/machinery/firealarm/directional/west,
+/obj/structure/table/reinforced,
+/obj/item/eftpos/register,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"tMD" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -100414,6 +100472,11 @@
icon_state = "tranquillite"
},
/area/station/service/mime)
+"tTY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/barrier/grille_maybe,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft)
"tUa" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -101184,6 +101247,21 @@
},
/turf/simulated/floor/plating,
/area/station/engineering/tech_storage)
+"ubi" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/lobby)
"ubl" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -103332,7 +103410,7 @@
/obj/structure/table/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
dir = 8;
- id_tag = "dormshop1"
+ id_tag = "smithdesk"
},
/obj/item/food/meatbun,
/obj/machinery/door/firedoor,
@@ -103580,15 +103658,6 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
-"uAS" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "Skynet_heavy"
- },
-/obj/item/camera_assembly,
-/obj/machinery/light,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"uAW" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -103716,6 +103785,16 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"uCu" = (
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/effect/landmark/start/smith,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"uCv" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -103855,20 +103934,6 @@
icon_state = "red"
},
/area/station/security/checkpoint/secondary)
-"uDx" = (
-/obj/effect/turf_decal/arrows/black{
- pixel_y = 16
- },
-/obj/effect/turf_decal/delivery/partial{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/rods/ten,
-/obj/item/stack/cable_coil{
- amount = 5
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"uDz" = (
/obj/structure/table/reinforced,
/obj/machinery/photocopier/faxmachine/longrange{
@@ -103898,21 +103963,6 @@
"uDU" = (
/turf/simulated/floor/plating,
/area/station/engineering/ai_transit_tube)
-"uDX" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
"uEb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -104041,6 +104091,10 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/storage)
+"uFt" = (
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"uFx" = (
/obj/effect/landmark/start/shaft_miner,
/turf/simulated/floor/plasteel,
@@ -104921,6 +104975,10 @@
"uNK" = (
/turf/simulated/wall,
/area/station/security/detective)
+"uNM" = (
+/obj/machinery/conveyor,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/assembly_line)
"uNR" = (
/obj/item/radio/intercom/department/security{
pixel_x = -28
@@ -105686,9 +105744,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -105697,7 +105752,7 @@
dir = 4
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/maintenance/aft)
"uVB" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -110452,11 +110507,10 @@
},
/area/station/security/checkpoint/secondary)
"vSy" = (
-/obj/structure/machine_frame,
-/obj/item/stack/cable_coil,
-/obj/structure/cable,
+/obj/machinery/alarm/directional/east,
+/obj/structure/closet/secure_closet/smith,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/supply/smith_office)
"vSD" = (
/obj/structure/girder,
/turf/simulated/floor/plating,
@@ -113285,7 +113339,7 @@
dir = 1
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/assembly_line)
+/area/station/maintenance/aft)
"wwp" = (
/obj/structure/window/reinforced{
dir = 8
@@ -115362,6 +115416,14 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
+"wTD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/conveyor{
+ dir = 8;
+ id = "packageSort2"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/assembly_line)
"wUa" = (
/obj/structure/table,
/obj/machinery/cell_charger,
@@ -115408,6 +115470,11 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
+/obj/item/radio/intercom{
+ name = "east bump";
+ pixel_x = 28
+ },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
"wUm" = (
@@ -116022,6 +116089,11 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"xbO" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
"xbZ" = (
/obj/effect/spawner/random/barrier/obstruction,
/turf/simulated/floor/plating,
@@ -117236,10 +117308,11 @@
/area/station/public/construction)
"xoj" = (
/obj/effect/decal/cleanable/dirt,
+/obj/item/mounted/frame/apc_frame,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-2"
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/station/maintenance/assembly_line)
"xoo" = (
/turf/simulated/floor/plasteel{
@@ -117367,9 +117440,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "1-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -117379,7 +117449,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/plating,
+/obj/machinery/door/airlock/engineering,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/turf/simulated/floor/plasteel,
/area/station/maintenance/assembly_line)
"xpj" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
@@ -118048,11 +118120,9 @@
/turf/simulated/floor/plating,
/area/shuttle/pod_1)
"xvG" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/assembly_line)
+/obj/effect/spawner/random/fungus/maybe,
+/turf/simulated/wall,
+/area/station/supply/smith_office)
"xvI" = (
/obj/structure/closet/firecloset,
/obj/structure/sign/poster/official/random{
@@ -119840,12 +119910,14 @@
/area/station/maintenance/asmaint)
"xOO" = (
/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
+ icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8;
+ initialize_directions = 11
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/disposalpipe/segment/corner{
dir = 4
},
/turf/simulated/floor/plasteel,
@@ -121175,6 +121247,7 @@
dir = 1
},
/obj/item/camera_assembly,
+/obj/machinery/conveyor,
/turf/simulated/floor/plasteel,
/area/station/maintenance/assembly_line)
"ydt" = (
@@ -144586,7 +144659,7 @@ vtm
nmE
mRE
gTK
-ezq
+nBV
tgD
iKv
vVK
@@ -144833,7 +144906,7 @@ uhS
qTV
jUQ
noY
-rGN
+nqX
eHo
bMP
gve
@@ -145091,8 +145164,8 @@ xnG
xOO
slj
wUh
-rGN
-bOS
+vrV
+mVO
rZn
oEt
naz
@@ -145345,12 +145418,12 @@ qVi
iKd
rGN
rGN
-rGN
+ubi
svc
-vrV
-vrV
+bcs
+jwe
nMg
-lBJ
+bcs
oEt
oEt
gZo
@@ -145602,9 +145675,9 @@ wRj
lBJ
vOh
vKf
-inF
+cGZ
sKV
-inF
+cna
nzM
sao
tMy
@@ -145858,13 +145931,13 @@ xvW
wQF
qDi
ioA
-ioA
-gvg
-jYN
-jxt
-niO
-jwE
-ioA
+fZM
+lzQ
+fZM
+bcs
+poZ
+spC
+uCu
mbf
oEt
mXy
@@ -146117,13 +146190,13 @@ hAn
ioA
acf
mXh
-uDX
-uDx
+wHk
+bcs
kiY
llQ
-ioA
-fJe
-oEt
+fGP
+dMp
+nfr
kSm
uFx
tbw
@@ -146372,14 +146445,14 @@ bSW
hMz
wOy
ioA
-rwL
+wHk
rTP
kam
-bbE
+bcs
gVK
-rqJ
-niO
-fJe
+ssH
+ssH
+dMp
oEt
iKk
uFx
@@ -146630,12 +146703,12 @@ xpT
xsC
ioA
sih
-mXh
+xrs
jHj
xvG
vSy
hvG
-ioA
+bFN
rPr
oEt
eod
@@ -146887,12 +146960,12 @@ vFj
usG
ioA
bFq
-iQa
+xgV
uVq
-bbE
-gVP
-frE
-ioA
+xvG
+bcs
+bcs
+bcs
ofB
oEt
avB
@@ -147144,12 +147217,12 @@ gdq
iWf
ioA
ngf
-oLB
+xbO
ano
wwk
-cMJ
-hvG
-niO
+ciO
+ciO
+cBs
kxI
wOm
rqs
@@ -147400,13 +147473,13 @@ hzM
vsI
wko
ioA
-szl
+bfD
pYq
-uDX
-kdd
-oLB
-pAF
-jwE
+jHj
+tTY
+pju
+wHk
+xrs
xHE
iHn
rqs
@@ -147657,12 +147730,12 @@ vLH
hEb
ioA
ioA
-pXC
-sbP
+ioA
+ioA
xpg
-oLB
-kdd
-uAS
+ioA
+jwE
+ioA
jwE
thk
bfD
@@ -147914,12 +147987,12 @@ qDi
qDi
ioA
wGD
-jpp
+hzd
xoj
qsX
yds
-bZU
-bZU
+uNM
+uNM
ioA
rRE
kzA
@@ -148172,7 +148245,7 @@ izR
vwR
vwR
efE
-qMg
+oLB
qNJ
mzq
mlZ
@@ -148432,7 +148505,7 @@ esJ
iGZ
hLU
bDb
-jpp
+bZU
jxt
rKv
fJe
@@ -148687,9 +148760,9 @@ kpX
vwR
gIK
enp
-tLK
-got
kdd
+got
+wTD
jxt
sJG
fJe
@@ -148944,9 +149017,9 @@ qlq
vwR
rff
rut
-plR
-sKs
oLB
+sKs
+aCA
jxt
mJC
fJe
@@ -154261,7 +154334,7 @@ mJS
rpF
jPn
tap
-nXR
+szY
rmE
oQM
qxy
@@ -156910,7 +156983,7 @@ iTl
uqq
aFa
vKF
-meR
+uFt
gBS
gBS
wEZ
@@ -160225,7 +160298,7 @@ twu
jOu
icb
dbu
-fuX
+qvu
adx
dZF
xfI
@@ -160699,7 +160772,7 @@ kAe
mZE
nXu
brq
-ejN
+lCc
bwi
uBv
nOk
@@ -163500,7 +163573,7 @@ pvz
pGB
ebB
jwm
-mqU
+nEV
ouc
iNH
ouc
@@ -164097,7 +164170,7 @@ xyC
eDy
iWE
muy
-rME
+cCX
pJV
giM
pcZ
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index 23eabc9f561..2e6bb622849 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -18,6 +18,24 @@
/obj/effect/landmark/spawner/carp,
/turf/space,
/area/space)
+"aaG" = (
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
+/obj/structure/chair/office/light,
+/obj/machinery/computer/security/telescreen{
+ desc = "Used for watching the test chamber.";
+ layer = 4;
+ name = "Test Chamber Telescreen";
+ network = list("Toxins");
+ pixel_y = -32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/launch)
"aaK" = (
/obj/docking_port/stationary{
dheight = 9;
@@ -112,6 +130,17 @@
/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"acm" = (
+/obj/machinery/camera{
+ c_tag = "Science Toxins Mixing - Aft";
+ dir = 4;
+ network = list("Research","SS13")
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"acv" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -295,18 +324,6 @@
icon_state = "red"
},
/area/station/security/main)
-"aec" = (
-/obj/structure/disaster_counter/toxins{
- pixel_x = -32
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/launch)
"aee" = (
/obj/structure/lattice/catwalk,
/turf/space,
@@ -315,14 +332,6 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/space/nearstation)
-"aei" = (
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"aen" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -901,13 +910,6 @@
/obj/machinery/suit_storage_unit/industrial/engine/secure,
/turf/simulated/floor/plasteel,
/area/station/engineering/hardsuitstorage)
-"ajW" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/atmospherics/portable/canister/toxins,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/science/storage)
"akg" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -1029,6 +1031,13 @@
icon_state = "whitepurple"
},
/area/station/science/research)
+"akL" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurple";
+ dir = 4
+ },
+/area/station/maintenance/aft2)
"akN" = (
/obj/structure/closet/secure_closet/brig,
/turf/simulated/floor/plasteel{
@@ -1547,19 +1556,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
-"anD" = (
-/obj/structure/chair/office/light,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the test chamber.";
- layer = 4;
- name = "Test Chamber Telescreen";
- network = list("Toxins");
- pixel_y = -32
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/launch)
"anE" = (
/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
@@ -4140,6 +4136,16 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
+/mob/living/simple_animal/bot/mulebot{
+ home_destination = "QM #2";
+ suffix = "#2"
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "delivery";
+ dir = 8;
+ location = "QM #2"
+ },
+/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"azP" = (
@@ -5175,12 +5181,17 @@
/area/station/engineering/engine_foyer)
"aEH" = (
/obj/machinery/firealarm/directional/east,
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
"aEI" = (
/obj/docking_port/stationary{
dir = 8;
@@ -5857,13 +5868,14 @@
/turf/simulated/floor/plating,
/area/station/legal/lawoffice)
"aHY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/cargo_technician,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ dir = 10
+ },
+/obj/effect/landmark/start/cargo_technician,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/east,
+/obj/structure/cable{
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel,
/area/station/supply/warehouse)
@@ -6284,12 +6296,12 @@
/area/station/hallway/primary/fore/north)
"aJi" = (
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "redcorner"
},
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/turf/simulated/floor/plating,
/area/station/hallway/primary/fore/north)
"aJk" = (
/obj/structure/cable{
@@ -6567,9 +6579,27 @@
},
/area/station/hallway/primary/fore/east)
"aKl" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/station/supply/warehouse)
+/obj/structure/table/reinforced,
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/smith{
+ dir = 1
+ },
+/obj/machinery/door/window/classic/reversed{
+ name = "Smith's Desk";
+ dir = 1
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id_tag = "smithdesk";
+ name = "Smith's Desk Shutters";
+ dir = 5
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id_tag = "smithdesk";
+ name = "Smith's Desk Shutters";
+ dir = 5
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"aKq" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -6601,8 +6631,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"aKv" = (
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -6965,10 +6995,12 @@
/turf/simulated/floor/plasteel,
/area/station/public/construction)
"aLK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/cargo_technician,
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
+/obj/machinery/requests_console/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
"aLL" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -7275,16 +7307,15 @@
},
/area/station/supply/storage)
"aMH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/watertank,
-/obj/machinery/light/small{
- dir = 1
- },
/obj/machinery/camera{
c_tag = "Cargo Bay Storage"
},
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
+/obj/structure/closet/secure_closet/smith,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
"aMK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -8151,14 +8182,23 @@
},
/area/station/public/sleep)
"aPV" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/light_switch{
name = "custom placement";
pixel_x = 6;
pixel_y = 24
},
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
+/obj/structure/shelf/supply,
+/obj/item/stack/sheet/glass{
+ amount = 10;
+ pixel_x = -3;
+ pixel_y = 6
+ },
+/obj/item/stack/sheet/metal/ten,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
"aPX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -8753,21 +8793,13 @@
/turf/simulated/floor/plating,
/area/station/engineering/secure_storage)
"aSl" = (
-/obj/effect/turf_decal/delivery,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/navbeacon{
- codes_txt = "delivery";
- dir = 8;
- location = "QM #1"
- },
-/mob/living/simple_animal/bot/mulebot{
- home_destination = "QM #1";
- suffix = "#1"
- },
/obj/machinery/power/apc/directional/east,
/obj/structure/cable,
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
"aSm" = (
/turf/simulated/wall,
/area/station/security/main)
@@ -8882,13 +8914,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"aSK" = (
-/obj/structure/closet/crate,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
"aSM" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -9160,6 +9185,9 @@
"aTX" = (
/obj/effect/landmark/spawner/nukedisc_respawn,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate,
+/obj/item/stack/ore/glass,
+/obj/item/stack/ore/iron,
/turf/simulated/floor/plasteel,
/area/station/supply/warehouse)
"aTY" = (
@@ -9245,22 +9273,6 @@
icon_state = "dark"
},
/area/station/command/bridge)
-"aUl" = (
-/obj/structure/chair/sofa/corp{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
-"aUn" = (
-/obj/structure/chair/sofa/corp{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"aUp" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -9602,19 +9614,13 @@
},
/area/station/engineering/atmos/control)
"aVk" = (
-/mob/living/simple_animal/bot/mulebot{
- home_destination = "QM #2";
- suffix = "#2"
+/obj/structure/table/reinforced,
+/obj/item/eftpos/register,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "brown"
},
-/obj/effect/turf_decal/delivery,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/navbeacon{
- codes_txt = "delivery";
- dir = 8;
- location = "QM #2"
- },
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
+/area/station/supply/smith_office)
"aVl" = (
/turf/simulated/wall,
/area/station/supply/qm)
@@ -9627,15 +9633,6 @@
icon_state = "darkgrey"
},
/area/station/public/locker)
-"aVo" = (
-/obj/structure/rack,
-/obj/item/apc_electronics,
-/obj/item/stock_parts/cell{
- maxcharge = 2000
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
"aVp" = (
/obj/machinery/economy/vending/clothing,
/turf/simulated/floor/plasteel{
@@ -9691,18 +9688,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
-"aVy" = (
-/turf/simulated/floor/transparent/glass/reinforced,
-/area/station/hallway/primary/central/north)
-"aVA" = (
-/obj/structure/chair/sofa/corp/corner,
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"aVD" = (
/obj/machinery/economy/vending/cigarette,
/turf/simulated/floor/plasteel{
@@ -9788,6 +9773,13 @@
icon_state = "neutralcorner"
},
/area/station/public/locker)
+"aVM" = (
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/station/science/lobby)
"aVT" = (
/obj/structure/table,
/obj/item/clothing/head/soft{
@@ -9924,13 +9916,16 @@
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"aWt" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/warehouse)
"aWu" = (
@@ -10057,18 +10052,6 @@
icon_state = "darkgrey"
},
/area/station/engineering/smes)
-"aWO" = (
-/obj/item/stack/sheet/cardboard,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
"aWQ" = (
/obj/structure/sign/chemistry,
/turf/simulated/wall,
@@ -10165,11 +10148,8 @@
},
/area/station/public/locker)
"aXn" = (
-/obj/structure/closet/crate/freezer,
-/obj/structure/sink/kitchen/old{
- pixel_y = 25
- },
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/alarm/directional/east,
/turf/simulated/floor/plasteel,
/area/station/supply/warehouse)
"aXp" = (
@@ -10247,10 +10227,18 @@
/turf/simulated/wall,
/area/station/supply/sorting)
"aXB" = (
-/obj/structure/closet/crate/internals,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
+/obj/structure/chair/office/dark,
+/obj/machinery/door_control{
+ id = "smithdesk";
+ name = "Smith's Desk Shutters Control";
+ pixel_x = -24;
+ req_access = list(49)
+ },
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
"aXF" = (
/obj/machinery/power/terminal,
/obj/structure/cable/yellow,
@@ -10265,14 +10253,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/smes)
-"aXG" = (
-/obj/structure/chair/sofa/corp/left{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"aXH" = (
/obj/structure/window/reinforced{
dir = 4
@@ -10430,6 +10410,11 @@
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"aYg" = (
+/obj/effect/decal/cleanable/cobweb2,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"aYh" = (
/obj/structure/disposalpipe/junction{
dir = 1
@@ -10818,11 +10803,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plasteel,
/area/station/engineering/smes)
-"aZN" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"aZP" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass,
@@ -11001,16 +10981,11 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"bas" = (
-/obj/structure/closet/crate,
-/obj/item/stack/ore/glass,
-/obj/item/stack/ore/iron,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "brown"
},
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
+/area/station/supply/smith_office)
"bau" = (
/obj/structure/table/wood,
/obj/item/clothing/mask/cigarette/cigar,
@@ -11254,16 +11229,6 @@
icon_state = "darkgrey"
},
/area/station/hallway/primary/central/se)
-"bbh" = (
-/obj/structure/closet/firecloset,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
-"bbk" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/station/hallway/primary/central/north)
"bbn" = (
/obj/item/kirbyplants/medium/medium8,
/obj/item/radio/intercom{
@@ -11582,12 +11547,6 @@
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
-"bcu" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint)
"bcy" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -12939,6 +12898,12 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
@@ -17164,6 +17129,7 @@
"bsi" = (
/obj/effect/turf_decal/delivery/hollow,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/internals,
/turf/simulated/floor/plasteel,
/area/station/supply/warehouse)
"bsj" = (
@@ -22772,6 +22738,13 @@
icon_state = "redcorner"
},
/area/station/security/brig)
+"bLz" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 6
+ },
+/turf/space,
+/area/space/nearstation)
"bLA" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/classic/reversed,
@@ -27151,13 +27124,6 @@
icon_state = "green"
},
/area/station/hallway/primary/central/se)
-"ccX" = (
-/obj/machinery/door/airlock/public/glass,
-/obj/effect/mapping_helpers/airlock/autoname,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"ccZ" = (
/obj/machinery/requests_console/directional/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -27786,6 +27752,12 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central/east)
+"cfs" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
+ dir = 8
+ },
+/turf/simulated/floor/engine/vacuum,
+/area/station/science/toxins/mixing)
"cft" = (
/obj/structure/sign/science,
/turf/simulated/wall,
@@ -28508,17 +28480,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
-"chY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/science/toxins/launch)
"chZ" = (
/obj/structure/table,
/obj/item/folder/white{
@@ -30881,14 +30842,6 @@
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"csS" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/turret_protected/ai_upload)
"csT" = (
/obj/machinery/light{
dir = 4
@@ -31435,17 +31388,6 @@
},
/turf/simulated/floor/engine/vacuum,
/area/station/maintenance/turbine)
-"cuR" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/research)
"cuS" = (
/obj/structure/table/glass,
/obj/item/radio/intercom{
@@ -31539,6 +31481,16 @@
"cvo" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/medmaint)
+"cvu" = (
+/obj/effect/spawner/window/reinforced/plasma/grilled,
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 4
+ },
+/obj/machinery/atmospherics/meter{
+ layer = 3.3
+ },
+/turf/simulated/floor/plating,
+/area/station/science/toxins/mixing)
"cvw" = (
/obj/machinery/light/small{
dir = 4
@@ -32455,6 +32407,17 @@
/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
+"czx" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/launch)
"czy" = (
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -33330,21 +33293,13 @@
/turf/space,
/area/station/medical/virology)
"cDq" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/portable/scrubber/huge,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/plasteel{
- icon_state = "whitepurplefull"
+ icon_state = "white"
},
-/area/station/science/storage)
+/area/station/science/toxins/mixing)
"cDr" = (
/obj/item/toolbox_tiles{
desc = "Why won't it work?";
@@ -33655,6 +33610,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
+"cED" = (
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/station/hallway/primary/central/north)
"cEE" = (
/obj/machinery/atmospherics/pipe/manifold/hidden,
/turf/simulated/floor/plasteel{
@@ -36439,6 +36398,24 @@
},
/turf/simulated/floor/plating/airless,
/area/station/science/toxins/test)
+"cPY" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/light,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/research)
"cQc" = (
/obj/structure/window/reinforced{
dir = 1
@@ -36831,13 +36808,6 @@
icon_state = "red"
},
/area/station/hallway/secondary/exit)
-"cRQ" = (
-/obj/machinery/alarm/directional/north,
-/obj/machinery/atmospherics/unary/thermomachine/freezer,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"cRS" = (
/obj/structure/sign/directions/evac{
pixel_x = 32
@@ -37721,17 +37691,6 @@
icon_state = "chapel"
},
/area/station/service/chapel)
-"cWc" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplefull"
- },
-/area/station/science/storage)
"cWd" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -37813,6 +37772,10 @@
icon_state = "dark"
},
/area/station/service/chapel)
+"cWA" = (
+/obj/machinery/economy/atm/directional/south,
+/turf/simulated/floor/wood,
+/area/station/service/bar)
"cWB" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -38057,10 +38020,6 @@
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fsmaint)
-"cXO" = (
-/obj/machinery/space_heater,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"cXQ" = (
/obj/structure/table/wood,
/obj/structure/disposalpipe/segment,
@@ -38155,6 +38114,10 @@
icon_state = "white"
},
/area/station/maintenance/aft)
+"cYr" = (
+/obj/effect/spawner/random/barrier/grille_maybe,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"cYx" = (
/obj/structure/chair{
dir = 1
@@ -38240,10 +38203,6 @@
icon_state = "whiteblue"
},
/area/station/medical/surgery/secondary)
-"cYP" = (
-/obj/effect/spawner/random/barrier/grille_maybe,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"cYQ" = (
/obj/effect/spawner/window,
/turf/simulated/floor/plating,
@@ -38475,21 +38434,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"dal" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "whitepurple"
},
/area/station/science/toxins/mixing)
"dam" = (
@@ -39728,15 +39675,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/a)
-"dif" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 10
- },
-/obj/structure/sign/vacuum/external{
- pixel_x = 30
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"dig" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -39744,6 +39682,14 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/prison/cell_block/a)
+"dih" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
+/obj/structure/closet/crate/freezer,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/supply/warehouse)
"dio" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -39825,12 +39771,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
-"dkM" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 9
- },
-/turf/simulated/floor/engine/vacuum,
-/area/station/science/toxins/mixing)
"dlb" = (
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
@@ -39882,6 +39822,14 @@
},
/turf/simulated/floor/engine,
/area/station/maintenance/turbine)
+"dmD" = (
+/obj/structure/chair/comfy/corp{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"dmE" = (
/obj/machinery/conveyor/north{
id = "QMLoad"
@@ -39950,6 +39898,12 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
+"dnE" = (
+/obj/machinery/atmospherics/unary/thermomachine/heater,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"dnH" = (
/obj/machinery/mass_driver{
id_tag = "toxinsdriver"
@@ -40096,6 +40050,28 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
+"dpO" = (
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/maintenance/aft2)
"dpZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -40238,6 +40214,18 @@
},
/turf/simulated/floor/wood,
/area/station/service/bar)
+"dsA" = (
+/obj/machinery/atmospherics/portable/canister/oxygen,
+/obj/effect/turf_decal/delivery/blue/hollow,
+/obj/machinery/camera{
+ c_tag = "Science - Toxins Secure - Starboard";
+ dir = 8;
+ network = list("Research","SS13")
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/science/storage)
"dtC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -40421,29 +40409,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/engine_foyer)
-"dxG" = (
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/status_display{
- layer = 4;
- pixel_x = -32
- },
-/obj/structure/closet/crate/secure{
- desc = "A secure crate containing various materials for building a customised test-site.";
- name = "Test Site Materials Crate";
- req_access = list(8)
- },
-/obj/item/target/syndicate,
-/obj/item/target/syndicate,
-/obj/item/target/alien,
-/obj/item/target/alien,
-/obj/item/target/alien,
-/obj/item/target/alien,
-/obj/item/target/alien,
-/turf/simulated/floor/plasteel{
- dir = 9;
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/launch)
"dxJ" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/unary/outlet_injector/on,
@@ -40555,6 +40520,11 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
+"dBP" = (
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/science/toxins/launch)
"dBS" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/structure/extinguisher_cabinet{
@@ -40648,6 +40618,17 @@
icon_state = "greenfull"
},
/area/station/hallway/primary/central/se)
+"dCA" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplefull"
+ },
+/area/station/science/storage)
"dCJ" = (
/obj/structure/closet,
/obj/effect/spawner/random/trash,
@@ -40739,14 +40720,6 @@
icon_state = "C9"
},
/area/station/hallway/primary/central/north)
-"dER" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"dFf" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -40768,6 +40741,16 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore)
+"dGn" = (
+/obj/machinery/atmospherics/binary/pump{
+ dir = 4;
+ name = "Burn Chamber to Port"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"dGs" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance_hatch{
@@ -40843,22 +40826,11 @@
},
/area/station/engineering/ai_transit_tube)
"dIQ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
- },
-/area/station/science/storage)
-"dJu" = (
-/obj/machinery/atmospherics/binary/pump{
- dir = 8;
- name = "Port to Hot Loop"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
+ icon_state = "white"
},
/area/station/science/toxins/mixing)
"dJx" = (
@@ -40873,13 +40845,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/nw)
-"dJM" = (
-/obj/machinery/doppler_array,
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel{
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/launch)
"dKd" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -41055,11 +41020,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
-"dOM" = (
-/obj/effect/decal/cleanable/cobweb2,
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"dOQ" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -41077,22 +41037,6 @@
icon_state = "dark"
},
/area/station/medical/surgery/observation)
-"dPk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
-"dPJ" = (
-/obj/machinery/atmospherics/unary/outlet_injector/on{
- dir = 4
- },
-/turf/simulated/floor/engine/vacuum,
-/area/station/science/toxins/mixing)
"dPW" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -41377,6 +41321,14 @@
},
/turf/simulated/floor/wood,
/area/station/legal/courtroom)
+"dWQ" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"dWX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -41419,6 +41371,13 @@
/obj/effect/spawner/random/blood/often,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
+"dYe" = (
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/port/east)
"dYi" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
@@ -41618,6 +41577,9 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/engine/supermatter)
+"ebX" = (
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"ebZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -41638,6 +41600,12 @@
/obj/effect/spawner/random/cobweb/left/rare,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
+"ecw" = (
+/obj/machinery/economy/atm/directional/east,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/aft/south)
"edg" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass,
@@ -41723,12 +41691,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/security/brig)
-"eeI" = (
-/obj/machinery/atmospherics/unary/thermomachine/heater,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"efd" = (
/obj/machinery/light/small{
dir = 1
@@ -41880,6 +41842,19 @@
icon_state = "yellow"
},
/area/station/engineering/break_room)
+"eim" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/warehouse)
"eiE" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -41920,28 +41895,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central/north)
-"ejr" = (
-/obj/structure/disposalpipe/segment/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/maintenance/aft2)
"eju" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -42028,6 +41981,15 @@
},
/turf/simulated/floor/plating/airless,
/area/station/engineering/solar/aft_port)
+"emw" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"emO" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -42134,6 +42096,11 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/warden)
+"epO" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
+/turf/space,
+/area/space/nearstation)
"epY" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
@@ -42649,6 +42616,12 @@
icon_state = "green"
},
/area/station/security/permabrig)
+"eAC" = (
+/obj/machinery/requests_console/directional/north,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"eAL" = (
/obj/machinery/camera{
c_tag = "Secure Lab - Test Chamber";
@@ -42774,15 +42747,23 @@
icon_state = "whitebluefull"
},
/area/station/medical/storage/secondary)
-"eDX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "1-2"
+"eDC" = (
+/obj/item/kirbyplants/large,
+/obj/item/radio/intercom{
+ name = "north bump";
+ pixel_y = 28
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
+"eDX" = (
+/obj/machinery/atmospherics/binary/pump{
+ name = "Cold Loop to Port"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
},
/area/station/science/toxins/mixing)
"eEc" = (
@@ -42883,21 +42864,13 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"eGn" = (
-/obj/structure/window/reinforced,
-/obj/structure/rack,
-/obj/item/extinguisher,
-/obj/item/clothing/mask/gas,
-/obj/item/grenade/chem_grenade/firefighting,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/area/station/science/toxins/mixing)
-"eGt" = (
-/obj/structure/dispenser,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "darkpurplecorners"
+ icon_state = "white"
},
/area/station/science/toxins/mixing)
"eGw" = (
@@ -42917,6 +42890,17 @@
icon_state = "white"
},
/area/station/medical/medbay)
+"eGA" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"eGG" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -42968,6 +42952,13 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
+"eJz" = (
+/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay,
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fpmaint)
"eJG" = (
/obj/structure/disposalpipe/segment/corner{
dir = 1
@@ -43107,24 +43098,6 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/fore/east)
-"eNL" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/light,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/research)
"eNR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
@@ -43346,17 +43319,6 @@
icon_state = "purple"
},
/area/station/science/xenobiology)
-"eSA" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/turf_decal/stripes/line,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"eSE" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -43615,6 +43577,12 @@
icon_state = "darkgrey"
},
/area/station/science/robotics)
+"eVS" = (
+/obj/machinery/atmospherics/unary/outlet_injector/on{
+ dir = 4
+ },
+/turf/simulated/floor/engine/vacuum,
+/area/station/science/toxins/mixing)
"eVZ" = (
/obj/structure/table,
/obj/machinery/recharger{
@@ -43813,13 +43781,6 @@
/obj/structure/cable,
/turf/simulated/floor/plating,
/area/station/security/brig)
-"fbL" = (
-/obj/machinery/atmospherics/unary/portables_connector,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"fbQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -43878,23 +43839,6 @@
icon_state = "dark"
},
/area/station/engineering/atmos)
-"fcJ" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/camera{
- c_tag = "Science Toxins Launch Room";
- network = list("Research","SS13")
- },
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/launch)
"fcT" = (
/obj/machinery/computer/brigcells{
dir = 8
@@ -43955,21 +43899,6 @@
icon_state = "C10"
},
/area/station/hallway/primary/central/south)
-"ffx" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "whitepurple"
- },
-/area/station/science/storage)
"ffG" = (
/obj/structure/chair/office/dark{
dir = 1
@@ -44114,12 +44043,6 @@
icon_state = "dark"
},
/area/station/engineering/atmos)
-"fhw" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 10
- },
-/turf/simulated/floor/engine/vacuum,
-/area/station/science/toxins/mixing)
"fhG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -44315,16 +44238,6 @@
icon_state = "dark"
},
/area/station/security/interrogation)
-"fmf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/explosives{
- pixel_x = 31
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple";
- dir = 4
- },
-/area/station/maintenance/aft2)
"fmm" = (
/obj/structure/table,
/obj/item/clothing/glasses/meson,
@@ -44411,17 +44324,6 @@
icon_state = "darkgrey"
},
/area/station/engineering/tech_storage)
-"foV" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 8;
- name = "Portable Scrubber Connector"
- },
-/obj/machinery/atmospherics/portable/scrubber,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"fpk" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -44438,12 +44340,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/fsmaint)
-"fpl" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"fpy" = (
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore)
@@ -44717,14 +44613,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
-"fue" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining{
- name = "Warehouse"
- },
-/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay,
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
"fuq" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -44760,6 +44648,17 @@
/obj/effect/spawner/random/barrier/grille_often,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"fuC" = (
+/obj/item/radio/intercom{
+ name = "east bump";
+ pixel_x = 28
+ },
+/obj/machinery/atmospherics/trinary/mixer,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"fvN" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -44889,13 +44788,6 @@
icon_state = "darkgrey"
},
/area/station/security/evidence)
-"fyt" = (
-/obj/machinery/firealarm/directional/west,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"fyS" = (
/obj/machinery/door/airlock/maintenance,
/obj/structure/cable{
@@ -45077,20 +44969,6 @@
icon_state = "whiteyellow"
},
/area/station/medical/chemistry)
-"fBK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/tox,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/machinery/door/airlock/research/glass,
-/obj/machinery/door/firedoor/heavy,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/science/toxins/launch)
"fBQ" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -45249,25 +45127,6 @@
icon_state = "cult"
},
/area/station/service/library)
-"fED" = (
-/obj/machinery/door/airlock/research/glass{
- name = "Toxins Storage"
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/tox,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor/heavy,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/storage)
"fES" = (
/obj/structure/window/reinforced{
dir = 1
@@ -45492,6 +45351,19 @@
/obj/effect/mapping_helpers/airlock/autoname,
/turf/simulated/floor/plating,
/area/station/maintenance/solar_maintenance/fore_port)
+"fIV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/maintenance/aft2)
"fJd" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig"
@@ -45539,29 +45411,10 @@
icon_state = "darkred"
},
/area/station/security/main)
-"fJu" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/white/line,
-/turf/simulated/floor/plasteel{
- icon_state = "darkgrey"
- },
-/area/station/science/research)
"fJF" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/station/security/brig)
-"fJJ" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/launch)
"fKW" = (
/obj/item/kirbyplants/large/plant1,
/obj/structure/cable{
@@ -45614,27 +45467,9 @@
icon_state = "browncorner"
},
/area/station/hallway/primary/port/east)
-"fMh" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"fMn" = (
/turf/simulated/wall/r_wall,
/area/station/engineering/equipmentstorage)
-"fMC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/l3closet/scientist,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/maintenance/asmaint)
"fMZ" = (
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
@@ -45755,6 +45590,12 @@
icon_state = "white"
},
/area/station/science/research)
+"fPL" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"fPN" = (
/obj/structure/chair/office/dark,
/obj/effect/landmark/start/coroner,
@@ -45951,10 +45792,6 @@
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/wood,
/area/station/maintenance/starboard)
-"fTW" = (
-/obj/effect/spawner/window/reinforced/plasma/grilled,
-/turf/simulated/floor/plating,
-/area/station/science/toxins/launch)
"fUf" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance,
@@ -46021,19 +45858,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
-"fVL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/maintenance/aft2)
"fVW" = (
/obj/structure/disposaloutlet{
dir = 4
@@ -46155,15 +45979,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
-"fYp" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"fYA" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -46284,6 +46099,12 @@
icon_state = "whitepurple"
},
/area/station/science/xenobiology)
+"gbF" = (
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"gbP" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -46321,6 +46142,14 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
+"gcw" = (
+/obj/machinery/economy/vending/plasmaresearch,
+/obj/effect/turf_decal/delivery/hollow,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/mixing)
"gcy" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
@@ -46344,15 +46173,6 @@
/obj/item/deck/cards,
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
-"gcP" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- dir = 9;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"gdb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -46419,6 +46239,16 @@
icon_state = "white"
},
/area/station/security/permabrig)
+"gdH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/explosives{
+ pixel_x = 31
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurple";
+ dir = 4
+ },
+/area/station/maintenance/aft2)
"geq" = (
/obj/structure/disposalpipe/segment/corner{
dir = 4
@@ -46700,6 +46530,12 @@
},
/turf/simulated/floor/plating,
/area/station/security/permabrig)
+"gjH" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"gkl" = (
/obj/structure/chair/stool,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -46767,17 +46603,28 @@
/turf/simulated/floor/plating,
/area/station/security/storage)
"glQ" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/status_display{
+ layer = 4;
+ pixel_x = -32
},
-/obj/machinery/hologram/holopad,
+/obj/structure/closet/crate/secure{
+ desc = "A secure crate containing various materials for building a customised test-site.";
+ name = "Test Site Materials Crate";
+ req_access = list(8)
+ },
+/obj/item/target/syndicate,
+/obj/item/target/syndicate,
+/obj/item/target/alien,
+/obj/item/target/alien,
+/obj/item/target/alien,
+/obj/item/target/alien,
+/obj/item/target/alien,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 9;
+ icon_state = "darkpurple"
},
-/area/station/science/toxins/mixing)
+/area/station/science/toxins/launch)
"glS" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -46865,6 +46712,12 @@
/obj/machinery/status_display,
/turf/simulated/wall/r_wall,
/area/station/engineering/engine/supermatter)
+"gpw" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/purple,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"gpT" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -46913,6 +46766,7 @@
/area/station/security/main)
"gqF" = (
/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate,
/turf/simulated/floor/plasteel,
/area/station/supply/warehouse)
"gqN" = (
@@ -47186,11 +47040,6 @@
icon_state = "dark"
},
/area/station/security/main)
-"gyA" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/science/toxins/launch)
"gyK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/purple,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -47220,6 +47069,19 @@
},
/turf/space,
/area/space/nearstation)
+"gAb" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/station/science/research)
"gAM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -47438,6 +47300,12 @@
},
/turf/simulated/floor/carpet,
/area/station/science/robotics/showroom)
+"gEq" = (
+/obj/structure/table/glass/reinforced,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"gEt" = (
/obj/structure/table/glass,
/obj/item/paper/crumpled,
@@ -47468,18 +47336,14 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"gFf" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "whitepurple"
+ icon_state = "white"
},
-/area/station/science/storage)
+/area/station/science/toxins/mixing)
"gFk" = (
/obj/structure/table/glass,
/obj/structure/window/reinforced{
@@ -47551,17 +47415,6 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
-"gGu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/storage)
"gGS" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -47747,6 +47600,13 @@
icon_state = "dark"
},
/area/station/medical/morgue)
+"gKg" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable,
+/turf/simulated/floor/plasteel,
+/area/station/supply/warehouse)
"gKl" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -47928,12 +47788,20 @@
/turf/simulated/floor/wood,
/area/station/service/bar)
"gOA" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
icon_state = "2-4"
},
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
"gOT" = (
/obj/effect/mapping_helpers/turfs/rust/maybe,
/turf/simulated/wall/r_wall,
@@ -48052,6 +47920,14 @@
icon_state = "dark"
},
/area/station/security/main)
+"gRS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/portable/canister/carbon_dioxide,
+/obj/effect/turf_decal/delivery/red/hollow,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/science/storage)
"gSa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -48107,14 +47983,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard2)
-"gSR" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"gSU" = (
/obj/structure/disposaloutlet{
dir = 1
@@ -48204,14 +48072,6 @@
icon_state = "whiteblue"
},
/area/station/medical/reception)
-"gUo" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"gUz" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
@@ -48389,6 +48249,12 @@
},
/turf/simulated/floor/plating,
/area/station/security/permabrig)
+"gYb" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 9
+ },
+/turf/simulated/floor/engine/vacuum,
+/area/station/science/toxins/mixing)
"gYm" = (
/obj/machinery/hydroponics/soil,
/obj/item/radio/intercom{
@@ -48822,6 +48688,14 @@
/obj/effect/turf_decal/delivery/white/hollow,
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
+"hjk" = (
+/obj/machinery/door/poddoor{
+ id_tag = "ToxinsVenting";
+ name = "Toxins Venting Bay Door";
+ power_state = 0
+ },
+/turf/simulated/floor/engine/vacuum,
+/area/station/science/toxins/mixing)
"hjn" = (
/obj/structure/table/glass,
/obj/item/folder/blue,
@@ -48916,16 +48790,6 @@
icon_state = "dark"
},
/area/station/medical/surgery/observation)
-"hkz" = (
-/obj/effect/spawner/window/reinforced/plasma/grilled,
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/meter{
- layer = 3.3
- },
-/turf/simulated/floor/plating,
-/area/station/science/toxins/mixing)
"hkF" = (
/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_2)
@@ -49928,6 +49792,15 @@
icon_state = "dark"
},
/area/station/science/server)
+"hHa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"hHz" = (
/obj/machinery/door/poddoor/preopen{
id_tag = "Perma Gate";
@@ -50302,6 +50175,14 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
+"hPG" = (
+/obj/item/clothing/mask/cigarette/rollie,
+/obj/item/clothing/mask/cigarette/rollie{
+ pixel_y = -3
+ },
+/obj/structure/table,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"hPJ" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -50591,6 +50472,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/garden)
+"hVK" = (
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/alarm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/launch)
"hWf" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -50635,13 +50527,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
-"hXV" = (
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
- },
-/area/station/hallway/primary/port/east)
"hYj" = (
/obj/machinery/door/airlock/atmos{
name = "Fore-Starboard Atmospherics Maintenance"
@@ -50653,13 +50538,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
-"hYs" = (
-/obj/machinery/economy/atm/directional/west,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
- },
-/area/station/hallway/primary/central/se)
"hYu" = (
/obj/machinery/newscaster/directional/north,
/obj/machinery/disposal,
@@ -50798,24 +50676,15 @@
icon_state = "vault"
},
/area/station/security/armory/secure)
-"iaD" = (
-/obj/item/radio/intercom{
- name = "west bump";
- pixel_x = -28
+"ibg" = (
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/structure/chair/office/light,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the test chamber.";
- layer = 4;
- name = "Test Chamber Telescreen";
- network = list("Toxins");
- pixel_y = -32
+/obj/machinery/light/small{
+ dir = 8
},
-/turf/simulated/floor/plasteel{
- dir = 10;
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/launch)
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"ibh" = (
/obj/machinery/atmospherics/binary/pump{
dir = 1;
@@ -50861,6 +50730,12 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/south)
+"ibV" = (
+/obj/machinery/economy/atm/directional/south,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralcorner"
+ },
+/area/station/public/locker)
"icm" = (
/turf/simulated/floor/plasteel{
dir = 10;
@@ -50971,12 +50846,6 @@
icon_state = "white"
},
/area/station/science/xenobiology)
-"ifi" = (
-/obj/machinery/atmospherics/pipe/manifold/visible,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"ifq" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
dir = 8;
@@ -51123,15 +50992,6 @@
/obj/machinery/newscaster/directional/west,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
-"iis" = (
-/obj/structure/extinguisher_cabinet{
- name = "east bump";
- pixel_x = 27
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"iiB" = (
/obj/docking_port/stationary{
dir = 8;
@@ -51209,12 +51069,6 @@
},
/turf/simulated/floor/plating,
/area/station/security/prison/cell_block/a)
-"ikG" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"ikK" = (
/obj/machinery/atmospherics/trinary/filter{
dir = 4;
@@ -51228,19 +51082,6 @@
icon_state = "red"
},
/area/station/engineering/atmos)
-"ikU" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/obj/item/radio/intercom{
- name = "west bump";
- pixel_x = -28
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"ile" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -51453,6 +51294,26 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
+"ipt" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/turretid/stun{
+ control_area = "\improper AI Upload Chamber";
+ name = "AI Upload Turret Control";
+ pixel_x = -28;
+ req_access = list(75)
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplecorner"
+ },
+/area/station/science/research)
"ipz" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -52058,6 +51919,13 @@
"iBR" = (
/turf/simulated/wall/r_wall,
/area/station/security/storage)
+"iCa" = (
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "cautioncorner"
+ },
+/area/station/hallway/primary/starboard/east)
"iCJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -52068,6 +51936,9 @@
/obj/structure/grille/broken,
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
+"iCR" = (
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"iCZ" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/greengrid,
@@ -52234,6 +52105,23 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
+"iHH" = (
+/obj/effect/mapping_helpers/airlock/windoor/access/all/science/tox{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/windoor/access/all/science/tox{
+ dir = 8
+ },
+/obj/machinery/door/window/reinforced/reversed{
+ name = "Toxins Launcher";
+ dir = 4
+ },
+/obj/machinery/door/window/reinforced/normal{
+ name = "Toxins Launcher";
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/station/science/toxins/launch)
"iHO" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
@@ -52267,6 +52155,23 @@
icon_state = "darkgrey"
},
/area/station/security/evidence)
+"iJt" = (
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
+ dir = 4
+ },
+/turf/simulated/floor/engine/vacuum,
+/area/station/science/toxins/mixing)
+"iJu" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "whitepurple"
+ },
+/area/station/science/storage)
"iJz" = (
/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/light{
@@ -52468,13 +52373,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
-"iOf" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 4
- },
-/obj/machinery/atmospherics/portable/canister/air,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/aft2)
"iOj" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -52550,14 +52448,6 @@
},
/turf/simulated/floor/engine,
/area/station/maintenance/turbine)
-"iPW" = (
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"iQm" = (
/obj/structure/sign/poster/official/random{
pixel_x = -32
@@ -52573,19 +52463,14 @@
/turf/simulated/floor/plasteel,
/area/station/service/janitor)
"iQC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/structure/window/reinforced{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
+/obj/structure/closet/bombcloset,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ icon_state = "whitepurple"
},
-/area/station/science/storage)
+/area/station/science/toxins/mixing)
"iQK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -52749,14 +52634,8 @@
},
/area/station/security/execution)
"iTN" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -52805,6 +52684,11 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
+"iVF" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
+/turf/space,
+/area/space/nearstation)
"iVP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -52825,12 +52709,6 @@
icon_state = "dark"
},
/area/station/security/interrogation)
-"iVX" = (
-/obj/machinery/requests_console/directional/north,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"iWb" = (
/obj/machinery/economy/vending/crittercare,
/obj/machinery/light{
@@ -52852,6 +52730,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
+"iWU" = (
+/obj/structure/chair/sofa/corp/corner,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"iXe" = (
/obj/machinery/hologram/holopad,
/obj/machinery/door/window/reinforced/reversed{
@@ -52865,6 +52752,20 @@
icon_state = "darkgrey"
},
/area/station/turret_protected/ai)
+"iXy" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"iYh" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -52933,12 +52834,18 @@
/obj/machinery/door/airlock/mining{
name = "Warehouse"
},
-/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay,
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/effect/mapping_helpers/airlock/access/any/supply/smith,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
+/area/station/supply/smith_office)
"jau" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
/turf/simulated/floor/bluegrid/telecomms,
@@ -53140,14 +53047,18 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"jfb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
@@ -53205,6 +53116,13 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/north)
+"jhm" = (
+/obj/machinery/firealarm/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"jil" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
@@ -53290,19 +53208,6 @@
icon_state = "C3"
},
/area/station/hallway/primary/central/south)
-"jkW" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/item/radio/intercom{
- name = "south bump";
- pixel_y = -28
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
- },
-/area/station/science/research)
"jkZ" = (
/obj/structure/window/reinforced{
dir = 8
@@ -53466,6 +53371,13 @@
/obj/effect/mapping_helpers/airlock/windoor/access/all/medical/genetics,
/turf/simulated/floor/grass/no_creep,
/area/station/science/genetics)
+"jqr" = (
+/obj/structure/chair/comfy/brown,
+/obj/structure/sign/poster/contraband/ambrosia_vulgaris{
+ pixel_x = -32
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"jrp" = (
/obj/structure/bed,
/obj/item/bedsheet,
@@ -53483,6 +53395,19 @@
},
/turf/simulated/floor/wood,
/area/station/service/library)
+"jsc" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/rack{
+ dir = 1
+ },
+/obj/item/flashlight{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"jse" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
@@ -53571,12 +53496,6 @@
icon_state = "C4"
},
/area/station/hallway/primary/central/north)
-"jth" = (
-/obj/machinery/economy/atm/directional/east,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
- },
-/area/station/hallway/primary/aft/south)
"jtB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -53696,29 +53615,6 @@
icon_state = "white"
},
/area/station/science/research)
-"jvV" = (
-/obj/effect/mapping_helpers/airlock/windoor/access/all/science/tox{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/windoor/access/all/science/tox{
- dir = 8
- },
-/obj/machinery/door/window/reinforced/reversed{
- name = "Toxins Launcher";
- dir = 4
- },
-/obj/machinery/door/window/reinforced/normal{
- name = "Toxins Launcher";
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/science/toxins/launch)
-"jwh" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/science/toxins/launch)
"jwi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 5
@@ -53985,7 +53881,7 @@
"jEO" = (
/obj/structure/sign/cargo,
/turf/simulated/wall,
-/area/station/supply/warehouse)
+/area/station/supply/smith_office)
"jFa" = (
/obj/machinery/light{
dir = 1
@@ -54312,9 +54208,27 @@
icon_state = "darkbluecorners"
},
/area/station/turret_protected/aisat/interior)
+"jKe" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"jKj" = (
/turf/simulated/wall/r_wall,
/area/station/engineering/ai_transit_tube)
+"jKx" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"jKG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -54580,6 +54494,14 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
+"jOB" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
+/obj/machinery/sparker{
+ id = "toxinsigniter";
+ pixel_x = -20
+ },
+/turf/simulated/floor/engine/vacuum,
+/area/station/science/toxins/mixing)
"jOM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -54682,7 +54604,6 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/nw)
"jPT" = (
-/obj/structure/chair,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -54748,17 +54669,6 @@
icon_state = "neutralcorner"
},
/area/station/public/fitness)
-"jRQ" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"jRX" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -54952,6 +54862,13 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/engineering/smes)
+"jVr" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/mechanical,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/mixing)
"jVQ" = (
/obj/machinery/alarm/directional/west,
/obj/machinery/atmospherics/binary/pump/on{
@@ -55071,6 +54988,17 @@
},
/turf/simulated/floor/plating,
/area/station/medical/virology)
+"jXU" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+ name = "Portable Air Pump Connector";
+ dir = 8
+ },
+/obj/machinery/atmospherics/portable/pump,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"jXY" = (
/obj/machinery/nuclearbomb/training,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -55367,10 +55295,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"kgd" = (
-/obj/effect/spawner/airlock/long,
-/turf/simulated/wall,
-/area/station/maintenance/aft2)
"kgf" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/spawner/airlock/e_to_w,
@@ -55659,15 +55583,6 @@
/obj/effect/spawner/airlock/e_to_w/long/square,
/turf/simulated/wall/r_wall,
/area/station/aisat)
-"koA" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/closet/bombcloset,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"kpl" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 1
@@ -55911,15 +55826,6 @@
"kvA" = (
/turf/simulated/wall,
/area/station/security/evidence)
-"kvF" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/launch)
"kvG" = (
/turf/simulated/wall/r_wall,
/area/station/command/office/rd)
@@ -56130,6 +56036,13 @@
icon_state = "whiteblue"
},
/area/station/command/office/cmo)
+"kAr" = (
+/obj/machinery/door/airlock/public/glass,
+/obj/effect/mapping_helpers/airlock/autoname,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"kAP" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/turf_decal/delivery,
@@ -56344,6 +56257,9 @@
/obj/structure/cable{
icon_state = "1-8"
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"kFD" = (
@@ -56411,6 +56327,12 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"kGo" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"kGv" = (
/obj/structure/table,
/obj/item/paper{
@@ -56473,6 +56395,23 @@
icon_state = "dark"
},
/area/station/security/main)
+"kGS" = (
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/machinery/hologram/holopad,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/science/storage)
"kHZ" = (
/obj/machinery/door_control{
id = "atmos";
@@ -56506,22 +56445,6 @@
},
/turf/simulated/floor/engine,
/area/station/maintenance/asmaint)
-"kIw" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
- },
-/area/station/hallway/secondary/bridge)
"kIA" = (
/obj/structure/window/reinforced{
dir = 4
@@ -56574,12 +56497,6 @@
},
/turf/simulated/floor/plating,
/area/station/command/office/cmo)
-"kKe" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"kKz" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -56736,6 +56653,13 @@
/obj/item/megaphone,
/turf/simulated/floor/carpet,
/area/station/legal/courtroom)
+"kNZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/l3closet/scientist,
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurple"
+ },
+/area/station/maintenance/asmaint)
"kOd" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
@@ -56875,6 +56799,15 @@
},
/turf/simulated/floor/plating,
/area/station/science/robotics/showroom)
+"kRG" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/fore/north)
"kRX" = (
/obj/structure/window/plasmareinforced{
dir = 1
@@ -56947,6 +56880,20 @@
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plasteel,
/area/station/public/construction)
+"kTs" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/alarm/directional/east,
+/obj/machinery/computer/area_atmos{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplefull"
+ },
+/area/station/science/storage)
"kTH" = (
/obj/structure/filingcabinet/chestdrawer,
/turf/simulated/floor/plasteel{
@@ -57135,12 +57082,6 @@
icon_state = "whiteyellow"
},
/area/station/medical/chemistry)
-"kWX" = (
-/obj/effect/turf_decal/stripes/corner,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"kXm" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -57162,12 +57103,6 @@
icon_state = "dark"
},
/area/station/aisat)
-"kXv" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
- dir = 8
- },
-/turf/simulated/floor/engine/vacuum,
-/area/station/science/toxins/mixing)
"kXT" = (
/obj/machinery/light/small{
dir = 1
@@ -57451,15 +57386,17 @@
},
/area/station/public/locker)
"leO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -57633,11 +57570,10 @@
},
/area/station/hallway/primary/starboard)
"lhF" = (
-/obj/structure/window/reinforced,
-/obj/structure/rack,
-/obj/item/extinguisher,
-/obj/item/clothing/mask/gas,
-/obj/item/grenade/chem_grenade/firefighting,
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 10
+ },
+/obj/machinery/atmospherics/meter,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -57708,6 +57644,13 @@
icon_state = "white"
},
/area/station/security/permabrig)
+"ljg" = (
+/obj/machinery/atmospherics/unary/portables_connector,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"ljk" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 5
@@ -57831,6 +57774,27 @@
icon_state = "whitepurplecorner"
},
/area/station/science/research)
+"llA" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8
+ },
+/obj/machinery/door_control{
+ id = "ToxinsVenting";
+ layer = 3.3;
+ name = "Toxin Venting Control";
+ pixel_x = 8;
+ pixel_y = -27
+ },
+/obj/machinery/ignition_switch{
+ id = "toxinsigniter";
+ layer = 3.3;
+ pixel_x = -6;
+ pixel_y = -26
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"llU" = (
/obj/effect/turf_decal/stripes/corner,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -58263,6 +58227,15 @@
icon_state = "redcorner"
},
/area/station/security/main)
+"lvB" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/disposal,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"lvE" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
@@ -58404,6 +58377,23 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/prisonlockers)
+"lAE" = (
+/obj/machinery/driver_button{
+ id_tag = "toxinsdriver";
+ pixel_y = -24;
+ range = 18
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/structure/table/reinforced,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/launch)
"lAG" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -58637,6 +58627,11 @@
icon_state = "dark"
},
/area/station/turret_protected/ai_upload)
+"lEz" = (
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/science/toxins/mixing)
"lEM" = (
/obj/structure/closet,
/obj/effect/spawner/random/maintenance,
@@ -58671,6 +58666,17 @@
icon_state = "freezerfloor"
},
/area/station/security/permabrig)
+"lFt" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8;
+ name = "Portable Scrubber Connector"
+ },
+/obj/machinery/atmospherics/portable/scrubber,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"lFu" = (
/obj/machinery/door/airlock/security/glass{
name = "Prison Wing";
@@ -58805,6 +58811,22 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/aft/south)
+"lIC" = (
+/obj/machinery/camera{
+ c_tag = "Science Toxins Mixing - Aft Starboard";
+ dir = 8;
+ network = list("Research","SS13")
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/portable/canister,
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"lIF" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -59097,6 +59119,9 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central/north)
+"lOz" = (
+/turf/simulated/wall,
+/area/station/supply/smith_office)
"lOE" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -59285,6 +59310,23 @@
"lSh" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/solar_maintenance/aft_port)
+"lSi" = (
+/obj/structure/table/reinforced,
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/smith{
+ dir = 1
+ },
+/obj/machinery/door/window/classic/reversed{
+ name = "Smith's Desk";
+ dir = 1
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ id_tag = "smithdesk";
+ name = "Smith's Desk Shutters";
+ dir = 5
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"lSn" = (
/obj/structure/window/reinforced{
dir = 1
@@ -59336,6 +59378,15 @@
},
/turf/simulated/floor/carpet,
/area/station/service/chapel)
+"lUD" = (
+/obj/structure/extinguisher_cabinet{
+ name = "east bump";
+ pixel_x = 27
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"lVd" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -59388,10 +59439,6 @@
icon_state = "darkblue"
},
/area/station/command/bridge)
-"lWk" = (
-/obj/effect/spawner/random/barrier/obstruction,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"lWT" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -59855,13 +59902,13 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"mfM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/portable/canister/carbon_dioxide,
-/obj/effect/turf_decal/delivery/red/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 1
},
-/area/station/science/storage)
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"mge" = (
/obj/structure/table/glass,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -59877,15 +59924,12 @@
},
/area/station/security/permabrig)
"mgu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 8
- },
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -59905,15 +59949,6 @@
icon_state = "darkblue"
},
/area/station/command/office/cmo)
-"mhw" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 6
- },
-/obj/machinery/atmospherics/air_sensor{
- autolink_id = "burn_sensor"
- },
-/turf/simulated/floor/engine/vacuum,
-/area/station/science/toxins/mixing)
"mhA" = (
/obj/item/kirbyplants/large/plant8,
/obj/machinery/light/small{
@@ -60144,18 +60179,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/a)
-"mnd" = (
-/obj/structure/chair/comfy/corp,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
-"mng" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"mnl" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -60266,18 +60289,6 @@
icon_state = "caution"
},
/area/station/engineering/atmos/distribution)
-"mqA" = (
-/obj/machinery/atmospherics/portable/canister/oxygen,
-/obj/effect/turf_decal/delivery/blue/hollow,
-/obj/machinery/camera{
- c_tag = "Science - Toxins Secure - Starboard";
- dir = 8;
- network = list("Research","SS13")
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/science/storage)
"mqG" = (
/obj/machinery/autolathe,
/obj/machinery/camera{
@@ -60307,6 +60318,12 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/research)
+"mrl" = (
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"mrv" = (
/obj/effect/turf_decal/loading_area,
/turf/simulated/floor/plating,
@@ -60346,9 +60363,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/medical/virology)
-"mtd" = (
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"mtr" = (
/obj/structure/closet/firecloset,
/obj/effect/spawner/random/maintenance,
@@ -60378,6 +60392,14 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
+"muv" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/maintenance,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"muA" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin{
@@ -60705,6 +60727,29 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
/turf/space,
/area/space/nearstation)
+"mBB" = (
+/obj/structure/chair/comfy/corp,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
+"mBJ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/portable/scrubber/huge,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light,
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplefull"
+ },
+/area/station/science/storage)
"mCc" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -60791,15 +60836,6 @@
},
/turf/simulated/floor/engine,
/area/station/science/xenobiology)
-"mDE" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "redcorner"
- },
-/area/station/hallway/primary/fore/north)
"mDR" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -61036,19 +61072,6 @@
icon_state = "whiteblue"
},
/area/station/medical/reception)
-"mJt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment/corner{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"mJv" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -61115,6 +61138,9 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/engimaint)
+"mLk" = (
+/turf/simulated/floor/transparent/glass/reinforced,
+/area/station/hallway/primary/central/north)
"mLn" = (
/obj/structure/disposalpipe/segment/corner{
dir = 4
@@ -61145,6 +61171,14 @@
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
/area/station/engineering/control)
+"mLD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/portable/canister/sleeping_agent,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/science/storage)
"mLH" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -61179,23 +61213,6 @@
icon_state = "whitebluefull"
},
/area/station/medical/exam_room)
-"mMI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/structure/disposalpipe/segment/corner{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"mNu" = (
/obj/structure/sink{
dir = 1;
@@ -61807,6 +61824,10 @@
/obj/structure/cable,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
+"mZs" = (
+/obj/machinery/space_heater,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"mZH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -61844,12 +61865,6 @@
/obj/effect/landmark/start/atmospheric,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
-"naq" = (
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"naR" = (
/obj/machinery/seed_extractor,
/obj/effect/turf_decal/stripes/line{
@@ -62092,15 +62107,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
-"nei" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/structure/closet/bombcloset,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"nej" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -62242,6 +62248,16 @@
/obj/effect/mapping_helpers/airlock/windoor/access/all/supply/general,
/turf/simulated/floor/plasteel,
/area/station/supply/office)
+"nhe" = (
+/obj/structure/chair/comfy/corp,
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"nht" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -62579,6 +62595,10 @@
icon_state = "redcorner"
},
/area/station/security/brig)
+"nob" = (
+/obj/effect/spawner/window/reinforced/plasma/grilled,
+/turf/simulated/floor/plating,
+/area/station/science/toxins/launch)
"nos" = (
/obj/machinery/requests_console/directional/south,
/turf/simulated/floor/plasteel{
@@ -62689,13 +62709,6 @@
},
/turf/simulated/floor/wood,
/area/station/public/mrchangs)
-"nru" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
"nry" = (
/obj/structure/disposalpipe/segment/corner{
dir = 1
@@ -63087,6 +63100,11 @@
icon_state = "bar"
},
/area/station/service/bar)
+"nAL" = (
+/obj/item/cigbutt/roach,
+/obj/item/cigbutt/roach,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"nAM" = (
/obj/machinery/space_heater,
/obj/effect/turf_decal/stripes/line{
@@ -63459,6 +63477,12 @@
icon_state = "red"
},
/area/station/security/main)
+"nID" = (
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"nIG" = (
/obj/machinery/light_switch{
dir = 8;
@@ -63474,27 +63498,6 @@
icon_state = "whitegreen"
},
/area/station/medical/virology)
-"nIS" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 8
- },
-/obj/machinery/door_control{
- id = "ToxinsVenting";
- layer = 3.3;
- name = "Toxin Venting Control";
- pixel_x = 8;
- pixel_y = -27
- },
-/obj/machinery/ignition_switch{
- id = "toxinsigniter";
- layer = 3.3;
- pixel_x = -6;
- pixel_y = -26
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"nIZ" = (
/obj/docking_port/stationary{
dir = 8;
@@ -63506,6 +63509,16 @@
},
/turf/space,
/area/space)
+"nJt" = (
+/obj/machinery/atmospherics/binary/pump{
+ dir = 8;
+ name = "Port to Hot Loop"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"nJz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/hologram/holopad,
@@ -63569,13 +63582,10 @@
},
/turf/simulated/floor/carpet,
/area/station/science/robotics/showroom)
-"nLN" = (
-/obj/effect/spawner/window/reinforced/plasma/grilled,
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
- dir = 8
- },
+"nLv" = (
+/obj/structure/closet/l3closet/scientist,
/turf/simulated/floor/plating,
-/area/station/science/toxins/mixing)
+/area/station/maintenance/asmaint)
"nLV" = (
/obj/structure/disposalpipe/sortjunction{
dir = 8;
@@ -63641,17 +63651,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"nNx" = (
-/obj/machinery/camera{
- c_tag = "Science Toxins Mixing - Aft";
- dir = 4;
- network = list("Research","SS13")
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"nOA" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -63774,49 +63773,11 @@
icon_state = "dark"
},
/area/station/medical/morgue)
-"nQl" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/windoor/autoname,
-/obj/effect/mapping_helpers/airlock/windoor/access/any/science/tox,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/window/classic/normal,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"nRh" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/engineering/control)
-"nRl" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplefull"
- },
-/area/station/science/storage)
-"nRv" = (
-/obj/machinery/computer/general_air_control{
- dir = 4;
- name = "Bomb Mix Monitor";
- autolink_sensors = list("burn_sensor"="Burn Mix")
- },
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"nRQ" = (
/obj/effect/mapping_helpers/turfs/rust/probably,
/turf/simulated/wall/r_wall,
@@ -63868,6 +63829,12 @@
icon_state = "browncorner"
},
/area/station/supply/qm)
+"nTf" = (
+/obj/structure/chair/comfy/corp,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"nTF" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -63893,14 +63860,6 @@
},
/turf/simulated/floor/greengrid,
/area/station/science/robotics/chargebay)
-"nUB" = (
-/obj/structure/chair/comfy/corp{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"nUG" = (
/obj/effect/landmark/start/roboticist,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -63967,6 +63926,12 @@
icon_state = "whitegreenfull"
},
/area/station/public/sleep)
+"nVo" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"nVp" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -64038,10 +64003,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
-"nWZ" = (
-/obj/structure/closet/l3closet/scientist,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"nXk" = (
/obj/structure/bookcase,
/obj/effect/mapping_helpers/turfs/damage,
@@ -64486,11 +64447,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
-"ogH" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
-/turf/space,
-/area/space/nearstation)
"oha" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -64499,6 +64455,15 @@
icon_state = "darkgreycheck"
},
/area/station/command/office/rd)
+"ohj" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurplecorner"
+ },
+/area/station/science/toxins/mixing)
"ohK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
@@ -64555,13 +64520,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
-"okT" = (
-/obj/machinery/atmospherics/binary/pump{
- dir = 4;
- name = "Burn Chamber to Port"
+"okj" = (
+/obj/machinery/power/apc/directional/west,
+/obj/structure/cable{
+ icon_state = "0-4"
},
/turf/simulated/floor/plasteel{
- dir = 10;
+ dir = 8;
icon_state = "whitepurple"
},
/area/station/science/toxins/mixing)
@@ -64780,15 +64745,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
-"oqh" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"oqi" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 1
@@ -64907,12 +64863,6 @@
icon_state = "darkgrey"
},
/area/station/science/robotics)
-"ouD" = (
-/obj/item/kirbyplants/large,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"ovM" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -64946,6 +64896,14 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
+"oxN" = (
+/obj/structure/chair/sofa/corp{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"oxT" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock,
@@ -65214,6 +65172,21 @@
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"oDK" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"oEe" = (
/obj/machinery/atmospherics/trinary/filter{
dir = 4;
@@ -65437,19 +65410,6 @@
icon_state = "purplecorner"
},
/area/station/science/testrange)
-"oJk" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/turf_decal/tile/bar,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutralcorner"
- },
-/area/station/hallway/primary/fore/east)
"oJo" = (
/obj/machinery/light_switch{
dir = 8;
@@ -65483,6 +65443,15 @@
icon_state = "caution"
},
/area/station/engineering/atmos/control)
+"oLm" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/launch)
"oLF" = (
/obj/machinery/light{
dir = 4
@@ -65551,13 +65520,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
-"oNf" = (
-/obj/structure/chair/comfy/brown,
-/obj/structure/sign/poster/contraband/ambrosia_vulgaris{
- pixel_x = -32
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"oNk" = (
/obj/effect/mapping_helpers/turfs/burn,
/turf/simulated/floor/plating,
@@ -65770,6 +65732,13 @@
icon_state = "white"
},
/area/station/medical/medbay)
+"oQo" = (
+/obj/effect/turf_decal/delivery/hollow,
+/obj/machinery/atmospherics/portable/canister/toxins,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/science/storage)
"oQz" = (
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -65902,12 +65871,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/aft/south)
-"oTc" = (
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurplecorner"
- },
-/area/station/science/toxins/mixing)
"oTn" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -66011,6 +65974,17 @@
icon_state = "darkgrey"
},
/area/station/science/robotics)
+"oVp" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/research)
"oVx" = (
/obj/effect/mapping_helpers/turfs/rust/probably,
/turf/simulated/wall/r_wall,
@@ -66087,20 +66061,6 @@
"oWE" = (
/turf/simulated/wall/r_wall,
/area/station/public/fitness)
-"oWK" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"oWL" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -66338,6 +66298,15 @@
icon_state = "white"
},
/area/station/security/permabrig)
+"pch" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/turf/simulated/floor/plating,
+/area/station/hallway/primary/fore/north)
"pcy" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/security_space_law,
@@ -66484,16 +66453,6 @@
/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
-"peu" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 10
- },
-/obj/machinery/atmospherics/meter,
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"peF" = (
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/machinery/door/airlock/engineering/glass{
@@ -66503,6 +66462,13 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
/turf/simulated/floor/engine,
/area/station/engineering/engine/supermatter)
+"peT" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 6
+ },
+/turf/space,
+/area/space/nearstation)
"pfa" = (
/obj/structure/table,
/obj/item/storage/belt/utility,
@@ -66537,12 +66503,6 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
/turf/simulated/floor/plating,
/area/station/engineering/control)
-"pgo" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"pgs" = (
/obj/structure/table,
/obj/item/toy/crayon/white{
@@ -66578,6 +66538,19 @@
icon_state = "white"
},
/area/station/science/rnd)
+"phs" = (
+/obj/machinery/disposal/delivery_chute{
+ dir = 4
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/structure/window/plasmareinforced{
+ dir = 8
+ },
+/obj/structure/window/plasmareinforced,
+/turf/simulated/floor/plating,
+/area/station/science/toxins/launch)
"phu" = (
/obj/effect/spawner/window/reinforced/plasma/grilled,
/turf/simulated/floor/plating,
@@ -66611,6 +66584,13 @@
icon_state = "purple"
},
/area/station/engineering/atmos)
+"phL" = (
+/obj/machinery/alarm/directional/north,
+/obj/machinery/atmospherics/unary/thermomachine/freezer,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"pig" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
@@ -66644,14 +66624,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/port)
-"piJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"piX" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -66804,6 +66776,17 @@
/obj/effect/spawner/random/oil/maybe,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fsmaint)
+"plV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/storage)
"pmd" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -67136,6 +67119,22 @@
icon_state = "darkredcorners"
},
/area/station/security/armory/secure)
+"ptw" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/portable/scrubber/huge,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplefull"
+ },
+/area/station/science/storage)
"ptU" = (
/obj/machinery/alarm/directional/east,
/turf/simulated/floor/wood,
@@ -67314,6 +67313,14 @@
icon_state = "freezerfloor"
},
/area/station/public/toilet/lockerroom)
+"pyg" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"pyh" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -67442,6 +67449,15 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/south)
+"pBf" = (
+/obj/machinery/camera{
+ c_tag = "Central Primary Hallway - Fore-Port - AI Upload"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/central/north)
"pBl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -67486,6 +67502,12 @@
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/station/security/brig)
+"pCd" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"pCf" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -67557,6 +67579,18 @@
icon_state = "dark"
},
/area/station/science/misc_lab)
+"pDD" = (
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 6
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"pDW" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -67598,6 +67632,18 @@
icon_state = "brown"
},
/area/station/hallway/primary/central/nw)
+"pFi" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"pFo" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -67786,11 +67832,6 @@
icon_state = "white"
},
/area/station/medical/medbay)
-"pIF" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/science/toxins/mixing)
"pJh" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -67835,15 +67876,6 @@
icon_state = "showroomfloor"
},
/area/station/medical/coldroom)
-"pJw" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"pJx" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -67873,6 +67905,13 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
+"pKo" = (
+/obj/structure/dispenser,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkpurplecorners"
+ },
+/area/station/science/toxins/mixing)
"pKs" = (
/obj/machinery/field/generator{
state = 2
@@ -67928,6 +67967,19 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
+"pKT" = (
+/obj/structure/chair/office/light,
+/obj/machinery/computer/security/telescreen{
+ desc = "Used for watching the test chamber.";
+ layer = 4;
+ name = "Test Chamber Telescreen";
+ network = list("Toxins");
+ pixel_y = -32
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/launch)
"pLD" = (
/obj/machinery/door_timer/cell_1{
pixel_x = -32
@@ -68210,10 +68262,6 @@
icon_state = "redcorner"
},
/area/station/hallway/primary/fore/north)
-"pRR" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"pRT" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -68544,15 +68592,6 @@
/obj/machinery/atmospherics/portable/canister/oxygen,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
-"pZE" = (
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/machinery/disposal,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"qal" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -68572,6 +68611,11 @@
icon_state = "dark"
},
/area/station/security/main)
+"qaF" = (
+/turf/simulated/floor/plasteel{
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
"qaW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -68729,16 +68773,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/a)
-"qdL" = (
-/obj/item/kirbyplants/large,
-/obj/item/radio/intercom{
- name = "north bump";
- pixel_y = 28
- },
+"qdy" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
- icon_state = "dark"
+ icon_state = "whitepurple"
},
-/area/station/hallway/primary/central/north)
+/area/station/science/storage)
"qdR" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/classic/reversed{
@@ -69228,6 +69269,25 @@
icon_state = "browncorner"
},
/area/station/hallway/primary/fore/east)
+"qpK" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/door/airlock/research,
+/obj/effect/mapping_helpers/airlock/access/all/science/tox,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/door/firedoor/heavy,
+/turf/simulated/floor/plasteel,
+/area/station/science/toxins/mixing)
"qpN" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -69259,6 +69319,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/distribution)
+"qqG" = (
+/obj/effect/mapping_helpers/turfs/damage,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"qqM" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -69588,12 +69652,16 @@
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
"qwA" = (
-/obj/machinery/light{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
+ icon_state = "white"
},
/area/station/science/toxins/mixing)
"qwB" = (
@@ -69744,6 +69812,10 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"qAm" = (
+/obj/effect/spawner/airlock/long,
+/turf/simulated/wall,
+/area/station/maintenance/aft2)
"qAr" = (
/obj/machinery/light/small{
dir = 1
@@ -69924,6 +69996,14 @@
icon_state = "red"
},
/area/station/security/main)
+"qEV" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/turret_protected/ai_upload)
"qEX" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -69972,15 +70052,6 @@
icon_state = "greenblue"
},
/area/station/service/hydroponics)
-"qGQ" = (
-/obj/machinery/atmospherics/binary/pump{
- name = "Cold Loop to Port"
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"qIg" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -70190,6 +70261,13 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
+"qNu" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 9
+ },
+/turf/space,
+/area/space/nearstation)
"qNJ" = (
/obj/machinery/atmospherics/pipe/manifold/visible/blue{
dir = 1
@@ -70369,20 +70447,6 @@
icon_state = "dark"
},
/area/station/security/interrogation)
-"qQT" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/portable/scrubber/huge,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplefull"
- },
-/area/station/science/storage)
"qRm" = (
/obj/effect/spawner/random/oil/maybe,
/turf/simulated/floor/plasteel,
@@ -70429,34 +70493,6 @@
icon_state = "caution"
},
/area/station/engineering/atmos/control)
-"qRR" = (
-/obj/structure/table/reinforced,
-/obj/machinery/light,
-/obj/item/transfer_valve{
- pixel_x = 4;
- pixel_y = -4
- },
-/obj/item/transfer_valve{
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/transfer_valve,
-/obj/item/transfer_valve{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/transfer_valve{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/item/transfer_valve{
- pixel_x = -6;
- pixel_y = 6
- },
-/turf/simulated/floor/plasteel{
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/mixing)
"qSf" = (
/obj/structure/window/reinforced{
dir = 1
@@ -70529,6 +70565,15 @@
},
/turf/simulated/floor/plasteel,
/area/station/public/dorms)
+"qUk" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "whitepurple"
+ },
+/area/station/science/storage)
"qUq" = (
/mob/living/simple_animal/chicken/clucky,
/turf/simulated/floor/grass,
@@ -70579,6 +70624,15 @@
icon_state = "dark"
},
/area/station/security/armory/secure)
+"qWh" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/structure/closet/bombcloset,
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"qWm" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -70866,6 +70920,20 @@
icon_state = "white"
},
/area/station/maintenance/aft)
+"rbp" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/machinery/camera{
+ c_tag = "Science Toxins Mixing - Fore";
+ dir = 8;
+ network = list("Research","SS13")
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"rbu" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -71006,6 +71074,12 @@
},
/turf/space,
/area/space)
+"rei" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 10
+ },
+/turf/simulated/floor/engine/vacuum,
+/area/station/science/toxins/mixing)
"ret" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel,
@@ -71077,6 +71151,26 @@
icon_state = "greencorner"
},
/area/station/security/permabrig)
+"rgJ" = (
+/obj/structure/table/reinforced,
+/obj/item/taperecorder{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/analyzer{
+ pixel_x = -5;
+ pixel_y = 5
+ },
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/mixing)
"rgX" = (
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
@@ -71109,22 +71203,12 @@
},
/area/station/service/kitchen)
"rhH" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/machinery/hologram/holopad,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
+/obj/structure/chair/office/light,
+/obj/effect/landmark/start/scientist,
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
+ icon_state = "dark"
},
-/area/station/science/storage)
+/area/station/science/toxins/mixing)
"rif" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -71226,6 +71310,19 @@
icon_state = "dark"
},
/area/station/aisat)
+"rjX" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"rkr" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
@@ -71300,6 +71397,12 @@
icon_state = "whiteblue"
},
/area/station/security/permabrig)
+"rlG" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"rlJ" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan,
/obj/machinery/light,
@@ -71312,13 +71415,6 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
-"rlX" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 6
- },
-/turf/space,
-/area/space/nearstation)
"rmg" = (
/obj/machinery/light,
/turf/simulated/floor/plasteel{
@@ -71336,10 +71432,6 @@
/obj/item/clothing/glasses/welding,
/turf/simulated/floor/plasteel,
/area/station/science/robotics/chargebay)
-"rmt" = (
-/obj/machinery/economy/atm/directional/south,
-/turf/simulated/floor/wood,
-/area/station/service/bar)
"rmz" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -71678,6 +71770,10 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet,
/area/station/command/office/captain/bedroom)
+"ruf" = (
+/obj/effect/spawner/random/fungus/probably,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"ruo" = (
/obj/structure/rack,
/obj/item/stack/cable_coil/random,
@@ -71886,23 +71982,6 @@
icon_state = "white"
},
/area/station/medical/medbay)
-"ryG" = (
-/obj/machinery/driver_button{
- id_tag = "toxinsdriver";
- pixel_y = -24;
- range = 18
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/structure/table/reinforced,
-/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/launch)
"ryV" = (
/obj/machinery/atmospherics/binary/pump{
dir = 0;
@@ -72027,13 +72106,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
-"rAG" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical,
-/turf/simulated/floor/plasteel{
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/mixing)
"rBn" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
@@ -72061,6 +72133,11 @@
icon_state = "black"
},
/area/station/security/permabrig)
+"rCj" = (
+/obj/effect/landmark/start/cargo_technician,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/supply/warehouse)
"rCq" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
@@ -72153,6 +72230,14 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/warden)
+"rEm" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"rEw" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -72163,6 +72248,15 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/north)
+"rEx" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"rEF" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -72458,6 +72552,12 @@
icon_state = "green"
},
/area/station/hallway/primary/central/se)
+"rJI" = (
+/obj/structure/chair/sofa/corp,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"rJJ" = (
/obj/machinery/door/airlock/titanium{
name = "Arrivals Shuttle Airlock"
@@ -72513,6 +72613,13 @@
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
+"rKT" = (
+/obj/machinery/economy/atm/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/central/se)
"rKV" = (
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -72658,15 +72765,6 @@
icon_state = "black"
},
/area/station/security/permabrig)
-"rOc" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurplecorner"
- },
-/area/station/science/toxins/mixing)
"rOi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -72723,10 +72821,6 @@
icon_state = "darkbluecorners"
},
/area/station/command/bridge)
-"rOP" = (
-/obj/machinery/economy/atm/directional/west,
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/east)
"rOT" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -72735,13 +72829,6 @@
icon_state = "redcorner"
},
/area/station/hallway/primary/central/se)
-"rOX" = (
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"rOY" = (
/obj/structure/table/glass,
/obj/machinery/light_switch{
@@ -72852,7 +72939,7 @@
},
/area/station/security/prisonlockers)
"rSj" = (
-/obj/structure/closet/emcloset,
+/obj/structure/closet/firecloset,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -73017,6 +73104,16 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/mob/living/simple_animal/bot/mulebot{
+ home_destination = "QM #1";
+ suffix = "#1"
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "delivery";
+ dir = 8;
+ location = "QM #1"
+ },
+/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"rUT" = (
@@ -73099,15 +73196,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"rWM" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "darkpurplecorners"
- },
-/area/station/science/toxins/launch)
"rXa" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -73222,13 +73310,6 @@
icon_state = "dark"
},
/area/station/aisat)
-"rZM" = (
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "red"
- },
-/area/station/hallway/primary/fore/north)
"rZN" = (
/obj/machinery/door/poddoor/impassable/gamma,
/turf/simulated/floor/plasteel{
@@ -73414,13 +73495,6 @@
},
/turf/simulated/floor/plating,
/area/station/command/office/cmo)
-"sft" = (
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "cautioncorner"
- },
-/area/station/hallway/primary/starboard/east)
"sfz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -73464,13 +73538,6 @@
icon_state = "yellowcorner"
},
/area/station/hallway/primary/aft/north)
-"sfW" = (
-/obj/machinery/economy/atm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
- },
-/area/station/science/lobby)
"sgk" = (
/obj/machinery/smartfridge/foodcart,
/obj/machinery/alarm/directional/north,
@@ -73528,14 +73595,6 @@
icon_state = "redcorner"
},
/area/station/security/brig)
-"shr" = (
-/obj/machinery/door/poddoor{
- id_tag = "ToxinsVenting";
- name = "Toxins Venting Bay Door";
- power_state = 0
- },
-/turf/simulated/floor/engine/vacuum,
-/area/station/science/toxins/mixing)
"sjx" = (
/obj/structure/chair{
dir = 1
@@ -73652,11 +73711,6 @@
icon_state = "whiteblue"
},
/area/station/medical/reception)
-"skQ" = (
-/obj/item/cigbutt/roach,
-/obj/item/cigbutt/roach,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"skT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -73913,6 +73967,14 @@
icon_state = "neutralcorner"
},
/area/station/public/fitness)
+"sql" = (
+/obj/structure/chair/sofa/corp{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"sqp" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -73920,6 +73982,16 @@
},
/turf/simulated/floor/wood,
/area/station/service/bar)
+"srn" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/power/apc/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "whitepurple"
+ },
+/area/station/science/storage)
"srB" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -73988,17 +74060,6 @@
/obj/machinery/economy/vending/cigarette,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"stj" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- name = "Portable Air Pump Connector";
- dir = 8
- },
-/obj/machinery/atmospherics/portable/pump,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"sts" = (
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel{
@@ -74014,6 +74075,12 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/range)
+"svc" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"svH" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -74186,6 +74253,13 @@
icon_state = "whiteblue"
},
/area/station/medical/storage)
+"syT" = (
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
+/area/station/hallway/primary/fore/north)
"szn" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -74302,6 +74376,12 @@
icon_state = "darkblue"
},
/area/station/medical/surgery/primary)
+"sBW" = (
+/obj/item/kirbyplants/large,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"sBZ" = (
/obj/structure/disposalpipe/broken{
dir = 8
@@ -74368,6 +74448,15 @@
icon_state = "neutral"
},
/area/station/hallway/secondary/garden)
+"sDk" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+ dir = 6
+ },
+/obj/machinery/atmospherics/air_sensor{
+ autolink_id = "burn_sensor"
+ },
+/turf/simulated/floor/engine/vacuum,
+/area/station/science/toxins/mixing)
"sDr" = (
/obj/structure/rack,
/obj/item/clothing/suit/armor/riot/sec{
@@ -74404,6 +74493,10 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/warden)
+"sEx" = (
+/obj/effect/spawner/random/barrier/obstruction,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fore2)
"sEI" = (
/obj/machinery/atmospherics/trinary/filter,
/turf/simulated/floor/plasteel,
@@ -74442,11 +74535,6 @@
},
/turf/simulated/floor/engine,
/area/station/science/xenobiology)
-"sFk" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
-/turf/space,
-/area/space/nearstation)
"sFz" = (
/obj/machinery/alarm/directional/north,
/obj/machinery/atmospherics/unary/tank/air,
@@ -74600,14 +74688,6 @@
icon_state = "red"
},
/area/station/security/processing)
-"sIf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/portable/canister/sleeping_agent,
-/obj/effect/turf_decal/delivery/white/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/science/storage)
"sIh" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/classic/normal{
@@ -74792,14 +74872,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/north)
-"sMf" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"sMg" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -74873,16 +74945,6 @@
icon_state = "cautioncorner"
},
/area/station/engineering/atmos)
-"sNi" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/power/apc/directional/west,
-/turf/simulated/floor/plasteel{
- dir = 10;
- icon_state = "whitepurple"
- },
-/area/station/science/storage)
"sNm" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -75010,19 +75072,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/testrange)
-"sQb" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/structure/rack{
- dir = 1
- },
-/obj/item/flashlight{
- pixel_x = 1;
- pixel_y = 5
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"sQg" = (
/obj/structure/table/glass,
/obj/item/storage/box/donkpockets,
@@ -75037,14 +75086,6 @@
icon_state = "green"
},
/area/station/hallway/primary/central/se)
-"sQu" = (
-/obj/item/clothing/mask/cigarette/rollie,
-/obj/item/clothing/mask/cigarette/rollie{
- pixel_y = -3
- },
-/obj/structure/table,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"sQA" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
@@ -75058,18 +75099,6 @@
},
/turf/simulated/floor/plating,
/area/station/medical/virology)
-"sRf" = (
-/obj/item/radio/intercom{
- name = "west bump";
- pixel_x = -28
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/portable/canister/sleeping_agent,
-/obj/effect/turf_decal/delivery/white/hollow,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/science/storage)
"sRs" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -75176,6 +75205,16 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/port/west)
+"sUW" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgrey"
+ },
+/area/station/science/research)
"sVy" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -75289,12 +75328,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central/nw)
-"sXz" = (
-/obj/structure/chair/sofa/corp,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"sXJ" = (
/obj/machinery/light/small,
/turf/simulated/floor/plasteel{
@@ -75373,6 +75406,17 @@
icon_state = "white"
},
/area/station/science/xenobiology)
+"sZg" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/science/toxins/launch)
"sZC" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance,
@@ -75516,15 +75560,6 @@
icon_state = "darkgrey"
},
/area/station/security/execution)
-"tbr" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 10;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"tbY" = (
/obj/structure/window/reinforced{
dir = 4
@@ -75539,6 +75574,14 @@
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"tcB" = (
+/obj/structure/chair/sofa/corp/corner{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"tcD" = (
/obj/structure/table,
/obj/item/storage/box/donkpockets{
@@ -75636,6 +75679,17 @@
icon_state = "white"
},
/area/station/science/research)
+"teC" = (
+/obj/structure/window/reinforced,
+/obj/structure/rack,
+/obj/item/extinguisher,
+/obj/item/clothing/mask/gas,
+/obj/item/grenade/chem_grenade/firefighting,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"teE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -75679,11 +75733,6 @@
"tfl" = (
/turf/simulated/wall/r_wall,
/area/station/security/prisonlockers)
-"tfn" = (
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"tfo" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -75756,17 +75805,6 @@
/obj/item/transfer_valve,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
-"tgZ" = (
-/obj/machinery/power/apc/directional/east,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/alarm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 5;
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/launch)
"thc" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -76018,10 +76056,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/a)
-"tnd" = (
-/obj/effect/mapping_helpers/turfs/damage,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"tnr" = (
/obj/machinery/atmospherics/pipe/simple/visible/green,
/obj/machinery/atmospherics/binary/pump/on{
@@ -76276,17 +76310,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"tto" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
- },
-/obj/structure/closet,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/trash,
-/obj/machinery/light/small,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/aft2)
"ttp" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -76423,14 +76446,18 @@
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
-"tvT" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 1
+"tvY" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 8
},
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 8;
+ icon_state = "brown"
},
-/area/station/science/toxins/mixing)
+/area/station/supply/smith_office)
"twE" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -76694,13 +76721,14 @@
icon_state = "white"
},
/area/station/medical/reception)
-"tDw" = (
-/obj/machinery/atmospherics/portable/canister/oxygen,
-/obj/effect/turf_decal/delivery/blue/hollow,
+"tDE" = (
+/obj/structure/chair/sofa/corp/right{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/station/science/storage)
+/area/station/hallway/primary/central/north)
"tDM" = (
/obj/structure/table/glass,
/obj/item/book/manual/wiki/engineering_construction{
@@ -76747,6 +76775,22 @@
},
/turf/space,
/area/space/nearstation)
+"tFD" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/economy/atm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/secondary/bridge)
"tGP" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -76843,6 +76887,20 @@
icon_state = "white"
},
/area/station/maintenance/asmaint)
+"tIB" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"tIU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -76988,6 +77046,15 @@
/obj/effect/spawner/random/cobweb/right/rare,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"tNn" = (
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 10
+ },
+/obj/structure/sign/vacuum/external{
+ pixel_x = 30
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"tNQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -77085,6 +77152,20 @@
icon_state = "cult"
},
/area/station/legal/magistrate)
+"tQW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/tox,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/door/airlock/research/glass,
+/obj/machinery/door/firedoor/heavy,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/science/toxins/launch)
"tRb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -77109,9 +77190,6 @@
},
/turf/simulated/floor/carpet,
/area/station/legal/lawoffice)
-"tRw" = (
-/turf/simulated/wall,
-/area/station/hallway/primary/central/north)
"tRx" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -77170,6 +77248,13 @@
icon_state = "greenblue"
},
/area/station/service/hydroponics)
+"tTu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/warehouse)
"tTK" = (
/obj/structure/closet/crate,
/obj/effect/spawner/random/maintenance,
@@ -77246,13 +77331,6 @@
icon_state = "darkgrey"
},
/area/station/science/robotics)
-"tVu" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 9
- },
-/turf/space,
-/area/space/nearstation)
"tVw" = (
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
dir = 5
@@ -77326,6 +77404,16 @@
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"tXo" = (
+/obj/effect/landmark/start/smith,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/turf/simulated/floor/plasteel,
+/area/station/supply/smith_office)
"tXq" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -77353,6 +77441,16 @@
icon_state = "white"
},
/area/station/science/research)
+"tYt" = (
+/obj/effect/spawner/window/reinforced/tinted/grilled,
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
+"tYz" = (
+/obj/machinery/atmospherics/pipe/manifold/visible,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"tYD" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -77448,12 +77546,6 @@
/obj/effect/decal/cleanable/glass,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"uam" = (
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/science/toxins/launch)
"uaH" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
@@ -77616,25 +77708,14 @@
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"ucR" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/effect/turf_decal/stripes/corner,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/west,
/turf/simulated/floor/plasteel{
- dir = 9;
- icon_state = "whitepurple"
+ icon_state = "white"
},
-/area/station/science/storage)
-"ucV" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/fore/north)
+/area/station/science/toxins/mixing)
"udg" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
@@ -77684,16 +77765,6 @@
"udK" = (
/turf/simulated/wall,
/area/station/security/permabrig)
-"ueh" = (
-/obj/machinery/atmospherics/binary/pump{
- dir = 8;
- name = "Port to Cold Loop"
- },
-/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"uel" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/wood,
@@ -77831,10 +77902,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fsmaint)
-"uhc" = (
-/obj/effect/spawner/window/reinforced/tinted/grilled,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"uhf" = (
/turf/simulated/floor/plasteel{
dir = 10;
@@ -77861,12 +77928,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/a)
-"uhO" = (
-/obj/structure/table/glass/reinforced,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"uhP" = (
/obj/machinery/computer/message_monitor{
dir = 4
@@ -77885,26 +77946,6 @@
icon_state = "dark"
},
/area/station/science/server)
-"uhT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/turretid/stun{
- control_area = "\improper AI Upload Chamber";
- name = "AI Upload Turret Control";
- pixel_x = -28;
- req_access = list(75)
- },
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurplecorner"
- },
-/area/station/science/research)
"uhV" = (
/obj/effect/turf_decal/woodsiding{
dir = 5
@@ -78006,12 +78047,17 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
-"ujT" = (
-/obj/machinery/economy/atm/directional/south,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
+"ujM" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/area/station/public/locker)
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"uka" = (
/obj/structure/chair/stool{
dir = 1
@@ -78025,15 +78071,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
-"ukl" = (
-/obj/structure/chair/comfy/corp,
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"ukO" = (
/obj/structure/kitchenspike,
/turf/simulated/floor/plasteel{
@@ -78059,6 +78096,11 @@
icon_state = "red"
},
/area/station/security/brig)
+"umc" = (
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"umh" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -78597,6 +78639,19 @@
},
/turf/simulated/floor/wood,
/area/station/maintenance/apmaint)
+"uBV" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/station/science/storage)
"uBY" = (
/obj/machinery/power/apc/important/directional/south,
/obj/structure/cable,
@@ -78604,6 +78659,19 @@
icon_state = "dark"
},
/area/station/security/armory/secure)
+"uCa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/turf_decal/tile/bar,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/fore/east)
"uCe" = (
/turf/simulated/wall/r_wall,
/area/station/science/testrange)
@@ -78623,6 +78691,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/port)
+"uCV" = (
+/obj/machinery/doppler_array,
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/launch)
"uCW" = (
/obj/machinery/door/poddoor/preopen{
id_tag = "Secure Gate";
@@ -78737,6 +78812,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
+"uGl" = (
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft2)
"uGn" = (
/obj/item/radio/intercom/locked/prison{
name = "Prison Intercom (General)";
@@ -78804,6 +78886,14 @@
icon_state = "caution"
},
/area/station/engineering/equipmentstorage)
+"uHG" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"uHX" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -78909,13 +78999,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"uJQ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "whitepurple";
- dir = 4
- },
-/area/station/maintenance/aft2)
"uKc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -78955,6 +79038,9 @@
id_tag = "qm_warehouse";
name = "Warehouse Shutters"
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/warehouse)
"uKT" = (
@@ -79018,14 +79104,6 @@
icon_state = "white"
},
/area/station/medical/chemistry)
-"uLQ" = (
-/obj/structure/chair/sofa/corp/right{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"uMj" = (
/obj/structure/chair/office/dark{
dir = 1
@@ -79499,6 +79577,20 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/south)
+"uWt" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/storage)
"uWQ" = (
/obj/machinery/door/window/classic/normal{
name = "Court Cell"
@@ -79603,19 +79695,6 @@
},
/turf/simulated/floor/plating,
/area/station/science/robotics/chargebay)
-"uYv" = (
-/obj/machinery/disposal/delivery_chute{
- dir = 4
- },
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/structure/window/plasmareinforced{
- dir = 8
- },
-/obj/structure/window/plasmareinforced,
-/turf/simulated/floor/plating,
-/area/station/science/toxins/launch)
"uYy" = (
/obj/machinery/hydroponics/soil,
/obj/structure/sign/poster/official/random{
@@ -79661,14 +79740,6 @@
icon_state = "darkblue"
},
/area/station/command/bridge)
-"uZf" = (
-/obj/structure/chair/sofa/corp/corner{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"uZj" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -79863,10 +79934,6 @@
icon_state = "brown"
},
/area/station/hallway/primary/central/nw)
-"vcT" = (
-/obj/effect/spawner/random/fungus/probably,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"vde" = (
/obj/machinery/navbeacon{
codes_txt = "delivery";
@@ -79913,15 +79980,6 @@
"vdE" = (
/turf/simulated/wall,
/area/station/security/prisonlockers)
-"vdF" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"vdR" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/portable/canister/air,
@@ -80068,14 +80126,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
-"vgI" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
-/obj/machinery/sparker{
- id = "toxinsigniter";
- pixel_x = -20
- },
-/turf/simulated/floor/engine/vacuum,
-/area/station/science/toxins/mixing)
"vgP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -80266,6 +80316,15 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"vmz" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "darkpurplecorners"
+ },
+/area/station/science/toxins/launch)
"vmA" = (
/obj/machinery/door/airlock/security{
id_tag = "prisonereducation";
@@ -80345,6 +80404,15 @@
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
+"vnP" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/launch)
"vnQ" = (
/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/atmospherics/portable/canister/air,
@@ -80360,17 +80428,6 @@
icon_state = "green"
},
/area/station/hallway/primary/central/se)
-"voE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/launch)
"voO" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -80409,6 +80466,20 @@
icon_state = "cafeteria"
},
/area/station/service/kitchen)
+"vpx" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/mapping_helpers/airlock/windoor/autoname,
+/obj/effect/mapping_helpers/airlock/windoor/access/any/science/tox,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/window/classic/normal,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"vpQ" = (
/obj/structure/cable/pink{
icon_state = "0-4"
@@ -80700,12 +80771,17 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
"vwD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/fueltank,
-/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/machinery/alarm/directional/north,
-/turf/simulated/floor/plasteel,
-/area/station/supply/warehouse)
+/obj/structure/shelf/supply,
+/obj/item/hammer,
+/obj/item/hammer,
+/obj/item/hammer,
+/obj/item/storage/belt/utility,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "brown"
+ },
+/area/station/supply/smith_office)
"vwU" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -80755,25 +80831,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
-"vyF" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/door/airlock/research,
-/obj/effect/mapping_helpers/airlock/access/all/science/tox,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/machinery/door/firedoor/heavy,
-/turf/simulated/floor/plasteel,
-/area/station/science/toxins/mixing)
"vyL" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -81031,6 +81088,15 @@
/obj/item/seeds/berry,
/turf/simulated/floor/wood,
/area/station/maintenance/starboard2)
+"vHc" = (
+/obj/structure/table/glass/reinforced,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"vHA" = (
/obj/machinery/light{
dir = 4
@@ -81099,6 +81165,17 @@
icon_state = "whitepurple"
},
/area/station/science/rnd)
+"vJm" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"vJo" = (
/obj/machinery/firealarm/directional/east,
/obj/effect/turf_decal/tile/neutral{
@@ -81111,12 +81188,6 @@
icon_state = "darkred"
},
/area/station/security/evidence)
-"vJt" = (
-/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
- dir = 4
- },
-/turf/simulated/floor/engine/vacuum,
-/area/station/science/toxins/mixing)
"vJB" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -81125,6 +81196,11 @@
icon_state = "dark"
},
/area/station/security/execution)
+"vJN" = (
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"vKs" = (
/obj/machinery/camera{
c_tag = "Security - Firing Range";
@@ -81383,13 +81459,6 @@
icon_state = "whitepurple"
},
/area/station/science/rnd)
-"vQu" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 6
- },
-/turf/space,
-/area/space/nearstation)
"vQB" = (
/obj/effect/turf_decal/stripes/white/line,
/obj/effect/turf_decal/stripes/white/line{
@@ -81781,17 +81850,6 @@
/obj/item/flag/syndi,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
-"waQ" = (
-/obj/item/radio/intercom{
- name = "east bump";
- pixel_x = 28
- },
-/obj/machinery/atmospherics/trinary/mixer,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"waX" = (
/obj/effect/decal/cleanable/blood/writing,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -81869,6 +81927,13 @@
icon_state = "red"
},
/area/station/security/main)
+"wdA" = (
+/obj/machinery/atmospherics/portable/canister/oxygen,
+/obj/effect/turf_decal/delivery/blue/hollow,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/science/storage)
"wdY" = (
/obj/structure/sign/poster/official/random{
pixel_y = -32
@@ -81956,14 +82021,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
-"wgF" = (
-/obj/machinery/economy/vending/plasmaresearch,
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel{
- dir = 6;
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/mixing)
"wgT" = (
/mob/living/simple_animal/cow/betsy,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -81991,8 +82048,11 @@
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"whx" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
- dir = 8;
+ dir = 10;
icon_state = "whitepurple"
},
/area/station/science/toxins/mixing)
@@ -82256,6 +82316,24 @@
icon_state = "white"
},
/area/station/security/permabrig)
+"wnZ" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"wos" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -82270,6 +82348,34 @@
icon_state = "whitepurple"
},
/area/station/science/research)
+"woH" = (
+/obj/structure/table/reinforced,
+/obj/machinery/light,
+/obj/item/transfer_valve{
+ pixel_x = 4;
+ pixel_y = -4
+ },
+/obj/item/transfer_valve{
+ pixel_x = 2;
+ pixel_y = -2
+ },
+/obj/item/transfer_valve,
+/obj/item/transfer_valve{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/transfer_valve{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/transfer_valve{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/mixing)
"woK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/item/pen,
@@ -82303,15 +82409,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
-"wpT" = (
-/obj/machinery/camera{
- c_tag = "Central Primary Hallway - Fore-Port - AI Upload"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
- },
-/area/station/hallway/primary/central/north)
"wqf" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -82342,15 +82439,6 @@
icon_state = "whiteblue"
},
/area/station/medical/reception)
-"wqJ" = (
-/obj/structure/table/glass/reinforced,
-/obj/machinery/light{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"wri" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -82481,26 +82569,27 @@
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"wtQ" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
},
-/obj/machinery/camera{
- c_tag = "Science Toxins Mixing - Fore";
- dir = 8;
- network = list("Research","SS13")
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
},
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/disposalpipe/segment/corner,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
},
/area/station/science/toxins/mixing)
-"wuc" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
+"wug" = (
/turf/simulated/floor/plasteel{
- icon_state = "whitepurple"
+ dir = 8;
+ icon_state = "whitepurplecorner"
},
-/area/station/science/storage)
+/area/station/science/toxins/mixing)
"wul" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -82795,6 +82884,17 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
+"wzX" = (
+/obj/structure/window/reinforced,
+/obj/structure/rack,
+/obj/item/extinguisher,
+/obj/item/clothing/mask/gas,
+/obj/item/grenade/chem_grenade/firefighting,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"wAw" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -82821,12 +82921,6 @@
icon_state = "dark"
},
/area/station/turret_protected/ai)
-"wBc" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"wBj" = (
/obj/structure/table,
/obj/item/radio/intercom{
@@ -82864,12 +82958,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central/ne)
-"wBV" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/purple,
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"wBW" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
@@ -82954,13 +83042,6 @@
icon_state = "whitegreen"
},
/area/station/public/sleep)
-"wEa" = (
-/obj/structure/chair/office/light,
-/obj/effect/landmark/start/scientist,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/science/toxins/mixing)
"wEx" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -83024,6 +83105,15 @@
/obj/effect/spawner/random/barrier/grille_often,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
+"wFR" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"wFW" = (
/obj/machinery/light/small{
dir = 1
@@ -83092,19 +83182,15 @@
},
/area/station/security/processing)
"wHL" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/structure/extinguisher_cabinet{
+ name = "east bump";
+ pixel_x = 27
},
-/obj/machinery/alarm/directional/east,
-/obj/machinery/computer/area_atmos{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
- icon_state = "whitepurplefull"
+ dir = 4;
+ icon_state = "darkpurple"
},
-/area/station/science/storage)
+/area/station/science/toxins/mixing)
"wIT" = (
/obj/structure/disposalpipe/segment/corner{
dir = 4
@@ -83349,13 +83435,6 @@
icon_state = "dark"
},
/area/station/security/execution)
-"wQJ" = (
-/obj/machinery/alarm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutralcorner"
- },
-/area/station/hallway/primary/central/north)
"wRh" = (
/obj/machinery/door/window/classic/reversed{
name = "Shooting Range";
@@ -83489,6 +83568,9 @@
"wUa" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/engimaint)
+"wUv" = (
+/turf/simulated/wall,
+/area/station/hallway/primary/central/north)
"wUE" = (
/obj/machinery/door/airlock/command/glass{
name = "Bridge Access"
@@ -83587,12 +83669,6 @@
},
/turf/simulated/floor/plating,
/area/station/engineering/control)
-"wWs" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft2)
"wWu" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -83711,6 +83787,14 @@
/obj/structure/transit_tube/diagonal,
/turf/space,
/area/space/nearstation)
+"wYw" = (
+/obj/structure/chair/sofa/corp/left{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/primary/central/north)
"wZa" = (
/obj/structure/window/reinforced{
dir = 8
@@ -83742,22 +83826,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
-"wZi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/disposalpipe/segment/corner,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"wZw" = (
/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 8;
@@ -83914,18 +83982,6 @@
icon_state = "black"
},
/area/station/engineering/atmos)
-"xbz" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 6
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"xbA" = (
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -83997,6 +84053,12 @@
icon_state = "white"
},
/area/station/medical/virology)
+"xcH" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/science/toxins/launch)
"xdb" = (
/obj/structure/rack,
/obj/machinery/light{
@@ -84082,6 +84144,23 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/hardsuitstorage)
+"xfc" = (
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/camera{
+ c_tag = "Science Toxins Launch Room";
+ network = list("Research","SS13")
+ },
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/launch)
"xfm" = (
/obj/structure/lattice/catwalk,
/obj/structure/disposalpipe/segment/corner{
@@ -84159,16 +84238,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/east)
-"xhE" = (
-/obj/structure/extinguisher_cabinet{
- name = "east bump";
- pixel_x = 27
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/mixing)
"xhF" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -84176,6 +84245,20 @@
icon_state = "cautioncorner"
},
/area/station/hallway/primary/starboard/east)
+"xhH" = (
+/obj/machinery/computer/general_air_control{
+ dir = 4;
+ name = "Bomb Mix Monitor";
+ autolink_sensors = list("burn_sensor"="Burn Mix")
+ },
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "whitepurple"
+ },
+/area/station/science/toxins/mixing)
"xhL" = (
/obj/machinery/door/window/reinforced/normal{
name = "Justice Chamber"
@@ -84442,6 +84525,13 @@
icon_state = "dark"
},
/area/station/security/execution)
+"xng" = (
+/obj/effect/spawner/window/reinforced/plasma/grilled,
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/station/science/toxins/mixing)
"xnj" = (
/obj/structure/window/reinforced{
dir = 8
@@ -84492,6 +84582,15 @@
icon_state = "purplecorner"
},
/area/station/science/testrange)
+"xoo" = (
+/obj/machinery/atmospherics/binary/pump{
+ dir = 4;
+ name = "Hot Loop to Port"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/toxins/mixing)
"xoq" = (
/obj/machinery/newscaster/directional/north,
/obj/machinery/disposal,
@@ -84721,15 +84820,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
-"xtx" = (
-/obj/machinery/atmospherics/binary/pump{
- dir = 4;
- name = "Hot Loop to Port"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
- },
-/area/station/science/toxins/mixing)
"xtA" = (
/obj/item/radio/intercom{
name = "west bump";
@@ -84840,6 +84930,18 @@
/obj/effect/turf_decal/caution/stand_clear,
/turf/simulated/floor/plasteel,
/area/station/engineering/transmission_laser)
+"xww" = (
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/portable/canister/sleeping_agent,
+/obj/effect/turf_decal/delivery/white/hollow,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/science/storage)
"xwJ" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -84934,6 +85036,18 @@
icon_state = "darkbluecorners"
},
/area/station/medical/surgery/observation)
+"xyJ" = (
+/obj/structure/disaster_counter/toxins{
+ pixel_x = -32
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "darkpurple"
+ },
+/area/station/science/toxins/launch)
"xyP" = (
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
@@ -84942,26 +85056,6 @@
/obj/item/cigbutt,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
-"xzC" = (
-/obj/structure/table/reinforced,
-/obj/item/taperecorder{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/analyzer{
- pixel_x = -5;
- pixel_y = 5
- },
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = -3
- },
-/turf/simulated/floor/plasteel{
- dir = 10;
- icon_state = "darkpurple"
- },
-/area/station/science/toxins/mixing)
"xzD" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 4
@@ -84986,6 +85080,25 @@
icon_state = "caution"
},
/area/station/engineering/equipmentstorage)
+"xAr" = (
+/obj/machinery/door/airlock/research/glass{
+ name = "Toxins Storage"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/tox,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor/heavy,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/science/storage)
"xAz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -85056,6 +85169,21 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/armory/secure)
+"xBY" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "whitepurple"
+ },
+/area/station/science/storage)
"xCk" = (
/obj/structure/cable,
/obj/effect/spawner/window/reinforced/grilled,
@@ -85150,9 +85278,9 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"xCY" = (
-/obj/machinery/power/apc/directional/west,
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/machinery/atmospherics/binary/pump{
+ dir = 8;
+ name = "Port to Cold Loop"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -85238,6 +85366,17 @@
icon_state = "neutral"
},
/area/station/hallway/primary/central/south)
+"xGb" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 4
+ },
+/obj/structure/closet,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/trash,
+/obj/machinery/light/small,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft2)
"xGg" = (
/obj/machinery/door/airlock/maintenance,
/obj/structure/disposalpipe/segment{
@@ -85262,8 +85401,6 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"xHw" = (
-/obj/structure/chair,
-/obj/machinery/newscaster/directional/north,
/obj/machinery/camera{
c_tag = "Cargo Lobby";
dir = 4
@@ -85736,6 +85873,12 @@
icon_state = "darkblue"
},
/area/station/medical/surgery/observation)
+"xQv" = (
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/science/toxins/launch)
"xQR" = (
/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
@@ -85750,6 +85893,13 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"xRg" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 4
+ },
+/obj/machinery/atmospherics/portable/canister/air,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/aft2)
"xRO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -85928,6 +86078,16 @@
icon_state = "whitepurple"
},
/area/station/science/research)
+"xXb" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplefull"
+ },
+/area/station/science/storage)
"xXd" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
@@ -86002,6 +86162,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
+"xYE" = (
+/obj/machinery/economy/atm/directional/west,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/fore/east)
"xYR" = (
/obj/structure/sign/poster/official/random{
pixel_x = 32
@@ -86190,22 +86354,6 @@
icon_state = "dark"
},
/area/station/engineering/atmos)
-"ybP" = (
-/obj/machinery/camera{
- c_tag = "Science Toxins Mixing - Aft Starboard";
- dir = 8;
- network = list("Research","SS13")
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/portable/canister,
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 1
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitepurple"
- },
-/area/station/science/toxins/mixing)
"ybT" = (
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "SHOW"
@@ -86264,16 +86412,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"ycT" = (
-/obj/structure/chair/comfy/corp,
-/obj/item/radio/intercom{
- name = "west bump";
- pixel_x = -28
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/hallway/primary/central/north)
"ydH" = (
/obj/structure/closet/secure_closet/security,
/obj/machinery/light{
@@ -86320,14 +86458,6 @@
/obj/item/stack/sheet/metal,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"yeG" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"yeR" = (
/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/north,
@@ -86501,6 +86631,13 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
+"yjo" = (
+/obj/machinery/alarm/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/central/north)
"yjJ" = (
/obj/effect/turf_decal/delivery,
/obj/structure/sign/vacuum{
@@ -106185,7 +106322,7 @@ tWP
aOB
gvz
aWt
-gqF
+rCj
aTW
aMT
bgy
@@ -106202,7 +106339,7 @@ boh
boh
fjl
bfw
-hXV
+dYe
sLH
lMU
bzM
@@ -106441,8 +106578,8 @@ aAP
bmp
aOB
bwq
-aWt
-gqF
+eim
+tTu
aTX
gqF
aVq
@@ -106696,11 +106833,11 @@ aaa
aOB
fuy
ozf
-aOB
+eJz
aXn
aHY
-gqF
-gqF
+gKg
+dih
bsi
aVq
ufI
@@ -106953,13 +107090,13 @@ abq
aOB
bmw
aNX
-bcu
-gqF
-aWO
-aSK
-nru
-aVo
-ufI
+aOB
+lOz
+lOz
+lOz
+lOz
+lOz
+lOz
ufI
bos
fhG
@@ -107210,13 +107347,13 @@ aaa
aOB
aOB
aRB
-aOB
+lOz
vwD
bas
-gqF
+tvY
aLK
aXB
-ufI
+lSi
xHw
hDK
nPw
@@ -107467,12 +107604,12 @@ pXH
gUg
aLW
aNe
-ufI
+lOz
aMH
-bsi
-bsi
-gqF
-gqF
+hHa
+tXo
+ebX
+qaF
aKl
jPT
hDK
@@ -107724,13 +107861,13 @@ aIY
aKg
aLY
xSm
-ufI
+lOz
aPV
gOA
aEH
aSl
aVk
-ufI
+lOz
aYX
wpu
hjC
@@ -107981,13 +108118,13 @@ pXH
rrq
eNp
aRG
-ufI
-fue
+lOz
+lOz
jap
-ufI
-ufI
-ufI
-ufI
+lOz
+lOz
+lOz
+lOz
jEO
fCQ
kFl
@@ -108244,7 +108381,7 @@ bgk
qpH
aUw
aYj
-rOP
+xYE
nGC
nGC
dEG
@@ -108499,7 +108636,7 @@ hjr
oOt
jfb
oHu
-oJk
+uCa
xNu
aKj
aWu
@@ -109261,8 +109398,8 @@ gKP
gsR
uPt
gYO
-oNf
-skQ
+jqr
+nAL
lIM
kyq
aNl
@@ -109518,8 +109655,8 @@ axN
axN
mdZ
gYO
-sQu
-tnd
+hPG
+qqG
lIM
cBa
cbv
@@ -109776,7 +109913,7 @@ wBl
wHH
gYO
lIM
-lWk
+sEx
lIM
lIM
lIM
@@ -110033,7 +110170,7 @@ axN
hvR
gYO
rcQ
-mtd
+iCR
hOu
xJy
xJy
@@ -110041,7 +110178,7 @@ xJy
aGy
xJy
jaK
-fYp
+ibg
xJy
xJy
xJy
@@ -110289,20 +110426,20 @@ aDT
axN
aty
gYO
-dOM
-mtd
+aYg
+iCR
aKs
-ikG
-mtd
-tnd
-mtd
-mtd
-mtd
-mtd
-mtd
-tnd
-mtd
-sQb
+fPL
+iCR
+qqG
+iCR
+iCR
+iCR
+iCR
+iCR
+qqG
+iCR
+jsc
lIM
sTC
hdw
@@ -110548,10 +110685,10 @@ yha
aHI
aMf
aMf
-aJi
+pch
lIM
-mtd
-cYP
+iCR
+cYr
lIM
lIM
lIM
@@ -110561,7 +110698,7 @@ lIM
lIM
lIM
lIM
-wpT
+pBf
xuG
bjA
xIX
@@ -110805,19 +110942,19 @@ iwq
aHI
bhF
uNe
-aKv
+aJi
lIM
-mtd
-mtd
+iCR
+iCR
lIM
-mnd
-uhO
-nUB
-ycT
-wqJ
-nUB
-tRw
-bbh
+nTf
+gEq
+dmD
+nhe
+vHc
+dmD
+wUv
+rSj
nuz
xuG
bfR
@@ -111061,20 +111198,20 @@ cTo
xbo
lXV
cvX
-ucV
-mDE
+kRG
+aKv
lIM
-cYP
-mtd
+cYr
+iCR
lIM
-ouD
-aZN
-aZN
-aZN
-aZN
-aZN
-tRw
-rSj
+sBW
+umc
+umc
+umc
+umc
+umc
+wUv
+mrl
nuz
qWN
acw
@@ -111321,17 +111458,17 @@ aiF
aJe
aND
lIM
-mtd
-mtd
+iCR
+iCR
lIM
-ukl
-uhO
-nUB
-ouD
-aZN
-aZN
-tRw
-rSj
+mBB
+gEq
+dmD
+sBW
+umc
+umc
+wUv
+mrl
nGC
bep
ccP
@@ -111578,17 +111715,17 @@ aHM
aJd
pRQ
lIM
-mtd
-mtd
+iCR
+iCR
lIM
-uZf
-aUl
-aUl
-uLQ
-aZN
-aZN
-tRw
-tRw
+tcB
+sql
+sql
+tDE
+umc
+umc
+wUv
+wUv
bgF
xuG
sWe
@@ -111607,7 +111744,7 @@ bCb
bqc
bLR
bFI
-kIw
+tFD
bKT
bMW
bPp
@@ -111835,17 +111972,17 @@ aHM
oBr
aKz
lIM
-mtd
-mtd
+iCR
+iCR
lIM
-sXz
-aVy
-aVy
-aVy
-aZN
-aZN
-aZN
-bbk
+rJI
+mLk
+mLk
+mLk
+umc
+umc
+umc
+cED
nGC
beq
jmL
@@ -112092,17 +112229,17 @@ aHM
aev
bPX
lIM
-mtd
-mtd
+iCR
+iCR
lIM
-sXz
-aVy
-aVy
-aVy
-aZN
-aZN
-aZN
-ccX
+rJI
+mLk
+mLk
+mLk
+umc
+umc
+umc
+kAr
nGC
xuG
jmL
@@ -112349,17 +112486,17 @@ aHM
aJf
aNJ
lIM
-tnd
-mtd
+qqG
+iCR
lIM
-sXz
-aVy
-aVy
-aVy
-aZN
-aZN
-iis
-bbk
+rJI
+mLk
+mLk
+mLk
+umc
+umc
+lUD
+cED
nGC
xuG
jmL
@@ -112602,22 +112739,22 @@ nvB
pNO
dig
lXV
-rZM
+syT
aJh
pRQ
lIM
-pgo
-mtd
+nVo
+iCR
lIM
-aVA
-aUn
-aUn
-aXG
-aZN
-aZN
-tRw
-tRw
-wQJ
+iWU
+oxN
+oxN
+wYw
+umc
+umc
+wUv
+wUv
+yjo
xuG
jmL
jMy
@@ -112863,16 +113000,16 @@ aHM
aJh
pRQ
lIM
-mtd
-pRR
-wBc
-aZN
-aZN
-aZN
-aZN
-aZN
-aZN
-tRw
+iCR
+jKe
+rlG
+umc
+umc
+umc
+umc
+umc
+umc
+wUv
bbn
nGC
pCy
@@ -113120,16 +113257,16 @@ aiF
aJk
aNL
lIM
-kKe
-cXO
+svc
+mZs
lIM
-qdL
-aZN
-aZN
-aZN
-aei
-ouD
-tRw
+eDC
+umc
+umc
+umc
+rEm
+sBW
+wUv
bbo
oYO
svH
@@ -113377,16 +113514,16 @@ aKD
aJk
pRQ
lIM
-wBc
+rlG
lIM
lIM
-tRw
-tRw
-tRw
-tRw
-tRw
-tRw
-tRw
+wUv
+wUv
+wUv
+wUv
+wUv
+wUv
+wUv
bbp
fJp
jtg
@@ -114223,7 +114360,7 @@ cKx
khl
bAt
mGK
-jth
+ecw
lHZ
eaG
cxl
@@ -116506,7 +116643,7 @@ jdP
bdb
cei
rNC
-sfW
+aVM
ily
cLY
oFw
@@ -116786,7 +116923,7 @@ cwR
cwR
cwR
cwR
-jkW
+gAb
aOG
aSY
bzZ
@@ -117049,7 +117186,7 @@ cFH
bzZ
mcw
rfK
-csS
+qEV
aRA
agK
cOp
@@ -117300,7 +117437,7 @@ gTS
oic
uSJ
pTk
-eNL
+cPY
aOG
lEw
beA
@@ -117319,7 +117456,7 @@ vZo
vZo
vZo
vZo
-iOf
+xRg
coG
aaa
aaa
@@ -117576,11 +117713,11 @@ lTS
vZo
lTS
vZo
-tto
+xGb
coG
coG
coG
-kgd
+qAm
abq
aef
abq
@@ -117832,11 +117969,11 @@ kQj
avs
avs
avs
-vcT
-dif
+ruf
+tNn
vZo
vZo
-rOX
+uGl
vZo
arA
arA
@@ -118072,10 +118209,10 @@ cxO
cIE
clb
lmq
-cuR
-cuR
+oVp
+oVp
jOM
-uhT
+ipt
wsu
eNY
bIG
@@ -118331,7 +118468,7 @@ akH
hns
cic
cic
-fJu
+sUW
clb
cwR
cwR
@@ -118349,9 +118486,9 @@ mlV
lYB
cOp
qnp
-vgI
+jOB
fdt
-shr
+hjk
abq
aef
abq
@@ -118550,7 +118687,7 @@ bcN
byg
cfr
bQF
-hYs
+rKT
bSW
bTW
bVn
@@ -118588,7 +118725,7 @@ hyQ
auf
cic
cic
-fJu
+sUW
uSP
tug
tId
@@ -118605,10 +118742,10 @@ vZo
vZo
vZo
cOp
-fhw
-mhw
-dkM
-shr
+rei
+sDk
+gYb
+hjk
abq
aef
abq
@@ -118862,13 +118999,13 @@ coG
coG
coG
cOp
-dPJ
-kXv
-vJt
-shr
-vQu
-ogH
-sFk
+eVS
+cfs
+iJt
+hjk
+peT
+epO
+iVF
ixU
iju
aaa
@@ -119119,14 +119256,14 @@ tmz
mxp
cUL
cOp
-hkz
-hkz
-hkz
+cvu
+cvu
+cvu
cEK
wJN
-rlX
-sFk
-tVu
+bLz
+iVF
+qNu
bwM
aaa
aaa
@@ -119367,22 +119504,22 @@ wvJ
ihF
acS
gJg
-fVL
-fVL
-ejr
+fIV
+fIV
+dpO
ekF
dpM
vNL
fxt
vZo
cOp
-gcP
-nRv
-okT
+emw
+xhH
+dGn
cEK
wJN
rUl
-sFk
+iVF
cxT
bwM
aaa
@@ -119624,23 +119761,23 @@ fqz
cPc
vZo
cvw
-fmf
-uJQ
+gdH
+akL
nBf
-uJQ
-wWs
+akL
+pCd
avs
lTS
lYB
cOp
-xbz
-ifi
-nIS
+pDD
+tYz
+llA
cEK
wJN
-rlX
-sFk
-tVu
+bLz
+iVF
+qNu
bwM
aaa
aaa
@@ -119883,19 +120020,19 @@ cPc
bdN
cOp
cOp
-vyF
+qpK
cOp
cOp
cOp
cOp
cOp
cOp
-dJu
-xtx
-tfn
+nJt
+xoo
+vJN
cEK
-nLN
-nLN
+xng
+xng
cEK
cEK
rOZ
@@ -120141,20 +120278,20 @@ bdN
yeU
dCm
nqr
-fyt
-ikU
+jhm
+rjX
+okj
+wzX
+nID
+nID
+ohj
+iTN
+wug
+acm
xCY
lhF
+eDX
whx
-whx
-rOc
-gUo
-oTc
-nNx
-ueh
-peu
-qGQ
-tbr
rOZ
rOZ
rOZ
@@ -120324,7 +120461,7 @@ aTo
spj
aTo
aTo
-ujT
+ibV
aLl
niC
eTo
@@ -120399,25 +120536,25 @@ yed
xrA
qkD
rEb
+oDK
+tIB
+vpx
+eGA
+wnZ
+vJm
+pFi
+ujM
leO
iTN
-nQl
-eDX
-dal
-jRQ
-glQ
-fMh
-mMI
-gUo
kgx
-gSR
-kWX
+pyg
+dal
rOZ
-dxG
-aec
-fJJ
-iaD
-fTW
+glQ
+xyJ
+vnP
+aaG
+nob
aaa
aaa
aaa
@@ -120656,25 +120793,25 @@ keu
xIl
xIl
rgX
+rbp
+rEx
+teC
+gbF
+jKx
+gbF
+gbF
+gbF
wtQ
qwA
eGn
-naq
+iXy
mgu
-naq
-naq
-naq
-wZi
-mJt
-dPk
-oWK
-eSA
-fBK
-voE
-chY
-jwh
-dJM
-fTW
+tQW
+czx
+sZg
+xQv
+uCV
+nob
aaa
aaa
aaa
@@ -120903,35 +121040,35 @@ pwo
nzb
luN
ayn
-uhc
-uhc
+tYt
+tYt
rPx
cPc
cPc
bdN
ubf
-wBV
-sMf
+gpw
+uHG
jwi
cEK
bXG
bXG
bXG
-fED
+xAr
bXG
bXG
bXG
bXG
-pZE
+lvB
kgx
-piJ
-nei
+dIQ
+qWh
rOZ
-tgZ
-rWM
-gyA
-anD
-fTW
+hVK
+vmz
+dBP
+pKT
+nob
aaa
aaa
abq
@@ -121164,30 +121301,30 @@ bZy
fCO
fGH
qEh
-nWZ
+nLv
bdN
jSe
-foV
-stj
+lFt
+jXU
ddG
cEK
-mfM
+gRS
+gRS
+iJu
+uWt
+srn
+xww
+mLD
+bXG
+dnE
mfM
ucR
iQC
-sNi
-sRf
-sIf
-bXG
-eeI
-tvT
-vdF
-koA
rOZ
rOZ
-fcJ
-kvF
-ryG
+xfc
+oLm
+lAE
rOZ
iju
abq
@@ -121421,30 +121558,30 @@ iKT
ggT
kgB
emj
-fMC
+kNZ
bdN
bdN
bdN
bdN
bdN
bdN
-mfM
-mfM
-dIQ
-gGu
-wuc
-sIf
-sIf
+gRS
+gRS
+qUk
+plV
+qdy
+mLD
+mLD
bXG
-cRQ
-tvT
-oqh
-eGt
-xzC
+phL
+mfM
+wFR
+pKo
+rgJ
rOZ
-uYv
-jvV
-fTW
+phs
+iHH
+nob
rOZ
abq
aaa
@@ -121685,22 +121822,22 @@ cPc
wyC
das
bdN
+ptw
+dCA
+uBV
+kGS
+xBY
+dCA
+mBJ
+bXG
cDq
-cWc
+kGo
gFf
rhH
-ffx
-cWc
-qQT
-bXG
-iPW
-mng
-pJw
-wEa
-rAG
+jVr
rOZ
dnH
-uam
+xcH
wvK
cOy
abq
@@ -121887,7 +122024,7 @@ sqp
sqp
sqp
ueC
-rmt
+cWA
bQI
soT
tRb
@@ -121934,27 +122071,27 @@ bdN
hjx
rPx
cPc
-uhc
+tYt
cPc
-yeG
+muv
emj
-uhc
+tYt
qEh
emj
bdN
-ajW
-ajW
-ajW
-nRl
-tDw
-tDw
-tDw
+oQo
+oQo
+oQo
+xXb
+wdA
+wdA
+wdA
bXG
-iVX
-dER
-fpl
-pIF
-qRR
+eAC
+dWQ
+gjH
+lEz
+woH
rOZ
rOZ
rOZ
@@ -122192,26 +122329,26 @@ uxT
fGH
egq
lTB
-uhc
+tYt
emj
bME
-uhc
+tYt
qEh
emj
bdN
-ajW
-ajW
-ajW
-wHL
-mqA
-tDw
-tDw
+oQo
+oQo
+oQo
+kTs
+dsA
+wdA
+wdA
bXG
-fbL
-waQ
-ybP
-xhE
-wgF
+ljg
+fuC
+lIC
+wHL
+gcw
rOZ
abq
aaa
@@ -122706,7 +122843,7 @@ imh
emj
dcu
vAa
-uhc
+tYt
cBQ
bNG
aZi
@@ -126501,7 +126638,7 @@ cfd
bhU
bjH
bam
-sft
+iCa
bsY
mGk
bHN
diff --git a/code/__DEFINES/access_defines.dm b/code/__DEFINES/access_defines.dm
index ffc66d841de..e9593f610e1 100644
--- a/code/__DEFINES/access_defines.dm
+++ b/code/__DEFINES/access_defines.dm
@@ -44,6 +44,7 @@
#define ACCESS_THEATRE 46
#define ACCESS_RESEARCH 47
#define ACCESS_MINING 48
+#define ACCESS_SMITH 49
#define ACCESS_MAILSORTING 50
#define ACCESS_HEADS_VAULT 53
#define ACCESS_MINING_STATION 54
diff --git a/code/__DEFINES/construction_defines.dm b/code/__DEFINES/construction_defines.dm
index 3264c0e9616..847659a14e6 100644
--- a/code/__DEFINES/construction_defines.dm
+++ b/code/__DEFINES/construction_defines.dm
@@ -78,6 +78,10 @@
#define MAT_TITANIUM "titanium"
#define MAT_BIOMASS "biomass"
#define MAT_PLASTIC "plastic"
+#define MAT_BRASS "brass"
+#define MAT_PALLADIUM "palladium"
+#define MAT_PLATINUM "platinum"
+#define MAT_IRIDIUM "iridium"
/// The amount of materials you get from a sheet of mineral like iron/diamond/glass etc
#define MINERAL_MATERIAL_AMOUNT 2000
diff --git a/code/__DEFINES/dcs/atom_signals.dm b/code/__DEFINES/dcs/atom_signals.dm
index 596a50b1dab..a1fc6449a75 100644
--- a/code/__DEFINES/dcs/atom_signals.dm
+++ b/code/__DEFINES/dcs/atom_signals.dm
@@ -142,3 +142,10 @@
/// On a ranged attack: base of mob/living/carbon/human/RangedAttack (/mob/living/carbon/human)
#define COMSIG_ATOM_RANGED_ATTACKED "atom_range_attacked"
+// Smithing signals
+/// When using a bit on an item that can accept a bit
+#define COMSIG_BIT_ATTACH "bit_attach"
+/// When using a lens on an item that can accept a lens
+#define COMSIG_LENS_ATTACH "lens_attach"
+/// When using an insert on an item that can accept an insert
+#define COMSIG_INSERT_ATTACH "insert_attach"
diff --git a/code/__DEFINES/job_defines.dm b/code/__DEFINES/job_defines.dm
index 161dd84541a..b7920fe728f 100644
--- a/code/__DEFINES/job_defines.dm
+++ b/code/__DEFINES/job_defines.dm
@@ -56,3 +56,4 @@
#define JOB_MIME (1<<12)
#define JOB_ASSISTANT (1<<13)
#define JOB_EXPLORER (1<<14)
+#define JOB_SMITH (1<<15)
diff --git a/code/__DEFINES/tools_defines.dm b/code/__DEFINES/tools_defines.dm
index c2a7efed8bf..429135c408b 100644
--- a/code/__DEFINES/tools_defines.dm
+++ b/code/__DEFINES/tools_defines.dm
@@ -5,6 +5,7 @@
#define TOOL_WIRECUTTER "wirecutter"
#define TOOL_WRENCH "wrench"
#define TOOL_WELDER "welder"
+#define TOOL_HAMMER "hammer"
GLOBAL_LIST_INIT(construction_tool_behaviors, list(
TOOL_CROWBAR,
diff --git a/code/_globalvars/lists/maint_loot_tables.dm b/code/_globalvars/lists/maint_loot_tables.dm
index 229024bd9e4..79ccee0baa5 100644
--- a/code/_globalvars/lists/maint_loot_tables.dm
+++ b/code/_globalvars/lists/maint_loot_tables.dm
@@ -129,6 +129,7 @@ GLOBAL_LIST_INIT(maintenance_loot_tier_2, list(
/obj/item/clothing/head/welding,
/obj/item/crowbar/red,
/obj/item/storage/belt/utility,
+ /obj/item/smithed_item/random,
) = 45,
list(
diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm
index e35d9379578..1e7060c7ff0 100644
--- a/code/datums/components/material_container.dm
+++ b/code/datums/components/material_container.dm
@@ -391,6 +391,30 @@
sheet_type = /obj/item/stack/ore/bluespace_crystal/refined
ore_type = /obj/item/stack/ore/bluespace_crystal
+/datum/material/brass
+ name = "Brass"
+ id = MAT_BRASS
+ sheet_type = /obj/item/stack/tile/brass
+ ore_type = /obj/item/stack/ore/brass
+
+/datum/material/palladium
+ name = "Palladium"
+ id = MAT_PALLADIUM
+ sheet_type = /obj/item/stack/sheet/mineral/palladium
+ ore_type = /obj/item/stack/ore/palladium
+
+/datum/material/platinum
+ name = "Platinum"
+ id = MAT_PLATINUM
+ sheet_type = /obj/item/stack/sheet/mineral/platinum
+ ore_type = /obj/item/stack/ore/platinum
+
+/datum/material/iridium
+ name = "Iridium"
+ id = MAT_IRIDIUM
+ sheet_type = /obj/item/stack/sheet/mineral/iridium
+ ore_type = /obj/item/stack/ore/iridium
+
/datum/material/bananium
name = "Bananium"
id = MAT_BANANIUM
diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm
index 2c3832190bb..f67513ab355 100644
--- a/code/datums/dog_fashion.dm
+++ b/code/datums/dog_fashion.dm
@@ -304,3 +304,7 @@
/datum/dog_fashion/head/qm
name = "Supplymaster REAL_NAME"
desc = "A loyal watchdog for the most secure transportation."
+
+/datum/dog_fashion/head/smith
+ name = "Metalworker REAL_NAME"
+ desc = "Whatever you do, don't let them hold the hot metal in their mouth."
diff --git a/code/datums/ores.dm b/code/datums/ores.dm
index 2c981bce73f..997b68b3b3f 100644
--- a/code/datums/ores.dm
+++ b/code/datums/ores.dm
@@ -43,6 +43,18 @@
drop_type = /obj/item/stack/ore/diamond
scan_icon_state = "rock_Diamond"
+/datum/ore/platinum
+ drop_type = /obj/item/stack/ore/platinum
+ scan_icon_state = "rock_Platinum"
+
+/datum/ore/palladium
+ drop_type = /obj/item/stack/ore/palladium
+ scan_icon_state = "rock_Palladium"
+
+/datum/ore/iridium
+ drop_type = /obj/item/stack/ore/iridium
+ scan_icon_state = "rock_Iridium"
+
/datum/ore/gold
drop_type = /obj/item/stack/ore/gold
spread_chance = 5
diff --git a/code/datums/ruins/space_ruins.dm b/code/datums/ruins/space_ruins.dm
index fe924bec1cd..8c2a3583aef 100644
--- a/code/datums/ruins/space_ruins.dm
+++ b/code/datums/ruins/space_ruins.dm
@@ -46,6 +46,24 @@
name = "Asteroid 5"
description = "Oh my god, another giant rock!"
+/datum/map_template/ruin/space/asteroidmining1
+ id = "asteroidmining1"
+ suffix = "asteroidmining1.dmm"
+ name = "Mining Asteroid 1"
+ description = "A giant rock rich in ores!"
+
+/datum/map_template/ruin/space/asteroidmining2
+ id = "asteroidmining2"
+ suffix = "asteroidmining2.dmm"
+ name = "Mining Asteroid 2"
+ description = "A cluster of rocks rich in ore."
+
+/datum/map_template/ruin/space/asteroidmining3
+ id = "asteroidmining3"
+ suffix = "asteroidmining3.dmm"
+ name = "Mining Asteroid 3"
+ description = "They dug too greedily, and too deeply..."
+
/datum/map_template/ruin/space/deep_storage
id = "deep-storage"
suffix = "deepstorage.dmm"
diff --git a/code/datums/smith_datums.dm b/code/datums/smith_datums.dm
new file mode 100644
index 00000000000..444747b81b6
--- /dev/null
+++ b/code/datums/smith_datums.dm
@@ -0,0 +1,267 @@
+// Quality
+
+/datum/smith_quality
+ var/name = "standard"
+ /// How much does this quality improve stats?
+ var/stat_mult = 1.0
+ /// How many more materials does this quality require?
+ var/material_mult = 1.0
+ /// How much extra work is needed to produce this quality?
+ var/work_mult = 1.0
+
+/datum/smith_quality/improved
+ name = "improved"
+ stat_mult = 1.25
+ material_mult = 1.5
+ work_mult = 2.0
+
+/datum/smith_quality/enhanced
+ name = "enhanced"
+ stat_mult = 1.5
+ material_mult = 2.0
+ work_mult = 3.0
+
+/datum/smith_quality/superior
+ name = "superior"
+ stat_mult = 1.75
+ material_mult = 3.0
+ work_mult = 4.5
+
+/datum/smith_quality/masterwork
+ name = "masterwork"
+ stat_mult = 2.0
+ material_mult = 4.0
+ work_mult = 6.0
+
+// Materials
+
+#define MAJOR_MATERIAL_BUFF 1.2
+#define MINOR_MATERIAL_BUFF 1.1
+#define MINOR_MATERIAL_DEBUFF 0.9
+#define MAJOR_MATERIAL_DEBUFF 0.8
+
+/datum/smith_material
+ var/name = "Boring Debug"
+ /// Brute armor multiplier
+ var/brute_armor_mult = 1.0
+ /// Burn armor multiplier
+ var/burn_armor_mult = 1.0
+ /// Laser armor multiplier
+ var/laser_armor_mult = 1.0
+ /// Explosive armor multiplier
+ var/explosive_armor_mult = 1.0
+ /// Movement speed modifier
+ var/movement_speed_mod = 0
+ /// Heat insulation multiplier
+ var/heat_insulation_mult = 1.0
+ /// Electrical insulation multiplier
+ var/siemens_coeff_mult = 1.0
+ /// Radiation insulation multiplier
+ var/radiation_armor_mult = 1.0
+ /// Tool speed multiplier
+ var/tool_speed_mult = 1.0
+ /// Tool precision multiplier
+ var/tool_failure_mult = 1.0
+ /// How much larger does a bit with this material make it?
+ var/size_mod = 0
+ /// Projectile speed multiplier
+ var/projectile_speed_mult = 1.0
+ /// Power draw multiplier
+ var/power_draw_mult = 1.0
+ /// Projectile damage multiplier
+ var/projectile_damage_multiplier = 1.0
+ /// Fire rate multiplier
+ var/fire_rate_multiplier = 1.0
+ /// Multiplier for tool uses and lens uses.
+ var/durability_mult = 1.0
+
+/datum/smith_material/metal
+ name = "metal"
+ brute_armor_mult = MINOR_MATERIAL_BUFF
+ burn_armor_mult = MINOR_MATERIAL_DEBUFF
+ explosive_armor_mult = MINOR_MATERIAL_BUFF
+ movement_speed_mod = MINOR_MATERIAL_BUFF
+ radiation_armor_mult = MINOR_MATERIAL_BUFF
+ tool_failure_mult = MINOR_MATERIAL_BUFF
+ fire_rate_multiplier = MINOR_MATERIAL_DEBUFF
+ durability_mult = MINOR_MATERIAL_BUFF
+
+/datum/smith_material/silver
+ name = "silver"
+ laser_armor_mult = MINOR_MATERIAL_BUFF
+ heat_insulation_mult = MINOR_MATERIAL_BUFF
+ siemens_coeff_mult = MINOR_MATERIAL_DEBUFF
+ tool_failure_mult = MINOR_MATERIAL_DEBUFF
+ power_draw_mult = MINOR_MATERIAL_DEBUFF
+ projectile_damage_multiplier = MINOR_MATERIAL_DEBUFF
+
+/datum/smith_material/gold
+ name = "gold"
+ burn_armor_mult = MINOR_MATERIAL_BUFF
+ movement_speed_mod = MINOR_MATERIAL_BUFF
+ heat_insulation_mult = MINOR_MATERIAL_BUFF
+ siemens_coeff_mult = MINOR_MATERIAL_DEBUFF
+ radiation_armor_mult = MAJOR_MATERIAL_BUFF
+ tool_speed_mult = MINOR_MATERIAL_BUFF
+ tool_failure_mult = MINOR_MATERIAL_DEBUFF
+ size_mod = 1
+ fire_rate_multiplier = MINOR_MATERIAL_BUFF
+ durability_mult = MINOR_MATERIAL_DEBUFF
+
+/datum/smith_material/plasma
+ name = "plasma"
+ burn_armor_mult = MAJOR_MATERIAL_DEBUFF
+ explosive_armor_mult = MINOR_MATERIAL_BUFF
+ siemens_coeff_mult = MINOR_MATERIAL_BUFF
+ tool_speed_mult = MINOR_MATERIAL_BUFF
+ projectile_damage_multiplier = MINOR_MATERIAL_BUFF
+ durability_mult = MINOR_MATERIAL_DEBUFF
+
+/datum/smith_material/titanium
+ name = "titanium"
+ brute_armor_mult = MINOR_MATERIAL_BUFF
+ burn_armor_mult = MINOR_MATERIAL_DEBUFF
+ laser_armor_mult = MINOR_MATERIAL_BUFF
+ heat_insulation_mult = MINOR_MATERIAL_BUFF
+ tool_failure_mult = MINOR_MATERIAL_DEBUFF
+ tool_speed_mult = MINOR_MATERIAL_BUFF
+ projectile_speed_mult = MINOR_MATERIAL_BUFF
+ power_draw_mult = MINOR_MATERIAL_DEBUFF
+ fire_rate_multiplier = MINOR_MATERIAL_DEBUFF
+
+/datum/smith_material/uranium
+ name = "uranium"
+ burn_armor_mult = MINOR_MATERIAL_BUFF
+ laser_armor_mult = MINOR_MATERIAL_BUFF
+ explosive_armor_mult = MINOR_MATERIAL_BUFF
+ movement_speed_mod = MINOR_MATERIAL_BUFF
+ siemens_coeff_mult = MINOR_MATERIAL_BUFF
+ radiation_armor_mult = MAJOR_MATERIAL_DEBUFF
+ tool_speed_mult = MINOR_MATERIAL_BUFF
+ tool_failure_mult = MINOR_MATERIAL_DEBUFF
+ size_mod = 1
+ projectile_speed_mult = MINOR_MATERIAL_BUFF
+ power_draw_mult = MINOR_MATERIAL_DEBUFF
+ fire_rate_multiplier = MINOR_MATERIAL_DEBUFF
+ durability_mult = MINOR_MATERIAL_BUFF
+ /// Radioactive, woah
+ var/radiation_amount = 15
+
+/datum/smith_material/diamond
+ name = "diamond"
+ brute_armor_mult = MAJOR_MATERIAL_BUFF
+ burn_armor_mult = MINOR_MATERIAL_BUFF
+ explosive_armor_mult = MINOR_MATERIAL_BUFF
+ siemens_coeff_mult = MAJOR_MATERIAL_BUFF
+ tool_failure_mult = MINOR_MATERIAL_DEBUFF
+ durability_mult = MAJOR_MATERIAL_BUFF
+
+/datum/smith_material/bluespace
+ name = "bluespace"
+ laser_armor_mult = MAJOR_MATERIAL_BUFF
+ explosive_armor_mult = MINOR_MATERIAL_BUFF
+ movement_speed_mod = MINOR_MATERIAL_DEBUFF
+ heat_insulation_mult = MINOR_MATERIAL_BUFF
+ siemens_coeff_mult = MINOR_MATERIAL_BUFF
+ radiation_armor_mult = MINOR_MATERIAL_DEBUFF
+ tool_speed_mult = MAJOR_MATERIAL_BUFF
+ power_draw_mult = MAJOR_MATERIAL_BUFF
+ projectile_damage_multiplier = MAJOR_MATERIAL_BUFF
+
+/datum/smith_material/plasteel
+ name = "plasteel"
+ brute_armor_mult = MINOR_MATERIAL_BUFF
+ burn_armor_mult = MINOR_MATERIAL_BUFF
+ laser_armor_mult = MINOR_MATERIAL_BUFF
+ explosive_armor_mult = MINOR_MATERIAL_BUFF
+ movement_speed_mod = MAJOR_MATERIAL_BUFF
+ heat_insulation_mult = MINOR_MATERIAL_DEBUFF
+ tool_speed_mult = MINOR_MATERIAL_BUFF
+ size_mod = 2
+ power_draw_mult = MAJOR_MATERIAL_BUFF
+ projectile_damage_multiplier = MINOR_MATERIAL_BUFF
+ fire_rate_multiplier = MINOR_MATERIAL_BUFF
+ durability_mult = MAJOR_MATERIAL_BUFF
+
+/datum/smith_material/plastitanium
+ name = "plastitanium"
+ brute_armor_mult = MINOR_MATERIAL_BUFF
+ burn_armor_mult = MINOR_MATERIAL_BUFF
+ laser_armor_mult = MAJOR_MATERIAL_BUFF
+ explosive_armor_mult = MINOR_MATERIAL_BUFF
+ movement_speed_mod = MINOR_MATERIAL_BUFF
+ heat_insulation_mult = MINOR_MATERIAL_DEBUFF
+ radiation_armor_mult = MINOR_MATERIAL_BUFF
+ tool_speed_mult = MINOR_MATERIAL_BUFF
+ size_mod = 1
+ projectile_speed_mult = MINOR_MATERIAL_BUFF
+ power_draw_mult = MAJOR_MATERIAL_BUFF
+ fire_rate_multiplier = MINOR_MATERIAL_BUFF
+ durability_mult = MAJOR_MATERIAL_BUFF
+
+/datum/smith_material/iridium
+ name = "iridium"
+ brute_armor_mult = MINOR_MATERIAL_BUFF
+ burn_armor_mult = MINOR_MATERIAL_BUFF
+ laser_armor_mult = MINOR_MATERIAL_BUFF
+ movement_speed_mod = MINOR_MATERIAL_BUFF
+ heat_insulation_mult = MINOR_MATERIAL_DEBUFF
+ radiation_armor_mult = MINOR_MATERIAL_BUFF
+ tool_speed_mult = MINOR_MATERIAL_BUFF
+ size_mod = -1
+ projectile_speed_mult = MINOR_MATERIAL_BUFF
+ power_draw_mult = MINOR_MATERIAL_BUFF
+ projectile_damage_multiplier = MINOR_MATERIAL_BUFF
+ durability_mult = MINOR_MATERIAL_BUFF
+
+/datum/smith_material/palladium
+ name = "palladium"
+ brute_armor_mult = MINOR_MATERIAL_BUFF
+ burn_armor_mult = MINOR_MATERIAL_BUFF
+ laser_armor_mult = MINOR_MATERIAL_DEBUFF
+ explosive_armor_mult = MINOR_MATERIAL_DEBUFF
+ heat_insulation_mult = MINOR_MATERIAL_BUFF
+ siemens_coeff_mult = MINOR_MATERIAL_BUFF
+ radiation_armor_mult = MINOR_MATERIAL_BUFF
+ tool_speed_mult = MINOR_MATERIAL_BUFF
+ size_mod = -1
+ power_draw_mult = MINOR_MATERIAL_DEBUFF
+ projectile_damage_multiplier = MINOR_MATERIAL_DEBUFF
+ durability_mult = MINOR_MATERIAL_BUFF
+
+/datum/smith_material/platinum
+ name = "platinum"
+ brute_armor_mult = MINOR_MATERIAL_BUFF
+ burn_armor_mult = MINOR_MATERIAL_BUFF
+ laser_armor_mult = MINOR_MATERIAL_BUFF
+ explosive_armor_mult = MINOR_MATERIAL_DEBUFF
+ movement_speed_mod = MINOR_MATERIAL_DEBUFF
+ heat_insulation_mult = MINOR_MATERIAL_DEBUFF
+ siemens_coeff_mult = MINOR_MATERIAL_DEBUFF
+ tool_failure_mult = MINOR_MATERIAL_DEBUFF
+ size_mod = -1
+ projectile_damage_multiplier = MINOR_MATERIAL_BUFF
+ power_draw_mult = MINOR_MATERIAL_BUFF
+ durability_mult = MINOR_MATERIAL_BUFF
+
+/datum/smith_material/brass
+ name = "brass"
+ brute_armor_mult = MINOR_MATERIAL_DEBUFF
+ burn_armor_mult = MINOR_MATERIAL_DEBUFF
+ laser_armor_mult = MAJOR_MATERIAL_BUFF
+ explosive_armor_mult = MINOR_MATERIAL_DEBUFF
+ movement_speed_mod = MINOR_MATERIAL_DEBUFF
+ heat_insulation_mult = MINOR_MATERIAL_DEBUFF
+ siemens_coeff_mult = MINOR_MATERIAL_DEBUFF
+ radiation_armor_mult = MINOR_MATERIAL_BUFF
+ tool_speed_mult = MINOR_MATERIAL_BUFF
+ tool_failure_mult = MINOR_MATERIAL_DEBUFF
+ projectile_speed_mult = MINOR_MATERIAL_DEBUFF
+ power_draw_mult = MAJOR_MATERIAL_DEBUFF
+ fire_rate_multiplier = MINOR_MATERIAL_DEBUFF
+ durability_mult = MINOR_MATERIAL_DEBUFF
+
+#undef MAJOR_MATERIAL_BUFF
+#undef MINOR_MATERIAL_BUFF
+#undef MINOR_MATERIAL_DEBUFF
+#undef MAJOR_MATERIAL_DEBUFF
diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm
index b4f5420d6ec..9b3279d2c33 100644
--- a/code/datums/station_traits/positive_traits.dm
+++ b/code/datums/station_traits/positive_traits.dm
@@ -170,6 +170,7 @@
/datum/job/hydro = /obj/item/organ/internal/cyberimp/arm/botanical,
/datum/job/captain = /obj/item/organ/internal/heart/cybernetic/upgraded,
/datum/job/cargo_tech = /obj/item/organ/internal/cyberimp/brain/anti_sleep,
+ /datum/job/smith = /obj/item/organ/internal/cyberimp/arm/toolset,
/datum/job/chaplain = /obj/item/organ/internal/cyberimp/brain/anti_drop,
/datum/job/chemist = /obj/item/organ/internal/liver/cybernetic,
/datum/job/chief_engineer = /obj/item/organ/internal/cyberimp/brain/wire_interface,
diff --git a/code/game/area/areas/mining_areas.dm b/code/game/area/areas/mining_areas.dm
index 029237a6521..de933902ff6 100644
--- a/code/game/area/areas/mining_areas.dm
+++ b/code/game/area/areas/mining_areas.dm
@@ -97,6 +97,10 @@
name = "Mining Station Storage"
icon_state = "storage"
+/area/mine/outpost/smith_workshop
+ name = "Smith's Workshop"
+ icon_state = "smith"
+
/area/mine/outpost/maintenance
name = "Mining Station Maintenance"
icon_state = "maintcentral"
diff --git a/code/game/area/ss13_areas/supply_areas.dm b/code/game/area/ss13_areas/supply_areas.dm
index ae960d04350..dd8303d5723 100644
--- a/code/game/area/ss13_areas/supply_areas.dm
+++ b/code/game/area/ss13_areas/supply_areas.dm
@@ -35,6 +35,10 @@
sound_environment = SOUND_AREA_LARGE_ENCLOSED
request_console_flags = RC_SUPPLY
+/area/station/supply/smith_office
+ name = "Smith's Office"
+ icon_state = "smith"
+
/area/station/supply/qm
name = "\improper Quartermaster's Office"
icon_state = "qm"
diff --git a/code/game/atom/atom_tool_acts.dm b/code/game/atom/atom_tool_acts.dm
index 6c56e5972da..a5a61afbf3f 100644
--- a/code/game/atom/atom_tool_acts.dm
+++ b/code/game/atom/atom_tool_acts.dm
@@ -84,6 +84,8 @@
act_result = wirecutter_act(user, tool)
if(TOOL_WELDER)
act_result = welder_act(user, tool)
+ if(TOOL_HAMMER)
+ act_result = hammer_act(user, tool)
if(!act_result)
return NONE
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 38e4954ff40..1c826989172 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -598,6 +598,9 @@
/atom/proc/welder_act(mob/living/user, obj/item/I)
return
+/atom/proc/hammer_act(mob/living/user, obj/item/I)
+ return
+
/// This is when an atom is emagged. Should return false if it fails, or it has no emag_act defined.
/atom/proc/emag_act(mob/user)
SEND_SIGNAL(src, COMSIG_ATOM_EMAG_ACT, user)
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 781421e38ae..1b6d3381b41 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -105,7 +105,7 @@
ACCESS_COURT, ACCESS_CONSTRUCTION, ACCESS_CREMATORIUM, ACCESS_JANITOR, ACCESS_ENGINE, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_FORENSICS_LOCKERS,
ACCESS_GENETICS, ACCESS_EXPEDITION, ACCESS_BRIG, ACCESS_HOP, ACCESS_HOS, ACCESS_HYDROPONICS, ACCESS_CHANGE_IDS, ACCESS_KEYCARD_AUTH, ACCESS_KITCHEN,
ACCESS_INTERNAL_AFFAIRS, ACCESS_LIBRARY, ACCESS_MAGISTRATE, ACCESS_MAINT_TUNNELS, ACCESS_HEADS_VAULT, ACCESS_MEDICAL, ACCESS_MIME,
- ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_NTREP, ACCESS_PARAMEDIC, ACCESS_ALL_PERSONAL_LOCKERS,
+ ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_SMITH, ACCESS_MORGUE, ACCESS_NTREP, ACCESS_PARAMEDIC, ACCESS_ALL_PERSONAL_LOCKERS,
ACCESS_ENGINE_EQUIP, ACCESS_PSYCHIATRIST, ACCESS_QM, ACCESS_RD, ACCESS_RC_ANNOUNCE, ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_RESEARCH, ACCESS_SECURITY,
ACCESS_SURGERY, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_TCOMSAT, ACCESS_TOX_STORAGE, ACCESS_VIROLOGY, ACCESS_WEAPONS, ACCESS_XENOBIOLOGY, ACCESS_TRAINER, ACCESS_EVIDENCE)
@@ -136,7 +136,7 @@
if(REGION_ENGINEERING) //engineering and maintenance
return list(ACCESS_CONSTRUCTION, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MINISAT, ACCESS_CE)
if(REGION_SUPPLY) //supply
- return list(ACCESS_EXPEDITION, ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_SUPPLY_SHUTTLE, ACCESS_QM, ACCESS_HEADS_VAULT)
+ return list(ACCESS_EXPEDITION, ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_SMITH, ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_SUPPLY_SHUTTLE, ACCESS_QM, ACCESS_HEADS_VAULT)
if(REGION_COMMAND) //command
return list(ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_TCOMSAT, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_HEADS_VAULT, ACCESS_BLUESHIELD, ACCESS_NTREP, ACCESS_HOP, ACCESS_CAPTAIN)
if(REGION_CENTCOMM) //because why the heck not
@@ -270,6 +270,8 @@
return "Main Vault"
if(ACCESS_MINING_STATION)
return "Mining Outpost"
+ if(ACCESS_SMITH)
+ return "Smith's Workshop"
if(ACCESS_XENOBIOLOGY)
return "Xenobiology Lab"
if(ACCESS_HOP)
diff --git a/code/game/jobs/departments.dm b/code/game/jobs/departments.dm
index 898b771f469..460214f334e 100644
--- a/code/game/jobs/departments.dm
+++ b/code/game/jobs/departments.dm
@@ -143,6 +143,7 @@
department_roles = list(
"Quartermaster",
"Cargo Technician",
+ "Smith",
"Shaft Miner",
"Spelunker"
)
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index cd5d8b0985f..05670d331a1 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -28,7 +28,8 @@
ACCESS_SUPPLY_SHUTTLE,
ACCESS_WEAPONS,
ACCESS_TELEPORTER,
- ACCESS_EXPEDITION
+ ACCESS_EXPEDITION,
+ ACCESS_SMITH
)
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY)
outfit = /datum/outfit/job/qm
@@ -87,7 +88,39 @@
id = /obj/item/card/id/supply
pda = /obj/item/pda/cargo
+/datum/job/smith
+ title = "Smith"
+ flag = JOB_SMITH
+ department_flag = JOBCAT_SUPPORT
+ total_positions = 1
+ spawn_positions = 1
+ job_department_flags = DEP_FLAG_SUPPLY
+ supervisors = "the quartermaster"
+ department_head = list("Quartermaster")
+ selection_color = "#eeddbe"
+ access = list(
+ ACCESS_CARGO_BAY,
+ ACCESS_CARGO,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MINERAL_STOREROOM,
+ ACCESS_MINERAL_STOREROOM,
+ ACCESS_MINING,
+ ACCESS_MINING_STATION,
+ ACCESS_SMITH
+ )
+ alt_titles = list("Metalworker", "Tinkerer")
+ outfit = /datum/outfit/job/smith
+/datum/outfit/job/smith
+ name = "Smith"
+ jobtype = /datum/job/smith
+
+ gloves = /obj/item/clothing/gloves/smithing
+ uniform = /obj/item/clothing/under/rank/cargo/smith
+ l_ear = /obj/item/radio/headset/headset_cargo
+ shoes = /obj/item/clothing/shoes/workboots/smithing
+ id = /obj/item/card/id/smith
+ pda = /obj/item/pda/cargo
/datum/job/mining
title = "Shaft Miner"
diff --git a/code/game/jobs/job_globals.dm b/code/game/jobs/job_globals.dm
index b81f5e41092..b61c81ce712 100644
--- a/code/game/jobs/job_globals.dm
+++ b/code/game/jobs/job_globals.dm
@@ -72,6 +72,7 @@ GLOBAL_LIST_INIT(service_positions, list(
GLOBAL_LIST_INIT(supply_positions, list(
"Quartermaster",
"Cargo Technician",
+ "Smith",
"Shaft Miner",
"Explorer"
))
diff --git a/code/game/machinery/computer/arcade_games/recruiter.dm b/code/game/machinery/computer/arcade_games/recruiter.dm
index 585a6bcbbae..933cbc0396c 100644
--- a/code/game/machinery/computer/arcade_games/recruiter.dm
+++ b/code/game/machinery/computer/arcade_games/recruiter.dm
@@ -41,7 +41,7 @@
var/list/jobs = list("Assistant", "Clown", "Chef", "Janitor", "Bartender", "Botanist", "Explorer", "Quartermaster",
"Station Engineer", "Atmospheric Technician", "Medical Doctor", "Coroner", "Geneticist", "Chaplain", "Librarian",
- "Security Officer", "Detective", "Scientist", "Roboticist", "Shaft Miner", "Cargo Technician", "Internal Affairs Agent")
+ "Security Officer", "Detective", "Scientist", "Roboticist", "Shaft Miner", "Cargo Technician", "Internal Affairs Agent", "Smith")
/// Jobs that NT stations dont offer/mispelled
var/list/incorrect_jobs = list("Syndicate Operative", "Syndicate Researcher", "Veterinary", "Brig Physician",
"Pod Pilot", "Cremist", "Cluwne", "Work Safety Inspector", "Musician",
diff --git a/code/game/machinery/machine_frame.dm b/code/game/machinery/machine_frame.dm
index 4560cccedfc..522cc23bf1e 100644
--- a/code/game/machinery/machine_frame.dm
+++ b/code/game/machinery/machine_frame.dm
@@ -319,6 +319,7 @@ to destroy them and players will be able to make replacements.
"JaniDrobe" = /obj/machinery/economy/vending/janidrobe,
"LawDrobe" = /obj/machinery/economy/vending/lawdrobe,
"TrainDrobe" = /obj/machinery/economy/vending/traindrobe,
+ "Castivend" = /obj/machinery/economy/vending/smith,
"CrewVend 3000" = /obj/machinery/economy/vending/custom)
var/static/list/unique_vendors = list(
"ShadyCigs Ultra" = /obj/machinery/economy/vending/cigarette/beach,
@@ -1051,6 +1052,72 @@ to destroy them and players will be able to make replacements.
req_components = list(/obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 2)
// End telecomms circuit boards
+/obj/item/circuitboard/smart_hopper
+ board_name = "Ore Redemption"
+ icon_state = "supply"
+ build_path = /obj/machinery/mineral/smart_hopper
+ board_type = "machine"
+ origin_tech = "programming=1;engineering=2"
+ req_components = list(
+ /obj/item/stack/sheet/glass = 1,
+ /obj/item/stock_parts/matter_bin = 3,
+ /obj/item/stock_parts/manipulator = 1)
+
+/obj/item/circuitboard/magma_crucible
+ board_name = "Magma Crucible"
+ icon_state = "supply"
+ build_path = /obj/machinery/magma_crucible
+ board_type = "machine"
+ origin_tech = "programming=1;engineering=4"
+ req_components = list(
+ /obj/item/stock_parts/matter_bin = 2,
+ /obj/item/stock_parts/micro_laser = 2,
+ /obj/item/stock_parts/manipulator = 1,
+ /obj/item/assembly/igniter = 1)
+
+/obj/item/circuitboard/casting_basin
+ board_name = "Casting Basin"
+ icon_state = "supply"
+ build_path = /obj/machinery/smithing/casting_basin
+ board_type = "machine"
+ origin_tech = "programming=1;engineering=4"
+ req_components = list(
+ /obj/item/stock_parts/matter_bin = 1,
+ /obj/item/stock_parts/manipulator = 1,
+ /obj/item/stack/sheet/glass = 1
+ )
+
+/obj/item/circuitboard/power_hammer
+ board_name = "Power Hammer"
+ icon_state = "supply"
+ build_path = /obj/machinery/smithing/power_hammer
+ board_type = "machine"
+ origin_tech = "programming=1;engineering=4"
+ req_components = list(
+ /obj/item/stock_parts/manipulator = 4,
+ /obj/item/stack/sheet/plasteel = 1)
+
+/obj/item/circuitboard/lava_furnace
+ board_name = "Lava Furnace"
+ icon_state = "supply"
+ build_path = /obj/machinery/smithing/lava_furnace
+ board_type = "machine"
+ origin_tech = "programming=1;engineering=4"
+ req_components = list(
+ /obj/item/stock_parts/micro_laser = 4,
+ /obj/item/assembly/igniter = 1)
+
+/obj/item/circuitboard/kinetic_assembler
+ board_name = "Kinetic Assembler"
+ icon_state = "supply"
+ build_path = /obj/machinery/smithing/kinetic_assembler
+ board_type = "machine"
+ origin_tech = "programming=1;engineering=4"
+ req_components = list(
+ /obj/item/stock_parts/micro_laser = 1,
+ /obj/item/stock_parts/manipulator = 3,
+ /obj/item/stack/sheet/glass = 1)
+
/obj/item/circuitboard/ore_redemption
board_name = "Ore Redemption"
icon_state = "supply"
diff --git a/code/game/machinery/smith_machines.dm b/code/game/machinery/smith_machines.dm
new file mode 100644
index 00000000000..e467682544d
--- /dev/null
+++ b/code/game/machinery/smith_machines.dm
@@ -0,0 +1,1108 @@
+#define BASE_POINT_MULT 0.60
+#define BASE_SHEET_MULT 0.60
+#define POINT_MULT_ADD_PER_RATING 0.10
+#define SHEET_MULT_ADD_PER_RATING 0.20
+#define OPERATION_SPEED_MULT_PER_RATING 0.075
+#define EFFICIENCY_MULT_ADD_PER_RATING 0.05
+
+/obj/machinery/mineral/smart_hopper
+ name = "smart hopper"
+ desc = "An electronic deposit bin that accepts raw ores and delivers them to an adjacent magma crucible."
+ icon = 'icons/obj/machines/smithing_machines.dmi'
+ icon_state = "hopper"
+ anchored = TRUE
+ density = TRUE
+ resistance_flags = FIRE_PROOF
+ /// Linked magma crucible
+ var/obj/machinery/magma_crucible/linked_crucible
+ /// Access to claim points
+ var/req_access_claim = ACCESS_MINING_STATION
+ /// The number of unclaimed points.
+ var/points = 0
+ /// Point multiplier
+ var/point_upgrade = 1
+ /// List of ore yet to process.
+ var/list/obj/item/stack/ore/ore_buffer = list()
+ /// Whether the message to relevant supply consoles was sent already or not for an ore dump. If FALSE, another will be sent.
+ var/message_sent = TRUE
+ /// If TRUE, [/obj/machinery/mineral/smart_hopper/var/req_access_claim] is ignored and any ID may be used to claim points.
+ var/anyone_claim = FALSE
+ /// What consoles get alerted when this is filled
+ var/list/supply_consoles = list(
+ "Smith's Office",
+ "Quartermaster's Desk"
+ )
+
+/obj/machinery/mineral/smart_hopper/Initialize(mapload)
+ . = ..()
+ // Stock parts
+ component_parts = list()
+ component_parts += new /obj/item/circuitboard/smart_hopper(null)
+ component_parts += new /obj/item/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/stock_parts/manipulator(null)
+ component_parts += new /obj/item/stack/sheet/glass(null)
+ RefreshParts()
+ // Try to link to magma crucible on initialize. Link to the first crucible it can find.
+ for(var/obj/machinery/magma_crucible/crucible in view(2, src))
+ linked_crucible = crucible
+ return
+
+/obj/machinery/mineral/smart_hopper/update_overlays()
+ . = ..()
+ overlays.Cut()
+ if(panel_open)
+ . += "hopper_wires"
+
+/obj/machinery/mineral/smart_hopper/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/I)
+ . = ..()
+ update_icon(UPDATE_OVERLAYS)
+
+/obj/machinery/mineral/smart_hopper/RefreshParts()
+ var/point_mult = BASE_POINT_MULT
+ for(var/obj/item/stock_parts/component in component_parts)
+ point_mult += POINT_MULT_ADD_PER_RATING * component.rating
+ // Update our values
+ point_upgrade = point_mult
+ SStgui.update_uis(src)
+
+/obj/machinery/mineral/smart_hopper/process()
+ if(panel_open || !has_power())
+ return
+ // Check if the input turf has a [/obj/structure/ore_box] to draw ore from. Otherwise suck ore from the turf
+ var/atom/input = get_step(src, input_dir)
+ var/obj/structure/ore_box/OB = locate() in input
+ if(OB)
+ input = OB
+ // Suck the ore in
+ for(var/obj/item/stack/ore/ore in input)
+ if(QDELETED(ore))
+ continue
+ ore_buffer |= ore
+ ore.forceMove(src)
+ CHECK_TICK
+ // Process it
+ if(length(ore_buffer))
+ message_sent = FALSE
+ process_ores(ore_buffer)
+ else if(!message_sent)
+ send_console_message()
+ message_sent = TRUE
+
+// Interactions
+/obj/machinery/mineral/smart_hopper/item_interaction(mob/living/user, obj/item/used, list/modifiers)
+ if(istype(used, /obj/item/storage/part_replacer))
+ return ..()
+
+ if(!has_power())
+ return ..()
+
+ if(istype(used, /obj/item/card/id))
+ var/obj/item/card/id/ID = used
+ if(!points)
+ to_chat(user, "There are no points to claim.");
+ return ITEM_INTERACT_COMPLETE
+ if(anyone_claim || (req_access_claim in ID.access))
+ ID.mining_points += points
+ ID.total_mining_points += points
+ to_chat(user, "[points] Mining Points claimed. You have earned a total of [ID.total_mining_points] Mining Points this Shift!")
+ points = 0
+ else
+ to_chat(user, "Required access not found.")
+ add_fingerprint(user)
+ return ITEM_INTERACT_COMPLETE
+ return ..()
+
+/obj/machinery/mineral/smart_hopper/multitool_act(mob/living/user, obj/item/I)
+ . = TRUE
+ if(!I.use_tool(src, user, 0, volume = I.tool_volume))
+ return
+ if(!I.multitool_check_buffer(user))
+ return
+ if(panel_open)
+ var/obj/item/multitool/multi = I
+ if(!istype(multi.buffer, /obj/machinery/magma_crucible))
+ to_chat(user, "You cannot link [src] to [multi.buffer]!")
+ return
+ linked_crucible = multi.buffer
+ to_chat(user, "You link [src] to [multi.buffer].")
+
+/obj/machinery/mineral/smart_hopper/crowbar_act(mob/user, obj/item/I)
+ if(default_deconstruction_crowbar(user, I))
+ return TRUE
+
+/obj/machinery/mineral/smart_hopper/screwdriver_act(mob/user, obj/item/I)
+ if(!I.use_tool(src, user, 0, volume = 0))
+ return
+ . = TRUE
+ default_deconstruction_screwdriver(user, icon_state, icon_state, I)
+
+/obj/machinery/mineral/smart_hopper/wrench_act(mob/living/user, obj/item/I)
+ if(!panel_open)
+ return
+ . = TRUE
+ if(!has_power())
+ return
+ if(!I.tool_start_check(src, user, 0))
+ return
+ input_dir = turn(input_dir, -90)
+ to_chat(user, "You change [src]'s input, moving the input to [dir2text(input_dir)].")
+
+/obj/machinery/mineral/smart_hopper/proc/process_ores(list/obj/item/stack/ore/ore_list)
+ if(!linked_crucible)
+ return
+ for(var/ore in ore_list)
+ transfer_ore(ore)
+
+/obj/machinery/mineral/smart_hopper/proc/transfer_ore(obj/item/stack/ore/O)
+ if(!linked_crucible)
+ return
+ // Award points if the ore is actually transferable to the magma crucible
+ give_points(O.type, O.amount)
+ animate_transfer(O.amount)
+ // Insert materials
+ var/datum/component/material_container/materials = linked_crucible.GetComponent(/datum/component/material_container)
+ var/amount_compatible = materials.get_item_material_amount(O)
+ if(amount_compatible)
+ // Prevents duping
+ if(O.refined_type)
+ materials.insert_item(O, linked_crucible.sheet_per_ore)
+ else
+ materials.insert_item(O, 1)
+ // Delete the stack
+ ore_buffer -= O
+ qdel(O)
+
+/obj/machinery/mineral/smart_hopper/proc/send_console_message()
+ if(!is_station_level(z))
+ return
+
+ var/list/msg = list("Now available in [get_area_name(src, TRUE) || "Unknown"]:")
+ var/mats_in_stock = list()
+ var/datum/component/material_container/materials = linked_crucible.GetComponent(/datum/component/material_container)
+ for(var/MAT in materials.materials)
+ var/datum/material/M = materials.materials[MAT]
+ var/mineral_amount = M.amount / MINERAL_MATERIAL_AMOUNT
+ if(mineral_amount)
+ mats_in_stock += M.id
+ msg.Add("[capitalize(M.name)]: [mineral_amount] sheets")
+
+ // No point sending a message if we're dry
+ if(!length(mats_in_stock))
+ return
+
+ // Notify
+ for(var/obj/machinery/requests_console/console as anything in GLOB.allRequestConsoles)
+ if(!(console.department in supply_consoles))
+ continue
+ if(!supply_consoles[console.department] || length(supply_consoles[console.department] - mats_in_stock))
+ console.createMessage("Smart Hopper", "New Minerals Available!", msg, RQ_LOWPRIORITY)
+
+/obj/machinery/mineral/smart_hopper/proc/give_points(obj/item/stack/ore/ore_path, ore_amount)
+ if(initial(ore_path.refined_type))
+ points += initial(ore_path.points) * point_upgrade * ore_amount
+
+/obj/machinery/mineral/smart_hopper/proc/animate_transfer(ore_amount)
+ icon_state = "hopper_on"
+ var/time_to_animate = max(ore_amount * 2, 1 SECONDS)
+ addtimer(VARSET_CALLBACK(src, icon_state, "hopper"), time_to_animate)
+ linked_crucible.animate_transfer(time_to_animate)
+
+/obj/machinery/magma_crucible
+ name = "magma crucible"
+ desc = "A massive machine that smelts down raw ore into a fine slurry, then sorts it into respective tanks for storage and use."
+ icon = 'icons/obj/machines/magma_crucible.dmi'
+ icon_state = "crucible"
+ max_integrity = 300
+ pixel_x = -32 // 3x3
+ pixel_y = -32
+ bound_width = 96
+ bound_x = -32
+ bound_height = 96
+ bound_y = -32
+ anchored = TRUE
+ density = TRUE
+ resistance_flags = FIRE_PROOF
+ /// Sheet multiplier applied when smelting ore.
+ var/sheet_per_ore = 1
+ /// State for adding ore
+ var/adding_ore
+ /// State for if ore is being taken from it
+ var/pouring
+
+/obj/machinery/magma_crucible/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PALLADIUM, MAT_IRIDIUM, MAT_PLATINUM, MAT_BRASS), INFINITY, FALSE, list(/obj/item/stack, /obj/item/smithed_item), null, null)
+ // Stock parts
+ component_parts = list()
+ component_parts += new /obj/item/circuitboard/magma_crucible(null)
+ component_parts += new /obj/item/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/stock_parts/manipulator(null)
+ component_parts += new /obj/item/stock_parts/micro_laser(null)
+ component_parts += new /obj/item/stock_parts/micro_laser(null)
+ component_parts += new /obj/item/assembly/igniter(null)
+ RefreshParts()
+
+/obj/machinery/magma_crucible/screwdriver_act(mob/user, obj/item/I)
+ if(!I.use_tool(src, user, 0, volume = 0))
+ return
+ . = TRUE
+ default_deconstruction_screwdriver(user, icon_state, icon_state, I)
+
+/obj/machinery/magma_crucible/crowbar_act(mob/user, obj/item/I)
+ if(default_deconstruction_crowbar(user, I))
+ return TRUE
+
+/obj/machinery/magma_crucible/RefreshParts()
+ var/sheet_mult = BASE_SHEET_MULT
+ for(var/obj/item/stock_parts/micro_laser/component in component_parts)
+ sheet_mult += SHEET_MULT_ADD_PER_RATING * component.rating
+ // Update our values
+ sheet_per_ore = sheet_mult
+
+/obj/machinery/magma_crucible/update_overlays()
+ . = ..()
+ overlays.Cut()
+ if(adding_ore)
+ . += "crucible_input"
+ if(panel_open)
+ . += "crucible_wires"
+ if(pouring)
+ . += "crucible_output"
+
+/obj/machinery/magma_crucible/update_icon_state()
+ . = ..()
+ if(!has_power())
+ icon_state = "[initial(icon_state)]_off"
+ else
+ icon_state = initial(icon_state)
+
+/obj/machinery/magma_crucible/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/I)
+ . = ..()
+ update_icon(UPDATE_OVERLAYS)
+
+/obj/machinery/magma_crucible/Destroy()
+ . = ..()
+ var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
+ materials.retrieve_all()
+ return ..()
+
+/obj/machinery/magma_crucible/power_change()
+ if(!..())
+ return
+ update_icon(UPDATE_ICON_STATE)
+
+/obj/machinery/magma_crucible/proc/animate_transfer(time_to_animate)
+ adding_ore = TRUE
+ update_icon(UPDATE_OVERLAYS)
+ addtimer(CALLBACK(src, PROC_REF(stop_animating)), time_to_animate)
+
+/obj/machinery/magma_crucible/proc/stop_animating()
+ adding_ore = FALSE
+ update_icon(UPDATE_OVERLAYS)
+
+/obj/machinery/magma_crucible/proc/animate_pour(time_to_animate)
+ pouring = TRUE
+ update_icon(UPDATE_OVERLAYS)
+ addtimer(CALLBACK(src, PROC_REF(stop_pouring)), time_to_animate)
+
+/obj/machinery/magma_crucible/proc/stop_pouring()
+ pouring = FALSE
+ update_icon(UPDATE_OVERLAYS)
+
+/obj/machinery/magma_crucible/multitool_act(mob/living/user, obj/item/I)
+ . = TRUE
+ if(!I.use_tool(src, user, 0, volume = I.tool_volume))
+ return
+ if(panel_open)
+ if(!I.multitool_check_buffer(user))
+ return
+ var/obj/item/multitool/multi = I
+ multi.set_multitool_buffer(user, src)
+ to_chat(user, "You save [src]'s linking data to the buffer.")
+ return
+
+ var/list/msgs = list()
+ msgs += "Scanning contents of [src]:"
+
+ var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
+ for(var/MAT in materials.materials)
+ var/datum/material/M = materials.materials[MAT]
+ if(!M)
+ continue
+ msgs += "[M.name]: [floor(M.amount / MINERAL_MATERIAL_AMOUNT)] sheets."
+ to_chat(user, chat_box_regular(msgs.Join("
")))
+
+/obj/machinery/smithing
+ name = "smithing machine"
+ desc = "A large unknown smithing machine. If you see this, there's a problem and you should notify the development team."
+ icon = 'icons/obj/machines/large_smithing_machines.dmi'
+ icon_state = "power_hammer"
+ max_integrity = 200
+ pixel_x = 0 // 2x2
+ pixel_y = -32
+ bound_height = 64
+ bound_width = 64
+ bound_y = -32
+ anchored = TRUE
+ density = TRUE
+ resistance_flags = FIRE_PROOF
+ /// How many loops per operation
+ var/operation_time = 10
+ /// Is this active
+ var/operating = FALSE
+ /// Cooldown on harming
+ var/special_attack_cooldown = 10 SECONDS
+ /// Are we on harm cooldown
+ var/special_attack_on_cooldown = FALSE
+ /// Store the worked component
+ var/obj/item/smithed_item/component/working_component
+ /// The noise the machine makes when operating
+ var/operation_sound
+ /// Will the machine auto-repeat?
+ var/repeating = FALSE
+
+/obj/machinery/smithing/examine(mob/user)
+ . = ..()
+ if(working_component)
+ . += "You can activate the machine with your hand, or remove the component by alt-clicking."
+
+/obj/machinery/smithing/power_change()
+ if(!..())
+ return
+ update_icon(UPDATE_ICON_STATE)
+
+/obj/machinery/smithing/item_interaction(mob/living/user, obj/item/used, list/modifiers)
+ if(istype(used, /obj/item/grab))
+ var/obj/item/grab/G = used
+ if(HAS_TRAIT(user, TRAIT_PACIFISM))
+ to_chat(user, "Putting [G.affecting] in [src] might hurt them!")
+ return ITEM_INTERACT_COMPLETE
+ special_attack_grab(G, user)
+ return ITEM_INTERACT_COMPLETE
+
+ if(operating)
+ to_chat(user, "[src] is still operating!")
+ return FINISH_ATTACK
+
+ if(istype(used, /obj/item/smithed_item/component))
+ if(working_component)
+ to_chat(user, "There is already a component in the machine!")
+ return ITEM_INTERACT_COMPLETE
+
+ if(used.flags & NODROP || !user.drop_item() || !used.forceMove(src))
+ to_chat(user, "[used] is stuck to your hand!")
+ return ITEM_INTERACT_COMPLETE
+
+ working_component = used
+ return ITEM_INTERACT_COMPLETE
+ return ..()
+
+/obj/machinery/smithing/proc/operate(loops, mob/living/user)
+ operating = TRUE
+ update_icon(ALL)
+ for(var/i in 1 to loops)
+ if(stat & (NOPOWER|BROKEN))
+ return FALSE
+ use_power(500)
+ if(operation_sound)
+ playsound(src, operation_sound, 50, TRUE)
+ sleep(1 SECONDS)
+ playsound(src, 'sound/machines/recycler.ogg', 50, FALSE)
+ operating = FALSE
+ update_icon(ALL)
+
+/obj/machinery/smithing/proc/special_attack_grab(obj/item/grab/G, mob/user)
+ if(special_attack_on_cooldown)
+ return FALSE
+ if(!istype(G))
+ return FALSE
+ if(!iscarbon(G.affecting))
+ to_chat(user, "You can't shove that in there!")
+ return FALSE
+ if(G.state < GRAB_NECK)
+ to_chat(user, "You need a better grip to do that!")
+ return FALSE
+ var/result = special_attack(user, G.affecting)
+ user.changeNext_move(CLICK_CD_MELEE)
+ special_attack_on_cooldown = TRUE
+ addtimer(VARSET_CALLBACK(src, special_attack_on_cooldown, FALSE), special_attack_cooldown)
+ if(result && !QDELETED(G))
+ qdel(G)
+
+ return TRUE
+
+/obj/machinery/smithing/proc/special_attack(mob/user, mob/living/target)
+ return
+
+/obj/machinery/smithing/AltClick(mob/living/user)
+ . = ..()
+ if(!Adjacent(user))
+ return
+ if(!working_component)
+ to_chat(user, "There isn't anything in [src].")
+ return
+ if(operating)
+ to_chat(user, "[src] is currently operating!")
+ return
+ if(working_component.burn_check(user))
+ working_component.burn_user(user)
+ working_component.forceMove(user.loc)
+ working_component = null
+ return
+ user.put_in_hands(working_component)
+ working_component = null
+
+/obj/machinery/smithing/screwdriver_act(mob/user, obj/item/I)
+ if(!I.use_tool(src, user, 0, volume = 0))
+ return
+ . = TRUE
+ if(operating)
+ to_chat(user, "[src] is busy. Please wait for completion of previous operation.")
+ return
+ default_deconstruction_screwdriver(user, icon_state, icon_state, I)
+
+/obj/machinery/smithing/crowbar_act(mob/user, obj/item/I)
+ if(default_deconstruction_crowbar(user, I))
+ return TRUE
+
+/obj/machinery/smithing/casting_basin
+ name = "casting basin"
+ desc = "A table with a large basin for pouring molten metal. It has a slot for a mold."
+ icon = 'icons/obj/machines/smithing_machines.dmi'
+ icon_state = "casting_open"
+ max_integrity = 100
+ pixel_x = 0 // 1x1
+ pixel_y = 0
+ bound_height = 32
+ bound_width = 32
+ bound_y = 0
+ /// Linked magma crucible
+ var/obj/machinery/magma_crucible/linked_crucible
+ /// Operational Efficiency
+ var/efficiency = 1
+ /// Inserted cast
+ var/obj/item/smithing_cast/cast
+ /// Finished product
+ var/obj/item/smithed_item/component/produced_item
+
+/obj/machinery/smithing/casting_basin/Initialize(mapload)
+ . = ..()
+ // Stock parts
+ component_parts = list()
+ component_parts += new /obj/item/circuitboard/casting_basin(null)
+ component_parts += new /obj/item/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/stock_parts/manipulator(null)
+ component_parts += new /obj/item/stack/sheet/glass(null)
+ RefreshParts()
+ // Try to link to magma crucible on initialize. Link to the first crucible it can find.
+ for(var/obj/machinery/magma_crucible/crucible in view(2, src))
+ linked_crucible = crucible
+ return
+
+/obj/machinery/smithing/casting_basin/examine(mob/user)
+ . = ..()
+ if(cast)
+ . += "You can activate the machine with your hand, or remove the cast by alt-clicking."
+ . += "There is a [cast] in the cast slot."
+ . += "Currently set to produce: [cast.selected_product.name]"
+ if(istype(cast, /obj/item/smithing_cast/component) && !produced_item)
+ var/obj/item/temp_product = new cast.selected_product(src) // This is necessary due to selected_product being a type
+ var/obj/item/smithing_cast/component/comp_cast = cast
+ var/datum/smith_quality/quality = new comp_cast.quality
+ . += "Required Resources:"
+ var/MAT
+ // Get the materials the item needs and display
+ for(MAT in temp_product.materials)
+ . += " - [MAT]: [ROUND_UP(((temp_product.materials[MAT] * quality.material_mult) * efficiency) / MINERAL_MATERIAL_AMOUNT)] sheets."
+ // Get rid of the temp product
+ qdel(temp_product)
+
+ if(produced_item)
+ . += "There is a [produced_item] in the machine. You can pick it up with your hand."
+
+/obj/machinery/smithing/casting_basin/RefreshParts()
+ var/operation_mult = 0
+ var/efficiency_mult = 0
+ for(var/obj/item/stock_parts/component in component_parts)
+ operation_mult += 2 * OPERATION_SPEED_MULT_PER_RATING * component.rating
+ efficiency_mult += EFFICIENCY_MULT_ADD_PER_RATING * component.rating
+ // Update our values
+ operation_time = max(ROUND_UP(initial(operation_time) * (1.3 - operation_mult)), 2)
+ efficiency = initial(efficiency) * (1.1 - efficiency_mult)
+
+/obj/machinery/smithing/casting_basin/update_overlays()
+ . = ..()
+ overlays.Cut()
+ if(produced_item)
+ . += "casting_closed"
+ if(cast && !produced_item)
+ if(istype(cast, /obj/item/smithing_cast/sheet))
+ . += "cast_sheet"
+ else if(istype(cast, /obj/item/smithing_cast/component/insert_frame))
+ . += "cast_armorframe"
+ else if(istype(cast, /obj/item/smithing_cast/component/insert_lining))
+ . += "cast_mesh"
+ else if(istype(cast, /obj/item/smithing_cast/component/bit_mount))
+ . += "cast_bitmount"
+ else if(istype(cast, /obj/item/smithing_cast/component/bit_head))
+ . += "cast_bithead"
+ else if(istype(cast, /obj/item/smithing_cast/component/lens_focus))
+ . += "cast_focus"
+ else if(istype(cast, /obj/item/smithing_cast/component/lens_frame))
+ . += "cast_lens"
+ else if(istype(cast, /obj/item/smithing_cast/component/trim))
+ . += "cast_trim"
+ . += "casting_lip"
+ if(panel_open)
+ . += "casting_wires"
+ if(operating)
+ . += "casting_pour"
+
+/obj/machinery/smithing/casting_basin/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/I)
+ . = ..()
+ update_icon(UPDATE_OVERLAYS)
+
+/obj/machinery/smithing/casting_basin/multitool_act(mob/living/user, obj/item/I)
+ if(!I.use_tool(src, user, 0, volume = I.tool_volume))
+ return
+ if(!I.multitool_check_buffer(user))
+ return
+ if(panel_open)
+ var/obj/item/multitool/multi = I
+ if(!istype(multi.buffer, /obj/machinery/magma_crucible))
+ to_chat(user, "You cannot link [src] to [multi.buffer]!")
+ return
+ linked_crucible = multi.buffer
+ to_chat(user, "You link [src] to [multi.buffer].")
+
+/obj/machinery/smithing/casting_basin/item_interaction(mob/living/user, obj/item/used, list/modifiers)
+ if(!istype(used, /obj/item/smithing_cast))
+ to_chat(user, "[used] does not fit in [src]'s cast slot.")
+ return
+
+ if(cast)
+ to_chat(user, "[src] already has a cast inserted.")
+ return
+
+ if(used.flags & NODROP || !user.transfer_item_to(used, src))
+ to_chat(user, "[used] is stuck to your hand!")
+ return ITEM_INTERACT_COMPLETE
+ cast = used
+ update_icon(UPDATE_OVERLAYS)
+ return ITEM_INTERACT_COMPLETE
+
+/obj/machinery/smithing/casting_basin/AltClick(mob/living/user)
+ if(!Adjacent(user))
+ return
+ if(!cast)
+ to_chat(user, "There is no cast to remove.")
+ return
+ if(operating)
+ to_chat(user, "[src] is currently operating!")
+ return
+ user.put_in_hands(cast)
+ cast = null
+ update_icon(UPDATE_OVERLAYS)
+
+/obj/machinery/smithing/casting_basin/attack_hand(mob/user)
+ if(produced_item)
+ if(produced_item.burn_check(user))
+ produced_item.burn_user(user)
+ produced_item.forceMove(user.loc)
+ produced_item = null
+ return FINISH_ATTACK
+ user.put_in_hands(produced_item)
+ produced_item = null
+ update_icon(UPDATE_OVERLAYS)
+ return FINISH_ATTACK
+ if(!cast)
+ to_chat(user, "There is no cast inserted!")
+ return FINISH_ATTACK
+ if(!linked_crucible)
+ to_chat(user, "There is no linked magma crucible!")
+ return FINISH_ATTACK
+ if(operating)
+ to_chat(user, "[src] is currently operating!")
+ return FINISH_ATTACK
+
+ var/datum/component/material_container/materials = linked_crucible.GetComponent(/datum/component/material_container)
+ var/obj/item/temp_product = new cast.selected_product // Product is stored as a type, I need a temporary item for handling material calcs
+ var/amount = cast.amount_to_make
+ var/MAT
+
+ if(!istype(temp_product))
+ to_chat(user, "The product is not an item! This is a problem you should make an issue report about!")
+ log_debug("Attempted to make [temp_product] at a casting basin, product is not an item.")
+ return FINISH_ATTACK
+
+ if(istype(cast, /obj/item/smithing_cast/component))
+ var/obj/item/smithing_cast/component/comp_cast = cast
+ var/datum/smith_quality/quality = new comp_cast.quality
+ var/list/used_mats = list()
+
+ // Check if there is enough materials to craft the item
+ for(MAT in temp_product.materials)
+ used_mats[MAT] = (temp_product.materials[MAT] * quality.material_mult) * efficiency
+
+ if(!materials.has_materials(used_mats, 1))
+ to_chat(user, "Not enough materials in the crucible to smelt [temp_product.name]!")
+ qdel(temp_product)
+ return FINISH_ATTACK
+
+ to_chat(user, "You begin to pour the liquid minerals into the [src]...")
+ // Use the materials and create the item.
+ materials.use_amount(used_mats)
+ linked_crucible.animate_pour(operation_time SECONDS)
+ operate(operation_time, user)
+ produced_item = new cast.selected_product(src)
+ produced_item.quality = quality
+ produced_item.set_worktime()
+ produced_item.update_appearance(UPDATE_NAME)
+ produced_item.update_icon(UPDATE_ICON_STATE)
+ update_icon(UPDATE_OVERLAYS)
+ // Clean up temps
+ qdel(temp_product)
+ return FINISH_ATTACK
+
+ if(istype(cast, /obj/item/smithing_cast/sheet))
+ // Get max amount of sheets (0-50)
+ var/datum/material/M
+ var/stored
+
+ // Check if there is enough materials to craft the item
+ for(MAT in temp_product.materials)
+ M = materials.materials[MAT]
+ if(!stored)
+ stored = M.amount / MINERAL_MATERIAL_AMOUNT
+ else
+ stored = min(M.amount / MINERAL_MATERIAL_AMOUNT, stored)
+ if(istype(cast, /obj/item/smithing_cast/sheet))
+ amount = min(amount, stored, MAX_STACK_SIZE)
+ if(!amount)
+ to_chat(user, "Not enough materials in the crucible to smelt a sheet of [temp_product.name]!")
+ qdel(temp_product)
+ return FINISH_ATTACK
+
+ to_chat(user, "You begin to pour the liquid minerals into the [src]...")
+ playsound(src, 'sound/machines/recycler.ogg', 50, TRUE)
+ // Use the materials and create the item.
+ materials.use_amount(temp_product.materials, amount)
+ linked_crucible.animate_pour(operation_time SECONDS)
+ operate(operation_time, user)
+ var/obj/item/stack/new_stack = new cast.selected_product(src.loc)
+ new_stack.amount = amount
+ new_stack.update_icon(UPDATE_ICON_STATE)
+
+ // Clean up temps
+ qdel(temp_product)
+ return FINISH_ATTACK
+
+/obj/machinery/smithing/power_hammer
+ name = "power hammer"
+ desc = "A heavy-duty pneumatic hammer designed to shape and mold molten metal."
+ icon = 'icons/obj/machines/large_smithing_machines.dmi'
+ icon_state = "power_hammer"
+ operation_sound = 'sound/magic/fellowship_armory.ogg'
+
+/obj/machinery/smithing/power_hammer/Initialize(mapload)
+ . = ..()
+ // Stock parts
+ component_parts = list()
+ component_parts += new /obj/item/circuitboard/power_hammer(null)
+ component_parts += new /obj/item/stock_parts/manipulator(null)
+ component_parts += new /obj/item/stock_parts/manipulator(null)
+ component_parts += new /obj/item/stock_parts/manipulator(null)
+ component_parts += new /obj/item/stock_parts/manipulator(null)
+ component_parts += new /obj/item/stack/sheet/plasteel(null)
+ RefreshParts()
+ update_icon(UPDATE_OVERLAYS)
+
+/obj/machinery/smithing/power_hammer/update_overlays()
+ . = ..()
+ overlays.Cut()
+ if(operating)
+ . += "hammer_hit"
+ else
+ . += "hammer_idle"
+ if(panel_open)
+ . += "hammer_wires"
+ if(has_power())
+ . += "hammer_fan_on"
+
+/obj/machinery/smithing/power_hammer/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/I)
+ . = ..()
+ update_icon(UPDATE_OVERLAYS)
+
+/obj/machinery/smithing/power_hammer/RefreshParts()
+ var/operation_mult = 0
+ for(var/obj/item/stock_parts/component in component_parts)
+ operation_mult += OPERATION_SPEED_MULT_PER_RATING * component.rating
+ // Update our values
+ operation_time = max(ROUND_UP(initial(operation_time) * (1.3 - operation_mult)), 2)
+
+/obj/machinery/smithing/power_hammer/operate(loops, mob/living/user)
+ if(!working_component.hot)
+ to_chat(user, "[working_component] is too cold to properly shape.")
+ return
+ if(working_component.hammer_time <= 0)
+ to_chat(user, "[working_component] is already fully shaped.")
+ return
+ ..()
+ working_component.powerhammer()
+ do_sparks(5, TRUE, src)
+ // If the hammer is set to repeat mode, let it repeat operations automatically.
+ if(repeating && working_component.hot && working_component.hammer_time)
+ operate(loops, user)
+ // When an item is done, beep.
+ if(!working_component.hammer_time)
+ playsound(src, 'sound/machines/boop.ogg', 50, TRUE)
+
+/obj/machinery/smithing/power_hammer/multitool_act(mob/living/user, obj/item/I)
+ . = TRUE
+ if(!I.use_tool(src, user, 0, volume = I.tool_volume))
+ return
+ if(!repeating)
+ repeating = TRUE
+ to_chat(user, "You set [src] to auto-repeat.")
+ else
+ repeating = FALSE
+ to_chat(user, "You set [src] to not auto-repeat.")
+
+/obj/machinery/smithing/power_hammer/attack_hand(mob/user)
+ . = ..()
+ if(operating)
+ to_chat(user, "[src] is currently operating!")
+ return
+ operate(operation_time, user)
+ update_icon(UPDATE_ICON_STATE)
+ return FINISH_ATTACK
+
+/obj/machinery/smithing/power_hammer/special_attack(mob/user, mob/living/target)
+ var/obj/item/organ/external/head/head = target.get_organ(BODY_ZONE_HEAD)
+ if(!istype(head))
+ to_chat(user, "This person doesn't have a head!")
+ return FALSE
+ target.visible_message("[user] hammers [target]'s head with [src]!", \
+ "[user] hammers your head with [src]! Did somebody get the license plate on that car?")
+ var/armor = target.run_armor_check(def_zone = BODY_ZONE_HEAD, attack_flag = MELEE, armour_penetration_percentage = 50)
+ target.apply_damage(40, BRUTE, BODY_ZONE_HEAD, armor)
+ target.Weaken(4 SECONDS)
+ target.emote("scream")
+ playsound(src, operation_sound, 50, TRUE)
+ add_attack_logs(user, target, "Hammered with [src]")
+ return TRUE
+
+/obj/machinery/smithing/lava_furnace
+ name = "lava furnace"
+ desc = "A furnace that uses the innate heat of lavaland to reheat metal that has not been fully reshaped."
+ icon = 'icons/obj/machines/large_smithing_machines.dmi'
+ icon_state = "furnace_off"
+ operation_sound = 'sound/surgery/cautery1.ogg'
+
+/obj/machinery/smithing/lava_furnace/Initialize(mapload)
+ . = ..()
+ // Stock parts
+ component_parts = list()
+ component_parts += new /obj/item/circuitboard/lava_furnace(null)
+ component_parts += new /obj/item/stock_parts/micro_laser(null)
+ component_parts += new /obj/item/stock_parts/micro_laser(null)
+ component_parts += new /obj/item/stock_parts/micro_laser(null)
+ component_parts += new /obj/item/stock_parts/micro_laser(null)
+ component_parts += new /obj/item/assembly/igniter(null)
+ RefreshParts()
+
+/obj/machinery/smithing/lava_furnace/RefreshParts()
+ var/operation_mult = 0
+ for(var/obj/item/stock_parts/component in component_parts)
+ operation_mult += OPERATION_SPEED_MULT_PER_RATING * component.rating
+ // Update our values
+ operation_time = max(ROUND_UP(initial(operation_time) * (1.3 - operation_mult)), 2)
+
+/obj/machinery/smithing/lava_furnace/update_overlays()
+ . = ..()
+ overlays.Cut()
+ if(panel_open)
+ . += "furnace_wires"
+
+/obj/machinery/smithing/lava_furnace/update_icon_state()
+ . = ..()
+ if(operating)
+ icon_state = "furnace"
+ else
+ icon_state = "furnace_off"
+
+/obj/machinery/smithing/lava_furnace/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/I)
+ . = ..()
+ update_icon(UPDATE_OVERLAYS)
+
+/obj/machinery/smithing/lava_furnace/operate(loops, mob/living/user)
+ if(working_component.hot)
+ to_chat(user, "[working_component] is already well heated.")
+ return
+ if(working_component.hammer_time <= 0)
+ to_chat(user, "[working_component] is already fully shaped.")
+ return
+ ..()
+ working_component.heat_up()
+
+/obj/machinery/smithing/lava_furnace/attack_hand(mob/user)
+ . = ..()
+ if(operating)
+ to_chat(user, "[src] is currently operating!")
+ return
+ if(!working_component)
+ to_chat(user, "There is nothing in [src]!")
+ return
+
+ operate(operation_time, user)
+ return FINISH_ATTACK
+
+/obj/machinery/smithing/lava_furnace/special_attack(mob/user, mob/living/target)
+ var/obj/item/organ/external/head/head = target.get_organ(BODY_ZONE_HEAD)
+ if(!istype(head))
+ to_chat(user, "This person doesn't have a head!")
+ return FALSE
+ target.visible_message("[user] pushes [target]'s head into [src]!", \
+ "[user] pushes your head into [src]! The heat is agonizing!")
+ var/armor = target.run_armor_check(def_zone = BODY_ZONE_HEAD, attack_flag = MELEE, armour_penetration_percentage = 50)
+ target.apply_damage(40, BURN, BODY_ZONE_HEAD, armor)
+ target.adjust_fire_stacks(5)
+ target.IgniteMob()
+ target.emote("scream")
+ playsound(src, operation_sound, 50, TRUE)
+ add_attack_logs(user, target, "Burned with [src]")
+ return TRUE
+
+#define PART_PRIMARY 1
+#define PART_SECONDARY 2
+#define PART_TRIM 3
+
+/obj/machinery/smithing/kinetic_assembler
+ name = "kinetic assembler"
+ desc = "A smart assembler that takes components and combines them at the strike of a hammer."
+ icon = 'icons/obj/machines/smithing_machines.dmi'
+ icon_state = "assembler"
+ max_integrity = 100
+ pixel_x = 0 // 1x1
+ pixel_y = 0
+ bound_height = 32
+ bound_width = 32
+ bound_y = 0
+ operation_sound = 'sound/items/welder.ogg'
+ /// Primary component
+ var/obj/item/smithed_item/component/primary
+ /// Secondary component
+ var/obj/item/smithed_item/component/secondary
+ /// Trim component
+ var/obj/item/smithed_item/component/trim
+ /// Finished product
+ var/obj/item/smithed_item/finished_product
+
+/obj/machinery/smithing/kinetic_assembler/Initialize(mapload)
+ . = ..()
+ // Stock parts
+ component_parts = list()
+ component_parts += new /obj/item/circuitboard/kinetic_assembler(null)
+ component_parts += new /obj/item/stock_parts/manipulator(null)
+ component_parts += new /obj/item/stock_parts/manipulator(null)
+ component_parts += new /obj/item/stock_parts/manipulator(null)
+ component_parts += new /obj/item/stock_parts/micro_laser(null)
+ component_parts += new /obj/item/stack/sheet/glass(null)
+ RefreshParts()
+
+/obj/machinery/smithing/kinetic_assembler/examine(mob/user)
+ . = ..()
+ if(primary || secondary || trim)
+ . += "You can activate the machine with your hand, or remove a component by alt-clicking."
+ if(primary)
+ . += "There is a [primary] in the primary slot."
+ if(secondary)
+ . += "There is a [secondary] in the primary slot."
+ if(trim)
+ . += "There is a [trim] in the primary slot."
+ if(finished_product)
+ . += "There is a nearly-complete [finished_product] on the assembler. To complete the product, strike it with your hammer!"
+
+/obj/machinery/smithing/kinetic_assembler/RefreshParts()
+ var/operation_mult = 0
+ for(var/obj/item/stock_parts/component in component_parts)
+ operation_mult += OPERATION_SPEED_MULT_PER_RATING * component.rating
+ // Update our values
+ operation_time = operation_time = max(ROUND_UP(initial(operation_time) * (1.3 - operation_mult)), 2)
+
+/obj/machinery/smithing/kinetic_assembler/update_icon_state()
+ . = ..()
+ if(panel_open)
+ icon_state = "assembler_wires"
+
+/obj/machinery/smithing/kinetic_assembler/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/I)
+ . = ..()
+ update_icon(UPDATE_ICON_STATE)
+
+/obj/machinery/smithing/kinetic_assembler/update_overlays()
+ . = ..()
+ overlays.Cut()
+ if(panel_open)
+ icon_state = "assembler_wires"
+
+/obj/machinery/smithing/kinetic_assembler/AltClick(mob/living/user)
+ if(!Adjacent(user))
+ return
+ if(!primary && !secondary && !trim)
+ to_chat(user, "There is no component to remove.")
+ return
+ var/list/components = list("Primary", "Secondary", "Trim")
+ var/removed = tgui_input_list(user, "Select a component to remove", src, components)
+ if(!removed)
+ return
+ switch(removed)
+ if("Primary")
+ to_chat(user, "You remove [primary] from the primary component slot of [src].")
+ if(primary.burn_check(user))
+ primary.burn_user(user)
+ primary.forceMove(user.loc)
+ primary = null
+ return
+ user.put_in_hands(primary)
+ primary = null
+ return
+ if("Secondary")
+ to_chat(user, "You remove [secondary] from the secondary component slot of [src].")
+ if(secondary.burn_check(user))
+ secondary.burn_user(user)
+ secondary.forceMove(user.loc)
+ secondary = null
+ return
+ user.put_in_hands(secondary)
+ secondary = null
+ return
+ if("Trim")
+ to_chat(user, "You remove [trim] from the trim component slot of [src].")
+ if(trim.burn_check(user))
+ trim.burn_user(user)
+ trim.forceMove(user.loc)
+ trim = null
+ return
+ user.put_in_hands(trim)
+ trim = null
+ return
+
+/obj/machinery/smithing/kinetic_assembler/item_interaction(mob/living/user, obj/item/used, list/modifiers)
+ if(operating)
+ to_chat(user, "[src] is still operating!")
+ return ITEM_INTERACT_COMPLETE
+
+ if(istype(used, /obj/item/hammer))
+ return ITEM_INTERACT_COMPLETE
+
+ if(!istype(used, /obj/item/smithed_item/component))
+ to_chat(user, "You feel like there's no reason to process [used].")
+ return ITEM_INTERACT_COMPLETE
+
+ if(finished_product)
+ to_chat(user, "There is an almost finished [finished_product] in [src]!")
+ return ITEM_INTERACT_COMPLETE
+
+ var/obj/item/smithed_item/component/comp = used
+ if(comp.hammer_time)
+ to_chat(user, "[used] is not complete yet!")
+ return ITEM_INTERACT_COMPLETE
+
+ if(comp.part_type == PART_PRIMARY)
+ if(primary)
+ to_chat(user, "You remove [primary] from the primary component slot of [src].")
+ primary.forceMove(src.loc)
+ primary = null
+ if(comp.flags & NODROP || !user.transfer_item_to(used, src))
+ to_chat(user, "[comp] is stuck to your hand!")
+ return ITEM_INTERACT_COMPLETE
+ to_chat(user, "You insert [comp] into the primary component slot of [src].")
+ primary = comp
+ return ITEM_INTERACT_COMPLETE
+
+ if(comp.part_type == PART_SECONDARY)
+ if(secondary)
+ to_chat(user, "You remove [secondary] from the secondary component slot of [src].")
+ secondary.forceMove(src.loc)
+ secondary = null
+ if(comp.flags & NODROP || !user.transfer_item_to(used, src))
+ to_chat(user, "[comp] is stuck to your hand!")
+ return ITEM_INTERACT_COMPLETE
+ to_chat(user, "You insert [comp] into the secondary component slot of [src].")
+ secondary = comp
+ return ITEM_INTERACT_COMPLETE
+
+ if(comp.part_type == PART_TRIM)
+ if(trim)
+ to_chat(user, "You remove [trim] from the trim component slot of [src].")
+ trim.forceMove(src.loc)
+ trim = null
+ if(comp.flags & NODROP || !user.transfer_item_to(used, src))
+ to_chat(user, "[comp] is stuck to your hand!")
+ return ITEM_INTERACT_COMPLETE
+ to_chat(user, "You insert [comp] into the trim component slot of [src].")
+ trim = comp
+ return ITEM_INTERACT_COMPLETE
+
+/obj/machinery/smithing/kinetic_assembler/attack_hand(mob/user)
+ if(!primary)
+ to_chat(user, "[src] lacks a primary component!")
+ return FINISH_ATTACK
+
+ if(!secondary)
+ to_chat(user, "[src] lacks a secondary component!")
+ return FINISH_ATTACK
+
+ if(!trim)
+ to_chat(user, "[src] lacks a trim component!")
+ return FINISH_ATTACK
+
+ if(primary.finished_product != secondary.finished_product)
+ to_chat(user, "[primary] does not match [secondary]!")
+ return FINISH_ATTACK
+
+ operate(operation_time, user)
+ return FINISH_ATTACK
+
+/obj/machinery/smithing/kinetic_assembler/operate(loops, mob/living/user)
+ ..()
+ finished_product = new primary.finished_product(src)
+ var/quality_list = list(primary.quality, secondary.quality, trim.quality)
+ var/datum/smith_quality/lowest = quality_list[1]
+ for(var/datum/smith_quality/quality in quality_list)
+ if(quality.stat_mult < lowest.stat_mult)
+ lowest = quality
+ finished_product.quality = lowest
+ finished_product.material = trim.material
+ finished_product.set_stats()
+ finished_product.update_appearance(UPDATE_NAME)
+ qdel(primary)
+ qdel(secondary)
+ qdel(trim)
+ primary = null
+ secondary = null
+ trim = null
+
+/obj/machinery/smithing/kinetic_assembler/hammer_act(mob/user, obj/item/i)
+ if(operating)
+ to_chat(user, "[src] is still operating!")
+ return
+ if(!finished_product)
+ to_chat(user, "There is no finished product ready!")
+ return
+ playsound(src, 'sound/magic/fellowship_armory.ogg', 50, TRUE)
+ finished_product.forceMove(src.loc)
+ finished_product = null
+
+#undef PART_PRIMARY
+#undef PART_SECONDARY
+#undef PART_TRIM
+#undef BASE_POINT_MULT
+#undef BASE_SHEET_MULT
+#undef POINT_MULT_ADD_PER_RATING
+#undef SHEET_MULT_ADD_PER_RATING
+#undef OPERATION_SPEED_MULT_PER_RATING
+#undef EFFICIENCY_MULT_ADD_PER_RATING
diff --git a/code/game/machinery/tcomms/nttc.dm b/code/game/machinery/tcomms/nttc.dm
index 993187499f1..b28ca59d700 100644
--- a/code/game/machinery/tcomms/nttc.dm
+++ b/code/game/machinery/tcomms/nttc.dm
@@ -109,6 +109,9 @@
// Supply
"Quartermaster" = "supradio",
"Cargo Technician" = "supradio",
+ "Smith" = "supradio",
+ "Metalworker" = "supradio",
+ "Tinkerer" = "supradio",
"Shaft Miner" = "supradio",
"Spelunker" = "supradio",
"Explorer" = "supradio",
diff --git a/code/game/machinery/vendors/departmental_vendors.dm b/code/game/machinery/vendors/departmental_vendors.dm
index ba03d05bc67..db2e67256c5 100644
--- a/code/game/machinery/vendors/departmental_vendors.dm
+++ b/code/game/machinery/vendors/departmental_vendors.dm
@@ -354,3 +354,26 @@
refill_canister = /obj/item/vending_refill/security
prices = list(/obj/item/food/donut = 40,
/obj/item/storage/fancy/donut_box = 200) //Bulk discount
+
+
+/obj/machinery/economy/vending/smith
+ name = "\improper Castivend"
+ desc = "Everything you need to start your own smithing workshop."
+ icon_state = "castivend"
+ category = VENDOR_TYPE_DEPARTMENTAL
+ req_access = list(ACCESS_SMITH)
+ products = list(/obj/item/smithing_cast/sheet = 6,
+ /obj/item/smithing_cast/component/insert_frame = 3,
+ /obj/item/smithing_cast/component/insert_lining = 3,
+ /obj/item/smithing_cast/component/bit_mount = 3,
+ /obj/item/smithing_cast/component/bit_head = 3,
+ /obj/item/smithing_cast/component/lens_focus = 3,
+ /obj/item/smithing_cast/component/lens_frame = 3,
+ /obj/item/smithing_cast/component/trim = 3,
+ /obj/item/storage/box/crewvend = 1)
+
+ refill_canister = /obj/item/vending_refill/smith
+
+ prices = list(
+ /obj/item/storage/box/crewvend = 100
+ )
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index ad651d5f080..8fd9210a8c1 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -318,6 +318,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp
name = "Cargo Technician"
icon_state = "CargoTech"
+/obj/effect/landmark/start/smith
+ name = "Smith"
+ icon_state = "CargoTech"
+
/obj/effect/landmark/start/chaplain
name = "Chaplain"
icon_state = "Chap"
diff --git a/code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm b/code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm
index f12f658f4e7..3af2926b4e1 100644
--- a/code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm
+++ b/code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm
@@ -40,8 +40,10 @@
/obj/item/stack/sheet/mineral/titanium = 5,
/obj/item/stack/sheet/plasteel = 5,
- // Hybrid stuff you could in theory get from mining
- /obj/item/stack/sheet/titaniumglass = 5,
+ // Rare space ore sheets
+ /obj/item/stack/sheet/mineral/platinum = 5,
+ /obj/item/stack/sheet/mineral/iridium = 5,
+ /obj/item/stack/sheet/mineral/palladium = 5,
// Rare stuff you can't get from mining
/obj/item/stack/sheet/mineral/tranquillite = 5,
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 60e16df4bb5..5a45e9a3d87 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -173,6 +173,16 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
var/tip_timer = 0
+ // Smithing vars
+ /// List of attached tool bits
+ var/list/attached_bits = list()
+ /// Maximum number of bits
+ var/max_bits = 1
+ /// Failure rate of using this tool. Without a bit, defaults to 0 for no failure chance
+ var/bit_failure_rate = 0
+ /// Efficiency modifier for tools that use energy or fuel
+ var/bit_efficiency_mod = 1
+
///////////////////////////
// MARK: item hover FX
///////////////////////////
@@ -285,6 +295,10 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
msg += "*--------*"
. += msg
+ if(length(attached_bits))
+ . += "Has [length(attached_bits)] bits attached."
+ . += "Bits can be removed with Alt-Click."
+
if(HAS_TRAIT(src, TRAIT_BUTCHERS_HUMANS))
. += "Can be used to butcher dead people into meat while on harm intent."
@@ -444,6 +458,42 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
owner.visible_message("[owner] blocks [attack_text] with [src]!")
return signal_result
+/// Used to add a bit through a signal
+/obj/item/proc/add_bit(atom/source, obj/item/smithed_item/tool_bit/bit, mob/user)
+ SIGNAL_HANDLER // COMSIG_BIT_ATTACH
+ if(length(attached_bits) >= max_bits)
+ to_chat(user, "Your tool already has the maximum number of bits!")
+ return
+ if(bit.flags & NODROP || !user.transfer_item_to(bit, src))
+ to_chat(user, "[bit] is stuck to your hand!")
+ return
+ attached_bits += bit
+ bit.on_attached(src)
+
+/// Used to remove a bit through a signal
+/obj/item/proc/remove_bit(atom/source, mob/user)
+ SIGNAL_HANDLER // COMSIG_CLICK_ALT
+ if(!Adjacent(user))
+ return
+ if(!length(attached_bits))
+ to_chat(user, "Your [src] has no tool bits to remove.")
+ return
+
+ INVOKE_ASYNC(src, PROC_REF(finish_remove_bit), user)
+
+/obj/item/proc/finish_remove_bit(mob/user)
+ if(!Adjacent(user))
+ return
+ var/obj/item/smithed_item/tool_bit/old_bit
+ if(length(attached_bits) == 1)
+ old_bit = attached_bits[1]
+ else
+ old_bit = tgui_input_list(user, "Select a tool bit", src, attached_bits)
+ if(!istype(old_bit, /obj/item/smithed_item/tool_bit))
+ return
+ old_bit.on_detached()
+ user.put_in_hands(old_bit)
+
/// Generic use proc. Depending on the item, it uses up fuel, charges, sheets, etc. Returns TRUE on success, FALSE on failure.
/obj/item/proc/use(used)
return !used
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 883399885be..063e67f9110 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -440,6 +440,42 @@ GLOBAL_LIST_INIT(sandbag_recipes, list (
. = ..()
recipes = GLOB.tranquillite_recipes
+/obj/item/stack/sheet/mineral/platinum
+ name = "platinum"
+ desc = "Shiny and valuable."
+ icon_state = "sheet-platinum"
+ item_state = "sheet-platinum"
+ singular_name = "platinum"
+ origin_tech = "materials=5"
+ sheettype = "platinum"
+ merge_type = /obj/item/stack/sheet/mineral/platinum
+ materials = list(MAT_PLATINUM = MINERAL_MATERIAL_AMOUNT)
+ point_value = 25
+
+/obj/item/stack/sheet/mineral/palladium
+ name = "palladium"
+ desc = "A valuable space mineral."
+ icon_state = "sheet-palladium"
+ item_state = "sheet-palladium"
+ singular_name = "palladium"
+ origin_tech = "materials=5"
+ sheettype = "palladium"
+ merge_type = /obj/item/stack/sheet/mineral/palladium
+ materials = list(MAT_PALLADIUM = MINERAL_MATERIAL_AMOUNT)
+ point_value = 25
+
+/obj/item/stack/sheet/mineral/iridium
+ name = "iridium"
+ desc = "A dense mineral found in abundance in space and extremely rare on planets."
+ icon_state = "sheet-iridium"
+ item_state = "sheet-iridium"
+ singular_name = "iridium"
+ origin_tech = "materials=5"
+ sheettype = "iridium"
+ merge_type = /obj/item/stack/sheet/mineral/iridium
+ materials = list(MAT_IRIDIUM = MINERAL_MATERIAL_AMOUNT)
+ point_value = 25
+
/*
* Titanium
*/
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 00b4a870bfe..167c761e8bc 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -644,6 +644,7 @@ GLOBAL_LIST_INIT(brass_recipes, list (
turf_type = /turf/simulated/floor/clockwork
table_type = /obj/structure/table/reinforced/brass
dynamic_icon_state = TRUE
+ materials = list(MAT_BRASS = 2000)
/obj/item/stack/tile/brass/examine_more(mob/user)
. = ..()
diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm
index b9f43561120..47c68618fbc 100644
--- a/code/game/objects/items/tools/crowbar.dm
+++ b/code/game/objects/items/tools/crowbar.dm
@@ -21,6 +21,11 @@
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
tool_behaviour = TOOL_CROWBAR
+/obj/item/crowbar/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
+
/obj/item/crowbar/red
desc = "A hefty steel crowbar with red stripes. It'll hit a bit harder than a normal crowbar."
icon_state = "crowbar_red"
@@ -137,5 +142,10 @@
playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1)
var/obj/item/wirecutters/power/cutjaws = new /obj/item/wirecutters/power
to_chat(user, "You attach the cutting jaws to [src].")
+ for(var/obj/item/smithed_item/tool_bit/bit in attached_bits)
+ bit.on_detached()
+ bit.forceMove(cutjaws)
+ cutjaws.attached_bits += bit
+ bit.on_attached(cutjaws)
qdel(src)
user.put_in_active_hand(cutjaws)
diff --git a/code/game/objects/items/tools/hammer.dm b/code/game/objects/items/tools/hammer.dm
new file mode 100644
index 00000000000..7596dd9be47
--- /dev/null
+++ b/code/game/objects/items/tools/hammer.dm
@@ -0,0 +1,33 @@
+/obj/item/hammer
+ name = "hammer"
+ desc = "A useful tool to many throughout history. Slightly better than a weighted rock."
+ icon = 'icons/obj/tools.dmi'
+ icon_state = "hammer"
+ item_state = "hammer"
+ belt_icon = "hammer"
+ usesound = 'sound/magic/fellowship_armory.ogg'
+ flags = CONDUCT
+ slot_flags = ITEM_SLOT_BELT
+ force = 10
+ throwforce = 7
+ w_class = WEIGHT_CLASS_NORMAL
+ materials = list(MAT_METAL = 300)
+ origin_tech = "engineering=1;combat=1"
+ attack_verb = list("attacked", "hammered", "smashed", "bludgeoned", "whacked")
+ toolspeed = 1
+
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
+ tool_behaviour = TOOL_HAMMER
+
+/obj/item/hammer/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
+
+/obj/item/hammer/suicide_act(mob/user)
+ user.visible_message("[user] is bashing [user.p_their()] head with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
+
+ if(!use_tool(user, user, 3 SECONDS, volume = tool_volume))
+ return SHAME
+ playsound(loc, usesound, 50, FALSE)
+ return BRUTELOSS
diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
index 9846599fbac..f5de9302e37 100644
--- a/code/game/objects/items/tools/screwdriver.dm
+++ b/code/game/objects/items/tools/screwdriver.dm
@@ -29,6 +29,8 @@
. = ..()
AddComponent(/datum/component/surgery_initiator/robo)
RegisterSignal(src, COMSIG_ATTACK, PROC_REF(on_attack))
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
/obj/item/screwdriver/nuke
name = "screwdriver"
@@ -129,6 +131,11 @@
playsound(get_turf(user), 'sound/items/change_drill.ogg', 50, 1)
var/obj/item/wrench/power/b_drill = new /obj/item/wrench/power
to_chat(user, "You attach the bolt driver bit to [src].")
+ for(var/obj/item/smithed_item/tool_bit/bit in attached_bits)
+ bit.on_detached()
+ bit.forceMove(b_drill)
+ b_drill.attached_bits += bit
+ bit.on_attached(b_drill)
qdel(src)
user.put_in_active_hand(b_drill)
diff --git a/code/game/objects/items/tools/tool_behaviour.dm b/code/game/objects/items/tools/tool_behaviour.dm
index fa7de207820..5ab8729770f 100644
--- a/code/game/objects/items/tools/tool_behaviour.dm
+++ b/code/game/objects/items/tools/tool_behaviour.dm
@@ -37,6 +37,17 @@
// but only if the delay between the beginning and the end is not too small
if(delay >= MIN_TOOL_SOUND_DELAY)
play_tool_sound(target, volume)
+
+ // If it has a bit, wear and tear
+ for(var/obj/item/smithed_item/tool_bit/bit in attached_bits)
+ bit.damage_bit()
+
+ // If it has a chance to fail, see if it failed
+ if(bit_failure_rate)
+ if(prob(bit_failure_rate))
+ return
+
+
return TRUE
// Called before use_tool if there is a delay, or by use_tool if there isn't.
diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm
index 29a40cf1bef..75fde4c9a39 100644
--- a/code/game/objects/items/tools/welder.dm
+++ b/code/game/objects/items/tools/welder.dm
@@ -46,6 +46,8 @@
create_reagents(maximum_fuel)
reagents.add_reagent("fuel", maximum_fuel)
update_icon()
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
/obj/item/weldingtool/Destroy()
STOP_PROCESSING(SSobj, src)
@@ -140,6 +142,7 @@
user.flash_eyes(light_intensity)
/obj/item/weldingtool/use(amount)
+ amount = amount * bit_efficiency_mod
if(GET_FUEL < amount * requires_fuel)
return
remove_fuel(amount)
diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
index a5a1da00210..b40ac824113 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -25,6 +25,11 @@
new_attack_chain = TRUE
+/obj/item/wirecutters/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
+
/obj/item/wirecutters/New(loc, param_color = null)
..()
if(random_color)
@@ -154,5 +159,10 @@
playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1)
var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power
to_chat(user, "You attach the pry jaws to [src].")
+ for(var/obj/item/smithed_item/tool_bit/bit in attached_bits)
+ bit.on_detached()
+ bit.forceMove(pryjaws)
+ pryjaws.attached_bits += bit
+ bit.on_attached(pryjaws)
qdel(src)
user.put_in_active_hand(pryjaws)
diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
index 1a442135004..88966e28f35 100644
--- a/code/game/objects/items/tools/wrench.dm
+++ b/code/game/objects/items/tools/wrench.dm
@@ -21,6 +21,11 @@
new_attack_chain = TRUE
+/obj/item/wrench/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
+
/obj/item/wrench/suicide_act(mob/user)
user.visible_message("[user] is unsecuring [user.p_their()] head with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -79,6 +84,11 @@
playsound(get_turf(user),'sound/items/change_drill.ogg', 50, 1)
var/obj/item/wirecutters/power/s_drill = new /obj/item/screwdriver/power
to_chat(user, "You attach the screwdriver bit to [src].")
+ for(var/obj/item/smithed_item/tool_bit/bit in attached_bits)
+ bit.on_detached()
+ bit.forceMove(s_drill)
+ s_drill.attached_bits += bit
+ bit.on_attached(s_drill)
qdel(src)
user.put_in_active_hand(s_drill)
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index baf991f9132..8d0b3df881e 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -277,6 +277,8 @@
/obj/item/rcd/Initialize(mapload)
. = ..()
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
if(!length(possible_actions))
possible_actions = list()
for(var/action_type in subtypesof(/datum/rcd_act))
@@ -419,6 +421,9 @@
SStgui.update_uis(src)
/obj/item/rcd/item_interaction(mob/living/user, obj/item/used, list/modifiers)
+ if(istype(used, /obj/item/smithed_item/tool_bit))
+ SEND_SIGNAL(src, COMSIG_BIT_ATTACH, used, user)
+ return ..()
if(!istype(used, /obj/item/rcd_ammo))
return ..()
var/obj/item/rcd_ammo/ammo = used
@@ -636,6 +641,7 @@
* * amount - the amount of matter to use
*/
/obj/item/rcd/use(amount)
+ amount = amount * bit_efficiency_mod
if(matter < amount)
return FALSE
matter -= amount
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 34633e58432..ff4f3285ae1 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -558,11 +558,17 @@
icon_state = "cargo"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
+/obj/item/card/id/smith
+ name = "Smith ID"
+ registered_name = "Smith"
+ icon_state = "smith"
+ access = list(ACCESS_CARGO_BAY, ACCESS_CARGO, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_SMITH)
+
/obj/item/card/id/quartermaster
name = "Quartermaster ID"
registered_name = "Quartermaster"
icon_state = "quartermaster"
- access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
+ access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_SMITH)
/obj/item/card/id/shaftminer
name = "Shaftminer ID"
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index b9bf3d5b5ca..8c13ec782e1 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -96,7 +96,8 @@
/obj/item/holosign_creator,
/obj/item/stack/nanopaste,
/obj/item/robotanalyzer,
- /obj/item/rpd/bluespace
+ /obj/item/rpd/bluespace,
+ /obj/item/hammer
)
/obj/item/storage/belt/utility/full/populate_contents()
diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm
index d4794f2fff5..2d57286a531 100644
--- a/code/game/objects/items/weapons/storage/garment.dm
+++ b/code/game/objects/items/weapons/storage/garment.dm
@@ -342,3 +342,20 @@
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/mask/gas/explorer(src)
+
+/obj/item/storage/bag/garment/smith
+ name = "smith's garment bag"
+ desc = "A bag for storing extra clothes and shoes. This one belongs to the smith."
+
+/obj/item/storage/bag/garment/smith/populate_contents()
+ new /obj/item/clothing/under/rank/cargo/smith(src)
+ new /obj/item/clothing/under/rank/cargo/smith/skirt(src)
+ new /obj/item/clothing/under/rank/cargo/smith/overalls(src)
+ new /obj/item/clothing/suit/apron/smith(src)
+ new /obj/item/clothing/suit/jacket/bomber/smith(src)
+ new /obj/item/clothing/head/soft/smith(src)
+ new /obj/item/clothing/head/beret/smith(src)
+ new /obj/item/clothing/gloves/smithing(src)
+ new /obj/item/clothing/shoes/workboots/smithing(src)
+ new /obj/item/clothing/under/plasmaman/smith(src)
+ new /obj/item/clothing/head/helmet/space/plasmaman/smith(src)
diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm
index 835b6959939..fc52960f71c 100644
--- a/code/game/objects/items/weapons/vending_items.dm
+++ b/code/game/objects/items/weapons/vending_items.dm
@@ -154,6 +154,10 @@
machine_name = "Robotech Deluxe"
icon_state = "refill_engi"
+/obj/item/vending_refill/smith
+ machine_name = "Castivend"
+ icon_state = "refill_custom"
+
//Departmental clothing vendors
/obj/item/vending_refill/secdrobe
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
index 2b7b9b412ab..22a66d59b2b 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
@@ -32,6 +32,20 @@
new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
new /obj/item/storage/bag/expedition(src)
+/obj/structure/closet/secure_closet/smith
+ name = "smith's locker"
+ req_access = list(ACCESS_SMITH)
+ icon_state = "cargo"
+ opened_door_sprite = "cargo"
+ closed_door_sprite = "smith"
+
+/obj/structure/closet/secure_closet/smith/populate_contents()
+ new /obj/item/radio/headset/headset_cargo(src)
+ new /obj/item/storage/bag/garment/smith(src)
+ new /obj/item/eftpos(src)
+ new /obj/item/pickaxe/drill(src)
+ new /obj/item/rcs(src)
+
/obj/structure/closet/secure_closet/quartermaster
name = "quartermaster's locker"
req_access = list(ACCESS_QM)
diff --git a/code/game/turfs/simulated/floor/transparent.dm b/code/game/turfs/simulated/floor/transparent.dm
index 813d5cd8c5e..e22b388cf53 100644
--- a/code/game/turfs/simulated/floor/transparent.dm
+++ b/code/game/turfs/simulated/floor/transparent.dm
@@ -23,11 +23,27 @@
/turf/simulated/floor/transparent/glass/Initialize(mapload)
. = ..()
- var/image/I = image('icons/turf/space.dmi', src, SPACE_ICON_STATE)
- I.plane = PLANE_SPACE
+ return INITIALIZE_HINT_LATELOAD
+
+/turf/simulated/floor/transparent/glass/LateInitialize()
+ . = ..()
+ var/image/I = null
+ if(is_mining_level(z))
+ if(SSmapping.lavaland_theme?.primary_turf_type_icon)
+ I = null
+ I = image(SSmapping.lavaland_theme.primary_turf_type_icon, src, "windowed")
+ else
+ I = image('icons/turf/space.dmi', src, SPACE_ICON_STATE)
+ I.plane = PLANE_SPACE
+ else
+ I = image('icons/turf/space.dmi', src, SPACE_ICON_STATE)
+ I.plane = PLANE_SPACE
+
+ I.layer = PLATING_LAYER
underlays += I
dir = SOUTH //dirs that are not 2/south cause smoothing jank
icon_state = "" //Prevents default icon appearing behind the glass
+ QUEUE_SMOOTH(src)
/turf/simulated/floor/transparent/glass/welder_act(mob/user, obj/item/I)
if(!broken && !burnt)
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index 5aae2edd51c..614ece98498 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -190,6 +190,22 @@
var/new_ore_type = pickweight(mineralSpawnChanceList)
set_ore(new_ore_type)
+/turf/simulated/mineral/random/space
+ mineralSpawnChanceList = list(
+ /datum/ore/iron = 40,
+ /datum/ore/plasma = 20,
+ /datum/ore/silver = 12,
+ /datum/ore/titanium = 11,
+ /datum/ore/gold = 10,
+ /datum/ore/uranium = 5,
+ /datum/ore/gibtonite = 4,
+ /datum/ore/bluespace = 1,
+ /datum/ore/diamond = 1,
+ /datum/ore/platinum = 3,
+ /datum/ore/palladium = 3,
+ /datum/ore/iridium = 3
+ )
+
/turf/simulated/mineral/ancient
name = "ancient rock"
desc = "A rare asteroid rock that appears to be resistant to all mining tools except pickaxes!"
@@ -286,6 +302,22 @@
/datum/ore/bluespace = 20,
)
+/turf/simulated/mineral/random/high_chance/space
+ color = COLOR_YELLOW
+ mineralChance = 25
+ mineralSpawnChanceList = list(
+ /datum/ore/silver = 50,
+ /datum/ore/plasma = 50,
+ /datum/ore/gold = 45,
+ /datum/ore/titanium = 45,
+ /datum/ore/uranium = 35,
+ /datum/ore/diamond = 30,
+ /datum/ore/bluespace = 20,
+ /datum/ore/platinum = 25,
+ /datum/ore/palladium = 25,
+ /datum/ore/iridium = 25
+ )
+
/turf/simulated/mineral/random/high_chance/clown
mineralChance = 40
mineralSpawnChanceList = list(
@@ -334,6 +366,24 @@
/datum/ore/bluespace = 1,
)
+/turf/simulated/mineral/random/low_chance/space
+ color = COLOR_VIOLET
+ mineralChance = 6
+ mineralSpawnChanceList = list(
+ /datum/ore/iron = 40,
+ /datum/ore/plasma = 15,
+ /datum/ore/silver = 6,
+ /datum/ore/gold = 4,
+ /datum/ore/titanium = 4,
+ /datum/ore/gibtonite = 2,
+ /datum/ore/uranium = 2,
+ /datum/ore/diamond = 1,
+ /datum/ore/bluespace = 1,
+ /datum/ore/platinum = 1,
+ /datum/ore/palladium = 1,
+ /datum/ore/iridium = 1
+ )
+
/turf/simulated/mineral/random/volcanic
environment_type = "basalt"
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm
index e4df3e5dcf1..1c37334b5dd 100644
--- a/code/modules/client/preference/character.dm
+++ b/code/modules/client/preference/character.dm
@@ -1176,6 +1176,20 @@
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
+ if(JOB_SMITH)
+ clothes_s = new /icon('icons/mob/clothing/under/cargo.dmi', "smith_s")
+ clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "smith"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "smithing"), ICON_OVERLAY)
+ has_gloves = TRUE
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/clothing/head/softcap.dmi', "smithsoft"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY)
if(JOB_MINER)
clothes_s = new /icon('icons/mob/clothing/under/cargo.dmi', "explorer_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "explorer"), ICON_UNDERLAY)
@@ -2051,7 +2065,7 @@
return(job_support_high || job_support_med || job_support_low || job_medsci_high || job_medsci_med || job_medsci_low || job_engsec_high || job_engsec_med || job_engsec_low)
-/datum/character_save/proc/SetChoices(mob/user, limit = 17, list/splitJobs = list("Head of Security", "Bartender"), widthPerColumn = 400, height = 700)
+/datum/character_save/proc/SetChoices(mob/user, limit = 17, list/splitJobs = list("Head of Security", "Quartermaster"), widthPerColumn = 400, height = 700)
if(!SSjobs)
return
@@ -2192,7 +2206,7 @@
html += "[prefLevelLabel]"
html += ""
-
+ index += 1
for(var/i in 1 to limit - index) // Finish the column so it is even
html += "| | |
"
diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm
index 3ad597f09bb..9debe847bc0 100644
--- a/code/modules/client/preference/loadout/loadout_suit.dm
+++ b/code/modules/client/preference/loadout/loadout_suit.dm
@@ -111,6 +111,11 @@
path = /obj/item/clothing/suit/jacket/bomber/expedition
allowed_roles = list("Quartermaster", "Explorer")
+/datum/gear/suit/bomber/job/smith
+ display_name = "Bomber jacket, smith"
+ path = /obj/item/clothing/suit/jacket/bomber/smith
+ allowed_roles = list("Quartermaster", "Smith")
+
/datum/gear/suit/bomber/job/engi
display_name = "Bomber jacket, engineering"
path = /obj/item/clothing/suit/jacket/bomber/engi
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index eab00980d10..cfa2050e02c 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -768,11 +768,17 @@
var/max_suit_w = WEIGHT_CLASS_BULKY
///How long to break out of the suits
var/breakouttime
+ /// How many inserts can you put into the suit
+ var/insert_max = 1
+ /// Currently applied inserts
+ var/list/inserts = list()
/obj/item/clothing/suit/Initialize(mapload)
. = ..()
setup_shielding()
+ RegisterSignal(src, COMSIG_INSERT_ATTACH, PROC_REF(attach_insert))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(detach_insert))
/**
* Wrapper proc to apply shielding through AddComponent().
@@ -783,6 +789,12 @@
/obj/item/clothing/suit/proc/setup_shielding()
return
+/obj/item/clothing/suit/examine(mob/user)
+ . = ..()
+ if(length(inserts))
+ . += "Has [length(inserts)] inserts attached."
+ . += "Inserts can be removed with Alt-Click."
+
///Hierophant card shielding. Saves me time.
/obj/item/clothing/suit/proc/setup_hierophant_shielding()
var/datum/component/shielded/shield = GetComponent(/datum/component/shielded)
@@ -869,6 +881,46 @@
/obj/item/clothing/suit/proc/special_overlays() // Does it have special overlays when worn?
return FALSE
+/obj/item/clothing/suit/attackby__legacy__attackchain(obj/item/I, mob/living/user, params)
+ ..()
+ if(istype(I, /obj/item/smithed_item/insert))
+ SEND_SIGNAL(src, COMSIG_INSERT_ATTACH, I, user)
+
+/obj/item/clothing/suit/proc/detach_insert(atom/source, mob/user)
+ SIGNAL_HANDLER // COMSIG_CLICK_ALT
+ if(!Adjacent(user))
+ return
+ if(!length(inserts))
+ to_chat(user, "Your suit has no inserts to remove.")
+ return
+ INVOKE_ASYNC(src, PROC_REF(finish_detach_insert), user)
+
+/obj/item/clothing/suit/proc/finish_detach_insert(mob/user)
+ var/obj/item/smithed_item/insert/old_insert
+ if(length(inserts) == 1)
+ old_insert = inserts[1]
+ else
+ old_insert = tgui_input_list(user, "Select an insert", src, inserts)
+ if(!istype(old_insert, /obj/item/smithed_item/insert))
+ return
+ old_insert.on_detached()
+ user.put_in_hands(old_insert)
+
+/obj/item/clothing/suit/proc/attach_insert(obj/source_item, obj/item/smithed_item/insert/new_insert, mob/user)
+ SIGNAL_HANDLER // COMSIG_INSERT_ATTACH
+ if(!Adjacent(user))
+ return
+ if(!istype(new_insert))
+ return
+ if(length(inserts) == insert_max)
+ to_chat(user, "Your suit has no slots to add an insert.")
+ return
+ if(new_insert.flags & NODROP || !user.transfer_item_to(new_insert, src))
+ to_chat(user, "[new_insert] is stuck to your hand!")
+ return
+ inserts += new_insert
+ new_insert.on_attached(src)
+
/obj/item/clothing/suit/proc/resist_restraints(mob/living/carbon/user, break_restraints)
var/effective_breakout_time = breakouttime
if(break_restraints)
@@ -945,6 +997,7 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
+ insert_max = 0 // No inserts for space suits
//////////////////////////////
// MARK: UNDER CLOTHES
diff --git a/code/modules/clothing/gloves/misc_gloves.dm b/code/modules/clothing/gloves/misc_gloves.dm
index 956d8254e7d..2ebd0997b51 100644
--- a/code/modules/clothing/gloves/misc_gloves.dm
+++ b/code/modules/clothing/gloves/misc_gloves.dm
@@ -98,6 +98,22 @@
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi'
)
+/obj/item/clothing/gloves/smithing
+ name = "smithing gloves"
+ desc = "Heatproof gloves designed for safely handling hot tools and even hotter metal."
+ icon_state = "smithing"
+ item_state = "smithing"
+ cold_protection = HANDS
+ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+ heat_protection = HANDS
+ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+ sprite_sheets = list(
+ "Human" = 'icons/mob/clothing/hands.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi'
+ )
/obj/item/clothing/gloves/handwraps
name = "cloth handwraps"
diff --git a/code/modules/clothing/head/beret.dm b/code/modules/clothing/head/beret.dm
index 55518efad77..c69af0d10c4 100644
--- a/code/modules/clothing/head/beret.dm
+++ b/code/modules/clothing/head/beret.dm
@@ -178,6 +178,17 @@
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi'
)
+/obj/item/clothing/head/beret/smith
+ name = "smith's beret"
+ desc = "A brown beret with a black insignia emblazoned on it. Won't help you against the atmosphere of the planet, but will look stylish."
+ icon_state = "beret_smith"
+ item_color = "beret_smith"
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
+ )
+
//NT Career Trainer
/obj/item/clothing/head/beret/nct/black
name = "\improper NT Career Trainer's beret"
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index c9b4e67ed17..64f554c6555 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -111,6 +111,13 @@
item_color = "expedition"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
+/obj/item/clothing/head/soft/smith
+ name = "smith's cap"
+ desc = "It's a brown baseball hat with a black smithing shield."
+ icon_state = "smithsoft"
+ item_color = "smith"
+ dog_fashion = /datum/dog_fashion/head/smith
+
/obj/item/clothing/head/soft/janitorgrey
name = "grey janitor's cap"
desc = "It's a grey baseball hat with a purple custodial shield."
diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm
index b5b8d0cadba..ca109007689 100644
--- a/code/modules/clothing/shoes/misc_shoes.dm
+++ b/code/modules/clothing/shoes/misc_shoes.dm
@@ -238,6 +238,17 @@
knife_slot = TRUE
dyeable = FALSE
+/obj/item/clothing/shoes/workboots/smithing
+ name = "smithing boots"
+ desc = "Steel-toed smithing boots to designed to protect the feet against both heavy objects and hot metal."
+ icon_state = "smith"
+ resistance_flags = FIRE_PROOF
+ cold_protection = FEET|LEGS
+ min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
+ heat_protection = FEET|LEGS
+ max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
+ dyeable = FALSE
+
/obj/item/clothing/shoes/winterboots
name = "winter boots"
desc = "Boots lined with 'synthetic' animal fur."
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index c917e38e961..1ae34482e3f 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -199,6 +199,12 @@
item_state = "expedition_envirohelm"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 150)
+/obj/item/clothing/head/helmet/space/plasmaman/smith
+ name = "smithing plasma envirosuit helmet"
+ desc = "A plasmaman helmet design for smiths."
+ icon_state = "smith_envirohelm"
+ item_state = "smith_envirohelm"
+
/obj/item/clothing/head/helmet/space/plasmaman/chaplain
name = "chaplain's plasma envirosuit helmet"
desc = "An envirohelmet specially designed for only the most pious of plasmamen."
diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm
index 3bb60b963d8..a214e418b36 100644
--- a/code/modules/clothing/suits/armor_suits.dm
+++ b/code/modules/clothing/suits/armor_suits.dm
@@ -156,6 +156,7 @@
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
strip_delay = 80
+ insert_max = 2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
@@ -214,6 +215,7 @@
dog_fashion = null
resistance_flags = FIRE_PROOF
allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/fancy/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun/energy, /obj/item/gun/projectile)
+ insert_max = 3
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
@@ -406,6 +408,7 @@
actions_types = list(/datum/action/item_action/toggle)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
hit_reaction_chance = 50
+ insert_max = 2
/// The cell reactive armor uses.
var/obj/item/stock_parts/cell/emproof/reactive/cell
/// Cost multiplier for armor. "Stronger" armors use 200 charge, other armors use 120.
@@ -709,6 +712,7 @@
sprite_sheets = null
armor = list(MELEE = 200, BULLET = 200, LASER = 50, ENERGY = 50, BOMB = INFINITY, RAD = INFINITY, FIRE = 450, ACID = 450)
flags_2 = RAD_PROTECT_CONTENTS_2
+ insert_max = 5
/obj/item/clothing/suit/armor/heavy
name = "heavy armor"
diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm
index 5fd8bd0a31b..0149b04393d 100644
--- a/code/modules/clothing/suits/job_suits.dm
+++ b/code/modules/clothing/suits/job_suits.dm
@@ -29,6 +29,24 @@
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
+// Smith
+/obj/item/clothing/suit/apron/smith
+ name = "smith's apron"
+ desc = "A black, heat-treated apron for use while smelting."
+ icon = 'icons/obj/clothing/suits/utility.dmi'
+ icon_state = "smith_apron"
+ item_state = "smith_apron"
+ icon_override = 'icons/mob/clothing/suits/utility.dmi'
+ allowed = list(/obj/item/hammer, /obj/item/smithing_cast, /obj/item/smithed_item, /obj/item/stack/sheet, /obj/item/stack/tile/brass)
+ resistance_flags = FIRE_PROOF
+ insert_max = 3
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/clothing/species/drask/suits/utility.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suits/utility.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/suits/utility.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/suits/utility.dmi'
+ )
+
//Chaplain
/obj/item/clothing/suit/hooded/chaplain_hoodie
name = "chaplain hoodie"
@@ -164,6 +182,7 @@
armor = list(MELEE = 15, BULLET = 5, LASER = 15, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 0, ACID = 40)
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ insert_max = 2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
@@ -252,6 +271,7 @@
item_state = "hopcoat"
allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic, /obj/item/kitchen/knife/combat)
armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50)
+ insert_max = 2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
@@ -267,6 +287,7 @@
item_state = "qmcoat"
allowed = list(/obj/item/paper, /obj/item/clipboard, /obj/item/gun/energy/kinetic_accelerator, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic, /obj/item/melee/knuckleduster, /obj/item/rcs)
armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50)
+ insert_max = 2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
@@ -285,6 +306,7 @@
ignore_suitadjust = 0
actions_types = list(/datum/action/item_action/button)
adjust_flavour = "unbutton"
+ insert_max = 2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
@@ -301,6 +323,7 @@
body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS
allowed = list(/obj/item/storage/fancy/cigarettes, /obj/item/stack/spacecash, /obj/item/flash, /obj/item/gavelhammer)
flags_inv = HIDEJUMPSUIT
+ insert_max = 2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 4c535d35c15..cbcf532ea21 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -22,6 +22,7 @@
desc = "Bluer than the standard model."
icon_state = "labcoat_cmo_open"
item_state = "labcoat_cmo_open"
+ insert_max = 2
/obj/item/clothing/suit/storage/labcoat/mad
name = "mad scientist's labcoat"
@@ -87,6 +88,7 @@
desc = "More purple than the standard model."
icon_state = "labcoat_rd_open"
item_state = "labcoat_rd_open"
+ insert_max = 2
/obj/item/clothing/suit/storage/labcoat/hydro
name = "hydroponics labcoat"
diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm
index 75a9570a9ce..9ef9812dbf6 100644
--- a/code/modules/clothing/suits/misc_suits.dm
+++ b/code/modules/clothing/suits/misc_suits.dm
@@ -19,6 +19,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO
allowed = list (/obj/item/gun/energy/laser/tag/blue)
resistance_flags = NONE
+ insert_max = 0
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
@@ -47,6 +48,7 @@
desc = "Yarr."
icon_state = "pirate_old"
item_state = "pirate_old"
+ insert_max = 0
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
@@ -57,6 +59,7 @@
desc = "Yarr."
icon_state = "pirate"
item_state = "pirate"
+ insert_max = 0
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
@@ -67,7 +70,7 @@
desc = "Yarr."
icon_state = "hgpirate"
item_state = "hgpirate"
-
+ insert_max = 0
/obj/item/clothing/suit/cyborg_suit
name = "cyborg suit"
@@ -78,14 +81,14 @@
flags = CONDUCT
fire_resist = T0C+5200
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
+ insert_max = 0
/obj/item/clothing/suit/johnny_coat
name = "johnny~~ coat"
desc = "Johnny~~"
icon_state = "johnny"
item_state = "johnny"
-
+ insert_max = 0
/obj/item/clothing/suit/justice
name = "justice suit"
@@ -93,7 +96,7 @@
icon_state = "justice"
item_state = "justice"
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
+ insert_max = 0
/obj/item/clothing/suit/judgerobe
name = "judge's robe costume"
@@ -103,7 +106,7 @@
body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS
allowed = list(/obj/item/storage/fancy/cigarettes,/obj/item/stack/spacecash)
flags_inv = HIDEJUMPSUIT
-
+ insert_max = 0
/obj/item/clothing/suit/wcoat
name = "waistcoat"
@@ -112,6 +115,7 @@
item_state = "wcoat"
blood_overlay_type = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
+ insert_max = 0
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
@@ -134,6 +138,7 @@
allowed = list(/obj/item/flashlight,/obj/item/tank/internals/emergency_oxygen,/obj/item/toy)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
resistance_flags = NONE
+ insert_max = 0
sprite_sheets = list(
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
@@ -149,7 +154,7 @@
item_state = "hastur"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDESHOES|HIDEJUMPSUIT
-
+ insert_max = 0
/obj/item/clothing/suit/imperium_monk
name = "imperium monk"
@@ -159,6 +164,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDESHOES|HIDEJUMPSUIT
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ insert_max = 0
/obj/item/clothing/suit/chickensuit
name = "chicken suit"
@@ -167,6 +173,7 @@
item_state = "chickensuit"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET
flags_inv = HIDESHOES|HIDEJUMPSUIT
+ insert_max = 0
/obj/item/clothing/suit/corgisuit
name = "corgi suit"
@@ -176,6 +183,7 @@
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET
flags_inv = HIDEJUMPSUIT
dog_fashion = /datum/dog_fashion/back
+ insert_max = 0
/obj/item/clothing/suit/corgisuit/en
name = "super-hero E-N suit"
@@ -216,7 +224,7 @@
item_state = "monkeysuit"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
+ insert_max = 0
/obj/item/clothing/suit/holidaypriest
name = "holiday priest"
@@ -226,6 +234,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ insert_max = 0
/obj/item/clothing/suit/snowman
name = "snowman outfit"
@@ -234,6 +243,7 @@
item_state = "snowman"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
flags_inv = HIDEJUMPSUIT
+ insert_max = 0
/obj/item/clothing/suit/poncho
name = "poncho"
@@ -263,6 +273,7 @@
icon_state = "ponchoshame"
item_state = "ponchoshame"
flags = NODROP
+ insert_max = 0
/obj/item/clothing/suit/hooded/carp_costume
name = "carp costume"
@@ -274,6 +285,7 @@
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT //Space carp like space, so you should too
allowed = list(/obj/item/tank/internals/emergency_oxygen)
hoodtype = /obj/item/clothing/head/hooded/carp_hood
+ insert_max = 0
/obj/item/clothing/head/hooded/carp_hood
name = "carp hood"
@@ -294,6 +306,7 @@
flags = STOPSPRESSUREDMAGE
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
hoodtype = /obj/item/clothing/head/hooded/carp_hood/dragon
+ insert_max = 1
/obj/item/clothing/suit/hooded/carp_costume/dragon/equipped(mob/user, slot, initial)
. = ..()
@@ -330,6 +343,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list(/obj/item/fish/salmon, /obj/item/fish_eggs/salmon)
hoodtype = /obj/item/clothing/head/hooded/salmon_hood
+ insert_max = 0
/obj/item/clothing/head/hooded/salmon_hood
name = "salmon hood"
@@ -349,6 +363,7 @@
flags = THICKMATERIAL
hoodtype = /obj/item/clothing/head/hooded/bee_hood
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
+ insert_max = 0
/obj/item/clothing/head/hooded/bee_hood
name = "bee hood"
@@ -366,6 +381,7 @@
icon_state = "lingspacesuit"
item_state = "lingspacesuit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ insert_max = 0
/// Bleh!
/obj/item/clothing/suit/draculacoat
@@ -373,6 +389,7 @@
desc = "What is a spessman? A miserable little pile of secrets."
icon_state = "draculacoat"
item_state = "draculacoat"
+ insert_max = 0
/*
* Winter Coats
@@ -437,6 +454,7 @@
item_state = "pimpcoat_tan"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, RAD = 0, FIRE = 15, ACID = 50)
allowed = list(/obj/item/paper, /obj/item/clipboard, /obj/item/gun/energy/kinetic_accelerator, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic, /obj/item/melee/knuckleduster, /obj/item/rcs)
+ insert_max = 3
/obj/item/clothing/suit/furcoat
name = "fur coat"
@@ -460,6 +478,7 @@
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
+ insert_max = 3
/obj/item/clothing/head/hooded/winterhood/captain
icon_state = "winterhood_captain"
@@ -741,6 +760,7 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
strip_delay = 60
breakouttime = 3000
+ insert_max = 0
/obj/item/clothing/suit/straight_jacket/equipped(mob/living/carbon/human/user, slot)
. = ..()
@@ -862,6 +882,7 @@
item_state = "xenos_helm"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+ insert_max = 0
/obj/item/clothing/suit/storage/mercy_hoodie
name = "mercy robe"
@@ -1090,6 +1111,14 @@
item_state = "bomberexpedition"
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/energy/kinetic_accelerator, /obj/item/t_scanner/adv_mining_scanner, /obj/item/shovel, /obj/item/pickaxe, /obj/item/storage/bag/ore, /obj/item/gps)
+/obj/item/clothing/suit/jacket/bomber/smith
+ name = "smithing bomber jacket"
+ desc = "A stylish jacket that has extra internal pockets for inserts."
+ icon_state = "bombersmith"
+ item_state = "bombersmith"
+ insert_max = 3
+ allowed = list(/obj/item/hammer, /obj/item/smithing_cast, /obj/item/smithed_item, /obj/item/stack/sheet, /obj/item/stack/tile/brass)
+
/obj/item/clothing/suit/jacket/bomber/hydro
name = "hydroponics bomber jacket"
desc = "A stylish choice for the workers of the hydroponics lab."
@@ -1191,7 +1220,7 @@
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 15, ACID = 15)
allowed = list(/obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/flashlight/seclite)
actions_types = list(/datum/action/item_action/toggle_wings)
-
+ insert_max = 0
/obj/item/clothing/suit/toggle/owlwings/griffinwings
name = "griffon cloak"
@@ -1215,6 +1244,7 @@
icon_state = "lordadmiral"
item_state = "lordadmiral"
allowed = list (/obj/item/gun)
+ insert_max = 0
/obj/item/clothing/suit/fluff/noble_coat
name = "noble coat"
@@ -1223,7 +1253,7 @@
icon_state = "noble_coat"
item_state = "noble_coat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-
+ insert_max = 0
///Advanced Protective Suit, AKA, God Mode in wearable form.
@@ -1246,6 +1276,7 @@
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
slowdown = -10
siemens_coefficient = 0
+ insert_max = 5
var/on = FALSE
/obj/item/clothing/suit/advanced_protective_suit/Destroy()
@@ -1357,6 +1388,7 @@
w_class = WEIGHT_CLASS_TINY
flags = BLOCKHAIR
flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE
+ insert_max = 0
/obj/item/clothing/neck/cloak/furcape
name = "fur cape"
diff --git a/code/modules/clothing/suits/suit_storage.dm b/code/modules/clothing/suits/suit_storage.dm
index 2e1839c32b7..d758f9cd13b 100644
--- a/code/modules/clothing/suits/suit_storage.dm
+++ b/code/modules/clothing/suits/suit_storage.dm
@@ -31,6 +31,7 @@
pockets?.update_viewers()
/obj/item/clothing/suit/storage/AltClick(mob/user)
+ ..()
if(ishuman(user) && Adjacent(user) && !user.incapacitated(FALSE, TRUE))
pockets?.open(user)
add_fingerprint(user)
@@ -45,6 +46,9 @@
return ..()
/obj/item/clothing/suit/storage/attackby__legacy__attackchain(obj/item/W as obj, mob/user as mob, params)
+ // Inserts shouldn't be added into the inventory of the pockets if they're attaching.
+ if(istype(W, /obj/item/smithed_item/insert) && length(inserts) != insert_max)
+ return ..()
..()
return pockets?.attackby__legacy__attackchain(W, user, params)
@@ -64,8 +68,10 @@
var/list/L = list()
- L += src.contents
+ for(var/obj/item/I in src.contents)
+ if(!istype(I, /obj/item/smithed_item/insert)) // We don't want people to pull inserts out without calling the proper signals, so they shouldn't be displayed in storage.
+ L += I
for(var/obj/item/storage/S in src)
L += S.return_inv()
for(var/obj/item/gift/G in src)
diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm
index 79fd2cafea2..bf5a689384e 100644
--- a/code/modules/clothing/under/jobs/cargo.dm
+++ b/code/modules/clothing/under/jobs/cargo.dm
@@ -109,3 +109,24 @@
icon_state = "expedition_overalls"
item_state = "expedition_overalls"
item_color = "expedition_overalls"
+
+/obj/item/clothing/under/rank/cargo/smith
+ name = "smith's jumpsuit"
+ desc = "A brown jumpsuit with some extra metal pieces strapped to it. You're not sure why, but the added armor doesn't make you feel any safer..."
+ icon_state = "smith"
+ item_state = "smith"
+ item_color = "smith"
+
+/obj/item/clothing/under/rank/cargo/smith/skirt
+ name = "smith's jumpskirt"
+ desc = "A brown jumpskirt with some extra metal pieces strapped to it. You're not sure why, but the added armor doesn't make you feel any safer..."
+ icon_state = "smith_skirt"
+ item_state = "smith_skirt"
+ item_color = "smith_skirt"
+
+/obj/item/clothing/under/rank/cargo/smith/overalls
+ name = "smith's overalls"
+ desc = "A brown set of overalls over a black turtleneck, designed with thinner materials to keep the wearer cool in the heat of the forge."
+ icon_state = "smith_overalls"
+ item_state = "smith_overalls"
+ item_color = "smith_overalls"
diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
index b7fa92dcbcc..4ef367e37e2 100644
--- a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
+++ b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm
@@ -19,6 +19,12 @@
item_state = "explorer_envirosuit"
item_color = "explorer_envirosuit"
+/obj/item/clothing/under/plasmaman/smith
+ name = "smith envirosuit"
+ desc = "An airtight brown and black suit designed for safety around hot metal for plasmamen."
+ icon_state = "smith_envirosuit"
+ item_state = "smith_envirosuit"
+ item_color = "smith_envirosuit"
/obj/item/clothing/under/plasmaman/chef
name = "chef's plasma envirosuit"
diff --git a/code/modules/crafting/smithed_items.dm b/code/modules/crafting/smithed_items.dm
new file mode 100644
index 00000000000..69ddec251f1
--- /dev/null
+++ b/code/modules/crafting/smithed_items.dm
@@ -0,0 +1,1198 @@
+/obj/item/smithing_cast
+ name = "smithing cast"
+ icon = 'icons/obj/smithing.dmi'
+ icon_state = "debug"
+ desc = "Debug smithing cast. If you see this, notify the development team."
+ w_class = WEIGHT_CLASS_SMALL
+ /// The selected final product of the item
+ var/obj/item/selected_product
+ /// Possible products of the item
+ var/list/possible_products = list()
+ /// How many products are we smelting at any given operation?
+ var/amount_to_make = 1
+
+ new_attack_chain = TRUE
+
+/obj/item/smithing_cast/Initialize(mapload)
+ . = ..()
+ populate_products()
+
+/obj/item/smithing_cast/examine(mob/user)
+ . = ..()
+ . += "It is currently configured to make [amount_to_make == 1 ? "a" : "[amount_to_make]"] [selected_product.name][amount_to_make == 1 ? "" : "s"]."
+ . += "You can select the desired product by using [src] in your hand."
+
+/obj/item/smithing_cast/activate_self(mob/user)
+ . = ..()
+ if(!possible_products)
+ return
+ var/list/product_names = list()
+ var/product
+ for(product in possible_products)
+ var/obj/item/possible_product = product
+ product_names[possible_product.name] = possible_product
+ var/new_product = tgui_input_list(user, "Select a product", src, product_names)
+ if(!new_product)
+ selected_product = possible_products[1]
+ else
+ selected_product = product_names[new_product]
+
+/obj/item/smithing_cast/update_desc()
+ return ..()
+
+/obj/item/smithing_cast/proc/populate_products()
+ return
+
+/obj/item/smithing_cast/sheet
+ name = "sheet cast"
+ icon_state = "sheet_cast"
+ desc = "A cast for forging molten minerals into workable sheets."
+
+/obj/item/smithing_cast/sheet/examine(mob/user)
+ . = ..()
+ . += "You can change the amount of sheets smelted by alt-clicking [src]."
+
+/obj/item/smithing_cast/sheet/populate_products()
+ possible_products = list(/obj/item/stack/sheet/metal,
+ /obj/item/stack/sheet/glass,
+ /obj/item/stack/sheet/mineral/silver,
+ /obj/item/stack/sheet/mineral/gold,
+ /obj/item/stack/sheet/mineral/plasma,
+ /obj/item/stack/sheet/mineral/uranium,
+ /obj/item/stack/sheet/mineral/diamond,
+ /obj/item/stack/ore/bluespace_crystal/refined,
+ /obj/item/stack/sheet/mineral/titanium,
+ /obj/item/stack/sheet/plasmaglass,
+ /obj/item/stack/sheet/titaniumglass,
+ /obj/item/stack/sheet/plasteel,
+ /obj/item/stack/sheet/mineral/plastitanium,
+ /obj/item/stack/sheet/plastitaniumglass,
+ /obj/item/stack/sheet/mineral/bananium,
+ /obj/item/stack/sheet/mineral/tranquillite,
+ /obj/item/stack/sheet/mineral/platinum,
+ /obj/item/stack/sheet/mineral/palladium,
+ /obj/item/stack/sheet/mineral/iridium,
+ /obj/item/stack/tile/brass
+ )
+ if(length(possible_products))
+ selected_product = possible_products[1]
+
+/obj/item/smithing_cast/sheet/AltClick(mob/user)
+ . = ..()
+ if(!Adjacent(user))
+ return
+ amount_to_make = tgui_input_number(user, "Select an amount (1-50)", src, 1, 50, 1)
+
+/obj/item/smithing_cast/component
+ name = "component cast"
+ desc = "Debug component cast. If you see this, notify the development team."
+ /// The selected quality of the item
+ var/datum/smith_quality/quality = /datum/smith_quality
+ /// The type of product
+ var/product_type
+
+/obj/item/smithing_cast/component/examine(mob/user)
+ . = ..()
+ . += "The current selected quality is [quality.name]."
+ . += "You can change the quality of the product by alt-clicking [src]."
+
+/obj/item/smithing_cast/component/AltClick(mob/user)
+ . = ..()
+ if(!Adjacent(user))
+ return
+ var/list/quality_name_list = list()
+ var/list/quality_type_list = typesof(/datum/smith_quality)
+ var/quality_type
+ for(quality_type in quality_type_list)
+ var/datum/smith_quality/new_quality = quality_type
+ quality_name_list[new_quality.name] = new_quality
+ var/selected_quality = tgui_input_list(user, "Select a quality", src, quality_name_list)
+ if(!selected_quality)
+ quality = quality_type_list[1]
+ else
+ quality = quality_name_list[selected_quality]
+
+/obj/item/smithing_cast/component/populate_products()
+ possible_products = (typesof(product_type) - list(product_type))
+ if(length(possible_products))
+ selected_product = possible_products[1]
+
+/obj/item/smithing_cast/component/insert_frame
+ name = "insert frame cast"
+ icon_state = "insert_frame_cast"
+ desc = "A cast for creating insert frames."
+ product_type = /obj/item/smithed_item/component/insert_frame
+
+/obj/item/smithing_cast/component/insert_lining
+ name = "insert lining cast"
+ icon_state = "insert_lining_cast"
+ desc = "A cast for creating insert linings."
+ product_type = /obj/item/smithed_item/component/insert_lining
+
+/obj/item/smithing_cast/component/bit_mount
+ name = "bit mount cast"
+ icon_state = "bit_mount_cast"
+ desc = "A cast for creating bit mounts."
+ product_type = /obj/item/smithed_item/component/bit_mount
+
+/obj/item/smithing_cast/component/bit_head
+ name = "bit head cast"
+ icon_state = "bit_head_cast"
+ desc = "A cast for creating bit heads."
+ product_type = /obj/item/smithed_item/component/bit_head
+
+/obj/item/smithing_cast/component/lens_frame
+ name = "lens frame cast"
+ icon_state = "lens_frame_cast"
+ desc = "A cast for creating lens frames."
+ product_type = /obj/item/smithed_item/component/lens_frame
+
+/obj/item/smithing_cast/component/lens_focus
+ name = "lens focus cast"
+ icon_state = "lens_focus_cast"
+ desc = "A cast for creating lens foci."
+ product_type = /obj/item/smithed_item/component/lens_focus
+
+/obj/item/smithing_cast/component/trim
+ name = "trim cast"
+ icon_state = "trim_cast"
+ desc = "A cast for creating trims."
+ product_type = /obj/item/smithed_item/component/trim
+
+/obj/item/smithed_item
+ name = "Debug smithed item"
+ icon = 'icons/obj/smithing.dmi'
+ icon_state = "debug"
+ desc = "Debug smithed item. If you see this, notify the development team."
+ w_class = WEIGHT_CLASS_SMALL
+ /// The quality of the item
+ var/datum/smith_quality/quality
+ /// The material of the item
+ var/datum/smith_material/material
+
+ new_attack_chain = TRUE
+
+/obj/item/smithed_item/Initialize(mapload)
+ . = ..()
+ set_name()
+
+/obj/item/smithed_item/update_name()
+ . = ..()
+ set_name()
+
+/obj/item/smithed_item/proc/on_attached(mob/user, obj/item/target)
+ return
+
+/obj/item/smithed_item/proc/on_detached(mob/user)
+ return
+
+/obj/item/smithed_item/proc/set_stats()
+ return
+
+/obj/item/smithed_item/proc/set_name()
+ if(!quality)
+ return
+ if(!material)
+ name = "[quality.name] " + name
+ return
+ name = "[quality.name] [material.name] [initial(name)]"
+
+// Inserts
+
+/obj/item/smithed_item/insert
+ name = "debug insert"
+ icon_state = "insert"
+ desc = "Debug insert. If you see this, notify the development team."
+ /// Brute armor
+ var/brute_armor = 0
+ /// Burn armor
+ var/burn_armor = 0
+ /// Laser armor
+ var/laser_armor = 0
+ /// Explosive armor
+ var/explosive_armor = 0
+ /// Movement speed
+ var/movement_speed_mod = 0
+ /// Used in the mobility insert - does this negate slowdown
+ var/no_more_slowdown = FALSE
+ /// Heat insulation
+ var/heat_insulation = 0
+ /// Electrical insulation
+ var/siemens_coeff = 0.0
+ /// Radiation armor
+ var/radiation_armor = 0
+ /// The suit the insert is attached to
+ var/obj/item/clothing/suit/attached_suit
+
+/obj/item/smithed_item/insert/set_stats()
+ brute_armor = initial(brute_armor) * quality.stat_mult * material.brute_armor_mult
+ burn_armor = initial(burn_armor) * quality.stat_mult * material.burn_armor_mult
+ laser_armor = initial(laser_armor) * quality.stat_mult * material.laser_armor_mult
+ explosive_armor = initial(explosive_armor) * quality.stat_mult * material.explosive_armor_mult
+ movement_speed_mod = initial(movement_speed_mod) * quality.stat_mult * material.movement_speed_mod
+ heat_insulation = initial(heat_insulation) * quality.stat_mult * material.heat_insulation_mult
+ siemens_coeff = initial(siemens_coeff) * quality.stat_mult * material.siemens_coeff_mult
+ radiation_armor = initial(radiation_armor) * quality.stat_mult * material.radiation_armor_mult
+ armor = new /datum/armor(brute_armor, brute_armor, laser_armor, laser_armor, explosive_armor, radiation_armor, burn_armor, 0, 0)
+
+/obj/item/smithed_item/insert/on_attached(obj/item/clothing/suit/target)
+ if(!istype(target))
+ return
+ attached_suit = target
+ attached_suit.armor = attached_suit.armor.attachArmor(armor)
+ attached_suit.slowdown -= movement_speed_mod
+ attached_suit.siemens_coefficient -= siemens_coeff
+ attached_suit.min_cold_protection_temperature -= heat_insulation
+ attached_suit.max_heat_protection_temperature += heat_insulation
+ if(no_more_slowdown)
+ attached_suit.slowdown = 0
+
+/obj/item/smithed_item/insert/on_detached(mob/user)
+ attached_suit.armor = attached_suit.armor.detachArmor(armor)
+ if(no_more_slowdown)
+ attached_suit.slowdown = initial(attached_suit.slowdown)
+ attached_suit.slowdown += movement_speed_mod
+ attached_suit.siemens_coefficient += siemens_coeff
+ attached_suit.min_cold_protection_temperature += heat_insulation
+ attached_suit.max_heat_protection_temperature -= heat_insulation
+ attached_suit.inserts -= src
+ attached_suit = null
+
+/obj/item/smithed_item/insert/ballistic
+ name = "ballistic plate"
+ desc = "A reinforced plate designed to stop small-caliber bullets and kinetic impacts."
+ brute_armor = 10
+ explosive_armor = 10
+ heat_insulation = -10
+
+/obj/item/smithed_item/insert/thermal
+ name = "thermal plate"
+ desc = "A fragile plate designed to reduce heat exposure."
+ brute_armor = -10
+ burn_armor = 10
+ heat_insulation = 10
+
+/obj/item/smithed_item/insert/fireproofing
+ name = "fireproofing plate"
+ desc = "A heavy plate of asbestos designed to fireproof a user. A firefighter's godsend."
+ burn_armor = 10
+ movement_speed_mod = -0.2
+ heat_insulation = 20
+
+/obj/item/smithed_item/insert/reflective
+ name = "reflective plate"
+ desc = "A shiny plate that assists in laser deflection."
+ burn_armor = -10
+ laser_armor = 10
+ siemens_coeff = -0.2
+
+/obj/item/smithed_item/insert/rad_hazard
+ name = "radiation hazard plate"
+ desc = "A dense plate that can reduce a wearer's radiation exposure."
+ heat_insulation = -10
+ radiation_armor = 20
+
+/obj/item/smithed_item/insert/rubberized
+ name = "rubberized plate"
+ desc = "A flexible plate that is resistant to electrical shocks."
+ brute_armor = -10
+ siemens_coeff = 0.2
+
+/obj/item/smithed_item/insert/advanced
+ name = "advanced armor mesh"
+ desc = "An alloy mesh that can protect the wearer from most sources of damage."
+ brute_armor = 10
+ burn_armor = 10
+ laser_armor = 10
+ explosive_armor = 10
+ radiation_armor = 10
+ movement_speed_mod = -0.2
+
+/obj/item/smithed_item/insert/engineering
+ name = "engineering mesh"
+ desc = "An alloy mesh designed to assist in most work around electrical engines."
+ brute_armor = -10
+ burn_armor = 10
+ radiation_armor = 10
+ heat_insulation = 10
+ explosive_armor = 10
+ siemens_coeff = 0.4
+ movement_speed_mod = -0.2
+
+/obj/item/smithed_item/insert/heavy
+ name = "heavy duty plate"
+ desc = "An advanced plate often used in SWAT gear. Heavy, yet durable."
+ brute_armor = 20
+ burn_armor = 10
+ laser_armor = 10
+ explosive_armor = 10
+ heat_insulation = 10
+ siemens_coeff = -0.4
+ movement_speed_mod = -0.4
+
+/obj/item/smithed_item/insert/mobility
+ name = "mobility mesh"
+ desc = "An advanced alloy mesh that is both lightweight and invigorating to the wearer."
+ brute_armor = -5
+ burn_armor = -5
+ laser_armor = -5
+ heat_insulation = 10
+ no_more_slowdown = TRUE
+
+/obj/item/smithed_item/insert/admin
+ name = "adminium mesh"
+ desc = "A special mesh plate reserved exclusively for high-ranking central command personnel."
+ brute_armor = 50
+ burn_armor = 50
+ laser_armor = 50
+ radiation_armor = 50
+ heat_insulation = 50
+ movement_speed_mod = 1
+ siemens_coeff = 1
+ quality = /datum/smith_quality/masterwork
+ material = /datum/smith_material/platinum
+
+// Tool Bits
+
+/obj/item/smithed_item/tool_bit
+ name = "Debug tool bit"
+ icon_state = "bit"
+ desc = "Debug tool bit. If you see this, notify the development team."
+ /// Base Speed modifier
+ var/base_speed_mod = 0
+ /// Base Efficiency modifier
+ var/base_efficiency_mod = 0
+ /// Speed modifier
+ var/speed_mod = 1.0
+ /// Efficiency modifier
+ var/efficiency_mod = 1.0
+ /// Failure rate
+ var/failure_rate = 0
+ /// Size modifier
+ var/size_mod = 0
+ /// Durability
+ var/durability = 90
+ /// Max durability
+ var/max_durability = 90
+ /// The tool the bit is attached to
+ var/obj/item/attached_tool
+
+/obj/item/smithed_item/tool_bit/interact_with_atom(atom/target, mob/living/user, list/modifiers)
+ . = ..()
+ if(istype(target, /obj/item))
+ SEND_SIGNAL(target, COMSIG_BIT_ATTACH, src, user)
+ return ITEM_INTERACT_COMPLETE
+
+/obj/item/smithed_item/tool_bit/set_stats()
+ durability = initial(durability) * material.durability_mult
+ max_durability = durability
+ size_mod = initial(size_mod) + material.size_mod
+ speed_mod = 1 + (base_speed_mod * quality.stat_mult * material.tool_speed_mult)
+ failure_rate = initial(failure_rate) * quality.stat_mult * material.tool_failure_mult
+ efficiency_mod = 1 + (base_efficiency_mod * quality.stat_mult * material.power_draw_mult)
+
+/obj/item/smithed_item/tool_bit/on_attached(obj/item/target)
+ if(!istype(target))
+ return
+ attached_tool = target
+ attached_tool.w_class += size_mod
+ attached_tool.toolspeed = attached_tool.toolspeed * speed_mod
+ attached_tool.bit_failure_rate += failure_rate
+ attached_tool.bit_efficiency_mod = attached_tool.bit_efficiency_mod * efficiency_mod
+
+/obj/item/smithed_item/tool_bit/on_detached()
+ attached_tool.toolspeed = attached_tool.toolspeed / speed_mod
+ attached_tool.w_class -= size_mod
+ attached_tool.bit_failure_rate -= failure_rate
+ attached_tool.bit_efficiency_mod = attached_tool.bit_efficiency_mod / efficiency_mod
+ attached_tool.attached_bits -= src
+ attached_tool = null
+
+/obj/item/smithed_item/tool_bit/examine(mob/user)
+ . = ..()
+ var/healthpercent = (durability/max_durability) * 100
+ switch(healthpercent)
+ if(80 to 100)
+ . += "It looks pristine."
+ if(60 to 79)
+ . += "It looks slightly used."
+ if(40 to 59)
+ . += "It's seen better days."
+ if(20 to 39)
+ . += "It's been heavily used."
+ if(0 to 19)
+ . += "It's falling apart!"
+
+/obj/item/smithed_item/tool_bit/proc/damage_bit()
+ durability--
+ if(istype(attached_tool, /obj/item/rcd))
+ durability--
+ if(durability == 0)
+ break_bit()
+
+/obj/item/smithed_item/tool_bit/proc/break_bit()
+ on_detached()
+ qdel(src)
+
+/obj/item/smithed_item/tool_bit/speed
+ name = "speed bit"
+ desc = "A tool bit optimized for speed, at the cost of efficiency."
+ base_speed_mod = -0.2
+ failure_rate = 5
+ base_efficiency_mod = 0.1
+
+/obj/item/smithed_item/tool_bit/efficiency
+ name = "efficient bit"
+ desc = "A tool bit optimized for efficiency, at the cost of speed."
+ base_speed_mod = 0.2
+ base_efficiency_mod = -0.25
+
+/obj/item/smithed_item/tool_bit/balanced
+ name = "balanced bit"
+ desc = "A tool bit that's fairly balanced in all aspects."
+ base_speed_mod = -0.1
+ failure_rate = 2
+ base_efficiency_mod = -0.1
+
+/obj/item/smithed_item/tool_bit/heavy
+ name = "heavy duty bit"
+ desc = "A large, advanced tool bit that maximises speed."
+ base_speed_mod = -0.4
+ failure_rate = 10
+ base_efficiency_mod = 0.25
+ size_mod = 1
+ durability = 120
+
+/obj/item/smithed_item/tool_bit/economical
+ name = "economical bit"
+ desc = "An advanced tool bit that maximises efficiency."
+ base_speed_mod = 0.4
+ base_efficiency_mod = -0.45
+ durability = 60
+
+/obj/item/smithed_item/tool_bit/advanced
+ name = "advanced bit"
+ desc = "An advanced tool bit that's fairly balanced in all aspects."
+ base_speed_mod = -0.25
+ failure_rate = 2
+ base_efficiency_mod = -0.3
+
+/obj/item/smithed_item/tool_bit/admin
+ name = "adminium bit"
+ desc = "A hyper-advanced bit restricted to central command officials."
+ speed_mod = -1
+ efficiency_mod = 1
+ durability = 300
+ quality = /datum/smith_quality/masterwork
+ material = /datum/smith_material/platinum
+
+// lenses
+
+/obj/item/smithed_item/lens
+ name = "Debug lens"
+ icon_state = "lens"
+ desc = "Debug lens. If you see this, notify the development team."
+ /// Base laser speed multiplier
+ var/base_laser_speed_mult = 0
+ /// Base power draw multiplier
+ var/base_power_mult = 0
+ /// Base damage multiplier
+ var/base_damage_mult = 0
+ /// Base fire rate multiplier
+ var/base_fire_rate_mult = 0
+ /// Laser speed multiplier after construction
+ var/laser_speed_mult = 1
+ /// Power draw multiplier after construction
+ var/power_mult = 1
+ /// Damage multiplier after construction
+ var/damage_mult = 1
+ /// Fire rate multiplier after construction
+ var/fire_rate_mult = 1
+ /// lens durability
+ var/durability = 40
+ /// Max durability
+ var/max_durability = 40
+ /// The weapon the lens is attached to
+ var/obj/item/gun/energy/attached_gun
+
+/obj/item/smithed_item/lens/set_stats()
+ durability = initial(durability) * material.durability_mult
+ max_durability = durability
+ power_mult = 1 + (base_power_mult * quality.stat_mult * material.power_draw_mult)
+ damage_mult = 1 + (base_damage_mult * quality.stat_mult * material.projectile_damage_multiplier)
+ laser_speed_mult = 1 + (base_laser_speed_mult * quality.stat_mult * material.projectile_speed_mult)
+ fire_rate_mult = 1 + (base_fire_rate_mult * quality.stat_mult * material.fire_rate_multiplier)
+
+/obj/item/smithed_item/lens/on_attached(obj/item/gun/energy/target)
+ if(!istype(target))
+ return
+ attached_gun = target
+ attached_gun.fire_delay = attached_gun.fire_delay / fire_rate_mult
+ for(var/obj/item/ammo_casing/energy/casing in attached_gun.ammo_type)
+ casing.e_cost = casing.e_cost * power_mult
+ casing.lens_damage_multiplier = casing.lens_damage_multiplier * damage_mult
+ casing.lens_speed_multiplier = casing.lens_speed_multiplier / laser_speed_mult
+
+/obj/item/smithed_item/lens/on_detached()
+ attached_gun.fire_delay = attached_gun.fire_delay * fire_rate_mult
+ for(var/obj/item/ammo_casing/energy/casing in attached_gun.ammo_type)
+ casing.e_cost = casing.e_cost / power_mult
+ casing.lens_damage_multiplier = casing.lens_damage_multiplier / damage_mult
+ casing.lens_speed_multiplier = casing.lens_speed_multiplier * laser_speed_mult
+ attached_gun.current_lens = null
+ attached_gun = null
+
+/obj/item/smithed_item/lens/examine(mob/user)
+ . = ..()
+ var/healthpercent = (durability/max_durability) * 100
+ switch(healthpercent)
+ if(80 to 100)
+ . += "It looks pristine."
+ if(60 to 79)
+ . += "It looks slightly used."
+ if(40 to 59)
+ . += "It's seen better days."
+ if(20 to 39)
+ . += "It's been heavily used."
+ if(0 to 19)
+ . += "It's falling apart!"
+
+/obj/item/smithed_item/lens/proc/damage_lens()
+ durability--
+ if(durability <= 0)
+ break_lens()
+
+/obj/item/smithed_item/lens/proc/break_lens()
+ on_detached()
+ qdel(src)
+
+/obj/item/smithed_item/lens/accelerator
+ name = "accelerator lens"
+ desc = "A lens that accelerates energy beams to a higher velocity, using some of its own energy to propel it."
+ base_laser_speed_mult = 0.1
+ base_damage_mult = -0.1
+
+/obj/item/smithed_item/lens/speed
+ name = "speed lens"
+ desc = "A lens that cools the capacitors more efficiently, allowing for greater fire rate."
+ base_fire_rate_mult = 0.15
+ base_damage_mult = -0.1
+ durability = 30
+
+/obj/item/smithed_item/lens/amplifier
+ name = "amplifier lens"
+ desc = "A lens that increases the frequency of emitted beams, increasing their potency."
+ base_power_mult = 0.2
+ base_damage_mult = 0.1
+
+/obj/item/smithed_item/lens/efficiency
+ name = "efficiency lens"
+ desc = "A lens that optimizes the number of shots an energy weapon can take before running dry."
+ base_power_mult = -0.2
+ base_damage_mult = -0.1
+ durability = 80
+
+/obj/item/smithed_item/lens/rapid
+ name = "rapid lens"
+ desc = "An advanced lens that bypasses the heat capacitor entirely, allowing for unprecedented fire rates of low-power emissions."
+ base_fire_rate_mult = 0.5
+ base_laser_speed_mult = -0.1
+ base_damage_mult = -0.2
+ durability = 60
+
+/obj/item/smithed_item/lens/densifier
+ name = "densifier lens"
+ desc = "An advanced lens that keeps energy emissions in the barrel as long as possible, maximising impact at the cost of everything else."
+ base_fire_rate_mult = -0.4
+ base_laser_speed_mult = -0.4
+ base_damage_mult = 0.4
+ durability = 30
+
+/obj/item/smithed_item/lens/velocity
+ name = "velocity lens"
+ desc = "An advanced lens that forces energy emissions from the barrel as fast as possible, accelerating them to ludicrous speed."
+ base_laser_speed_mult = 0.5
+ base_damage_mult = -0.2
+ durability = 30
+
+/obj/item/smithed_item/lens/admin
+ name = "adminium lens"
+ desc = "A hyper-advanced lens restricted to high-ranking central command officials."
+ laser_speed_mult = 5
+ damage_mult = 5
+ fire_rate_mult = 5
+ power_mult = -0.5
+ durability = 3000
+ quality = /datum/smith_quality/masterwork
+ material = /datum/smith_material/platinum
+
+// Random Spawners
+/obj/item/smithed_item/random
+ name = "random smithed item"
+ desc = "If you see me please contact development because I should not exist."
+ /// Weighted list of possible item qualities
+ var/list/smithed_item_qualities = list(
+ /datum/smith_quality = 9,
+ /datum/smith_quality/improved = 1
+ )
+ /// Weighted list of possible item materials
+ var/list/smithed_item_materials = list(
+ /datum/smith_material/metal = 40,
+ /datum/smith_material/silver = 10,
+ /datum/smith_material/gold = 5,
+ /datum/smith_material/plasma = 10,
+ /datum/smith_material/titanium = 5,
+ /datum/smith_material/uranium = 3,
+ /datum/smith_material/brass = 15
+ )
+ /// List of possible item types
+ var/list/smithed_type_list = list(
+ /obj/item/smithed_item/insert/ballistic,
+ /obj/item/smithed_item/insert/thermal,
+ /obj/item/smithed_item/insert/fireproofing,
+ /obj/item/smithed_item/insert/reflective,
+ /obj/item/smithed_item/insert/rad_hazard,
+ /obj/item/smithed_item/insert/rubberized,
+ /obj/item/smithed_item/tool_bit/speed,
+ /obj/item/smithed_item/tool_bit/balanced,
+ /obj/item/smithed_item/tool_bit/efficiency,
+ /obj/item/smithed_item/lens/accelerator,
+ /obj/item/smithed_item/lens/speed,
+ /obj/item/smithed_item/lens/amplifier,
+ /obj/item/smithed_item/lens/efficiency
+ )
+
+/obj/item/smithed_item/random/Initialize(mapload)
+ . = ..()
+ var/picked_type = pick(smithed_type_list)
+ var/obj/item/smithed_item/new_item = new picked_type(src.loc)
+ new_item.quality = pickweight(smithed_item_qualities)
+ new_item.material = pickweight(smithed_item_materials)
+ new_item.set_stats()
+ new_item.update_appearance(UPDATE_NAME)
+ qdel(src)
+
+/obj/item/smithed_item/random/insert
+ name = "random smithed insert"
+ smithed_type_list = list(
+ /obj/item/smithed_item/insert/ballistic,
+ /obj/item/smithed_item/insert/thermal,
+ /obj/item/smithed_item/insert/fireproofing,
+ /obj/item/smithed_item/insert/reflective,
+ /obj/item/smithed_item/insert/rad_hazard,
+ /obj/item/smithed_item/insert/rubberized
+ )
+
+/obj/item/smithed_item/random/bit
+ name = "random smithed tool bit"
+ smithed_type_list = list(
+ /obj/item/smithed_item/tool_bit/speed,
+ /obj/item/smithed_item/tool_bit/balanced,
+ /obj/item/smithed_item/tool_bit/efficiency
+ )
+
+/obj/item/smithed_item/random/lens
+ name = "random smithed lens"
+ smithed_type_list = list(
+ /obj/item/smithed_item/lens/accelerator,
+ /obj/item/smithed_item/lens/speed,
+ /obj/item/smithed_item/lens/amplifier,
+ /obj/item/smithed_item/lens/efficiency
+ )
+
+// Components
+
+#define PART_PRIMARY 1
+#define PART_SECONDARY 2
+#define PART_TRIM 3
+
+/obj/item/smithed_item/component
+ name = "Debug smithed component"
+ icon = 'icons/obj/smithing.dmi'
+ icon_state = "debug"
+ desc = "Debug smithed component part. If you see this, notify the development team."
+ /// What type of part is it
+ var/part_type
+ /// What is this a part of
+ var/finished_product
+ /// Is this component currently hot
+ var/hot = TRUE
+ /// How many times the component needs to be shaped to be considered ready
+ var/hammer_time = 3
+
+/obj/item/smithed_item/component/update_icon_state()
+ . = ..()
+ if(hot)
+ icon_state = "[initial(icon_state)]_hot"
+ else
+ icon_state = "[initial(icon_state)]"
+
+/obj/item/smithed_item/component/proc/powerhammer()
+ hammer_time--
+ if(prob(50) || hammer_time <= 0)
+ hot = FALSE
+ update_icon(UPDATE_ICON_STATE)
+
+/obj/item/smithed_item/component/proc/heat_up()
+ hot = TRUE
+ update_icon(UPDATE_ICON_STATE)
+
+/obj/item/smithed_item/component/examine(mob/user)
+ . = ..()
+ if(hammer_time)
+ . += "It is incomplete. It looks like it needs [hammer_time] more cycles in the power hammer."
+ else
+ . += "It is complete."
+ if(hot)
+ . +="It is glowing hot!"
+
+/obj/item/smithed_item/component/attack_hand(mob/user)
+ if(!hot)
+ return ..()
+ if(burn_check(user))
+ burn_user(user)
+ return
+ return ..()
+
+/obj/item/smithed_item/component/proc/set_worktime()
+ if(!quality)
+ return
+ hammer_time = ROUND_UP(initial(hammer_time) * quality.work_mult)
+
+/obj/item/smithed_item/component/proc/burn_check(mob/user)
+ if(!hot)
+ return FALSE
+ var/burn_me = TRUE
+ var/mob/living/carbon/human/H = user
+ if(!istype(H))
+ return TRUE
+ if(H.gloves)
+ var/obj/item/clothing/gloves/G = H.gloves
+ if(G.max_heat_protection_temperature)
+ burn_me = !(G.max_heat_protection_temperature > 360)
+
+ if(!burn_me || HAS_TRAIT(user, TRAIT_RESISTHEAT) || HAS_TRAIT(user, TRAIT_RESISTHEATHANDS))
+ return FALSE
+ return TRUE
+
+/obj/item/smithed_item/component/proc/burn_user(mob/user)
+ var/mob/living/carbon/human/H = user
+ if(!istype(H))
+ return
+ to_chat(user, "You burn your hand as you try to pick up [src]!")
+ var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand")
+ if(affecting.receive_damage(0, 10)) // 10 burn damage
+ H.UpdateDamageIcon()
+ H.updatehealth()
+
+/obj/item/smithed_item/component/insert_frame
+ name = "Debug insert frame"
+ icon_state = "insert_frame"
+ desc = "Debug smithed component part of an insert. If you see this, notify the development team."
+ part_type = PART_PRIMARY
+
+/obj/item/smithed_item/component/insert_frame/ballistic
+ name = "ballistic insert frame"
+ desc = "This is the primary component of a ballistic plate."
+ materials = list(MAT_METAL = 10000)
+ finished_product = /obj/item/smithed_item/insert/ballistic
+
+/obj/item/smithed_item/component/insert_frame/thermal
+ name = "thermal insert frame"
+ desc = "This is the primary component of a thermal plate."
+ materials = list(MAT_GOLD = 6000)
+ finished_product = /obj/item/smithed_item/insert/thermal
+
+/obj/item/smithed_item/component/insert_frame/fireproofing
+ name = "fireproofing insert frame"
+ desc = "This is the primary component of a fireproofing plate."
+ materials = list(MAT_SILVER = 10000)
+ finished_product = /obj/item/smithed_item/insert/fireproofing
+
+/obj/item/smithed_item/component/insert_frame/reflective
+ name = "reflective insert frame"
+ desc = "This is the primary component of a reflective plate."
+ materials = list(MAT_SILVER = 10000)
+ finished_product = /obj/item/smithed_item/insert/reflective
+
+/obj/item/smithed_item/component/insert_frame/rad_hazard
+ name = "radiation hazard insert frame"
+ desc = "This is the primary component of a radiation hazard plate."
+ materials = list(MAT_GOLD = 6000)
+ finished_product = /obj/item/smithed_item/insert/rad_hazard
+
+/obj/item/smithed_item/component/insert_frame/rubberized
+ name = "rubberized insert frame"
+ desc = "This is the primary component of a rubberized plate."
+ materials = list(MAT_PLASMA = 10000)
+ finished_product = /obj/item/smithed_item/insert/rubberized
+
+/obj/item/smithed_item/component/insert_frame/advanced
+ name = "advanced insert frame"
+ desc = "This is the primary component of a advanced armor mesh."
+ materials = list(MAT_METAL = 10000, MAT_PLASMA = 10000)
+ finished_product = /obj/item/smithed_item/insert/advanced
+
+/obj/item/smithed_item/component/insert_frame/engineering
+ name = "engineering insert frame"
+ desc = "This is the primary component of a advanced engineering mesh."
+ materials = list(MAT_GOLD = 10000, MAT_SILVER = 10000)
+ finished_product = /obj/item/smithed_item/insert/engineering
+
+/obj/item/smithed_item/component/insert_frame/heavy
+ name = "heavy duty insert frame"
+ desc = "This is the primary component of a advanced heavy duty plate."
+ materials = list(MAT_TITANIUM = 20000, MAT_PLASMA = 20000)
+ finished_product = /obj/item/smithed_item/insert/heavy
+
+/obj/item/smithed_item/component/insert_frame/mobility
+ name = "mobility mesh insert frame"
+ desc = "This is the primary component of a advanced mobility mesh."
+ materials = list(MAT_BLUESPACE = 4000)
+ finished_product = /obj/item/smithed_item/insert/mobility
+
+/obj/item/smithed_item/component/insert_lining
+ name = "Debug insert lining"
+ icon_state = "insert_lining"
+ desc = "Debug smithed component part of an insert. If you see this, notify the development team."
+ part_type = PART_SECONDARY
+
+/obj/item/smithed_item/component/insert_lining/ballistic
+ name = "ballistic insert lining"
+ desc = "This is the secondary component of a ballistic plate."
+ materials = list(MAT_METAL = 10000)
+ finished_product = /obj/item/smithed_item/insert/ballistic
+
+/obj/item/smithed_item/component/insert_lining/thermal
+ name = "thermal insert lining"
+ desc = "This is the secondary component of a thermal plate."
+ materials = list(MAT_METAL = 10000)
+ finished_product = /obj/item/smithed_item/insert/thermal
+
+/obj/item/smithed_item/component/insert_lining/fireproofing
+ name = "fireproofing insert lining"
+ desc = "This is the secondary component of a fireproofing plate."
+ materials = list(MAT_METAL = 10000, MAT_PLASMA = 10000)
+ finished_product = /obj/item/smithed_item/insert/fireproofing
+
+/obj/item/smithed_item/component/insert_lining/reflective
+ name = "reflective insert lining"
+ desc = "This is the secondary component of a reflective plate."
+ materials = list(MAT_GOLD = 6000)
+ finished_product = /obj/item/smithed_item/insert/reflective
+
+/obj/item/smithed_item/component/insert_lining/rad_hazard
+ name = "radiation hazard insert lining"
+ desc = "This is the secondary component of a radiation hazard plate."
+ materials = list(MAT_TITANIUM = 10000)
+ finished_product = /obj/item/smithed_item/insert/rad_hazard
+
+/obj/item/smithed_item/component/insert_lining/rubberized
+ name = "rubberized insert lining"
+ desc = "This is the secondary component of a rubberized plate."
+ materials = list(MAT_PLASMA = 10000)
+ finished_product = /obj/item/smithed_item/insert/rubberized
+
+/obj/item/smithed_item/component/insert_lining/advanced
+ name = "advanced insert lining"
+ desc = "This is the secondary component of a advanced armor mesh."
+ materials = list(MAT_TITANIUM = 10000, MAT_DIAMOND = 2000)
+ finished_product = /obj/item/smithed_item/insert/advanced
+
+/obj/item/smithed_item/component/insert_lining/engineering
+ name = "engineering insert lining"
+ desc = "This is the secondary component of a advanced engineering mesh."
+ materials = list(MAT_TITANIUM = 10000, MAT_IRIDIUM = 2000)
+ finished_product = /obj/item/smithed_item/insert/engineering
+
+/obj/item/smithed_item/component/insert_lining/heavy
+ name = "heavy duty insert lining"
+ desc = "This is the secondary component of a advanced heavy duty plate."
+ materials = list(MAT_TITANIUM = 10000, MAT_PLATINUM = 2000)
+ finished_product = /obj/item/smithed_item/insert/heavy
+
+/obj/item/smithed_item/component/insert_lining/mobility
+ name = "mobility mesh insert lining"
+ desc = "This is the secondary component of a advanced mobility mesh."
+ materials = list(MAT_PALLADIUM = 2000)
+ finished_product = /obj/item/smithed_item/insert/mobility
+
+/obj/item/smithed_item/component/bit_mount
+ name = "Debug bit mount"
+ icon_state = "bit_mount"
+ desc = "Debug smithed component part of a tool bit. If you see this, notify the development team."
+ part_type = PART_PRIMARY
+
+/obj/item/smithed_item/component/bit_mount/speed
+ name = "speed bit mount"
+ desc = "This is the primary component of a speed bit"
+ materials = list(MAT_TITANIUM = 4000)
+ finished_product = /obj/item/smithed_item/tool_bit/speed
+
+/obj/item/smithed_item/component/bit_mount/efficiency
+ name = "efficiency bit mount"
+ desc = "This is the primary component of an efficiency bit"
+ materials = list(MAT_SILVER = 4000)
+ finished_product = /obj/item/smithed_item/tool_bit/efficiency
+
+/obj/item/smithed_item/component/bit_mount/balanced
+ name = "balanced bit mount"
+ desc = "This is the primary component of an balanced bit."
+ materials = list(MAT_TITANIUM = 4000)
+ finished_product = /obj/item/smithed_item/tool_bit/balanced
+
+/obj/item/smithed_item/component/bit_mount/heavy
+ name = "heavy duty bit mount"
+ desc = "This is the primary component of a heavy duty bit."
+ materials = list(MAT_TITANIUM = 8000, MAT_PLASMA = 8000)
+ finished_product = /obj/item/smithed_item/tool_bit/heavy
+
+/obj/item/smithed_item/component/bit_mount/economical
+ name = "economical bit mount"
+ desc = "This is the primary component of an economical bit."
+ materials = list(MAT_TITANIUM = 4000, MAT_PLASMA = 4000)
+ finished_product = /obj/item/smithed_item/tool_bit/economical
+
+/obj/item/smithed_item/component/bit_mount/advanced
+ name = "advanced bit mount"
+ desc = "This is the primary component of an advanced bit."
+ materials = list(MAT_TITANIUM = 4000, MAT_PLASMA = 4000)
+ finished_product = /obj/item/smithed_item/tool_bit/advanced
+
+/obj/item/smithed_item/component/bit_head
+ name = "Debug bit head"
+ icon_state = "bit_head"
+ desc = "Debug smithed component part of a tool bit. If you see this, notify the development team."
+ part_type = PART_SECONDARY
+
+/obj/item/smithed_item/component/bit_head/speed
+ name = "speed bit head"
+ desc = "This is the secondary component of a speed bit."
+ materials = list(MAT_METAL = 4000)
+ finished_product = /obj/item/smithed_item/tool_bit/speed
+
+/obj/item/smithed_item/component/bit_head/efficiency
+ name = "efficiency bit head"
+ desc = "This is the secondary component of an efficiency bit."
+ materials = list(MAT_METAL = 4000)
+ finished_product = /obj/item/smithed_item/tool_bit/efficiency
+
+/obj/item/smithed_item/component/bit_head/balanced
+ name = "balanced bit head"
+ desc = "This is the secondary component of a balanced bit."
+ materials = list(MAT_BRASS = 4000)
+ finished_product = /obj/item/smithed_item/tool_bit/balanced
+
+/obj/item/smithed_item/component/bit_head/heavy
+ name = "heavy duty bit head"
+ desc = "This is the secondary component of a heavy duty bit."
+ materials = list(MAT_METAL = 8000, MAT_PLASMA = 8000)
+ finished_product = /obj/item/smithed_item/tool_bit/heavy
+
+/obj/item/smithed_item/component/bit_head/economical
+ name = "economical bit head"
+ desc = "This is the secondary component of an economical bit."
+ materials = list(MAT_METAL = 4000, MAT_PLASMA = 4000)
+ finished_product = /obj/item/smithed_item/tool_bit/economical
+
+/obj/item/smithed_item/component/bit_head/advanced
+ name = "advanced bit head"
+ desc = "This is the secondary component of an advanced bit."
+ materials = list(MAT_METAL = 4000, MAT_PLATINUM = 4000)
+ finished_product = /obj/item/smithed_item/tool_bit/advanced
+
+/obj/item/smithed_item/component/lens_frame
+ name = "Debug lens frame"
+ icon_state = "lens_frame"
+ desc = "Debug smithed component part of a laser lens. If you see this, notify the development team."
+ part_type = PART_PRIMARY
+
+/obj/item/smithed_item/component/lens_frame/accelerator
+ name = "accelerator lens frame"
+ desc = "This is the primary component of an accelerator lens."
+ materials = list(MAT_TITANIUM = 4000)
+ finished_product = /obj/item/smithed_item/lens/accelerator
+
+/obj/item/smithed_item/component/lens_frame/speed
+ name = "speed lens frame"
+ desc = "This is the primary component of a speed lens."
+ materials = list(MAT_METAL = 4000)
+ finished_product = /obj/item/smithed_item/lens/speed
+
+/obj/item/smithed_item/component/lens_frame/amplifier
+ name = "amplifier lens frame"
+ desc = "This is the primary component of an amplifier lens."
+ materials = list(MAT_GOLD = 4000)
+ finished_product = /obj/item/smithed_item/lens/amplifier
+
+/obj/item/smithed_item/component/lens_frame/efficiency
+ name = "efficiency lens frame"
+ desc = "This is the primary component of an efficiency lens."
+ materials = list(MAT_SILVER = 4000)
+ finished_product = /obj/item/smithed_item/lens/efficiency
+
+/obj/item/smithed_item/component/lens_frame/rapid
+ name = "rapid lens frame"
+ desc = "This is the primary component of an advanced rapid lens."
+ materials = list(MAT_PALLADIUM = 2000)
+ finished_product = /obj/item/smithed_item/lens/rapid
+
+/obj/item/smithed_item/component/lens_frame/densifier
+ name = "densifier lens frame"
+ desc = "This is the primary component of an advanced densifier lens."
+ materials = list(MAT_PLATINUM = 2000)
+ finished_product = /obj/item/smithed_item/lens/densifier
+
+/obj/item/smithed_item/component/lens_frame/velocity
+ name = "velocity lens frame"
+ desc = "This is the primary component of an advanced velocity lens."
+ materials = list(MAT_BRASS = 30000)
+ finished_product = /obj/item/smithed_item/lens/velocity
+
+/obj/item/smithed_item/component/lens_focus
+ name = "Debug lens focus"
+ icon_state = "lens_focus"
+ desc = "Debug smithed component part of a laser lens. If you see this, notify the development team."
+ part_type = PART_SECONDARY
+
+/obj/item/smithed_item/component/lens_focus/accelerator
+ name = "accelerator lens focus"
+ desc = "This is the secondary component of an accelerator lens."
+ materials = list(MAT_METAL = 4000, MAT_GLASS = 10000)
+ finished_product = /obj/item/smithed_item/lens/accelerator
+
+/obj/item/smithed_item/component/lens_focus/speed
+ name = "speed lens focus"
+ desc = "This is the secondary component of a speed lens."
+ materials = list(MAT_PLASMA = 4000, MAT_GLASS = 10000)
+ finished_product = /obj/item/smithed_item/lens/speed
+
+/obj/item/smithed_item/component/lens_focus/amplifier
+ name = "amplifier lens focus"
+ desc = "This is the secondary component of an amplifier lens."
+ materials = list(MAT_TITANIUM = 4000, MAT_GLASS = 10000)
+ finished_product = /obj/item/smithed_item/lens/amplifier
+
+/obj/item/smithed_item/component/lens_focus/efficiency
+ name = "efficiency lens focus"
+ desc = "This is the secondary component of an efficiency lens."
+ materials = list(MAT_METAL = 4000, MAT_GLASS = 10000)
+ finished_product = /obj/item/smithed_item/lens/efficiency
+
+/obj/item/smithed_item/component/lens_focus/rapid
+ name = "rapid lens focus"
+ desc = "This is the secondary component of an advanced rapid lens."
+ materials = list(MAT_PLASMA = 10000, MAT_GLASS = 10000, MAT_DIAMOND = 2000)
+ finished_product = /obj/item/smithed_item/lens/rapid
+
+/obj/item/smithed_item/component/lens_focus/densifier
+ name = "densifier lens focus"
+ desc = "This is the secondary component of an advanced densifier lens."
+ materials = list(MAT_PLASMA = 10000, MAT_GLASS = 10000, MAT_DIAMOND = 2000)
+ finished_product = /obj/item/smithed_item/lens/densifier
+
+/obj/item/smithed_item/component/lens_focus/velocity
+ name = "velocity lens focus"
+ desc = "This is the secondary component of an advanced velocity lens."
+ materials = list(MAT_PLASMA = 10000, MAT_GLASS = 10000, MAT_DIAMOND = 2000)
+ finished_product = /obj/item/smithed_item/lens/velocity
+
+/obj/item/smithed_item/component/trim
+ name = "Debug trim"
+ icon_state = "trim"
+ desc = "Debug smithed component part of any smithed item. If you see this, notify the development team."
+ part_type = PART_TRIM
+
+/obj/item/smithed_item/component/trim/set_name()
+ if(!quality)
+ return
+ name = "[quality.name] " + name
+ return
+
+/obj/item/smithed_item/component/trim/metal
+ name = "metal trim"
+ desc = "Smithed component of any smithing item. Made of metal."
+ materials = list(MAT_METAL = 10000)
+ material = /datum/smith_material/metal
+
+/obj/item/smithed_item/component/trim/silver
+ name = "silver trim"
+ desc = "Smithed component of any smithing item. Made of silver."
+ materials = list(MAT_SILVER = 10000)
+ material = /datum/smith_material/silver
+
+/obj/item/smithed_item/component/trim/gold
+ name = "gold trim"
+ desc = "Smithed component of any smithing item. Made of gold."
+ materials = list(MAT_GOLD = 10000)
+ material = /datum/smith_material/gold
+
+/obj/item/smithed_item/component/trim/plasma
+ name = "plasma trim"
+ desc = "Smithed component of any smithing item. Made of solid plasma."
+ materials = list(MAT_PLASMA = 10000)
+ material = /datum/smith_material/plasma
+
+/obj/item/smithed_item/component/trim/titanium
+ name = "titanium trim"
+ desc = "Smithed component of any smithing item. Made of titanium."
+ materials = list(MAT_TITANIUM = 10000)
+ material = /datum/smith_material/titanium
+
+/obj/item/smithed_item/component/trim/uranium
+ name = "uranium trim"
+ desc = "Smithed component of any smithing item. Made of uranium."
+ materials = list(MAT_URANIUM = 10000)
+ material = /datum/smith_material/uranium
+
+/obj/item/smithed_item/component/trim/diamond
+ name = "diamond trim"
+ desc = "Smithed component of any smithing item. Made of diamond."
+ materials = list(MAT_DIAMOND = 10000)
+ material = /datum/smith_material/diamond
+
+/obj/item/smithed_item/component/trim/bluespace
+ name = "bluespace trim"
+ desc = "Smithed component of any smithing item. Made of bluespace crystals."
+ materials = list(MAT_BLUESPACE = 10000)
+ material = /datum/smith_material/bluespace
+
+/obj/item/smithed_item/component/trim/plasteel
+ name = "plasteel trim"
+ desc = "Smithed component of any smithing item. Made of plasteel."
+ materials = list(MAT_METAL = 10000, MAT_PLASMA = 10000)
+ material = /datum/smith_material/plasteel
+
+/obj/item/smithed_item/component/trim/plastitanium
+ name = "plastitanium trim"
+ desc = "Smithed component of any smithing item. Made of plastitanium."
+ materials = list(MAT_TITANIUM = 10000, MAT_PLASMA = 10000)
+ material = /datum/smith_material/plastitanium
+
+/obj/item/smithed_item/component/trim/iridium
+ name = "iridium trim"
+ desc = "Smithed component of any smithing item. Made of iridium."
+ materials = list(MAT_IRIDIUM = 10000)
+ material = /datum/smith_material/iridium
+
+/obj/item/smithed_item/component/trim/palladium
+ name = "palladium trim"
+ desc = "Smithed component of any smithing item. Made of palladium."
+ materials = list(MAT_PALLADIUM = 10000)
+ material = /datum/smith_material/palladium
+
+/obj/item/smithed_item/component/trim/platinum
+ name = "platinum trim"
+ desc = "Smithed component of any smithing item. Made of platinum."
+ materials = list(MAT_PLATINUM = 10000)
+ material = /datum/smith_material/platinum
+
+/obj/item/smithed_item/component/trim/brass
+ name = "brass trim"
+ desc = "Smithed component of any smithing item. Made of brass."
+ materials = list(MAT_BRASS = 10000)
+ material = /datum/smith_material/brass
+
+#undef PART_PRIMARY
+#undef PART_SECONDARY
+#undef PART_TRIM
diff --git a/code/modules/lavaland/lavaland_theme.dm b/code/modules/lavaland/lavaland_theme.dm
index 08ce4d374a7..75acae4cde9 100644
--- a/code/modules/lavaland/lavaland_theme.dm
+++ b/code/modules/lavaland/lavaland_theme.dm
@@ -5,6 +5,8 @@
var/turf/simulated/floor/primary_turf_type
/// Icon state of planet present on background of station Z-level
var/planet_icon_state
+ /// Icon for glass floors
+ var/primary_turf_type_icon
/datum/lavaland_theme/New()
if(!primary_turf_type)
@@ -23,6 +25,7 @@
name = "lava"
primary_turf_type = /turf/simulated/floor/lava/lava_land_surface
planet_icon_state = "planet_lava"
+ primary_turf_type_icon = 'icons/turf/floors/lava.dmi'
/datum/lavaland_theme/lava/setup()
var/datum/river_spawner/lava_spawner = new(level_name_to_num(MINING))
@@ -32,6 +35,7 @@
name = "plasma"
primary_turf_type = /turf/simulated/floor/lava/lava_land_surface/plasma
planet_icon_state = "planet_plasma"
+ primary_turf_type_icon = 'icons/turf/floors/liquidplasma.dmi'
/datum/lavaland_theme/plasma/setup()
var/datum/river_spawner/spawner = new(level_name_to_num(MINING))
@@ -42,8 +46,8 @@
name = "chasm"
primary_turf_type = /turf/simulated/floor/chasm/straight_down/lava_land_surface
planet_icon_state = "planet_chasm"
+ primary_turf_type_icon = 'icons/turf/floors/Chasms.dmi'
/datum/lavaland_theme/chasm/setup()
var/datum/river_spawner/spawner = new(level_name_to_num(MINING), spread_prob_ = 10, spread_prob_loss_ = 5)
spawner.generate(nodes = 6, min_x = 50, min_y = 7, max_x = 250, max_y = 225)
-
diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm
index cc60cc3eddd..23e99b8c5e9 100644
--- a/code/modules/mapping/access_helpers.dm
+++ b/code/modules/mapping/access_helpers.dm
@@ -233,6 +233,9 @@
/obj/effect/mapping_helpers/airlock/access/any/supply/mineral_storage
access = ACCESS_MINERAL_STOREROOM
+/obj/effect/mapping_helpers/airlock/access/any/supply/smith
+ access = ACCESS_SMITH
+
/obj/effect/mapping_helpers/airlock/access/any/supply/qm
access = ACCESS_QM
diff --git a/code/modules/mapping/windoor_access_helpers.dm b/code/modules/mapping/windoor_access_helpers.dm
index c93c81dcad5..8f81052f0ad 100644
--- a/code/modules/mapping/windoor_access_helpers.dm
+++ b/code/modules/mapping/windoor_access_helpers.dm
@@ -232,6 +232,9 @@
/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mineral_storage
access = ACCESS_MINERAL_STOREROOM
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/smith
+ access = ACCESS_SMITH
+
/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/qm
access = ACCESS_QM
diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm
index 4d5a6e63d55..6d7317191c9 100644
--- a/code/modules/mining/equipment/mining_tools.dm
+++ b/code/modules/mining/equipment/mining_tools.dm
@@ -20,6 +20,11 @@
usesound = 'sound/effects/picaxe1.ogg'
toolspeed = 1
+/obj/item/pickaxe/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
+
/obj/item/pickaxe/proc/playDigSound()
playsound(src, pick(digsound),20,1)
@@ -141,6 +146,11 @@
usesound = 'sound/effects/shovel_dig.ogg'
toolspeed = 0.5
+/obj/item/shovel/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
+
/obj/item/shovel/spade
name = "spade"
desc = "A small tool for digging and moving dirt."
diff --git a/code/modules/mining/lavaland/loot/ancient_loot.dm b/code/modules/mining/lavaland/loot/ancient_loot.dm
index c32c75a4eaf..ca6004c1230 100644
--- a/code/modules/mining/lavaland/loot/ancient_loot.dm
+++ b/code/modules/mining/lavaland/loot/ancient_loot.dm
@@ -25,6 +25,14 @@
var/obj/item/stack/R = new res(src)
R.amount = rand(10, 15) //ash drakes drop 5, this is perfectly fine
+ var/list/exquisite_ore = list(
+ /obj/item/stack/ore/platinum, // The vetus can have some, as a treat
+ /obj/item/stack/ore/iridium,
+ /obj/item/stack/ore/palladium
+ )
+
+ for(var/ore in exquisite_ore)
+ new ore(src, rand(5, 10)) // Don't want mining to step too much on explorer's toes.
/obj/structure/closet/crate/necropolis/ancient/ex_act(severity)
return
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index db4ba936b6c..3d34ce3121e 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -183,6 +183,7 @@
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
hide_tail_by_species = list("Unathi", "Tajaran", "Vox", "Vulpkanin")
+ insert_max = 0
/obj/item/clothing/suit/hooded/berserker/Initialize(mapload)
. = ..()
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 60eeca60d17..d49a0f97c40 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -1,7 +1,7 @@
-#define BASE_POINT_MULT 0.65
-#define BASE_SHEET_MULT 0.65
-#define POINT_MULT_ADD_PER_RATING 0.35
-#define SHEET_MULT_ADD_PER_RATING 0.35
+#define BASE_POINT_MULT 0.90
+#define BASE_SHEET_MULT 0.90
+#define POINT_MULT_ADD_PER_RATING 0.10
+#define SHEET_MULT_ADD_PER_RATING 0.10
/**
* # Ore Redemption Machine
@@ -56,7 +56,7 @@
/obj/machinery/mineral/ore_redemption/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_BLUESPACE), INFINITY, FALSE, /obj/item/stack, null, CALLBACK(src, PROC_REF(on_material_insert)))
+ AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLATINUM, MAT_IRIDIUM, MAT_PALLADIUM), INFINITY, FALSE, /obj/item/stack, null, CALLBACK(src, PROC_REF(on_material_insert)))
ore_buffer = list()
files = new /datum/research/smelter(src)
// Stock parts
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 3cc7d8c7636..a649e58ca86 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -189,6 +189,47 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
refined_type = /obj/item/stack/sheet/mineral/diamond
materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
+/obj/item/stack/ore/platinum
+ name = "platinum ore"
+ desc = "Rock formation containing platinum."
+ icon_state = "platinum_ore"
+ item_state = "platinum_ore"
+ origin_tech = "materials=5"
+ singular_name = "platinum ore chunk"
+ points = 50
+ refined_type = /obj/item/stack/sheet/mineral/platinum
+ materials = list(MAT_PLATINUM = MINERAL_MATERIAL_AMOUNT)
+
+/obj/item/stack/ore/palladium
+ name = "palladium ore"
+ desc = "Rock formation containing palladium."
+ icon_state = "palladium_ore"
+ item_state = "palladium_ore"
+ origin_tech = "materials=5"
+ singular_name = "palladium ore chunk"
+ points = 50
+ refined_type = /obj/item/stack/sheet/mineral/palladium
+ materials = list(MAT_PALLADIUM = MINERAL_MATERIAL_AMOUNT)
+
+/obj/item/stack/ore/iridium
+ name = "iridium ore"
+ desc = "Rock formation containing iridium."
+ icon_state = "iridium_ore"
+ item_state = "iridium_ore"
+ origin_tech = "materials=5"
+ singular_name = "iridium ore chunk"
+ points = 50
+ refined_type = /obj/item/stack/sheet/mineral/iridium
+ materials = list(MAT_IRIDIUM = MINERAL_MATERIAL_AMOUNT)
+
+/obj/item/stack/ore/brass
+ name = "brass ore"
+ desc = "Rock formation containing brass. This ore is not naturally occurring - if you see this, let development know."
+ singular_name = "brass ore chunk"
+ points = 1
+ refined_type = /obj/item/stack/tile/brass
+ materials = list(MAT_BRASS = MINERAL_MATERIAL_AMOUNT)
+
/obj/item/stack/ore/bananium
name = "bananium ore"
desc = "HONK!"
diff --git a/code/modules/mod/mod_clothes.dm b/code/modules/mod/mod_clothes.dm
index fac7e766721..052d8f47672 100644
--- a/code/modules/mod/mod_clothes.dm
+++ b/code/modules/mod/mod_clothes.dm
@@ -38,6 +38,7 @@
heat_protection = UPPER_TORSO|LOWER_TORSO
cold_protection = UPPER_TORSO|LOWER_TORSO
permeability_coefficient = 0.01
+ insert_max = 0
hide_tail_by_species = list("modsuit")
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/clothing/modsuit/species/vulp_modsuits.dmi',
diff --git a/code/modules/projectiles/ammunition/energy_lens.dm b/code/modules/projectiles/ammunition/energy_lens.dm
index e899f55e0f3..01687ae1007 100644
--- a/code/modules/projectiles/ammunition/energy_lens.dm
+++ b/code/modules/projectiles/ammunition/energy_lens.dm
@@ -7,6 +7,10 @@
var/select_name = "energy"
fire_sound = 'sound/weapons/laser.ogg'
muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/energy
+ /// Damage multiplier from equipped lenses
+ var/lens_damage_multiplier = 1
+ /// Speed multiplier from equipped lenses.
+ var/lens_speed_multiplier = 1
/obj/item/ammo_casing/energy/laser
projectile_type = /obj/item/projectile/beam/laser
diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm
index b63adbe2b45..e6f28e618b7 100644
--- a/code/modules/projectiles/firing.dm
+++ b/code/modules/projectiles/firing.dm
@@ -47,6 +47,11 @@
if(!istype(targloc) || !istype(curloc) || !BB)
return
BB.ammo_casing = src
+ if(istype(BB.ammo_casing, /obj/item/ammo_casing/energy))
+ var/obj/item/ammo_casing/energy/energy_casing = BB.ammo_casing
+ BB.damage = BB.damage * energy_casing.lens_damage_multiplier
+ BB.stamina = BB.stamina * energy_casing.lens_damage_multiplier
+ BB.speed = BB.speed * energy_casing.lens_speed_multiplier
if(target && get_dist(user, target) <= 1) //Point blank shot must always hit
BB.starting = curloc
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index e083ad2b2da..779ff2d2e02 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -9,6 +9,7 @@
origin_tech = "combat=3;powerstorage=3;engineering=3"
weapon_weight = WEAPON_LIGHT
can_flashlight = TRUE
+ can_be_lensed = FALSE
flight_x_offset = 15
flight_y_offset = 9
var/overheat_time = 16
diff --git a/code/modules/projectiles/guns/energy_guns.dm b/code/modules/projectiles/guns/energy_guns.dm
index d51cce88a8b..20ba8288bc2 100644
--- a/code/modules/projectiles/guns/energy_guns.dm
+++ b/code/modules/projectiles/guns/energy_guns.dm
@@ -34,12 +34,19 @@
var/overlay_set
/// Used when updating icon and overlays to determine the energy pips
var/ratio
+ /// Can it use a lens
+ var/can_be_lensed = TRUE
+ /// Current lens
+ var/obj/item/smithed_item/lens/current_lens
/obj/item/gun/energy/examine(mob/user)
. = ..()
if(cell)
. += "It is [round(cell.percent())]% charged."
. += "Energy weapons can fire through windows and other see-through surfaces. [can_charge ? "Can be recharged with a recharger" : "Cannot be recharged in a recharger."]"
+ if(current_lens)
+ . += "Has a lens currently attached."
+ . += "Lenses can be removed with Alt-Click."
/obj/item/gun/energy/emp_act(severity)
cell.use(round(cell.charge / severity))
@@ -66,6 +73,40 @@
if(selfcharge)
START_PROCESSING(SSobj, src)
update_icon()
+ RegisterSignal(src, COMSIG_LENS_ATTACH, PROC_REF(attach_lens))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(detach_lens))
+
+/obj/item/gun/energy/attackby__legacy__attackchain(obj/item/I, mob/living/user, params)
+ ..()
+ if(istype(I, /obj/item/smithed_item/lens))
+ SEND_SIGNAL(src, COMSIG_LENS_ATTACH, I, user)
+
+/obj/item/gun/energy/proc/attach_lens(atom/source, obj/item/smithed_item/lens/new_lens, mob/user)
+ SIGNAL_HANDLER // COMSIG_LENS_ATTACH
+ if(!Adjacent(user))
+ return
+ if(!can_be_lensed)
+ return
+ if(!istype(new_lens))
+ return
+ if(current_lens)
+ to_chat(user, "Your [src] already has a lens.")
+ return
+ if(new_lens.flags & NODROP || !user.transfer_item_to(new_lens, src))
+ to_chat(user, "[new_lens] is stuck to your hand!")
+ return
+ current_lens = new_lens
+ new_lens.on_attached(src)
+
+/obj/item/gun/energy/proc/detach_lens(atom/source, mob/user)
+ SIGNAL_HANDLER // COMSIG_CLICK_ALT
+ if(!Adjacent(user))
+ return
+ if(!current_lens)
+ to_chat(user, "Your [src] has no lens to remove.")
+ return
+ user.put_in_hands(current_lens)
+ current_lens.on_detached()
/obj/item/gun/energy/proc/update_ammo_types()
var/obj/item/ammo_casing/energy/shot
@@ -132,6 +173,8 @@
/obj/item/gun/energy/process_fire(atom/target, mob/living/user, message = 1, params, zone_override, bonus_spread = 0)
if(!chambered && can_shoot())
process_chamber()
+ if(current_lens)
+ current_lens.damage_lens()
return ..()
/obj/item/gun/energy/proc/select_fire(mob/living/user)
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index e83043dd2f3..241fd98b6fa 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -82,6 +82,14 @@
build_path = /obj/item/screwdriver
category = list("initial","Tools")
+/datum/design/hammer
+ name = "Hammer"
+ id = "hammer"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 500)
+ build_path = /obj/item/hammer
+ category = list("initial","Tools")
+
/datum/design/wirecutters
name = "Wirecutters"
id = "wirecutters"
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 647ee8e2344..627988fba98 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -512,6 +512,66 @@
build_path = /obj/item/circuitboard/ore_redemption
category = list ("Misc. Machinery")
+/datum/design/smart_hopper
+ name = "Machine Design (Smart Hopper)"
+ desc = "The circuit board for a Smart Hopper."
+ id = "smart_hopper"
+ req_tech = list("programming" = 2, "engineering" = 4, "plasmatech" = 3)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000)
+ build_path = /obj/item/circuitboard/smart_hopper
+ category = list ("Misc. Machinery")
+
+/datum/design/magma_crucible
+ name = "Machine Design (Magma Crucible)"
+ desc = "The circuit board for a Magma Crucible."
+ id = "magma_crucible"
+ req_tech = list("programming" = 2, "engineering" = 5, "plasmatech" = 3)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000)
+ build_path = /obj/item/circuitboard/magma_crucible
+ category = list ("Misc. Machinery")
+
+/datum/design/casting_basin
+ name = "Machine Design (Casting Bench)"
+ desc = "The circuit board for a Casting Bench."
+ id = "casting_bench"
+ req_tech = list("programming" = 2, "engineering" = 4, "plasmatech" = 3)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000)
+ build_path = /obj/item/circuitboard/casting_basin
+ category = list ("Misc. Machinery")
+
+/datum/design/power_hammer
+ name = "Machine Design (Power Hammer)"
+ desc = "The circuit board for a Power Hammer."
+ id = "power_hammer"
+ req_tech = list("programming" = 2, "engineering" = 4, "plasmatech" = 3)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000)
+ build_path = /obj/item/circuitboard/power_hammer
+ category = list ("Misc. Machinery")
+
+/datum/design/lava_furnace
+ name = "Machine Design (Lava Furnace)"
+ desc = "The circuit board for a Lava Furnace."
+ id = "lava_furnace"
+ req_tech = list("programming" = 2, "engineering" = 4, "plasmatech" = 3)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000)
+ build_path = /obj/item/circuitboard/lava_furnace
+ category = list ("Misc. Machinery")
+
+/datum/design/kinetic_assembler
+ name = "Machine Design (Kinetic Assembler)"
+ desc = "The circuit board for a Kinetic Assembler."
+ id = "kinetic_assembler"
+ req_tech = list("programming" = 2, "engineering" = 4, "plasmatech" = 3)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000)
+ build_path = /obj/item/circuitboard/kinetic_assembler
+ category = list ("Misc. Machinery")
+
/datum/design/mining_equipment_vendor
name = "Machine Design (Mining Rewards Vendor Board)"
desc = "The circuit board for a Mining Rewards Vendor."
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 32bc124a4cd..9a0804f4827 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -14,6 +14,8 @@
/obj/item/retractor/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_SURGICAL, ROUNDSTART_TRAIT)
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
/obj/item/retractor/augment
desc = "Micro-mechanical manipulator for retracting stuff."
@@ -37,6 +39,8 @@
/obj/item/hemostat/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_SURGICAL, ROUNDSTART_TRAIT)
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
/obj/item/hemostat/augment
desc = "Tiny servos power a pair of pincers to stop bleeding."
@@ -57,6 +61,11 @@
attack_verb = list("burnt")
tool_behaviour = TOOL_CAUTERY
+/obj/item/cautery/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
+
/obj/item/cautery/attack__legacy__attackchain(mob/living/target, mob/living/user)
if(!cigarette_lighter_act(user, target))
return ..()
@@ -107,6 +116,8 @@
/obj/item/surgicaldrill/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_SURGICAL, ROUNDSTART_TRAIT)
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
/obj/item/surgicaldrill/suicide_act(mob/user)
to_chat(viewers(user), pick("[user] is pressing [src] to [user.p_their()] temple and activating it! It looks like [user.p_theyre()] trying to commit suicide!",
@@ -145,6 +156,8 @@
. = ..()
ADD_TRAIT(src, TRAIT_SURGICAL, ROUNDSTART_TRAIT)
AddComponent(/datum/component/surgery_initiator)
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
/obj/item/scalpel/suicide_act(mob/user)
@@ -246,6 +259,8 @@
/obj/item/circular_saw/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_SURGICAL, ROUNDSTART_TRAIT)
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
/obj/item/circular_saw/augment
desc = "A small but very fast spinning saw. Edges dulled to prevent accidental cutting inside of the surgeon."
@@ -270,6 +285,8 @@
/obj/item/bonegel/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_SURGICAL, ROUNDSTART_TRAIT)
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
/obj/item/bonegel/augment
toolspeed = 0.5
@@ -290,6 +307,8 @@
/obj/item/fix_o_vein/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_SURGICAL, ROUNDSTART_TRAIT)
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
/obj/item/fix_o_vein/augment
toolspeed = 0.5
@@ -313,6 +332,8 @@
/obj/item/bonesetter/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_SURGICAL, ROUNDSTART_TRAIT)
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
/obj/item/bonesetter/augment
toolspeed = 0.5
diff --git a/code/modules/telesci/rcs.dm b/code/modules/telesci/rcs.dm
index 67b938b11fb..fc3dc3b2c57 100644
--- a/code/modules/telesci/rcs.dm
+++ b/code/modules/telesci/rcs.dm
@@ -28,6 +28,11 @@
/// How much power does each teleport use?
var/chargecost = 1000
+/obj/item/rcs/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
+ RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
+
/obj/item/rcs/get_cell()
return rcell
@@ -131,7 +136,8 @@
return
teleporting = FALSE
- rcell.use(chargecost)
+ var/final_cost = chargecost * bit_efficiency_mod
+ rcell.use(final_cost)
playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 25, TRUE)
do_teleport(C, target)
- to_chat(user, "Teleport successful. [round(rcell.charge/chargecost)] charge\s left.")
+ to_chat(user, "Teleport successful. [round(rcell.charge/final_cost)] charge\s left.")
diff --git a/config/example/config.toml b/config/example/config.toml
index 9c72c8594fe..b2893eda418 100644
--- a/config/example/config.toml
+++ b/config/example/config.toml
@@ -471,6 +471,7 @@ job_slot_amounts = [
{name = "Librarian", lowpop = 1, highpop = 1}, # Cargo/Supply
{name = "Quartermaster", lowpop = 1, highpop = 1},
{name = "Shaft Miner", lowpop = 6, highpop = 6},
+ {name = "Smith", lowpop = 1, highpop = 1},
{name = "Cargo Technician", lowpop = 3, highpop = 4}, # Silicon
{name = "AI", lowpop = 1, highpop = 1},
{name = "Cyborg", lowpop = 1, highpop = 1}, # Misc
@@ -627,6 +628,9 @@ active_space_ruins = [
"_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm",
"_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm",
"_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm",
+ "_maps/map_files/RandomRuins/SpaceRuins/asteroidmining1.dmm",
+ "_maps/map_files/RandomRuins/SpaceRuins/asteroidmining2.dmm",
+ "_maps/map_files/RandomRuins/SpaceRuins/asteroidmining3.dmm",
"_maps/map_files/RandomRuins/SpaceRuins/derelict1.dmm",
"_maps/map_files/RandomRuins/SpaceRuins/derelict2.dmm",
"_maps/map_files/RandomRuins/SpaceRuins/derelict3.dmm",
diff --git a/icons/effects/ore_visuals.dmi b/icons/effects/ore_visuals.dmi
index be831b0d7d48ab2d8374b48a05091b1d7cc09203..1ae4e148c30564f42a97ac62a586b492e9898d82 100644
GIT binary patch
literal 28946
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
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index 47fcd649edb9a3f875de804406cdd321184671c6..1ec3472b11417d517434f05e531423e45e84107b 100644
GIT binary patch
literal 11342
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
MOzxE3y8rZl0aEa_ivR!s
literal 7484
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