From 8f42158cde5fc3d63068bd53da7ad702e9ecf17f Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 19 May 2024 19:26:24 +0200 Subject: [PATCH 01/49] Dwayne, yay --- _maps/configs/independent_dwayne.json | 18 +- .../independent/independent_dwayne.dmm | 4843 ++++++++++------- .../game/objects/effects/spawners/lootdrop.dm | 25 + 3 files changed, 2960 insertions(+), 1926 deletions(-) diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json index 1cd4a3683f0f..8899e4097680 100644 --- a/_maps/configs/independent_dwayne.json +++ b/_maps/configs/independent_dwayne.json @@ -10,10 +10,10 @@ ], "map_short_name": "Mk.II Dwayne-class ", "map_path": "_maps/shuttles/independent/independent_dwayne.dmm", - "description": "The Dwayne is one of the older classes of ships commonly seen on the Frontier, and one of the few such classes that doesn’t also carry a reputation for nightmarish conditions or high accident rates. Originally conceived of as a “mothership” for Nanotrasen mining shuttles that could enable long-duration mining missions at minimal cost, severe budget overruns and issues with the mining shuttle docking system left Nanotrasen with a massive number of mostly-completed hulls upon the project’s cancellation. These hulls were then quickly refurbished and sold on the civilian market, where they proved an immediate success on the Frontier. Contemporary Dwaynes can typically be found carrying a variety of mining equipment and extensive modifications unique to their captains. Recently-available aftermarket modifications have solved the Dwayne’s longstanding shuttle dock issues, allowing modern Dwaynes to finally serve their original design purpose, provided the captain is able to source a shuttle.", + "description": "The Dwayne is one of the older classes of ships commonly seen on the Frontier, and one of the few such classes that doesn’t also carry a reputation for nightmarish conditions or high accident rates. Originally conceived of as a “mothership” for Nanotrasen mining shuttles that could enable long-duration mining missions at minimal cost, severe budget overruns and issues with the mining shuttle docking system left Nanotrasen with a massive number of mostly-completed hulls upon the project’s cancellation. These hulls were then quickly refurbished and sold on the civilian market, where they proved an immediate success on the Frontier. Contemporary Dwaynes can typically be found carrying a variety of mining equipment and extensive modifications unique to their captains.", "tags": [ "Mining", - "Generalist" + "Cargo" ], "roundstart": true, "limit": 1, @@ -27,21 +27,17 @@ "outfit": "/datum/outfit/job/independent/quartermaster/western", "slots": 1 }, - "Ship's Doctor": { - "outfit": "/datum/outfit/job/independent/doctor", - "slots": 1 - }, - "Ship's Engineer": { - "outfit": "/datum/outfit/job/independent/engineer", - "slots": 1 - }, "Asteroid Miner": { "outfit": "/datum/outfit/job/independent/miner/hazard", "slots": 2 + }, + "Ship's Engineer": { + "outfit": "/datum/outfit/job/independent/engineer", + "slots": 1 }, "Deckhand": { "outfit": "/datum/outfit/job/independent/assistant", - "slots": 3 + "slots": 2 } }, "enabled": true diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 262ac034dc5a..acd596dbeb63 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -1,31 +1,38 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ak" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/effect/landmark/start/captain, -/obj/effect/turf_decal/box, -/turf/open/floor/plasteel/mono/dark, -/area/ship/bridge) -"ap" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/sleeper{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/cable/cyan{ + icon_state = "5-8" }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plasteel/mono, -/area/ship/medical) +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/central) +"ap" = ( +/turf/closed/wall, +/area/ship/crew/dorm) "as" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/cyan{ + icon_state = "5-8" }, -/obj/effect/turf_decal/techfloor{ - dir = 9 +/turf/open/floor/plating, +/area/ship/storage/eva) +"ax" = ( +/obj/machinery/power/solar, +/obj/effect/turf_decal/solarpanel, +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating/airless, +/area/ship/external/dark) "aD" = ( /obj/machinery/power/shuttle/engine/electric{ dir = 4 @@ -36,16 +43,29 @@ /turf/open/floor/plating/airless, /area/ship/engineering) "aI" = ( -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) +/obj/item/radio/intercom/directional/north, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) "aR" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/suit_storage_unit/independent/mining/eva, -/turf/open/floor/plasteel, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "dwayne_windows"; + name = "Fore Window Control"; + pixel_x = -10; + pixel_y = -20; + dir = 1 + }, +/obj/machinery/computer/crew/retro{ + pixel_y = 0; + dir = 8 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) "aS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer2{ dir = 1 @@ -58,234 +78,362 @@ }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) -"aY" = ( +"aV" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/ration, -/obj/item/storage/cans/sixbeer, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, -/area/ship/crew) -"bb" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/northright{ +/area/ship/crew/dorm) +"aY" = ( +/obj/structure/sink/kitchen{ dir = 4; - name = "Engine Access" + pixel_y = -6 }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/structure/sign/poster/official/bless_this_spess{ + pixel_x = -32 }, -/turf/open/floor/plating, -/area/ship/engineering) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"bb" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) "bf" = ( -/obj/effect/turf_decal/number/zero, /obj/effect/turf_decal/industrial/warning, +/obj/structure/cable/cyan{ + icon_state = "6-9" + }, /turf/open/floor/plating, -/area/ship/construction) +/area/ship/cargo) "bj" = ( /turf/closed/wall, -/area/ship/crew) +/area/ship/crew/toilet) "bl" = ( -/obj/docking_port/mobile{ - can_move_docking_ports = 1; - dir = 2; - launch_status = 0; - name = "mining ship"; - port_direction = 8; - preferred_direction = 4 - }, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 8; - id = "mining_ship_atmosgen"; - locked = 1 +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ntspaceworks_big/four, +/obj/structure/chair/office{ + dir = 1 }, -/obj/machinery/door/poddoor{ - id = "mining_ship_port" +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"bo" = ( +/obj/effect/turf_decal/industrial/warning, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/cyan{ + icon_state = "5-10" }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/structure/cable/cyan{ + icon_state = "5-9" }, /turf/open/floor/plating, /area/ship/cargo) "bv" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/structure/cable/cyan{ + icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/cable{ +/obj/structure/cable/cyan{ icon_state = "1-8" }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/catwalk/over, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/crew) +/area/ship/hallway/central) +"bx" = ( +/obj/structure/chair/sofa/brown/old/left/directional/south, +/obj/machinery/firealarm/directional/north, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/wood, +/area/ship/crew/canteen) "bE" = ( -/obj/machinery/cryopod{ +/obj/machinery/door/airlock/grunge{ + name = "Bathroom" + }, +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/machinery/computer/cryopod/directional/south, -/turf/open/floor/wood, -/area/ship/crew) -"bP" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/cyan{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "engine fuel pump" +/turf/open/floor/plasteel/tech, +/area/ship/crew/toilet) +"bO" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/structure/cable/cyan{ + icon_state = "5-10" }, -/obj/structure/catwalk/over, /turf/open/floor/plating, +/area/ship/storage/eva) +"bP" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "0-6" + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "bW" = ( +/obj/machinery/power/solar, +/obj/effect/turf_decal/solarpanel, /obj/structure/cable/yellow{ - icon_state = "2-8" + icon_state = "0-8" }, /turf/open/floor/plating/airless, -/area/ship/external) +/area/ship/external/dark) +"cc" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) "cf" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, -/obj/structure/curtain/bounty, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/sign/poster/official/soft_cap_pop_art{ + pixel_x = -32 + }, +/obj/structure/closet/secure_closet{ + icon_state = "cabinet"; + name = "Captain's wardobe"; + req_access_txt = "20" + }, +/obj/item/storage/backpack/satchel/cap, +/obj/item/storage/backpack/captain, +/obj/item/clothing/under/rank/command/captain, +/obj/item/clothing/under/rank/command/captain/skirt, +/obj/item/clothing/shoes/cowboy/fancy, +/obj/item/clothing/suit/jacket/leather/duster/command, +/obj/item/clothing/gloves/color/white, +/obj/item/clothing/head/caphat/cowboy, +/obj/item/clothing/head/HoS/cowboy, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 11; + pixel_y = -19 + }, /turf/open/floor/wood, -/area/ship/crew) +/area/ship/crew/dorm) +"cw" = ( +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_windows"; + dir = 4 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating/airless, +/area/ship/bridge) +"cL" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance/two, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) "dx" = ( -/obj/machinery/light/directional/south, -/obj/structure/ore_box, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/turf/open/floor/plating, -/area/ship/cargo) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_box/c38_box, +/obj/item/ammo_box/c38_box, +/obj/item/ammo_box/c38_box, +/obj/structure/closet/crate/secure/weapon, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) "dy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"dK" = ( +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/machinery/door/airlock/medical, -/obj/effect/turf_decal/corner/opaque/white/mono, -/obj/effect/turf_decal/corner/opaque/blue/mono, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"dK" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"ec" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/plasteel/dark, -/area/ship/crew) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) "ei" = ( -/turf/closed/wall/r_wall, -/area/ship/medical) +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_windows"; + dir = 2 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating/airless, +/area/ship/crew/cryo) +"eu" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) "eH" = ( -/obj/effect/landmark/start/shaft_miner, -/turf/open/floor/plasteel, -/area/ship/cargo) +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/industrial/loading, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/arrows, +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/eva) "eM" = ( /turf/closed/wall, /area/ship/cargo) "fl" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/grid, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, /area/ship/engineering) "fp" = ( -/obj/docking_port/stationary{ - width = 30; - height = 15; - dwidth = 15 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/turf/template_noop, -/area/template_noop) +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) "fy" = ( -/obj/machinery/door/poddoor/preopen{ - id = "mining_ship_blast"; - dir = 4 +/obj/structure/catwalk, +/obj/item/clothing/head/cone{ + pixel_x = 3; + pixel_y = -2 }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/ship/engineering) +/turf/open/floor/plating/airless, +/area/ship/external/dark) +"fz" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/sign/poster/contraband/ntos{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) "fV" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "mining_ship_blast"; - dir = 8 +/obj/structure/closet/cabinet{ + name = "wardrobe" }, -/turf/open/floor/plating, -/area/ship/medical) +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/cyan{ + icon_state = "0-6" + }, +/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/satchel, +/obj/item/clothing/under/utility, +/obj/item/clothing/under/utility, +/obj/item/clothing/under/utility, +/obj/item/clothing/under/utility/skirt, +/obj/item/clothing/under/utility/skirt, +/obj/item/clothing/under/utility/skirt, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/suit/jacket/leather/duster, +/obj/item/clothing/suit/jacket/leather/duster, +/obj/item/clothing/suit/jacket/leather/duster, +/obj/item/clothing/gloves/fingerless, +/obj/item/clothing/gloves/fingerless, +/obj/item/clothing/gloves/fingerless, +/obj/item/clothing/head/cowboy, +/obj/item/clothing/head/cowboy, +/obj/item/clothing/head/cowboy, +/turf/open/floor/wood, +/area/ship/crew/dorm) "fY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ + dir = 8 }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "gf" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/catwalk/over/plated_catwalk, +/turf/open/floor/plating, +/area/ship/engineering) +"gm" = ( +/obj/machinery/atmospherics/components/unary/shuttle/heater{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/obj/machinery/door/window/northright{ + dir = 4; + name = "Engine Access" + }, +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_engines"; dir = 4 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/power/ship_gravity, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/structure/window/plasma/reinforced{ + dir = 8 }, /turf/open/floor/plating, /area/ship/engineering) -"gm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 9 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) "gs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/obj/effect/turf_decal/corner/opaque/white/mono, -/turf/open/floor/plasteel/mono/white, -/area/ship/medical) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/crew/cryo) "gu" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/closet/firecloset/full{ - anchored = 1 +/turf/closed/wall/r_wall/yesdiag, +/area/ship/cargo) +"gz" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 1 }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 8 +/obj/structure/cable/cyan{ + icon_state = "5-10" }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) "gF" = ( /obj/machinery/power/shuttle/engine/fueled/plasma{ dir = 4 @@ -293,2006 +441,2823 @@ /turf/open/floor/plating/airless, /area/ship/engineering) "gT" = ( +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 7 + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 + dir = 5 }, -/obj/structure/closet/wall/directional/north, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/shoes/workboots, -/obj/item/clothing/shoes/workboots, -/obj/item/clothing/shoes/workboots, -/obj/item/clothing/suit/toggle/hazard, -/obj/item/clothing/suit/toggle/hazard, -/obj/item/clothing/suit/toggle/hazard, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/under/utility, -/obj/item/clothing/under/utility, -/obj/item/clothing/under/utility, -/obj/item/clothing/under/utility/skirt, -/obj/item/clothing/under/utility/skirt, -/obj/item/clothing/under/utility/skirt, -/obj/item/clothing/head/cowboy, -/obj/item/clothing/head/cowboy, -/obj/item/clothing/head/cowboy, -/obj/item/clothing/head/cowboy, -/obj/item/clothing/head/cowboy, -/obj/item/clothing/head/cowboy, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"he" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" +/turf/open/floor/plasteel/patterned, +/area/ship/crew/toilet) +"hd" = ( +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_windows"; + dir = 2 }, +/obj/structure/grille, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/catwalk/over, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, +/area/ship/crew/canteen) +"he" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "hy" = ( -/obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/obj/machinery/power/solar, -/obj/effect/turf_decal/solarpanel, -/turf/open/floor/plating/airless, -/area/ship/external) -"hK" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"hB" = ( +/obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/structure/window/reinforced{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Engine Access" +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"hK" = ( +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 8; + name = "connector port (fuel)" }, -/turf/open/floor/plating, +/obj/structure/sign/warning/fire{ + pixel_x = 23; + pixel_y = 4 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering) -"hZ" = ( -/obj/structure/cable{ - icon_state = "2-8" +"hO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/components/unary/portables_connector{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/item/radio/intercom/directional/east, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"hZ" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/structure/cable/cyan{ + icon_state = "2-5" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/engineering) "ig" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 1 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "in" = ( +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "dwayne_mining_field"; + locked = 1 + }, /obj/machinery/door/poddoor{ - id = "mining_ship_port" + id = "dwayne_mining" }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/cyan{ + icon_state = "0-6" }, /turf/open/floor/plating, -/area/ship/cargo) +/area/ship/storage/eva) "iq" = ( -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/layer4, +/obj/effect/turf_decal/industrial/warning{ + dir = 9 }, -/obj/effect/turf_decal/box, -/obj/structure/tank_dispenser/oxygen, +/obj/structure/closet/emcloset/wall/directional/west, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "ir" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/effect/turf_decal/techfloor, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 }, -/obj/effect/turf_decal/techfloor{ - dir = 6 +/obj/structure/cable/cyan{ + icon_state = "1-2" }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "iZ" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/corner/opaque/yellow/border{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"jS" = ( -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/power/solar, -/obj/effect/turf_decal/solarpanel, -/turf/open/floor/plating/airless, -/area/ship/external) -"kb" = ( -/obj/effect/turf_decal/corner/opaque/blue{ +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/closet/emcloset/wall/directional/north, -/turf/open/floor/plasteel/white{ - dir = 1 - }, -/area/ship/crew) -"kf" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/door/airlock/engineering{ + dir = 4; + name = "Engineering" }, /obj/effect/turf_decal/techfloor{ dir = 8 }, -/obj/effect/turf_decal/industrial/caution{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"kM" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/corner/opaque/yellow/half, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/plasteel, -/area/ship/cargo) -"kO" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"ja" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/structure/closet/crate/secure/plasma, +/obj/item/stack/sheet/mineral/plasma{ + amount = 10 }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"jz" = ( +/obj/structure/cable/yellow, /obj/machinery/power/solar, /obj/effect/turf_decal/solarpanel, /turf/open/floor/plating/airless, -/area/ship/external) -"kQ" = ( -/obj/machinery/atmospherics/components/unary/tank/toxins{ - dir = 8 +/area/ship/external/dark) +"jS" = ( +/obj/structure/chair/sofa/brown/old/left/directional/north, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/ship/engineering) -"ls" = ( -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 8 +/turf/open/floor/wood, +/area/ship/crew/canteen) +"kb" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"lv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/crew) -"lD" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"kf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 24 + }, +/obj/machinery/door/airlock/external/glass{ + dir = 4 + }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/effect/turf_decal/techfloor{ +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering) +"kM" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/door/airlock/engineering{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/engineering) -"ma" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/effect/turf_decal/techfloor{ +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"kO" = ( +/obj/effect/decal/cleanable/food/tomato_smudge, +/obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/light/directional/east, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"kQ" = ( +/obj/structure/table, +/obj/machinery/computer/helm/viewscreen/directional/north, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering) -"mr" = ( -/obj/effect/turf_decal/ntspaceworks_big/six, -/turf/open/floor/plating, -/area/ship/construction) -"ms" = ( +"ld" = ( /obj/machinery/door/poddoor/preopen{ - id = "mining_ship_blast" + id = "dwayne_windows"; + dir = 2 }, -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating/airless, -/area/ship/bridge) -"my" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 5 +/area/ship/crew/canteen) +"ls" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 }, -/turf/open/floor/plasteel/white{ - dir = 1 +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Engine Access" }, -/area/ship/crew) -"mA" = ( -/obj/structure/table/reinforced, -/obj/item/gps{ - gpstag = "NTREC1"; - pixel_x = -9; - pixel_y = 7 +/obj/structure/cable{ + icon_state = "0-8" }, -/obj/item/radio{ - pixel_x = 6; - pixel_y = 7 +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_engines"; + dir = 4 }, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/corner/opaque/blue/half, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"mC" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/computer/monitor/retro{ +/obj/structure/window/plasma/reinforced{ dir = 8 }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/plating, /area/ship/engineering) -"mE" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-8" +"lv" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/effect/turf_decal/corner/opaque/yellow/border{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 + dir = 8 }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/central) +"lD" = ( +/obj/effect/turf_decal/techfloor{ + dir = 5 }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"mF" = ( -/turf/closed/wall, -/area/ship/engineering) -"nf" = ( -/obj/effect/turf_decal/corner/opaque/yellow/half, -/turf/open/floor/plasteel, -/area/ship/cargo) -"nr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-9" }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) -"nJ" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" +"ma" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/structure/catwalk/over, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/ship/crew) -"nL" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/closet/crate/internals, -/obj/effect/turf_decal/box, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + dir = 10 }, -/turf/open/floor/plasteel, -/area/ship/cargo) -"nY" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/structure/cable/cyan{ + icon_state = "1-4" }, -/turf/open/floor/plating/airless, -/area/ship/external) -"oa" = ( -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ - dir = 8 +/obj/structure/cable/cyan{ + icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "5-9" +/obj/structure/cable/cyan{ + icon_state = "1-10" }, -/obj/structure/catwalk/over, +/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering) -"om" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/catwalk/over, -/obj/effect/landmark/start/station_engineer, +"mf" = ( +/obj/effect/turf_decal/industrial/warning, /turf/open/floor/plating, -/area/ship/engineering) -"or" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"oB" = ( -/obj/effect/decal/cleanable/oil, -/turf/open/floor/plasteel, /area/ship/cargo) -"oC" = ( -/turf/closed/wall, -/area/ship/medical) -"oE" = ( -/obj/structure/sink{ - pixel_y = 17 +"mr" = ( +/obj/structure/cable/cyan{ + icon_state = "6-9" }, -/obj/structure/mirror{ - pixel_y = 28 +/turf/open/floor/plating, +/area/ship/cargo) +"ms" = ( +/obj/machinery/computer/helm/viewscreen/directional/north, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/effect/turf_decal/corner/opaque/white/mono, -/obj/effect/turf_decal/corner/opaque/blue/border{ - dir = 9 +/obj/structure/cable/yellow{ + icon_state = "6-9" }, -/turf/open/floor/plasteel/mono/white, -/area/ship/medical) -"oR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/obj/structure/cable{ +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"mv" = ( +/obj/machinery/power/solar, +/obj/effect/turf_decal/solarpanel, +/obj/structure/cable/yellow, +/turf/open/floor/plating/airless, +/area/ship/external/dark) +"my" = ( +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/light/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"mA" = ( +/obj/effect/turf_decal/industrial/warning/corner, +/obj/machinery/light/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"mC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/turf/open/floor/plating, -/area/ship/crew) -"pl" = ( -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 4; - id = "mining_ship_atmosgen"; - locked = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/machinery/door/poddoor{ - id = "mining_ship_port" +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 10 }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/cyan{ + icon_state = "1-10" }, /turf/open/floor/plating, -/area/ship/cargo) -"pn" = ( -/obj/structure/closet/secure_closet/medical2, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable{ - icon_state = "0-4" +/area/ship/engineering) +"mE" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, -/obj/effect/turf_decal/corner/opaque/white/mono, -/obj/effect/turf_decal/corner/opaque/blue/border{ - dir = 10 +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/turf/open/floor/plasteel/mono/white, -/area/ship/medical) -"pq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/effect/turf_decal/techfloor{ + dir = 8 }, -/turf/open/floor/plasteel, -/area/ship/cargo) -"pt" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/corner/opaque/yellow/border, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"pv" = ( -/obj/machinery/light/small/directional/north, -/obj/machinery/computer/helm/viewscreen/directional/east, -/obj/effect/landmark/start/assistant, -/obj/structure/chair/comfy/orange/directional/west, -/turf/open/floor/wood, -/area/ship/crew) -"pS" = ( -/obj/effect/turf_decal/box, -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/plasteel, -/area/ship/cargo) -"qg" = ( -/obj/machinery/holopad/emergency/command, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/box, -/turf/open/floor/plasteel/mono/dark, -/area/ship/bridge) -"qz" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/suit_storage_unit/independent/mining/eva, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/cargo) -"qK" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/cable/cyan{ + icon_state = "6-10" }, -/turf/open/floor/plasteel/white{ - dir = 1 +/obj/machinery/door/airlock/engineering{ + dir = 4; + name = "Engineering" }, -/area/ship/crew) -"qO" = ( -/obj/item/reagent_containers/food/snacks/canned/beans{ - pixel_x = -5; - pixel_y = 3 +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"mF" = ( +/turf/closed/wall, +/area/ship/engineering) +"mJ" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 8 }, -/obj/item/reagent_containers/food/snacks/canned/beans{ - pixel_x = 2; - pixel_y = 3 +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/cyan{ + icon_state = "0-10" }, -/obj/item/reagent_containers/food/snacks/canned/beans{ - pixel_x = -2 +/obj/item/modular_computer/laptop/preset/civilian{ + pixel_x = 11; + pixel_y = 4 }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 5 +/obj/item/computer_hardware/card_slot{ + pixel_x = -7; + pixel_y = 1 }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 1; - pixel_y = -3 +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"mR" = ( +/obj/effect/turf_decal/solarpanel, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/obj/item/reagent_containers/food/drinks/waterbottle/large{ - pixel_x = 8; - pixel_y = -3 +/obj/machinery/power/solar, +/turf/open/floor/plating, +/area/ship/external/dark) +"mX" = ( +/obj/effect/turf_decal/corner/opaque/yellow/three_quarters{ + dir = 1 }, -/obj/structure/closet/crate{ - name = "food crate" +/obj/effect/turf_decal/industrial/warning/corner, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"nf" = ( +/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/machinery/mineral/processing_unit_console{ + pixel_y = -32; + machinedir = 8; + output_dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/eva) +"nr" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/button/door{ + id = "dwayne_engines"; + name = "Aft Window Control"; + pixel_x = -20; + pixel_y = 0; + dir = 4 }, -/obj/item/storage/cans/sixbeer, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) -"rE" = ( +"nJ" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/layer2{ + name = "connector port (air)" + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 10 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"nL" = ( +/obj/structure/closet/crate/large, +/obj/item/gun/energy/kinetic_accelerator, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"nY" = ( /turf/closed/wall/r_wall, -/area/ship/bridge) -"sg" = ( +/area/ship/crew/canteen) +"oa" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable/cyan, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"of" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/obj/machinery/suit_storage_unit/independent/mining/eva, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"om" = ( +/obj/structure/closet/wall/orange/directional/west{ + name = "Mechanic's wardrobe" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/item/storage/backpack/industrial, +/obj/item/storage/backpack/satchel/eng, +/obj/item/storage/backpack/duffelbag/engineering, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/under/rank/engineering/engineer, +/obj/item/clothing/suit/toggle/hazard, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/toggle/industrial, +/obj/item/storage/belt/utility, +/obj/item/clothing/head/hardhat, +/obj/item/clothing/head/hardhat/dblue, +/obj/item/clothing/glasses/meson/engine/tray, +/obj/item/clothing/glasses/welding, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"or" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable{ +/obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"sp" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/dept/mining, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"ow" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"oy" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/white/mono, -/obj/effect/landmark/start/medical_doctor, -/obj/effect/turf_decal/corner/opaque/blue/border{ +/obj/machinery/light/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"oB" = ( +/obj/machinery/conveyor_switch/oneway{ + pixel_y = 15; + pixel_x = 11; + id = "smelter_dwayne" + }, +/obj/structure/railing{ + dir = 10 + }, +/obj/effect/turf_decal/corner/opaque/yellow/three_quarters{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"oC" = ( +/obj/machinery/light_switch{ + dir = 2; + pixel_x = 12; + pixel_y = 20 + }, +/obj/structure/chair, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"oE" = ( +/obj/machinery/cryopod, +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/crew/cryo) +"oJ" = ( +/obj/effect/turf_decal/corner/opaque/yellow/three_quarters{ dir = 8 }, -/turf/open/floor/plasteel/mono/white, -/area/ship/medical) -"sD" = ( -/obj/structure/cable/yellow{ +/obj/structure/table, +/obj/item/toy/crayon/spraycan{ + pixel_x = 9; + pixel_y = 17 + }, +/obj/item/decal_painter{ + pixel_x = -20; + pixel_y = 3 + }, +/obj/item/hand_labeler{ + pixel_x = 1; + pixel_y = -1 + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"oQ" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"oR" = ( +/obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"sM" = ( -/obj/effect/turf_decal/corner/opaque/blue/half{ +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/central) +"pl" = ( +/obj/structure/table/reinforced, +/obj/item/radio/intercom/wideband/table{ + dir = 1; + pixel_x = 5; + pixel_y = 3 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"pn" = ( +/turf/closed/wall, +/area/ship/crew/cryo) +"pq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/yellow/half, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"pt" = ( +/obj/item/radio/intercom/directional/south, +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/frame/computer/retro{ +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"sP" = ( -/obj/structure/cable/yellow{ - icon_state = "0-4" +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"pv" = ( +/obj/machinery/light_switch{ + dir = 2; + pixel_x = 12; + pixel_y = 20 + }, +/obj/machinery/vending/coffee, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"pS" = ( +/obj/effect/turf_decal/corner/opaque/yellow/three_quarters{ + dir = 4 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"qg" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-8" }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/central) +"ql" = ( +/obj/structure/cable/yellow, /obj/machinery/power/solar, /obj/effect/turf_decal/solarpanel, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plating/airless, -/area/ship/external) -"sZ" = ( -/obj/machinery/vending/wallmed{ - pixel_y = 28 +/area/ship/external/dark) +"qt" = ( +/obj/structure/cable/yellow{ + icon_state = "6-9" + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/glass{ + name = "Common Room" }, -/obj/structure/closet/crate/freezer/blood, -/obj/effect/turf_decal/corner/opaque/white/mono, -/obj/effect/turf_decal/corner/opaque/blue/border{ +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/plasteel/mono/white, -/area/ship/medical) -"tj" = ( +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/plasteel/tech, +/area/ship/crew/canteen) +"qz" = ( +/turf/closed/wall/r_wall, +/area/ship/storage/eva) +"qK" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"tq" = ( -/turf/closed/wall/r_wall, -/area/ship/engineering) -"tX" = ( -/obj/structure/ore_box, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/item/cigbutt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "6-8" }, -/turf/open/floor/plating, -/area/ship/cargo) -"uc" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/ship/cargo) -"uk" = ( -/turf/open/floor/plating, -/area/ship/construction) -"uP" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 +/obj/structure/cable/cyan{ + icon_state = "1-2" }, -/obj/structure/window/reinforced{ - dir = 8 +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"qO" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Engine Access" +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/power/terminal{ + dir = 4 }, /turf/open/floor/plating, /area/ship/engineering) -"uT" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/suit_storage_unit/independent/mining/eva, -/obj/machinery/light/directional/west, -/turf/open/floor/plasteel, -/area/ship/cargo) -"vb" = ( -/obj/effect/turf_decal/box, -/obj/machinery/ore_silo, -/turf/open/floor/plasteel, +"rq" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 1 + }, +/obj/machinery/autolathe, +/obj/machinery/light_switch{ + dir = 2; + pixel_x = -12; + pixel_y = 20 + }, +/turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) -"vf" = ( -/obj/effect/turf_decal/ntspaceworks_big/seven, -/turf/open/floor/plating, -/area/ship/construction) -"vj" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" +"rE" = ( +/turf/closed/wall/r_wall, +/area/ship/bridge) +"sg" = ( +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"sp" = ( +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/machinery/airalarm/directional/south, +/obj/machinery/computer/cryopod/retro/directional/west, +/turf/open/floor/plasteel/tech, +/area/ship/crew/cryo) +"sD" = ( +/obj/effect/turf_decal/industrial/warning, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/dept/cargo{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"sM" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"sP" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/wood{ + icon_state = "wood-broken5" + }, +/area/ship/crew/dorm) +"sZ" = ( +/obj/machinery/cryopod, +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/crew/cryo) +"tj" = ( +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/firealarm/directional/south, +/obj/item/cigbutt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"tq" = ( +/turf/closed/wall/r_wall, +/area/ship/engineering) +"tJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/item/stack/sheet/cardboard, +/turf/open/floor/plating, +/area/ship/cargo) +"tX" = ( +/obj/structure/cable/cyan{ + icon_state = "2-5" + }, +/obj/structure/cable/cyan{ + icon_state = "2-9" + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"uc" = ( +/turf/closed/wall, +/area/ship/storage/eva) +"uk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/ntspaceworks_big/two, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"ul" = ( +/obj/effect/decal/cleanable/oil, +/obj/structure/cable/cyan{ + icon_state = "5-10" + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"uP" = ( +/obj/machinery/door/poddoor{ + id = "dwayne_cargo" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "dwayne_cargo_field"; + locked = 1 + }, +/obj/structure/cable/cyan{ + icon_state = "0-5" + }, +/turf/open/floor/plating, +/area/ship/cargo) +"uT" = ( +/obj/machinery/computer/helm/retro{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"vb" = ( +/obj/machinery/conveyor/inverted{ + dir = 9; + id = "smelter_dwayne" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/eva) +"ve" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"vf" = ( +/obj/structure/closet/crate, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/number/zero, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"vj" = ( +/obj/structure/sign/poster/contraband/winchester{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"vm" = ( +/turf/closed/wall/r_wall, +/area/ship/crew/toilet) +"vn" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/machinery/door/window/northright{ + dir = 4; + name = "Engine Access" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_engines"; + dir = 4 + }, +/obj/structure/window/plasma/reinforced{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering) +"vw" = ( +/obj/structure/table/reinforced, +/obj/item/cutting_board{ + anchored = 1 + }, +/obj/item/kitchen/knife, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/cyan{ + icon_state = "0-5" + }, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"vA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plating, +/area/ship/storage/eva) +"vJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_engines"; + dir = 4 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/ship/engineering) +"vQ" = ( +/obj/structure/cable/yellow{ + icon_state = "5-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"wh" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -12; + pixel_y = -20 + }, +/obj/machinery/suit_storage_unit/independent/mining/eva, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"wv" = ( +/turf/closed/wall, +/area/ship/bridge) +"ww" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/closet/crate/secure/exo, +/obj/item/clothing/under/rank/cargo/miner/hazard, +/obj/item/clothing/under/rank/cargo/miner/hazard, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/head/hardhat/mining, +/obj/item/clothing/head/hardhat/mining, +/obj/item/clothing/head/hardhat/mining, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/turf/open/floor/plating, +/area/ship/storage/eva) +"wW" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"xh" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "6-9" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/central) +"xr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"xP" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/structure/closet/crate, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_rilena, +/obj/item/poster/random_minutemen, +/obj/item/poster/random_contraband, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"yu" = ( +/turf/closed/wall, +/area/ship/hallway/central) +"yx" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/structure/sign/poster/contraband/smoke{ + pixel_x = -32 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned, +/area/ship/crew/toilet) +"yJ" = ( +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"yN" = ( +/obj/machinery/power/solar, +/obj/effect/turf_decal/solarpanel, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plating/airless, +/area/ship/external/dark) +"za" = ( +/obj/effect/turf_decal/solarpanel, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/power/solar, +/turf/open/floor/plating, +/area/ship/external/dark) +"zc" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 1 + }, +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"zl" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/mining/glass{ + name = "Mining Hangar" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/ship/storage/eva) +"zq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"zt" = ( +/obj/effect/turf_decal/corner/opaque/yellow/three_quarters, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/independent/mining/eva, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"zF" = ( +/obj/structure/ore_box, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"zI" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/item/cigbutt, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"zK" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/ship/storage/eva) +"zQ" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/structure/closet/firecloset/wall/directional/west, +/obj/structure/cable/cyan{ + icon_state = "2-5" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"zY" = ( +/obj/machinery/atmospherics/components/unary/tank/toxins{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"AD" = ( +/obj/structure/cable/cyan{ + icon_state = "4-9" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/item/kirbyplants/random{ + pixel_x = -10 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/sign/warning/electricshock{ + pixel_x = -25; + pixel_y = 5 + }, +/obj/structure/cable/cyan{ + icon_state = "2-9" + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"AE" = ( +/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 9 + }, +/obj/item/areaeditor/shuttle{ + pixel_y = 5 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"AQ" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/central) +"AY" = ( +/obj/structure/cable/yellow{ + icon_state = "0-10" + }, +/obj/machinery/computer/monitor/retro{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"Bq" = ( +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_windows"; + dir = 2 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating/airless, +/area/ship/bridge) +"Bx" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"BX" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"Cn" = ( +/obj/structure/catwalk, +/turf/closed/wall, +/area/ship/engineering) +"Cp" = ( +/obj/machinery/light/directional/west, +/obj/machinery/mineral/unloading_machine{ + input_dir = 1; + output_dir = 2 + }, +/obj/effect/turf_decal/industrial/outline/yellow, +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/eva) +"CB" = ( +/obj/structure/sign/warning/docking, +/turf/closed/wall/yesdiag, +/area/ship/engineering) +"CD" = ( +/obj/machinery/atmospherics/components/unary/shuttle/heater{ + dir = 4 + }, +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Engine Access" + }, +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_engines"; + dir = 4 + }, +/obj/structure/window/plasma/reinforced{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering) +"CO" = ( +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_windows"; + dir = 2 + }, +/obj/structure/grille, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating/airless, +/area/ship/crew/dorm) +"CP" = ( +/obj/machinery/door/airlock/external, +/turf/open/floor/plating, +/area/ship/engineering) +"CS" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"Ds" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_windows"; + dir = 4 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/ship/crew/canteen) +"DG" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "5-10" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/door/airlock{ + name = "Dormitory" + }, +/turf/open/floor/plasteel/tech, +/area/ship/crew/dorm) +"DJ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/ash, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"Ee" = ( +/obj/structure/sink{ + pixel_y = 19 + }, +/obj/structure/mirror{ + pixel_y = 28; + layer = 2.89 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned, +/area/ship/crew/toilet) +"Ex" = ( +/obj/structure/window/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/ship/storage/eva) +"Ez" = ( +/obj/machinery/power/ship_gravity, +/obj/structure/cable/cyan{ + icon_state = "0-10" + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"EE" = ( +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"Fd" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"Fn" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 1 + }, +/obj/structure/ore_box, +/obj/structure/cable/cyan{ + icon_state = "6-9" + }, +/obj/structure/cable/cyan{ + icon_state = "6-10" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"Fz" = ( +/obj/structure/table/wood, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/item/toy/cards/deck{ + pixel_y = 6; + pixel_x = -11 + }, +/obj/item/reagent_containers/food/snacks/chips{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"FH" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/corner/opaque/yellow/bordercorner{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"vn" = ( -/obj/structure/cable{ - icon_state = "0-4" +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, -/obj/machinery/power/terminal{ +/obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"FN" = ( +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 20 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"vw" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/wood, -/area/ship/crew) -"vA" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen" +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"FP" = ( +/turf/open/floor/plating, +/area/ship/cargo) +"FR" = ( +/obj/structure/closet/cardboard, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/obj/effect/turf_decal/box, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/item/paicard, -/turf/open/floor/plasteel, +/obj/item/caution, +/obj/item/caution, +/obj/item/caution, +/obj/item/reagent_containers/glass/bucket, +/obj/item/storage/bag/trash, +/obj/item/mop, +/turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) -"vJ" = ( -/obj/structure/cable{ - icon_state = "1-2" +"FS" = ( +/obj/machinery/power/solar, +/obj/effect/turf_decal/solarpanel, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"vQ" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/turf/open/floor/plating/airless, +/area/ship/external/dark) +"Gl" = ( +/obj/structure/bed, +/obj/item/bedsheet/random, +/obj/machinery/airalarm/directional/east, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/wood, +/area/ship/crew/dorm) +"Gr" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/door/airlock/command/glass{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/bridge) -"wh" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/door/airlock/command/glass{ + dir = 4; + name = "Bridge" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 8 }, -/obj/machinery/door/airlock/public/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, -/area/ship/crew) -"wv" = ( -/turf/closed/wall, /area/ship/bridge) -"ww" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/mineral/titanium/twenty, -/obj/effect/turf_decal/box, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel, +"Gx" = ( +/obj/structure/closet/emcloset/wall/directional/south, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"GH" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/turf_decal/ntspaceworks_big/one, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) -"wW" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 +"GN" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/light/directional/east, +/obj/item/pickaxe/drill{ + pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"xh" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/item/pickaxe/drill{ + pixel_y = -2 }, -/obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/item/pinpointer/mineral{ + pixel_y = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/closet/crate/engineering, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"GU" = ( +/obj/docking_port/mobile{ + can_move_docking_ports = 1; + dir = 2; + launch_status = 0; + name = "mining ship"; + port_direction = 8; + preferred_direction = 4 + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "dwayne_mining_field"; + locked = 1 + }, +/obj/machinery/door/poddoor{ + id = "dwayne_mining" + }, +/obj/structure/cable/cyan{ + icon_state = "0-10" }, -/obj/structure/catwalk/over, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /turf/open/floor/plating, -/area/ship/crew) -"xr" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "mining_ship_blast"; - dir = 8 +/area/ship/storage/eva) +"GW" = ( +/turf/closed/wall/r_wall/yesdiag, +/area/ship/bridge) +"He" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/structure/cable/cyan{ + icon_state = "5-6" }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"Hh" = ( +/obj/structure/window/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/window, /turf/open/floor/plating, -/area/ship/crew) -"yu" = ( -/obj/machinery/mineral/ore_redemption{ +/area/ship/cargo) +"HI" = ( +/obj/machinery/door/airlock/external{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/yellow/border{ - dir = 8 +/turf/open/floor/plating, +/area/ship/engineering) +"HP" = ( +/obj/structure/toilet{ + dir = 8; + pixel_x = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/light/dim/directional/east, +/obj/effect/decal/cleanable/vomit/old{ + pixel_x = -7 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/turf/open/floor/plasteel/patterned, +/area/ship/crew/toilet) +"Ia" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/cyan{ + icon_state = "1-10" }, -/obj/structure/cable{ - icon_state = "1-4" +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"Ip" = ( +/obj/machinery/door/poddoor{ + id = "dwayne_cargo" }, -/turf/open/floor/plasteel, -/area/ship/crew) -"yx" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/turf/open/floor/plating, +/area/ship/cargo) +"Is" = ( +/obj/structure/closet/crate, +/obj/item/paicard, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/ship/cargo) +"IF" = ( +/obj/structure/table/reinforced, +/obj/item/radio/intercom/table{ + pixel_x = 5; + pixel_y = -2 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"IJ" = ( +/obj/machinery/vending/cigarette, +/obj/item/toy/figure/miner{ + pixel_y = 17; + toysay = "Careful out there! Frontier is deadly this time of the year!" + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"IK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/cigbutt, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"IT" = ( +/obj/structure/grille, +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_windows"; + dir = 2 + }, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating/airless, +/area/ship/bridge) +"IZ" = ( +/obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"yJ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"Jg" = ( +/obj/machinery/conveyor{ + dir = 2; + id = "smelter_dwayne" }, -/obj/effect/turf_decal/corner/opaque/yellow/border, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"za" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/corner/opaque/yellow/half{ - dir = 8 +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/eva) +"Jk" = ( +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_windows"; + dir = 4 }, -/turf/open/floor/plasteel, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/ship/crew/canteen) +"Jn" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/ntspaceworks_big/eight, +/turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) -"zc" = ( +"Jq" = ( +/obj/structure/closet/crate/engineering, +/obj/item/stack/sheet/mineral/titanium/twenty, +/obj/item/stack/sheet/glass/twenty, +/obj/item/stack/sheet/metal/fifty, +/obj/effect/turf_decal/ntspaceworks_big/six, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"Jy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/airlock/command/glass{ - dir = 4 - }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) -"zq" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/ship/external) -"zF" = ( -/obj/structure/cable{ - icon_state = "2-4" +"JE" = ( +/obj/effect/decal/cleanable/ash, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"JH" = ( +/obj/structure/bed, +/obj/item/bedsheet/random, +/obj/structure/cable/yellow{ + icon_state = "4-10" }, -/mob/living/simple_animal/turtle, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ +/turf/open/floor/wood, +/area/ship/crew/dorm) +"JZ" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/table, +/obj/machinery/computer/helm/viewscreen/directional/north, +/obj/item/paper_bin{ + pixel_x = -7; + pixel_y = 3 }, -/turf/open/floor/plasteel, +/obj/item/pen/fourcolor, +/turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) -"zK" = ( -/obj/machinery/button/shieldwallgen{ - id = "mining_ship_atmosgen"; - pixel_x = 8; - pixel_y = 21 - }, -/obj/machinery/button/door{ - id = "mining_ship_port"; - name = "Port Hangar Shutters"; - pixel_x = -2; - pixel_y = 23 +"Ka" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/effect/turf_decal/industrial/warning/corner{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/plating, -/area/ship/cargo) -"zQ" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow, -/obj/machinery/power/terminal{ - dir = 4 +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" }, -/obj/structure/catwalk/over, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/engineering) -"AD" = ( -/obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/area/ship/hallway/central) +"Kc" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = 6 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/crew) -"AE" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 5 +/obj/item/clothing/head/welding{ + pixel_x = -2; + pixel_y = 1 }, -/obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) -"AQ" = ( -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "1-8" +"Kz" = ( +/obj/machinery/computer/cargo/express/retro{ + dir = 8 }, /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"Cn" = ( -/obj/structure/catwalk, -/turf/closed/wall, -/area/ship/engineering) -"Cp" = ( -/turf/open/floor/plasteel, -/area/ship/cargo) -"CD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ +/obj/machinery/firealarm/directional/north{ + pixel_x = -6 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"KO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"CO" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/ntspaceworks_big/seven, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"LH" = ( +/obj/machinery/firealarm/directional/south{ + pixel_x = -5 }, -/obj/structure/window/reinforced{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/door/window/northright{ - dir = 4; - name = "Engine Access" +/obj/structure/cable/yellow{ + icon_state = "5-10" }, -/turf/open/floor/plating, -/area/ship/engineering) -"CP" = ( -/obj/machinery/door/airlock/external, -/turf/open/floor/plating, -/area/ship/engineering) -"DG" = ( +/obj/structure/cable/yellow{ + icon_state = "1-10" + }, +/obj/structure/extinguisher_cabinet/directional/south{ + pixel_x = 7 + }, +/turf/open/floor/wood, +/area/ship/crew/dorm) +"LJ" = ( /obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/folder/yellow, -/obj/item/folder/yellow, -/obj/item/pen, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable{ - icon_state = "0-2" +/obj/machinery/microwave, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"LK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/binary/pump/on/layer2{ + dir = 1; + name = "Air to Distro" }, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Cockpit"; - pixel_x = -30; - pixel_y = 30 +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/cyan{ + icon_state = "1-2" }, -/obj/machinery/camera/autoname, -/obj/effect/turf_decal/corner/opaque/blue/half{ - dir = 1 +/turf/open/floor/plating, +/area/ship/engineering) +"LN" = ( +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 4 }, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"DJ" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 5 +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"LZ" = ( +/obj/structure/table/reinforced, +/obj/structure/closet/secure_closet/freezer/wall/directional/south{ + name = "kitchen cabinet" }, -/turf/open/floor/plasteel/white{ - dir = 1 +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/item/storage/cans/sixbeer, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/snacks/canned/beans, +/obj/item/reagent_containers/food/snacks/canned/beans, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/snacks/candy, +/obj/item/reagent_containers/food/snacks/candy, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"Mb" = ( +/obj/machinery/door/airlock/mining/glass{ + name = "Cargo Hangar" }, -/area/ship/crew) -"Ee" = ( -/obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + dir = 1 }, -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"Ex" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/structure/cable{ +/obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/door/airlock/public/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/ship/cargo) -"Fd" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +"Mg" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/obj/effect/turf_decal/corner/opaque/yellow/bordercorner, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"Fn" = ( -/obj/effect/turf_decal/industrial/warning{ +/obj/effect/turf_decal/techfloor{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering) +"Mk" = ( +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_engines"; + dir = 4 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/ship/cargo) -"Fz" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" +/area/ship/engineering) +"Mn" = ( +/obj/machinery/light/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"Mo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/storage/eva) +"Mz" = ( +/obj/machinery/holopad/emergency/command, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/box/white{ + color = "#283674" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"MB" = ( +/obj/machinery/door/airlock/hatch{ + name = "Cryogenics" }, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"FP" = ( -/turf/open/floor/plating, -/area/ship/cargo) -"FS" = ( -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/cyan{ + icon_state = "2-5" }, +/turf/open/floor/plasteel/tech, +/area/ship/crew/cryo) +"MD" = ( /obj/machinery/power/solar, /obj/effect/turf_decal/solarpanel, -/turf/open/floor/plating/airless, -/area/ship/external) -"Gr" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "mining_ship_blast"; - dir = 8 - }, -/turf/open/floor/plating/airless, -/area/ship/bridge) -"Gx" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/corner/opaque/yellow/border, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"GU" = ( -/obj/machinery/vending/snack/random, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"GW" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/emergency{ - pixel_x = -12 - }, -/obj/item/megaphone{ - pixel_x = 3; - pixel_y = 1 + icon_state = "1-4" }, -/obj/effect/turf_decal/corner/opaque/blue/half, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"He" = ( /obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/engineering) -"Hh" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/layer_manifold, -/obj/machinery/door/airlock/external{ - name = "Hangar Airlock" + icon_state = "0-1" }, -/turf/open/floor/plasteel, -/area/ship/crew) -"HI" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/turf/open/floor/plating/airless, +/area/ship/external/dark) +"MG" = ( +/turf/closed/wall/r_wall, +/area/ship/crew/dorm) +"MQ" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/cyan{ + icon_state = "0-5" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/item/cigbutt, +/obj/effect/turf_decal/techfloor, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering) +"MT" = ( +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/item/radio/intercom/directional/north, +/turf/open/floor/plating, +/area/ship/storage/eva) +"Nf" = ( +/obj/effect/turf_decal/industrial/warning, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/cargo) +"Nw" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 +/obj/structure/cable/cyan{ + icon_state = "5-8" }, +/obj/machinery/light/directional/east, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) -"HP" = ( -/mob/living/simple_animal/butterfly{ - color = "#DBB17F"; - desc = "A moth."; - name = "moth" +"NC" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/power/solar, +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/effect/landmark/observer_start, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"Ia" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "mining_ship_blast"; +/obj/effect/turf_decal/solarpanel, +/turf/open/floor/plating/airless, +/area/ship/external/dark) +"NE" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/light/directional/east, +/obj/machinery/power/solar_control{ dir = 8 }, -/turf/open/floor/plating, -/area/ship/crew) -"Ip" = ( -/obj/machinery/door/poddoor{ - id = "mining_ship_starboard" +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"NM" = ( +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_windows"; + dir = 2 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating/airless, +/area/ship/crew/dorm) +"NN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"NT" = ( +/obj/structure/closet/cardboard, +/obj/effect/spawner/lootdrop/glowstick, +/obj/effect/spawner/lootdrop/glowstick, +/obj/effect/spawner/lootdrop/glowstick, +/obj/effect/spawner/lootdrop/glowstick, +/obj/effect/spawner/lootdrop/glowstick, +/obj/effect/spawner/lootdrop/glowstick, +/obj/item/stack/marker_beacon/thirty{ + pixel_y = -5; + pixel_x = -5 }, /turf/open/floor/plating, -/area/ship/construction) -"Is" = ( -/obj/effect/turf_decal/ntspaceworks_big/five, -/turf/open/floor/plating, -/area/ship/construction) -"IF" = ( -/obj/machinery/power/port_gen/pacman, +/area/ship/storage/eva) +"NW" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"Op" = ( /obj/structure/cable/yellow{ - icon_state = "0-4" + icon_state = "0-8" }, -/obj/item/stack/sheet/mineral/plasma/five, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"IJ" = ( +/obj/machinery/power/tracker, +/obj/effect/turf_decal/solarpanel, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/machinery/door/airlock/medical, -/obj/effect/turf_decal/corner/opaque/white/mono, -/obj/effect/turf_decal/corner/opaque/blue/mono, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"IK" = ( -/obj/effect/turf_decal/corner/opaque/yellow/half{ - dir = 4 +/turf/open/floor/plating/airless, +/area/ship/external/dark) +"Ou" = ( +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/plasteel, -/area/ship/cargo) -"IT" = ( -/obj/structure/table, -/obj/item/storage/firstaid/o2{ - pixel_x = 4; - pixel_y = 3 +/obj/structure/chair/comfy/shuttle{ + dir = 8 }, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/medical{ - pixel_x = -5; - pixel_y = -4 +/obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering) +"Ov" = ( +/obj/structure/closet/cardboard, +/obj/item/chair/plastic, +/obj/item/chair/plastic{ + pixel_y = 4 }, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/plasteel/mono, -/area/ship/medical) -"IZ" = ( -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket"; - pixel_x = -4; - pixel_y = -4 +/obj/item/chair/plastic{ + pixel_y = 8 }, -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket" +/obj/item/chair/plastic{ + pixel_y = 11 }, -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket"; - pixel_x = 4; - pixel_y = 4 +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"Oz" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 8 }, -/obj/item/clothing/head/hardhat/mining{ - pixel_x = -4; - pixel_y = -4 +/obj/machinery/airalarm/directional/west, +/obj/item/spacecash/bundle/c1000{ + pixel_x = -2; + pixel_y = 0 }, -/obj/item/clothing/head/hardhat/mining, -/obj/item/clothing/head/hardhat/mining{ - pixel_x = 4; +/obj/item/spacecash/bundle/c1000{ + pixel_x = -3; pixel_y = 4 }, -/obj/item/gps/mining, -/obj/item/gps/mining, -/obj/item/gps/mining, -/obj/item/clothing/glasses/meson/prescription, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/t_scanner/adv_mining_scanner/lesser, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/pickaxe/silver, -/obj/item/pickaxe/silver, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, -/obj/structure/closet/wall/directional/north{ - name = "equipment closet" - }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 1 +/obj/item/megaphone/cargo{ + pixel_x = 17; + pixel_y = 5 }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"Jg" = ( -/obj/effect/landmark/start/quartermaster, -/turf/open/floor/plasteel, -/area/ship/cargo) -"Jn" = ( -/obj/effect/turf_decal/ntspaceworks_big/four, -/turf/open/floor/plating, -/area/ship/construction) -"Jq" = ( -/obj/effect/turf_decal/ntspaceworks_big/two, -/turf/open/floor/plating, -/area/ship/construction) -"Jy" = ( -/obj/effect/turf_decal/corner/opaque/white/mono, -/obj/effect/turf_decal/borderfloor{ - dir = 8 +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) +"OJ" = ( +/turf/template_noop, +/area/template_noop) +"OL" = ( +/obj/item/kirbyplants/random{ + pixel_x = 10 }, -/obj/effect/turf_decal/corner/opaque/blue/half{ +/obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 4 }, -/obj/machinery/computer/operating/retro{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"OP" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/cable/yellow{ + icon_state = "6-9" }, -/turf/open/floor/plasteel/mono/white, -/area/ship/medical) -"JH" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/head/hardhat/mining{ - pixel_x = -18; - pixel_y = 8 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/obj/item/phone{ - pixel_x = 5; - pixel_y = 8 +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"OQ" = ( +/obj/effect/turf_decal/corner/opaque/yellow/three_quarters, +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 8 }, -/obj/item/areaeditor/shuttle{ - pixel_x = -11 +/obj/machinery/button/shieldwallgen{ + id = "dwayne_cargo_field"; + pixel_x = 1; + pixel_y = -19; + dir = 1 }, -/obj/effect/turf_decal/corner/opaque/blue/half{ +/obj/machinery/button/door{ + id = "dwayne_cargo"; + name = "Blast Doors"; + pixel_x = -8; + pixel_y = -20; dir = 1 }, -/obj/item/radio/intercom/wideband/directional/east, -/obj/item/clothing/suit/armor/vest/capcarapace/duster, -/obj/item/clothing/head/caphat/cowboy, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"Ka" = ( -/obj/machinery/status_display/shuttle, -/turf/closed/wall, -/area/ship/bridge) -"Kc" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/firealarm/directional/east, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"OW" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half, +/obj/structure/closet/crate/large, +/obj/effect/turf_decal/industrial/warning, +/obj/effect/spawner/lootdrop/plushie, +/obj/effect/spawner/lootdrop/plushie, +/obj/effect/spawner/lootdrop/plushie, +/obj/effect/spawner/lootdrop/plushie, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"Pd" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 25; - pixel_y = -25 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/effect/turf_decal/corner/opaque/white/mono, -/obj/effect/turf_decal/corner/opaque/blue/border, -/turf/open/floor/plasteel/mono/white, -/area/ship/medical) -"KO" = ( -/obj/effect/turf_decal/ntspaceworks_big/three, -/turf/open/floor/plating, -/area/ship/construction) -"LH" = ( -/obj/machinery/door/poddoor/preopen{ - id = "mining_ship_blast" +/obj/structure/cable/cyan{ + icon_state = "1-2" }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/ship/engineering) -"LJ" = ( -/obj/machinery/vending/cola/random, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"LK" = ( -/obj/machinery/power/solar_control{ - dir = 8 +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"Pe" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ + dir = 4 }, -/obj/structure/cable/yellow, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/storage/overmap_ship/electric/directional/east, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"LN" = ( -/obj/effect/turf_decal/industrial/warning/corner, -/turf/open/floor/plating, -/area/ship/construction) -"LZ" = ( -/turf/closed/wall/r_wall, -/area/ship/crew) -"Mb" = ( -/obj/machinery/door/poddoor/preopen{ - id = "mining_ship_blast" +/turf/open/floor/plating/airless, +/area/ship/external/dark) +"Ph" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, -/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/ship/crew) -"Mg" = ( +/area/ship/storage/eva) +"Pl" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "4-8" + icon_state = "4-6" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/structure/cable/yellow{ + icon_state = "1-6" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/structure/cable/cyan{ + icon_state = "2-5" }, -/obj/effect/turf_decal/techfloor{ - dir = 1 +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/cyan{ + icon_state = "5-9" }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plating, /area/ship/engineering) -"Mk" = ( -/obj/machinery/power/port_gen/pacman, -/obj/structure/cable/yellow{ - icon_state = "0-4" +"Po" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/cyan{ + icon_state = "2-9" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/item/stack/sheet/mineral/plasma/five, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"Mn" = ( +/mob/living/simple_animal/turtle{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ship/crew/dorm) +"Px" = ( +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/corner/opaque/yellow, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/bridge) -"Mo" = ( -/obj/structure/closet/crate/large, -/obj/effect/spawner/lootdrop/maintenance/four, -/obj/item/circuitboard/machine/chem_dispenser/drinks, -/obj/item/circuitboard/computer/arcade/orion_trail, -/obj/item/kinetic_crusher, -/obj/effect/turf_decal/box, -/obj/item/vending_refill/mining_equipment, -/obj/item/ammo_box/c38_box, -/obj/item/ammo_box/c38_box, -/obj/item/ammo_box/c38_box, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -12; + pixel_y = -19 }, -/turf/open/floor/plasteel, -/area/ship/cargo) -"Mz" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, -/obj/structure/curtain/bounty, -/obj/structure/sign/poster/official/no_erp{ - pixel_y = 32 +/obj/structure/cable/cyan{ + icon_state = "0-10" }, -/turf/open/floor/wood, -/area/ship/crew) -"MB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "2-8" +/turf/open/floor/plasteel/tech, +/area/ship/crew/cryo) +"PH" = ( +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 8 }, -/obj/effect/turf_decal/corner/opaque/white/mono, -/obj/effect/turf_decal/corner/opaque/blue/border, -/turf/open/floor/plasteel/mono/white, -/area/ship/medical) -"MD" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/chair/comfy/shuttle{ + dir = 8 }, -/obj/machinery/light/directional/west, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stack/cable_coil/red{ - pixel_x = 2; - pixel_y = 6 +/obj/item/radio/intercom/directional/east, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering) +"PU" = ( +/obj/structure/filingcabinet/chestdrawer/wheeled{ + dir = 2 + }, +/obj/item/folder/yellow, +/obj/item/folder/yellow, +/obj/item/folder/blue, +/obj/item/folder, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ntspaceworks_big/five, +/obj/structure/cable/cyan{ + icon_state = "1-10" }, -/obj/item/stock_parts/cell/high/plus, -/obj/structure/cable{ +/obj/structure/cable/cyan{ icon_state = "1-6" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/item/tape/random, +/obj/item/pen, +/obj/item/pen, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"Qe" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/cyan{ + icon_state = "0-1" + }, +/turf/open/floor/plasteel/patterned, +/area/ship/crew/toilet) +"Qg" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable/cyan{ + icon_state = "0-10" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) -"MG" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +"Qj" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half, +/obj/item/stack/sheet/cardboard, +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) +"Qp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 + dir = 4 }, -/obj/machinery/light_switch{ - pixel_x = 21; - pixel_y = 25 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"MQ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/catwalk/over/plated_catwalk, +/turf/open/floor/plating, +/area/ship/engineering) +"QG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/structure/cable/cyan{ + icon_state = "6-9" }, -/obj/machinery/atmospherics/components/binary/pump/on/layer2{ - dir = 1; - name = "Air to Distro"; - target_pressure = 500 +/obj/structure/closet/crate/miningcar{ + name = "mining cart" }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"QI" = ( /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/effect/turf_decal/techfloor, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"MT" = ( -/obj/effect/turf_decal/corner/opaque/yellow/half{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/cargo) -"Nf" = ( -/obj/effect/turf_decal/number/five, -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plating, -/area/ship/construction) -"Nw" = ( -/obj/machinery/status_display/shuttle, -/turf/closed/wall, -/area/ship/engineering) -"NM" = ( -/obj/structure/cable/yellow, /obj/structure/cable/yellow{ - icon_state = "0-2" + icon_state = "2-5" }, -/obj/machinery/power/solar, -/obj/effect/turf_decal/solarpanel, -/turf/open/floor/plating/airless, -/area/ship/external) -"NN" = ( -/obj/structure/closet/crate/engineering, -/obj/item/stack/sheet/metal/twenty, -/obj/item/stack/sheet/glass/fifty, -/obj/effect/turf_decal/box, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/structure/cable/cyan{ + icon_state = "1-10" }, -/turf/open/floor/plasteel, -/area/ship/cargo) -"Op" = ( -/obj/item/vending_refill/mining_equipment{ - pixel_y = -8 +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/cyan{ + icon_state = "9-10" }, -/turf/closed/wall/r_wall, +/turf/open/floor/plating, /area/ship/engineering) -"OJ" = ( -/turf/template_noop, -/area/template_noop) -"OL" = ( -/obj/effect/turf_decal/corner/opaque/blue/half{ - dir = 4 +"QO" = ( +/obj/effect/turf_decal/corner/opaque/yellow/three_quarters{ + dir = 1 }, -/obj/machinery/computer/helm/retro{ +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"RA" = ( +/obj/effect/turf_decal/techfloor{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"OP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"OW" = ( -/obj/effect/turf_decal/number/one, -/obj/effect/turf_decal/industrial/warning/corner{ dir = 8 }, -/turf/open/floor/plating, -/area/ship/construction) -"Pd" = ( -/obj/structure/cable{ +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering) +"RJ" = ( +/obj/machinery/power/solar, +/obj/effect/turf_decal/solarpanel, +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/corner/opaque/yellow, -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = -25 +/obj/structure/cable/yellow{ + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/turf/open/floor/plating/airless, +/area/ship/external/dark) +"RN" = ( +/turf/closed/wall/r_wall/yesdiag, +/area/ship/storage/eva) +"RS" = ( +/obj/effect/turf_decal/corner/opaque/yellow/three_quarters{ dir = 8 }, -/turf/open/floor/plasteel, -/area/ship/cargo) -"Ph" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/corner/opaque/yellow/half{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning{ +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/turf_decal/industrial/warning/corner{ dir = 1 }, -/turf/open/floor/plasteel, -/area/ship/cargo) -"Pl" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/electrical{ +/obj/machinery/button/shieldwallgen{ + id = "dwayne_mining_field"; pixel_x = 1; - pixel_y = 6 + pixel_y = 19 }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 +/obj/machinery/button/door{ + id = "dwayne_mining"; + name = "Blast Doors"; + pixel_x = -8; + pixel_y = 20 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"RT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/item/clothing/head/welding{ - pixel_x = -2; - pixel_y = 1 +/obj/item/radio/intercom/directional/south, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"RU" = ( +/obj/structure/closet/crate/internals, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen/yellow, +/obj/item/tank/internals/oxygen/yellow, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/turf/open/floor/plating, +/area/ship/storage/eva) +"Se" = ( +/obj/structure/cable/cyan{ + icon_state = "4-10" }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/structure/cable, -/obj/item/clothing/gloves/color/yellow, -/obj/item/clothing/gloves/color/yellow, -/obj/item/reagent_containers/glass/beaker{ - list_reagents = list(/datum/reagent/fuel=50) +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 4 }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"Po" = ( -/obj/structure/cable/yellow, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"Sg" = ( /obj/structure/cable/yellow{ - icon_state = "0-4" + icon_state = "4-8" }, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"St" = ( +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_windows"; + dir = 4 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/ship/crew/dorm) +"SB" = ( /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/tracker, +/obj/machinery/power/solar, /obj/effect/turf_decal/solarpanel, -/turf/open/floor/plating/airless, -/area/ship/external) -"Px" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "2-8" + }, +/turf/open/floor/plating/airless, +/area/ship/external/dark) +"SI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/cyan{ + icon_state = "0-4" }, -/obj/effect/turf_decal/corner/opaque/white/mono, -/turf/open/floor/plasteel/mono/white, -/area/ship/medical) -"PU" = ( -/obj/effect/turf_decal/ntspaceworks_big/one, /turf/open/floor/plating, -/area/ship/construction) -"Qe" = ( -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"Qp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/area/ship/cargo) +"Tl" = ( +/obj/structure/window{ + dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/item/soap{ + pixel_x = -6; + pixel_y = -7 }, -/obj/machinery/door/airlock/external{ - dir = 4 +/obj/item/bikehorn/rubberducky/plasticducky{ + pixel_x = -2; + pixel_y = 4 }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"QG" = ( -/obj/structure/cable{ - icon_state = "1-2" +/turf/open/floor/plasteel/patterned, +/area/ship/crew/toilet) +"Tz" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/turf/open/floor/plating, -/area/ship/cargo) -"QI" = ( -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/structure/reagent_dispensers/watertank, -/obj/item/storage/bag/trash{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bucket, -/obj/item/mop, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) -"QO" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + icon_state = "wood-broken2" }, +/area/ship/crew/dorm) +"TO" = ( /obj/effect/turf_decal/corner/opaque/yellow/half, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/ship/cargo) -"RA" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"TP" = ( +/obj/machinery/power/solar, +/obj/effect/turf_decal/solarpanel, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/engineering{ - dir = 4 - }, -/obj/effect/turf_decal/techfloor{ - dir = 8 + icon_state = "0-2" }, -/turf/open/floor/plasteel, -/area/ship/engineering) -"RN" = ( -/obj/effect/turf_decal/corner/opaque/white/mono, +/turf/open/floor/plating/airless, +/area/ship/external/dark) +"TR" = ( +/obj/structure/chair/sofa/brown/old/right/directional/north, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"Ub" = ( /obj/structure/table, -/obj/item/book/manual/wiki/surgery, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/suit/apron/surgical, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/effect/turf_decal/borderfloor{ - dir = 8 +/obj/effect/turf_decal/industrial/warning, +/obj/item/radio{ + pixel_y = 5 }, -/obj/effect/turf_decal/corner/opaque/blue/half{ - dir = 4 +/obj/item/radio{ + pixel_y = 5 }, -/turf/open/floor/plasteel/mono/white, -/area/ship/medical) -"RS" = ( -/obj/structure/bed, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/turf_decal/corner/opaque/white/mono, -/obj/effect/turf_decal/borderfloor{ - dir = 8 +/obj/item/radio{ + pixel_y = 5 }, -/obj/effect/turf_decal/corner/opaque/blue/half{ - dir = 4 +/obj/item/radio{ + pixel_y = 5 }, -/obj/machinery/light/directional/west, -/turf/open/floor/plasteel/mono/white, -/area/ship/medical) -"RT" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/obj/item/radio{ + pixel_y = 5 }, -/obj/effect/turf_decal/box, -/turf/open/floor/plasteel/mono/dark, -/area/ship/bridge) -"RU" = ( -/obj/structure/closet/crate/wooden, -/obj/item/clothing/suit/hooded/explorer, -/obj/item/clothing/suit/hooded/explorer, -/obj/item/clothing/suit/hooded/explorer, -/turf/open/floor/plating, -/area/ship/cargo) -"Se" = ( -/obj/effect/turf_decal/corner/opaque/blue/half{ +/turf/open/floor/plasteel/patterned/grid, +/area/ship/crew/cryo) +"Uj" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half{ dir = 4 }, -/obj/machinery/computer/cargo/express/retro{ +/obj/structure/ore_box, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"Um" = ( +/turf/closed/wall, +/area/ship/crew/canteen) +"Un" = ( +/obj/effect/decal/cleanable/ash, +/obj/structure/railing{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) -"Sg" = ( -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"St" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/layer4, -/obj/effect/turf_decal/industrial/warning{ - dir = 9 +/obj/effect/turf_decal/corner/opaque/yellow/half{ + dir = 8 }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) -"SB" = ( -/obj/effect/turf_decal/ntspaceworks_big/eight, -/turf/open/floor/plating, -/area/ship/construction) -"Tl" = ( -/obj/structure/chair/comfy/orange/directional/north, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"TP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/item/gun/ballistic/shotgun/flamingarrow, +/obj/item/gun/ballistic/shotgun/flamingarrow, +/obj/item/gun/ballistic/shotgun/flamingarrow, +/obj/structure/guncase/shotgun{ + name = "rifle locker" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"UD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_containers/hypospray/medipen/survival, +/obj/item/reagent_containers/hypospray/medipen/survival{ + pixel_y = -4 }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/crew) -"Ub" = ( -/obj/structure/bed/roller, -/obj/item/bedsheet/medical, -/obj/machinery/iv_drip, -/obj/effect/turf_decal/corner/opaque/white/mono, -/obj/effect/turf_decal/corner/opaque/blue/border{ - dir = 1 +/obj/item/storage/pill_bottle/mining{ + pixel_x = -6 }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/mono/white, -/area/ship/medical) -"Um" = ( -/obj/structure/table/wood, -/obj/machinery/microwave, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) -"Un" = ( -/obj/effect/turf_decal/box, -/turf/open/floor/plasteel, +/obj/item/storage/pill_bottle/charcoal/less{ + pixel_x = 5 + }, +/turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "UP" = ( -/obj/machinery/door/airlock/external{ - dir = 4 +/obj/docking_port/stationary{ + width = 30; + height = 15; + dwidth = 15; + dir = 8 }, -/obj/structure/cable/yellow{ +/turf/template_noop, +/area/template_noop) +"UX" = ( +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, -/area/ship/engineering) +/area/ship/hallway/central) "UY" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/closet/crate, -/obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/ship/cargo) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) "Vb" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "mining_ship_blast"; - dir = 8 +/obj/structure/dresser{ + dir = 4 }, -/turf/open/floor/plating, -/area/ship/medical) +/obj/machinery/light/directional/west, +/turf/open/floor/wood, +/area/ship/crew/dorm) "Vv" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable{ - icon_state = "0-10" +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "engine fuel pump" }, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/engineering) "VP" = ( -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 8 +/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 5 }, -/obj/structure/closet/emcloset/anchored, +/obj/structure/sign/poster/rilena/random{ + pixel_y = -32 + }, +/obj/item/modular_computer/tablet/preset/cheap, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) +"VZ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_windows"; + dir = 4 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/ship/crew/dorm) "Wi" = ( -/obj/effect/turf_decal/corner/opaque/yellow/half, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/autolathe, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/plasteel, -/area/ship/cargo) +/obj/machinery/mineral/processing_unit{ + output_dir = 4; + input_dir = 8 + }, +/obj/effect/turf_decal/industrial/outline/yellow, +/turf/open/floor/plasteel/mono/dark, +/area/ship/storage/eva) "Wm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/corner/opaque/yellow/three_quarters{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/obj/structure/guncase/shotgun, -/obj/item/gun/ballistic/shotgun/flamingarrow, -/obj/item/gun/ballistic/shotgun/flamingarrow, -/obj/item/gun/ballistic/shotgun/flamingarrow, -/turf/open/floor/plasteel, -/area/ship/cargo) -"WE" = ( -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/corner/opaque/yellow/half, +/obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/light_switch{ - pixel_x = -25; - pixel_y = -25; - dir = 4 +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage/eva) +"WE" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" }, -/obj/effect/turf_decal/techfloor{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/engineering) +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/hallway/central) +"WK" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/cargo) "WL" = ( -/obj/structure/table, -/obj/item/storage/belt/utility, -/obj/item/radio{ - pixel_x = 6; - pixel_y = 7 +/obj/machinery/door/poddoor/preopen{ + id = "dwayne_engines"; + dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/light/directional/west, -/obj/item/storage/box/lights/mixed, -/turf/open/floor/plasteel/tech/grid, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, /area/ship/engineering) "WZ" = ( -/obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/item/kirbyplants/random{ + pixel_y = 18; + pixel_x = -8 }, -/obj/machinery/power/solar, -/obj/effect/turf_decal/solarpanel, -/turf/open/floor/plating/airless, -/area/ship/external) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/wood, +/area/ship/crew/dorm) "Xk" = ( +/obj/effect/turf_decal/corner/opaque/yellow/half, +/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/industrial/warning, -/turf/open/floor/plating, -/area/ship/construction) +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) "Xl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/firealarm/directional/north, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"Xm" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"Xn" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/cyan{ + icon_state = "5-8" }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/airlock/command/glass{ + dir = 4; + name = "Bridge" + }, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 8 }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) +"Xn" = ( /obj/effect/turf_decal/techfloor{ - dir = 5 + dir = 1 + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "Xo" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "mining_ship_blast"; - name = "Blast Door Control"; - pixel_y = 28 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/effect/turf_decal/box, -/turf/open/floor/plasteel/mono/dark, -/area/ship/bridge) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) "Xw" = ( -/obj/structure/table, -/obj/item/defibrillator/loaded, -/obj/item/stack/medical/suture, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = -4 - }, -/obj/item/reagent_containers/glass/bottle/charcoal{ - pixel_x = 7; - pixel_y = 4 +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/salad/oatmeal{ + pixel_y = 14; + pixel_x = 10 }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "4-9" + }, +/obj/structure/cable/yellow{ + icon_state = "2-9" + }, +/obj/item/reagent_containers/food/drinks/soda_cans/cola{ + pixel_y = 1; + pixel_x = -5 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"XC" = ( +/obj/structure/chair/sofa/brown/old/right/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"YA" = ( +/obj/machinery/power/solar, +/obj/effect/turf_decal/solarpanel, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/item/storage/belt/medical, -/turf/open/floor/plasteel/mono, -/area/ship/medical) +/turf/open/floor/plating/airless, +/area/ship/external/dark) "YE" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "engine fuel pump" +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 10 }, -/obj/structure/catwalk/over, -/obj/machinery/computer/helm/viewscreen/directional/north, -/turf/open/floor/plating, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "YJ" = ( /turf/closed/wall/r_wall, /area/ship/cargo) "YN" = ( -/turf/closed/wall/r_wall, -/area/ship/construction) +/obj/machinery/door/poddoor{ + id = "dwayne_cargo" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "dwayne_cargo_field"; + locked = 1 + }, +/obj/structure/cable/cyan{ + icon_state = "0-9" + }, +/turf/open/floor/plating, +/area/ship/cargo) +"YY" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/trash/candy, +/obj/item/trash/sosjerky, +/obj/item/trash/can/food/beans, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/cable/cyan{ + icon_state = "6-8" + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/cargo) "Zj" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/machinery/button/door{ - dir = 1; - id = "mining_ship_starboard"; - name = "Starboard Hangar Shutters"; - pixel_y = -21 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) -"Zv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/structure/cable/cyan{ + icon_state = "0-1" }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 22 +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) +"Zv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/cyan{ + icon_state = "1-2" }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/bridge) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) "ZA" = ( -/obj/effect/turf_decal/corner/opaque/yellow/half{ - dir = 1 - }, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/ship/cargo) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/storage/eva) "ZK" = ( /obj/machinery/door/poddoor{ - id = "mining_ship_port" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "2-8" + id = "dwayne_mining" }, /turf/open/floor/plating, -/area/ship/cargo) +/area/ship/storage/eva) "ZL" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) +"ZQ" = ( +/obj/structure/bed, +/obj/item/bedsheet/random, +/turf/open/floor/wood, +/area/ship/crew/dorm) "ZR" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/industrial/warning/corner, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/structure/sign/poster/official/safety_internals{ + pixel_y = -32 }, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/dark, -/area/ship/crew) +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) (1,1,1) = {" OJ @@ -2302,11 +3267,10 @@ OJ OJ OJ OJ -mF -mF +OJ UP -mF -mF +OJ +OJ OJ OJ OJ @@ -2321,12 +3285,11 @@ OJ OJ OJ OJ -OJ -CP -St +CB +mF HI -aS -CP +mF +CB OJ OJ OJ @@ -2337,58 +3300,55 @@ OJ (3,1,1) = {" OJ OJ -mF -gF -aD -Cn OJ -LH +OJ +OJ +OJ +CP iq ZL -gu -ig -zq -Cn -aD -gF -mF +aS +CP +OJ +OJ +OJ +OJ +OJ OJ "} (4,1,1) = {" OJ -OJ -tq -hK -bb -tq +mF +gF +aD +Cn fy -tq -tq +WL +Ou Qp -tq -tq -fy -tq -uP -CO -tq +PH +WL +Pe +Cn +aD +gF +mF OJ "} (5,1,1) = {" OJ -OJ tq CD vn -WL +tq Mk -IF -as +tq +tq kf -WE -vJ +tq +tq vJ -MD +tq ls gm tq @@ -2396,8 +3356,7 @@ OJ "} (6,1,1) = {" OJ -OJ -Op +tq YE bP om @@ -2416,7 +3375,6 @@ OJ "} (7,1,1) = {" OJ -OJ tq kQ hZ @@ -2436,106 +3394,100 @@ OJ "} (8,1,1) = {" OJ -YJ -YJ -YJ -YJ -YJ -YJ -YJ +tq +Ez +AY +NE +Qg +ow lD Nw RA +nJ +Kc +ig +hK +zY tq -tq -tq -tq -tq -tq -tq +OJ "} (9,1,1) = {" -OJ -YJ +RN qz -aR -uT -za -pS -eM +uc +uc +uc +uc +uc mE yu iZ -bj -uk -uk -uk -uk -LN -YN +eM +eM +eM +eM +eM +YJ +gu "} (10,1,1) = {" -OJ -pl +qz MT eH Cp Jg vb -eM +uc Sg AD Zj -bj -uk -uk -uk -uk -Xk -Ip +eM +pS +ve +xP +SI +mX +YJ "} (11,1,1) = {" -OJ in -MT -FP +Ph +as Un oB Wi -eM +uc aI -TP +lv ZR -bj -uk -uk -uk -uk -Xk -Ip +eM +CS +Ov +NW +YY +mf +uP "} (12,1,1) = {" -OJ -in +ZK Fn vA NN pq nf uc -or +LN lv -sD -Mb -uk -uk -uk -uk -Xk +mA +eM +cL +zI +UD +FR +bo Ip "} (13,1,1) = {" -fp ZK ZA QG @@ -2544,50 +3496,48 @@ zF QO Ex wW -nJ +lv sg Hh -uk -uk -uk -uk -Xk +bb +hO +WK +ul +Qj Ip "} (14,1,1) = {" -OJ -in -Fn -FP +ZK +eu +NT tX Pd Wm -uc +zl or -lv +UX sD Mb -uk -uk +oQ +GH PU Is Xk Ip "} (15,1,1) = {" -OJ -in +ZK Ph -FP +bO nL kM -YJ -YJ +TO +Ex IZ -lv +WE dK -bj -uk +Hh +zc uk Jq mr @@ -2595,109 +3545,103 @@ Nf Ip "} (16,1,1) = {" -OJ -bl -Fn +ZK +gz ww Mo dx -YJ -LJ -Sg +wh +uc +EE lv tj -bj -uk -uk +eM +rq +tJ KO vf bf Ip "} (17,1,1) = {" -OJ -YJ +GU zK -FP +JE IK RU -YJ -GU -Sg +of +uc +fz lv Fd -bj -uk -uk +eM +JZ +bl Jn -SB +FP OW YN "} (18,1,1) = {" -OJ -YJ -YJ -ei -ei -ei -ei -oC +qz +RS +Uj +GN +zq +zt +uc kb -lv +FH pt -bj -LZ -LZ -LZ -LZ -LZ -LZ +eM +oJ +ja +oy +cc +OQ +YJ "} (19,1,1) = {" -OJ -OJ -sP -ei -Jy -RS RN -oC +qz +qz +uc +uc +uc +uc my lv Gx -bj -Mz -cf -bE -LZ -sP -OJ +eM +eM +eM +eM +eM +YJ +gu "} (20,1,1) = {" OJ -OJ -FS +mR ei oE sp pn oC -my +ec oR -Gx -bj +dy +bE gT yx Qe -Mb -FS +bj +vm OJ "} (21,1,1) = {" OJ -OJ -FS +za ei Ub gs @@ -2710,143 +3654,212 @@ bj Ee HP Tl -Mb -FS +bj +vm OJ "} (22,1,1) = {" OJ -OJ -FS +za ei sZ Px -Kc +pn IJ DJ xh vj -wh -MG -Fz Um -Mb -FS +Um +Um +Um +Um +nY OJ "} (23,1,1) = {" OJ -OJ FS -ei -IT -Xw +MG +ap +ap +ap ap -oC Xl AQ OP -bj +Um pv aY vw -LZ -FS +LJ +nY OJ "} (24,1,1) = {" OJ -OJ FS -ei +MG fV Vb -rE -wv +cf +ap vQ Ka -zc -wv -rE +Zv +qt +fp Ia xr LZ -FS +nY OJ "} (25,1,1) = {" OJ -OJ -bW +FS NM WZ Po -ms +Tz DG Zv qg Mn -mA +Um ms kO hy -NM +nY nY OJ "} (26,1,1) = {" OJ -OJ -OJ -OJ -jS -jS -ms -JH +YA +CO +aV +sP +LH +ap Xo ak RT -GW -ms -jS +Um +XC +Xw jS -OJ -OJ +hd +MD OJ "} (27,1,1) = {" OJ -OJ -OJ -OJ -OJ -OJ -rE -rE +RJ +NM +ZQ +JH +Gl +ap Se OL sM +Um +bx +Fz +TR +ld +RJ +OJ +"} +(28,1,1) = {" +OJ +bW +MG +St +VZ rE +wv +Xm +wv +Gr +wv rE +Ds +Jk +nY +bW OJ +"} +(29,1,1) = {" OJ OJ +TP +ax +Op +Bq +mJ +FN +Mz +Jy +Oz +IT +NC +ql +jz OJ OJ "} -(28,1,1) = {" +(30,1,1) = {" +OJ +OJ +OJ +TP +yN +Bq +pl +hB +Bx +BX +IF +IT +SB +mv +OJ OJ OJ +"} +(31,1,1) = {" OJ OJ OJ OJ OJ +GW rE -Gr -Gr -Gr +Kz +uT +aR rE +GW +OJ +OJ +OJ +OJ +OJ +"} +(32,1,1) = {" +OJ +OJ +OJ +OJ +OJ +OJ +GW +cw +cw +cw +GW OJ OJ OJ diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index d763c46e84e9..bf396bcdd297 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -1290,3 +1290,28 @@ /obj/item/storage/ration/cheese_pizza_slice = 5, /obj/item/storage/ration/crayons = 2 // :) ) + +/obj/effect/spawner/lootdrop/plushie + loot = list ( + /obj/item/toy/plush/beeplushie = 6, + /obj/item/toy/plush/blahaj = 6, + /obj/item/toy/plush/carpplushie = 6, + /obj/item/toy/plush/flushed = 6, + /obj/item/toy/plush/kari = 6, + /obj/item/toy/plush/lizardplushie = 6, + /obj/item/toy/plush/mora = 6, + /obj/item/toy/plush/realgoat = 6, + /obj/item/toy/plush/rilena = 6, + /obj/item/toy/plush/sharai = 6, + /obj/item/toy/plush/slimeplushie = 6, + /obj/item/toy/plush/snakeplushie = 6, + /obj/item/toy/plush/spider = 6, + /obj/item/toy/plush/tali = 6, + /obj/item/toy/plush/xader = 6, + /obj/item/toy/plush/moth = 1, + /obj/item/toy/plush/moth/deadhead = 1, + /obj/item/toy/plush/moth/moonfly = 1, + /obj/item/toy/plush/moth/poison = 1, + /obj/item/toy/plush/moth/punished = 1, + /obj/item/toy/plush/moth/whitefly = 1 + ) From 0da9f671f5c96f17b4eeeaaac8bf78f0af444fb8 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 19 May 2024 19:43:39 +0200 Subject: [PATCH 02/49] oops --- _maps/configs/independent_dwayne.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json index 8899e4097680..e9852948f9d2 100644 --- a/_maps/configs/independent_dwayne.json +++ b/_maps/configs/independent_dwayne.json @@ -31,7 +31,7 @@ "outfit": "/datum/outfit/job/independent/miner/hazard", "slots": 2 }, - "Ship's Engineer": { + "Ship's Engineer": { "outfit": "/datum/outfit/job/independent/engineer", "slots": 1 }, From 2930f12995f641729e4d16abbbf03c5901b78d57 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 20 May 2024 20:50:52 +0200 Subject: [PATCH 03/49] tweaks --- .../independent/independent_dwayne.dmm | 109 +++++++++++------- 1 file changed, 65 insertions(+), 44 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index acd596dbeb63..d338a5ff73b8 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -207,6 +207,7 @@ }, /obj/item/storage/backpack/satchel/cap, /obj/item/storage/backpack/captain, +/obj/item/storage/backpack/messenger/com, /obj/item/clothing/under/rank/command/captain, /obj/item/clothing/under/rank/command/captain/skirt, /obj/item/clothing/shoes/cowboy/fancy, @@ -270,6 +271,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) +"dQ" = ( +/turf/closed/wall/r_wall, +/area/ship/crew/cryo) "ec" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -336,7 +340,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/sign/poster/contraband/ntos{ +/obj/structure/sign/poster/contraband/cardinal_port_starboard{ pixel_y = 32 }, /turf/open/floor/plasteel/tech, @@ -381,6 +385,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/insectguts, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "gf" = ( @@ -417,6 +422,9 @@ dir = 10 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/cyan{ + icon_state = "2-9" + }, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "gu" = ( @@ -831,7 +839,7 @@ icon_state = "0-10" }, /obj/item/modular_computer/laptop/preset/civilian{ - pixel_x = 11; + pixel_x = 7; pixel_y = 4 }, /obj/item/computer_hardware/card_slot{ @@ -842,11 +850,7 @@ /area/ship/bridge) "mR" = ( /obj/effect/turf_decal/solarpanel, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/power/solar, -/turf/open/floor/plating, +/turf/closed/wall/r_wall/yesdiag, /area/ship/external/dark) "mX" = ( /obj/effect/turf_decal/corner/opaque/yellow/three_quarters{ @@ -989,16 +993,37 @@ "oC" = ( /obj/machinery/light_switch{ dir = 2; - pixel_x = 12; + pixel_x = 11; pixel_y = 20 }, /obj/structure/chair, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "oE" = ( -/obj/machinery/cryopod, /obj/effect/turf_decal/industrial/warning, -/obj/machinery/light/directional/west, +/obj/structure/table, +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_y = 32 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable/cyan{ + icon_state = "0-6" + }, +/obj/item/radio{ + pixel_y = 5 + }, +/obj/item/radio{ + pixel_y = 5 + }, +/obj/item/radio{ + pixel_y = 5 + }, +/obj/item/radio{ + pixel_y = 5 + }, +/obj/item/radio{ + pixel_y = 5 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew/cryo) "oJ" = ( @@ -1197,8 +1222,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/airalarm/directional/south, -/obj/machinery/computer/cryopod/retro/directional/west, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "sD" = ( @@ -1223,9 +1248,6 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 4 - }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "sP" = ( @@ -1239,6 +1261,7 @@ "sZ" = ( /obj/machinery/cryopod, /obj/effect/turf_decal/industrial/warning, +/obj/machinery/light/dim/directional/east, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew/cryo) "tj" = ( @@ -1529,6 +1552,14 @@ /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) +"zi" = ( +/obj/effect/turf_decal/solarpanel, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/power/solar, +/turf/open/floor/plating, +/area/ship/external/dark) "zl" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1843,6 +1874,10 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) +"Fq" = ( +/obj/effect/turf_decal/solarpanel, +/turf/closed/wall/r_wall/yesdiag, +/area/ship/crew/dorm) "Fz" = ( /obj/structure/table/wood, /obj/structure/cable/yellow{ @@ -2011,6 +2046,10 @@ /obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/cargo) +"HE" = ( +/obj/effect/turf_decal/solarpanel, +/turf/closed/wall/r_wall/yesdiag, +/area/ship/crew/canteen) "HI" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -2333,7 +2372,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/cyan{ - icon_state = "2-5" + icon_state = "1-2" }, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) @@ -2605,19 +2644,18 @@ /turf/open/floor/wood, /area/ship/crew/dorm) "Px" = ( -/obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/corner/opaque/yellow, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/computer/cryopod/retro/directional/east, /obj/machinery/light_switch{ dir = 1; pixel_x = -12; pixel_y = -19 }, -/obj/structure/cable/cyan{ - icon_state = "0-10" +/obj/item/radio/intercom/directional/south{ + pixel_x = 1 }, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) @@ -2884,23 +2922,8 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "Ub" = ( -/obj/structure/table, /obj/effect/turf_decal/industrial/warning, -/obj/item/radio{ - pixel_y = 5 - }, -/obj/item/radio{ - pixel_y = 5 - }, -/obj/item/radio{ - pixel_y = 5 - }, -/obj/item/radio{ - pixel_y = 5 - }, -/obj/item/radio{ - pixel_y = 5 - }, +/obj/machinery/cryopod, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew/cryo) "Uj" = ( @@ -3101,9 +3124,6 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "Xn" = ( @@ -3245,6 +3265,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "ZQ" = ( @@ -3604,7 +3625,7 @@ YJ (19,1,1) = {" RN qz -qz +uc uc uc uc @@ -3623,7 +3644,7 @@ gu (20,1,1) = {" OJ mR -ei +dQ oE sp pn @@ -3641,7 +3662,7 @@ OJ "} (21,1,1) = {" OJ -za +zi ei Ub gs @@ -3731,7 +3752,7 @@ ms kO hy nY -nY +HE OJ "} (26,1,1) = {" @@ -3775,7 +3796,7 @@ OJ (28,1,1) = {" OJ bW -MG +Fq St VZ rE @@ -3787,7 +3808,7 @@ wv rE Ds Jk -nY +HE bW OJ "} From 894c3b72e36bf2511e5bcc9c131942dc780a5357 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 20 May 2024 23:29:52 +0200 Subject: [PATCH 04/49] lookie who forgot area --- _maps/shuttles/independent/independent_dwayne.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index d338a5ff73b8..cf204bc804b1 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -851,7 +851,7 @@ "mR" = ( /obj/effect/turf_decal/solarpanel, /turf/closed/wall/r_wall/yesdiag, -/area/ship/external/dark) +/area/ship/crew/cryo) "mX" = ( /obj/effect/turf_decal/corner/opaque/yellow/three_quarters{ dir = 1 From b68014bf67d35aeb160e3c1017b0dd344ef700d6 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Wed, 22 May 2024 16:58:18 +0200 Subject: [PATCH 05/49] mothable --- .../independent/independent_dwayne.dmm | 1 + .../game/objects/effects/spawners/lootdrop.dm | 25 ------------ code/game/objects/items/plushes.dm | 40 +++++++++++++++++++ 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index cf204bc804b1..78e3c7f4336b 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -2590,6 +2590,7 @@ /obj/effect/spawner/lootdrop/plushie, /obj/effect/spawner/lootdrop/plushie, /obj/effect/spawner/lootdrop/plushie, +/obj/effect/spawner/lootdrop/plushie, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "Pd" = ( diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index bf396bcdd297..d763c46e84e9 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -1290,28 +1290,3 @@ /obj/item/storage/ration/cheese_pizza_slice = 5, /obj/item/storage/ration/crayons = 2 // :) ) - -/obj/effect/spawner/lootdrop/plushie - loot = list ( - /obj/item/toy/plush/beeplushie = 6, - /obj/item/toy/plush/blahaj = 6, - /obj/item/toy/plush/carpplushie = 6, - /obj/item/toy/plush/flushed = 6, - /obj/item/toy/plush/kari = 6, - /obj/item/toy/plush/lizardplushie = 6, - /obj/item/toy/plush/mora = 6, - /obj/item/toy/plush/realgoat = 6, - /obj/item/toy/plush/rilena = 6, - /obj/item/toy/plush/sharai = 6, - /obj/item/toy/plush/slimeplushie = 6, - /obj/item/toy/plush/snakeplushie = 6, - /obj/item/toy/plush/spider = 6, - /obj/item/toy/plush/tali = 6, - /obj/item/toy/plush/xader = 6, - /obj/item/toy/plush/moth = 1, - /obj/item/toy/plush/moth/deadhead = 1, - /obj/item/toy/plush/moth/moonfly = 1, - /obj/item/toy/plush/moth/poison = 1, - /obj/item/toy/plush/moth/punished = 1, - /obj/item/toy/plush/moth/whitefly = 1 - ) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index a6ef402ecad4..63e4ffc5e6c3 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -863,3 +863,43 @@ var/mutable_appearance/base_overlay_among = mutable_appearance(icon, "plushie_among_visor") base_overlay_among.appearance_flags = RESET_COLOR add_overlay(base_overlay_among) + +/obj/effect/spawner/lootdrop/plushie + loot = list ( + /obj/item/toy/plush/beeplushie, + /obj/item/toy/plush/blahaj, + /obj/item/toy/plush/carpplushie, + /obj/item/toy/plush/flushed, + /obj/item/toy/plush/kari, + /obj/item/toy/plush/lizardplushie, + /obj/item/toy/plush/mora, + /obj/item/toy/plush/realgoat, + /obj/item/toy/plush/rilena, + /obj/item/toy/plush/sharai, + /obj/item/toy/plush/slimeplushie, + /obj/item/toy/plush/snakeplushie, + /obj/item/toy/plush/spider, + /obj/item/toy/plush/tali, + /obj/item/toy/plush/xader, + /obj/effect/spawner/lootdrop/plushie/moth // fair chances + ) + +/obj/effect/spawner/lootdrop/plushie/moth + loot = list ( + /obj/item/toy/plush/moth, + /obj/item/toy/plush/moth/monarch, + /obj/item/toy/plush/moth/luna, + /obj/item/toy/plush/moth/atlas, + /obj/item/toy/plush/moth/redish, + /obj/item/toy/plush/moth/royal, + /obj/item/toy/plush/moth/gothic, + /obj/item/toy/plush/moth/lovers, + /obj/item/toy/plush/moth/whitefly, + /obj/item/toy/plush/moth/punished, + /obj/item/toy/plush/moth/firewatch, + /obj/item/toy/plush/moth/deadhead, + /obj/item/toy/plush/moth/poison, + /obj/item/toy/plush/moth/ragged, + /obj/item/toy/plush/moth/snow, + /obj/item/toy/plush/moth/moonfly + ) From 1d19186e32d7320c1f10d1164425627e0cfd97e6 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Wed, 22 May 2024 17:01:22 +0200 Subject: [PATCH 06/49] less titanium --- _maps/shuttles/independent/independent_dwayne.dmm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 78e3c7f4336b..268606ee2995 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -2149,10 +2149,12 @@ /area/ship/cargo) "Jq" = ( /obj/structure/closet/crate/engineering, -/obj/item/stack/sheet/mineral/titanium/twenty, +/obj/effect/turf_decal/ntspaceworks_big/six, +/obj/item/stack/sheet/mineral/titanium{ + amount = 10 + }, /obj/item/stack/sheet/glass/twenty, /obj/item/stack/sheet/metal/fifty, -/obj/effect/turf_decal/ntspaceworks_big/six, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "Jy" = ( From 9020872a55fb78a71f67933eb1b819aa7a3531ea Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Wed, 22 May 2024 17:10:22 +0200 Subject: [PATCH 07/49] this --- _maps/shuttles/independent/independent_dwayne.dmm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 268606ee2995..4312c4384508 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -600,10 +600,8 @@ dir = 4 }, /obj/structure/closet/crate/secure/plasma, -/obj/item/stack/sheet/mineral/plasma{ - amount = 10 - }, /obj/item/radio/intercom/directional/east, +/obj/item/stack/sheet/mineral/plasma/ten, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "jz" = ( From f308016c5d031029f40412a5cff51d28deff2dac Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Wed, 22 May 2024 20:31:07 +0200 Subject: [PATCH 08/49] tweaks --- .../independent/independent_dwayne.dmm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 4312c4384508..f7889f7dc644 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -203,7 +203,9 @@ /obj/structure/closet/secure_closet{ icon_state = "cabinet"; name = "Captain's wardobe"; - req_access_txt = "20" + req_access_txt = "20"; + close_sound = 'sound/machines/wooden_closet_close.ogg'; + open_sound = 'sound/machines/wooden_closet_open.ogg' }, /obj/item/storage/backpack/satchel/cap, /obj/item/storage/backpack/captain, @@ -627,6 +629,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/closet/emcloset/wall/directional/north, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "kf" = ( @@ -893,6 +896,10 @@ /area/ship/engineering) "nL" = ( /obj/structure/closet/crate/large, +/obj/item/flashlight/seclite{ + pixel_y = -6; + pixel_x = 3 + }, /obj/item/gun/energy/kinetic_accelerator, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) @@ -1096,7 +1103,6 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "pt" = ( -/obj/item/radio/intercom/directional/south, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -1975,7 +1981,7 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Gx" = ( -/obj/structure/closet/emcloset/wall/directional/south, +/obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "GH" = ( @@ -2813,9 +2819,9 @@ /area/ship/hallway/central) "RU" = ( /obj/structure/closet/crate/internals, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen/yellow, +/obj/item/tank/internals/oxygen/yellow, +/obj/item/tank/internals/oxygen/yellow, /obj/item/tank/internals/oxygen/yellow, /obj/item/tank/internals/oxygen/yellow, /obj/item/tank/internals/emergency_oxygen/engi, From 6cb65b7ab0a08f7e0c5e97a889863d7adbf4feda Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Thu, 23 May 2024 15:42:33 +0200 Subject: [PATCH 09/49] tweaks --- .../independent/independent_dwayne.dmm | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index f7889f7dc644..0bd38ec98add 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -237,9 +237,10 @@ /obj/effect/turf_decal/corner/opaque/yellow/half{ dir = 1 }, -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/structure/closet/crate/engineering/electrical, /obj/machinery/firealarm/directional/north, +/obj/item/circuitboard/machine/space_heater, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "dx" = ( @@ -747,6 +748,9 @@ /area/ship/engineering) "mf" = ( /obj/effect/turf_decal/industrial/warning, +/obj/item/c_tube{ + pixel_y = 3 + }, /turf/open/floor/plating, /area/ship/cargo) "mr" = ( @@ -1502,11 +1506,7 @@ }, /obj/machinery/light/directional/west, /obj/structure/closet/crate, -/obj/item/poster/random_official, -/obj/item/poster/random_official, -/obj/item/poster/random_rilena, -/obj/item/poster/random_minutemen, -/obj/item/poster/random_contraband, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "yu" = ( @@ -1777,6 +1777,8 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/large, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "Ds" = ( @@ -2085,7 +2087,7 @@ /turf/open/floor/plating, /area/ship/cargo) "Is" = ( -/obj/structure/closet/crate, +/obj/structure/closet/crate/science, /obj/item/paicard, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -2814,7 +2816,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "RU" = ( @@ -3146,6 +3147,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Xw" = ( From ff93fce058bd11a4bb227583de29a12602008f8b Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 28 May 2024 20:44:52 +0200 Subject: [PATCH 10/49] eh, this wasn't needed --- _maps/configs/independent_dwayne.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json index e9852948f9d2..acdae05e754e 100644 --- a/_maps/configs/independent_dwayne.json +++ b/_maps/configs/independent_dwayne.json @@ -37,7 +37,7 @@ }, "Deckhand": { "outfit": "/datum/outfit/job/independent/assistant", - "slots": 2 + "slots": 3 } }, "enabled": true From 7551cf648b11e837b0bd3554f1fa947924ca8bff Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 28 May 2024 22:52:12 +0200 Subject: [PATCH 11/49] slot number changes and related tweaks --- _maps/configs/independent_dwayne.json | 8 +-- .../independent/independent_dwayne.dmm | 65 ++++++++++--------- .../clothing/outfits/factions/independent.dm | 13 ++++ 3 files changed, 50 insertions(+), 36 deletions(-) diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json index acdae05e754e..6fd5d86b8e37 100644 --- a/_maps/configs/independent_dwayne.json +++ b/_maps/configs/independent_dwayne.json @@ -24,20 +24,16 @@ "slots": 1 }, "Foreman": { - "outfit": "/datum/outfit/job/independent/quartermaster/western", + "outfit": "/datum/outfit/job/independent/ce/western", "slots": 1 }, "Asteroid Miner": { "outfit": "/datum/outfit/job/independent/miner/hazard", "slots": 2 }, - "Ship's Engineer": { - "outfit": "/datum/outfit/job/independent/engineer", - "slots": 1 - }, "Deckhand": { "outfit": "/datum/outfit/job/independent/assistant", - "slots": 3 + "slots": 1 } }, "enabled": true diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 0bd38ec98add..e13dd92de89d 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -214,6 +214,7 @@ /obj/item/clothing/under/rank/command/captain/skirt, /obj/item/clothing/shoes/cowboy/fancy, /obj/item/clothing/suit/jacket/leather/duster/command, +/obj/item/clothing/suit/armor/vest/capcarapace/duster, /obj/item/clothing/gloves/color/white, /obj/item/clothing/head/caphat/cowboy, /obj/item/clothing/head/HoS/cowboy, @@ -504,13 +505,14 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "hK" = ( -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 8; - name = "connector port (fuel)" +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 10 }, -/obj/structure/sign/warning/fire{ - pixel_x = 23; - pixel_y = 4 +/obj/structure/frame/machine{ + anchored = 1 + }, +/obj/structure/sign/poster/contraband/tools{ + pixel_x = 32 }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) @@ -673,6 +675,9 @@ "kQ" = ( /obj/structure/table, /obj/machinery/computer/helm/viewscreen/directional/north, +/obj/item/areaeditor/shuttle{ + pixel_y = 3 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "ld" = ( @@ -930,23 +935,23 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "om" = ( -/obj/structure/closet/wall/orange/directional/west{ - name = "Mechanic's wardrobe" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/structure/closet/secure_closet/wall/directional/west{ + icon_state = "cargo_wall"; + name = "Foreman's locker"; + req_access_txt = "56" + }, /obj/item/storage/backpack/industrial, /obj/item/storage/backpack/satchel/eng, -/obj/item/storage/backpack/duffelbag/engineering, /obj/item/clothing/shoes/workboots, -/obj/item/clothing/under/rank/engineering/engineer, -/obj/item/clothing/suit/toggle/hazard, +/obj/item/clothing/under/rank/security/detective, /obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/toggle/industrial, +/obj/item/clothing/suit/toggle/hazard, /obj/item/storage/belt/utility, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/hardhat/dblue, -/obj/item/clothing/glasses/meson/engine/tray, +/obj/item/clothing/head/hardhat/orange, +/obj/item/clothing/head/cowboy/sec, /obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/meson/engine/tray, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "or" = ( @@ -1638,7 +1643,7 @@ /area/ship/engineering) "zY" = ( /obj/machinery/atmospherics/components/unary/tank/toxins{ - dir = 8 + dir = 1 }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) @@ -1668,13 +1673,9 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "AE" = ( -/obj/structure/table, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 9 }, -/obj/item/areaeditor/shuttle{ - pixel_y = 5 - }, /obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) @@ -1696,6 +1697,9 @@ /obj/machinery/computer/monitor/retro{ dir = 8 }, +/obj/structure/sign/poster/rilena/random{ + pixel_x = 32 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "Bq" = ( @@ -2967,17 +2971,18 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/closet/crate/medical, +/obj/item/clothing/gloves/color/latex/nitrile, /obj/item/storage/firstaid/regular, /obj/item/reagent_containers/hypospray/medipen/survival, /obj/item/reagent_containers/hypospray/medipen/survival{ pixel_y = -4 }, -/obj/item/storage/pill_bottle/mining{ - pixel_x = -6 - }, /obj/item/storage/pill_bottle/charcoal/less{ pixel_x = 5 }, +/obj/item/storage/pill_bottle/mining{ + pixel_x = -6 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "UP" = ( @@ -3024,14 +3029,14 @@ /turf/open/floor/plating, /area/ship/engineering) "VP" = ( -/obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 5 +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 1; + name = "connector port (fuel)" }, -/obj/structure/sign/poster/rilena/random{ - pixel_y = -32 +/obj/structure/sign/warning/fire{ + pixel_y = -20; + pixel_x = 9 }, -/obj/item/modular_computer/tablet/preset/cheap, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "VZ" = ( diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm index c819246f7cae..a3c3edd65248 100644 --- a/code/modules/clothing/outfits/factions/independent.dm +++ b/code/modules/clothing/outfits/factions/independent.dm @@ -385,6 +385,19 @@ box = /obj/item/storage/box/survival/engineer chameleon_extras = /obj/item/stamp/ce +/datum/outfit/job/independent/ce/western // Something between CE and QM + name = "Independent - Chief Engineer (Western)" + + belt = /obj/item/storage/belt/utility/full/engi // Indies probably don't need adv. tools + uniform = /obj/item/clothing/under/rank/security/detective + suit = /obj/item/clothing/suit/hazardvest + dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo + shoes = /obj/item/clothing/shoes/workboots + head = /obj/item/clothing/head/cowboy/sec + gloves = /obj/item/clothing/gloves/color/yellow + glasses = /obj/item/clothing/glasses/sunglasses + r_pocket = /obj/item/clipboard + // Medical Doctor /datum/outfit/job/independent/doctor From b5a026eb1ec9d9a9a47989c137001dcaeadc8572 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sat, 1 Jun 2024 12:02:32 +0200 Subject: [PATCH 12/49] tweaks --- .../independent/independent_dwayne.dmm | 71 ++++++++++--------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index e13dd92de89d..cce417c245b2 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -217,7 +217,6 @@ /obj/item/clothing/suit/armor/vest/capcarapace/duster, /obj/item/clothing/gloves/color/white, /obj/item/clothing/head/caphat/cowboy, -/obj/item/clothing/head/HoS/cowboy, /obj/machinery/light_switch{ dir = 1; pixel_x = 11; @@ -357,9 +356,9 @@ /obj/structure/cable/cyan{ icon_state = "0-6" }, -/obj/item/storage/backpack/satchel, -/obj/item/storage/backpack/satchel, -/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/satchel/explorer, +/obj/item/storage/backpack/satchel/explorer, +/obj/item/storage/backpack/satchel/explorer, /obj/item/clothing/under/utility, /obj/item/clothing/under/utility, /obj/item/clothing/under/utility, @@ -505,15 +504,12 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "hK" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, -/obj/structure/frame/machine{ - anchored = 1 - }, /obj/structure/sign/poster/contraband/tools{ pixel_x = 32 }, +/obj/machinery/atmospherics/components/unary/tank/toxins{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "hO" = ( @@ -766,9 +762,6 @@ /area/ship/cargo) "ms" = ( /obj/machinery/computer/helm/viewscreen/directional/north, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "6-9" }, @@ -776,6 +769,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/plasteel/grimy, /area/ship/crew/canteen) "mv" = ( @@ -1127,6 +1123,10 @@ pixel_y = 20 }, /obj/machinery/vending/coffee, +/obj/item/trash/candle{ + pixel_y = 18; + pixel_x = 4 + }, /turf/open/floor/plasteel/grimy, /area/ship/crew/canteen) "pS" = ( @@ -1639,11 +1639,17 @@ /obj/structure/cable/cyan{ icon_state = "2-5" }, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "zY" = ( -/obj/machinery/atmospherics/components/unary/tank/toxins{ - dir = 1 +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 8; + name = "connector port (fuel)" + }, +/obj/structure/sign/warning/fire{ + pixel_y = -20; + pixel_x = -10 }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) @@ -1893,14 +1899,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/item/toy/cards/deck{ - pixel_y = 6; - pixel_x = -11 - }, /obj/item/reagent_containers/food/snacks/chips{ pixel_x = 5; pixel_y = 4 }, +/obj/item/toy/cards/deck/kotahi{ + pixel_x = -11; + pixel_y = 6 + }, /turf/open/floor/wood, /area/ship/crew/canteen) "FH" = ( @@ -2005,6 +2011,7 @@ dir = 4 }, /obj/machinery/light/directional/east, +/obj/structure/closet/crate/engineering, /obj/item/pickaxe/drill{ pixel_y = -2 }, @@ -2014,7 +2021,6 @@ /obj/item/pinpointer/mineral{ pixel_y = 4 }, -/obj/structure/closet/crate/engineering, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "GU" = ( @@ -2108,7 +2114,8 @@ /obj/machinery/vending/cigarette, /obj/item/toy/figure/miner{ pixel_y = 17; - toysay = "Careful out there! Frontier is deadly this time of the year!" + toysay = "Careful out there! Frontier is deadly this time of the year!"; + pixel_x = -4 }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) @@ -2698,7 +2705,6 @@ /obj/structure/cable/cyan{ icon_state = "1-6" }, -/obj/item/tape/random, /obj/item/pen, /obj/item/pen, /turf/open/floor/plasteel/patterned/grid, @@ -2744,6 +2750,7 @@ /obj/structure/closet/crate/miningcar{ name = "mining cart" }, +/obj/item/pickaxe/mini, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "QI" = ( @@ -2973,16 +2980,17 @@ /obj/structure/closet/crate/medical, /obj/item/clothing/gloves/color/latex/nitrile, /obj/item/storage/firstaid/regular, +/obj/item/roller, /obj/item/reagent_containers/hypospray/medipen/survival, /obj/item/reagent_containers/hypospray/medipen/survival{ pixel_y = -4 }, -/obj/item/storage/pill_bottle/charcoal/less{ - pixel_x = 5 - }, /obj/item/storage/pill_bottle/mining{ pixel_x = -6 }, +/obj/item/storage/pill_bottle/charcoal/less{ + pixel_x = 5 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "UP" = ( @@ -3029,13 +3037,9 @@ /turf/open/floor/plating, /area/ship/engineering) "VP" = ( -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 1; - name = "connector port (fuel)" - }, -/obj/structure/sign/warning/fire{ - pixel_y = -20; - pixel_x = 9 +/obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 5 }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) @@ -3175,9 +3179,6 @@ /area/ship/crew/canteen) "XC" = ( /obj/structure/chair/sofa/brown/old/right/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, /obj/item/radio/intercom/directional/north, /turf/open/floor/wood, /area/ship/crew/canteen) From 1cc56046bf406f76d4f49d740c0736db615db71e Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 2 Jun 2024 11:46:54 +0200 Subject: [PATCH 13/49] Bathroom tweaks --- .../independent/independent_dwayne.dmm | 79 +++++++++++-------- 1 file changed, 45 insertions(+), 34 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index cce417c245b2..9f2be9bbe2a3 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -145,8 +145,13 @@ /area/ship/hallway/central) "bx" = ( /obj/structure/chair/sofa/brown/old/left/directional/south, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/north{ + pixel_x = 4 + }, /obj/machinery/airalarm/directional/east, +/obj/machinery/newscaster/directional/north{ + pixel_x = -10 + }, /turf/open/floor/wood, /area/ship/crew/canteen) "bE" = ( @@ -455,15 +460,16 @@ /obj/machinery/light_switch{ dir = 4; pixel_x = -20; - pixel_y = 7 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" + pixel_y = 13 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, +/obj/structure/cable/cyan{ + icon_state = "0-1" + }, +/obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/plasteel/patterned, /area/ship/crew/toilet) "hd" = ( @@ -1007,6 +1013,7 @@ pixel_y = 20 }, /obj/structure/chair, +/obj/machinery/newscaster/directional/north, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "oE" = ( @@ -1518,11 +1525,14 @@ /turf/closed/wall, /area/ship/hallway/central) "yx" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/structure/closet/wall/directional/west, +/obj/item/soap{ + pixel_x = -1; + pixel_y = -2 }, -/obj/structure/sign/poster/contraband/smoke{ - pixel_x = -32 +/obj/item/towel{ + pixel_y = 4; + pixel_x = -3 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -1840,8 +1850,8 @@ layer = 2.89 }, /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, /turf/open/floor/plasteel/patterned, /area/ship/crew/toilet) @@ -2073,13 +2083,12 @@ /turf/open/floor/plating, /area/ship/engineering) "HP" = ( -/obj/structure/toilet{ - dir = 8; - pixel_x = 4 - }, /obj/machinery/light/dim/directional/east, -/obj/effect/decal/cleanable/vomit/old{ - pixel_x = -7 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, /turf/open/floor/plasteel/patterned, /area/ship/crew/toilet) @@ -2710,11 +2719,20 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "Qe" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/cyan{ - icon_state = "0-1" +/obj/structure/window{ + dir = 4 }, -/turf/open/floor/plasteel/patterned, +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 1; + pixel_y = 0 + }, +/obj/item/bikehorn/rubberducky/plasticducky{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/structure/catwalk/over/plated_catwalk/white, +/turf/open/floor/plasteel/mono/white, /area/ship/crew/toilet) "Qg" = ( /obj/machinery/power/smes/engineering, @@ -2893,20 +2911,13 @@ /turf/open/floor/plating, /area/ship/cargo) "Tl" = ( -/obj/structure/window{ - dir = 1 - }, -/obj/structure/curtain, -/obj/machinery/shower{ - dir = 8 - }, -/obj/item/soap{ - pixel_x = -6; - pixel_y = -7 +/obj/structure/toilet{ + dir = 1; + pixel_y = 0 }, -/obj/item/bikehorn/rubberducky/plasticducky{ - pixel_x = -2; - pixel_y = 4 +/obj/effect/decal/cleanable/vomit/old{ + pixel_y = 12; + pixel_x = -6 }, /turf/open/floor/plasteel/patterned, /area/ship/crew/toilet) From 80b7cc222e3a74e5c67200ac0f6e19ae0c3eba1a Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 2 Jun 2024 12:10:49 +0200 Subject: [PATCH 14/49] I hate git --- _maps/shuttles/independent/independent_dwayne.dmm | 3 --- 1 file changed, 3 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 9f2be9bbe2a3..c874543b6e44 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -2084,9 +2084,6 @@ /area/ship/engineering) "HP" = ( /obj/machinery/light/dim/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, From cf042a3c273b9129ad5fccf2e4bcebc1b45bc98f Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:15:49 +0200 Subject: [PATCH 15/49] Technically an officer. --- _maps/configs/independent_dwayne.json | 1 + 1 file changed, 1 insertion(+) diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json index a11e2dd0018c..1faf9a108fdf 100644 --- a/_maps/configs/independent_dwayne.json +++ b/_maps/configs/independent_dwayne.json @@ -24,6 +24,7 @@ }, "Foreman": { "outfit": "/datum/outfit/job/independent/ce/western", + "officer": true, "slots": 1 }, "Asteroid Miner": { From 470fa11838a767b00aae0705ef792bb371c93fb9 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 4 Jun 2024 20:12:09 +0200 Subject: [PATCH 16/49] like a bunch of changes idfk --- .../independent/independent_dwayne.dmm | 103 +++++++++++------- 1 file changed, 63 insertions(+), 40 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index c874543b6e44..768a66db22e2 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -100,6 +100,10 @@ /obj/effect/turf_decal/corner/opaque/yellow/half{ dir = 1 }, +/obj/item/stack/packageWrap{ + pixel_y = 9; + pixel_x = -7 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "bf" = ( @@ -145,12 +149,10 @@ /area/ship/hallway/central) "bx" = ( /obj/structure/chair/sofa/brown/old/left/directional/south, -/obj/machinery/firealarm/directional/north{ - pixel_x = 4 - }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/airalarm/directional/east, /obj/machinery/newscaster/directional/north{ - pixel_x = -10 + pixel_x = -13 }, /turf/open/floor/wood, /area/ship/crew/canteen) @@ -182,7 +184,7 @@ dir = 8 }, /obj/structure/cable/cyan{ - icon_state = "0-6" + icon_state = "0-4" }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) @@ -202,7 +204,7 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "cf" = ( -/obj/structure/sign/poster/official/soft_cap_pop_art{ +/obj/structure/sign/poster/rilena/random{ pixel_x = -32 }, /obj/structure/closet/secure_closet{ @@ -242,7 +244,7 @@ /obj/effect/turf_decal/corner/opaque/yellow/half{ dir = 1 }, -/obj/structure/closet/crate/engineering/electrical, +/obj/structure/closet/crate, /obj/machinery/firealarm/directional/north, /obj/item/circuitboard/machine/space_heater, /obj/effect/spawner/lootdrop/maintenance, @@ -259,7 +261,7 @@ /obj/item/ammo_box/c38_box, /obj/item/ammo_box/c38_box, /obj/item/ammo_box/c38_box, -/obj/structure/closet/crate/secure/weapon, +/obj/structure/closet/crate/secure/plasma, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "dy" = ( @@ -532,9 +534,12 @@ dir = 1 }, /obj/structure/cable/cyan{ - icon_state = "2-5" + icon_state = "4-8" }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, /turf/open/floor/plating, /area/ship/engineering) "ig" = ( @@ -606,7 +611,7 @@ /obj/effect/turf_decal/corner/opaque/yellow/half{ dir = 4 }, -/obj/structure/closet/crate/secure/plasma, +/obj/structure/closet/crate/engineering/electrical, /obj/item/radio/intercom/directional/east, /obj/item/stack/sheet/mineral/plasma/ten, /turf/open/floor/plasteel/patterned/grid, @@ -680,6 +685,13 @@ /obj/item/areaeditor/shuttle{ pixel_y = 3 }, +/obj/machinery/power/terminal{ + dir = 4; + layer = 2.30 + }, +/obj/structure/cable/yellow{ + icon_state = "0-6" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "ld" = ( @@ -851,13 +863,17 @@ icon_state = "0-10" }, /obj/item/modular_computer/laptop/preset/civilian{ - pixel_x = 7; + pixel_x = 9; pixel_y = 4 }, /obj/item/computer_hardware/card_slot{ pixel_x = -7; pixel_y = 1 }, +/obj/item/computer_hardware/printer/mini{ + pixel_x = -6; + pixel_y = 10 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "mR" = ( @@ -948,9 +964,11 @@ /obj/item/clothing/shoes/workboots, /obj/item/clothing/under/rank/security/detective, /obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/toggle/hazard, +/obj/item/clothing/suit/jacket/leather/duster{ + name = "foreman's duster" + }, /obj/item/storage/belt/utility, -/obj/item/clothing/head/hardhat/orange, +/obj/item/clothing/head/hardhat/white, /obj/item/clothing/head/cowboy/sec, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/meson/engine/tray, @@ -1207,13 +1225,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/structure/cable/cyan{ + icon_state = "4-8" }, /obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/power/terminal{ - dir = 4 - }, /turf/open/floor/plating, /area/ship/engineering) "rq" = ( @@ -1242,7 +1257,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/noticeboard{ + pixel_x = -32 + }, /obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) @@ -1369,6 +1386,9 @@ dir = 8 }, /obj/structure/extinguisher_cabinet/directional/west, +/obj/item/stack/sheet/cardboard{ + amount = 2 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "vf" = ( @@ -1707,15 +1727,21 @@ /turf/open/floor/plating, /area/ship/hallway/central) "AY" = ( -/obj/structure/cable/yellow{ - icon_state = "0-10" - }, /obj/machinery/computer/monitor/retro{ dir = 8 }, /obj/structure/sign/poster/rilena/random{ pixel_x = 32 }, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/obj/structure/cable/cyan{ + icon_state = "0-1" + }, +/obj/structure/cable/yellow{ + icon_state = "9-10" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "Bq" = ( @@ -1862,11 +1888,11 @@ /turf/open/floor/plating, /area/ship/storage/eva) "Ez" = ( -/obj/machinery/power/ship_gravity, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/power/smes/engineering, /obj/structure/cable/cyan{ - icon_state = "0-10" + icon_state = "0-2" }, -/obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "EE" = ( @@ -2060,10 +2086,13 @@ /area/ship/bridge) "He" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/effect/decal/cleanable/dirt, /obj/structure/cable/cyan{ icon_state = "5-6" }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/cyan{ + icon_state = "4-5" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "Hh" = ( @@ -2173,9 +2202,7 @@ "Jq" = ( /obj/structure/closet/crate/engineering, /obj/effect/turf_decal/ntspaceworks_big/six, -/obj/item/stack/sheet/mineral/titanium{ - amount = 10 - }, +/obj/item/stack/sheet/plastic/five, /obj/item/stack/sheet/glass/twenty, /obj/item/stack/sheet/metal/fifty, /turf/open/floor/plasteel/patterned/grid, @@ -2651,12 +2678,9 @@ icon_state = "1-6" }, /obj/structure/cable/cyan{ - icon_state = "2-5" + icon_state = "2-9" }, /obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/cable/cyan{ - icon_state = "5-9" - }, /turf/open/floor/plating, /area/ship/engineering) "Po" = ( @@ -2732,15 +2756,17 @@ /turf/open/floor/plasteel/mono/white, /area/ship/crew/toilet) "Qg" = ( -/obj/machinery/power/smes/engineering, +/obj/machinery/power/ship_gravity, /obj/structure/cable/cyan{ - icon_state = "0-10" + icon_state = "0-8" }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "Qj" = ( /obj/effect/turf_decal/corner/opaque/yellow/half, -/obj/item/stack/sheet/cardboard, +/obj/item/stack/sheet/cardboard{ + amount = 2 + }, /obj/effect/turf_decal/industrial/warning, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) @@ -2772,16 +2798,13 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/cable/yellow{ icon_state = "2-5" }, /obj/structure/cable/cyan{ icon_state = "1-10" }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/cable/cyan{ - icon_state = "9-10" - }, /turf/open/floor/plating, /area/ship/engineering) "QO" = ( From 811734a10c9756bd16782a6337ac6f2e4b9c52d9 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Wed, 5 Jun 2024 20:14:59 +0200 Subject: [PATCH 17/49] more small tweaks --- .../independent/independent_dwayne.dmm | 60 +++++++++++-------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 768a66db22e2..158589dd9e1b 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -261,7 +261,7 @@ /obj/item/ammo_box/c38_box, /obj/item/ammo_box/c38_box, /obj/item/ammo_box/c38_box, -/obj/structure/closet/crate/secure/plasma, +/obj/structure/closet/crate/secure/weapon, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "dy" = ( @@ -682,9 +682,6 @@ "kQ" = ( /obj/structure/table, /obj/machinery/computer/helm/viewscreen/directional/north, -/obj/item/areaeditor/shuttle{ - pixel_y = 3 - }, /obj/machinery/power/terminal{ dir = 4; layer = 2.30 @@ -863,7 +860,7 @@ icon_state = "0-10" }, /obj/item/modular_computer/laptop/preset/civilian{ - pixel_x = 9; + pixel_x = 8; pixel_y = 4 }, /obj/item/computer_hardware/card_slot{ @@ -972,6 +969,7 @@ /obj/item/clothing/head/cowboy/sec, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/meson/engine/tray, +/obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "or" = ( @@ -1059,6 +1057,12 @@ /obj/item/radio{ pixel_y = 5 }, +/obj/item/radio{ + pixel_y = 5 + }, +/obj/item/radio{ + pixel_y = 5 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew/cryo) "oJ" = ( @@ -1066,18 +1070,15 @@ dir = 8 }, /obj/structure/table, +/obj/item/paper_bin{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/pen/fourcolor, /obj/item/toy/crayon/spraycan{ - pixel_x = 9; + pixel_x = -9; pixel_y = 17 }, -/obj/item/decal_painter{ - pixel_x = -20; - pixel_y = 3 - }, -/obj/item/hand_labeler{ - pixel_x = 1; - pixel_y = -1 - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "oQ" = ( @@ -1546,16 +1547,20 @@ /area/ship/hallway/central) "yx" = ( /obj/structure/closet/wall/directional/west, -/obj/item/soap{ - pixel_x = -1; - pixel_y = -2 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/item/towel{ + pixel_y = 4; + pixel_x = 4 }, /obj/item/towel{ pixel_y = 4; pixel_x = -3 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/item/soap{ + pixel_x = -1; + pixel_y = -2 }, /turf/open/floor/plasteel/patterned, /area/ship/crew/toilet) @@ -1888,7 +1893,6 @@ /turf/open/floor/plating, /area/ship/storage/eva) "Ez" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, /obj/machinery/power/smes/engineering, /obj/structure/cable/cyan{ icon_state = "0-2" @@ -2231,11 +2235,14 @@ }, /obj/structure/table, /obj/machinery/computer/helm/viewscreen/directional/north, -/obj/item/paper_bin{ - pixel_x = -7; +/obj/item/decal_painter{ + pixel_x = -2; pixel_y = 3 }, -/obj/item/pen/fourcolor, +/obj/item/hand_labeler{ + pixel_x = 13; + pixel_y = -1 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "Ka" = ( @@ -2721,7 +2728,7 @@ /area/ship/engineering) "PU" = ( /obj/structure/filingcabinet/chestdrawer/wheeled{ - dir = 2 + dir = 4 }, /obj/item/folder/yellow, /obj/item/folder/yellow, @@ -2753,6 +2760,9 @@ pixel_y = 3 }, /obj/structure/catwalk/over/plated_catwalk/white, +/obj/machinery/door/window/northleft{ + name = "shower door" + }, /turf/open/floor/plasteel/mono/white, /area/ship/crew/toilet) "Qg" = ( @@ -2939,6 +2949,7 @@ pixel_y = 12; pixel_x = -6 }, +/obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel/patterned, /area/ship/crew/toilet) "Tz" = ( @@ -3072,6 +3083,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 5 }, +/obj/effect/decal/cleanable/glass, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "VZ" = ( From 4c2b850bb309c474a383cb79acb920dc0e5a0860 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:56:00 +0200 Subject: [PATCH 18/49] Happy? --- _maps/shuttles/independent/independent_dwayne.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 158589dd9e1b..1ce61dbae00d 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -2761,7 +2761,7 @@ }, /obj/structure/catwalk/over/plated_catwalk/white, /obj/machinery/door/window/northleft{ - name = "shower door" + name = "Shower Door" }, /turf/open/floor/plasteel/mono/white, /area/ship/crew/toilet) From 33bf728c337ba8ebc3add6a88cb062a16649a24e Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 9 Jun 2024 11:25:00 +0200 Subject: [PATCH 19/49] kills u --- .../clothing/outfits/factions/independent.dm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm index a3c3edd65248..930328af9f81 100644 --- a/code/modules/clothing/outfits/factions/independent.dm +++ b/code/modules/clothing/outfits/factions/independent.dm @@ -385,8 +385,8 @@ box = /obj/item/storage/box/survival/engineer chameleon_extras = /obj/item/stamp/ce -/datum/outfit/job/independent/ce/western // Something between CE and QM - name = "Independent - Chief Engineer (Western)" +/datum/outfit/job/independent/ce/western + name = "Independent - Foreman (Western)" // Something between CE and QM belt = /obj/item/storage/belt/utility/full/engi // Indies probably don't need adv. tools uniform = /obj/item/clothing/under/rank/security/detective @@ -537,15 +537,6 @@ chameleon_extras = /obj/item/stamp/qm -/datum/outfit/job/independent/quartermaster/western - name = "Independent - Quartermaster (Western)" - - uniform = /obj/item/clothing/under/rank/cargo/qm - suit = /obj/item/clothing/suit/toggle/hazard - shoes = /obj/item/clothing/shoes/workboots - glasses = /obj/item/clothing/glasses/sunglasses - head = /obj/item/clothing/head/cowboy/sec - /datum/outfit/job/independent/miner name = "Independent - Miner" jobtype = /datum/job/mining From e0df5f014cf2cf97e191e63a3a36e7006bdb618f Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 9 Jun 2024 11:30:57 +0200 Subject: [PATCH 20/49] QM access --- code/modules/clothing/outfits/factions/independent.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm index 930328af9f81..bdf960682a54 100644 --- a/code/modules/clothing/outfits/factions/independent.dm +++ b/code/modules/clothing/outfits/factions/independent.dm @@ -398,6 +398,13 @@ glasses = /obj/item/clothing/glasses/sunglasses r_pocket = /obj/item/clipboard +/datum/outfit/job/independent/ce/western/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + var/obj/item/card/id/W = H.wear_id // All of QM's access. + W.access += list(ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_VAULT) + // Medical Doctor /datum/outfit/job/independent/doctor From 31a6378bf56f58ac36ff38b3e4f9322fed9a1e64 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 9 Jun 2024 12:20:33 +0200 Subject: [PATCH 21/49] more tweaks --- .../independent/independent_dwayne.dmm | 63 ++++++++++++------ .../modular_computers/hardware/_hardware.dm | 5 +- icons/obj/machines/mining_machines.dmi | Bin 4273 -> 5590 bytes 3 files changed, 45 insertions(+), 23 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 1ce61dbae00d..4e1614934177 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -53,17 +53,12 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 4 }, -/obj/machinery/button/door{ - id = "dwayne_windows"; - name = "Fore Window Control"; - pixel_x = -10; - pixel_y = -20; - dir = 1 - }, -/obj/machinery/computer/crew/retro{ - pixel_y = 0; +/obj/machinery/computer/cargo/express/retro{ dir = 8 }, +/obj/machinery/firealarm/directional/south{ + pixel_x = -9 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "aS" = ( @@ -640,6 +635,12 @@ dir = 8 }, /obj/structure/closet/emcloset/wall/directional/north, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "kf" = ( @@ -860,7 +861,7 @@ icon_state = "0-10" }, /obj/item/modular_computer/laptop/preset/civilian{ - pixel_x = 8; + pixel_x = 13; pixel_y = 4 }, /obj/item/computer_hardware/card_slot{ @@ -869,7 +870,7 @@ }, /obj/item/computer_hardware/printer/mini{ pixel_x = -6; - pixel_y = 10 + pixel_y = 11 }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) @@ -888,9 +889,10 @@ "nf" = ( /obj/effect/turf_decal/industrial/hatch/yellow, /obj/machinery/mineral/processing_unit_console{ - pixel_y = -32; + pixel_y = -18; machinedir = 8; - output_dir = 1 + output_dir = 1; + dir = 1 }, /turf/open/floor/plasteel/mono/dark, /area/ship/storage/eva) @@ -962,7 +964,8 @@ /obj/item/clothing/under/rank/security/detective, /obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/jacket/leather/duster{ - name = "foreman's duster" + name = "foreman's duster"; + desc = "A long, utilitarian leather coat. Ideal for protecting its wearer from rain, sun, dust and paperwork." }, /obj/item/storage/belt/utility, /obj/item/clothing/head/hardhat/white, @@ -1140,6 +1143,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "pv" = ( @@ -1259,9 +1268,10 @@ dir = 4 }, /obj/structure/noticeboard{ - pixel_x = -32 + dir = 1; + pixel_y = -26 }, -/obj/machinery/airalarm/directional/south, +/obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "sD" = ( @@ -1966,6 +1976,12 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "FN" = ( @@ -2208,7 +2224,7 @@ /obj/effect/turf_decal/ntspaceworks_big/six, /obj/item/stack/sheet/plastic/five, /obj/item/stack/sheet/glass/twenty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/twenty, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "Jy" = ( @@ -2281,14 +2297,19 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "Kz" = ( -/obj/machinery/computer/cargo/express/retro{ +/obj/machinery/computer/crew/retro{ + pixel_y = 0; dir = 8 }, /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 4 }, -/obj/machinery/firealarm/directional/north{ - pixel_x = -6 +/obj/machinery/button/door{ + id = "dwayne_windows"; + name = "Fore Window Control"; + pixel_x = -10; + pixel_y = 20; + dir = 2 }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) @@ -2728,7 +2749,7 @@ /area/ship/engineering) "PU" = ( /obj/structure/filingcabinet/chestdrawer/wheeled{ - dir = 4 + dir = 8 }, /obj/item/folder/yellow, /obj/item/folder/yellow, diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm index 5ff3480977c9..4aa6fcc4d01f 100644 --- a/code/modules/modular_computers/hardware/_hardware.dm +++ b/code/modules/modular_computers/hardware/_hardware.dm @@ -22,8 +22,9 @@ /obj/item/computer_hardware/New(obj/L) ..() - pixel_x = base_pixel_x + rand(-8, 8) - pixel_y = base_pixel_y + rand(-8, 8) + if(!pixel_x || !pixel_y) // Allows mapping those in, without random pixelshifts. + pixel_x = base_pixel_x + rand(-8, 8) + pixel_y = base_pixel_y + rand(-8, 8) /obj/item/computer_hardware/Destroy() if(holder) diff --git a/icons/obj/machines/mining_machines.dmi b/icons/obj/machines/mining_machines.dmi index 96151f074e117ffa2f310a869bb169d62d0d688d..2818df55ce165f4d7db5393d176e66729fcff9e8 100644 GIT binary patch literal 5590 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 YD%QWp!x(4iKOrF|1{V4+&bko)2es~X?*IS* literal 4273 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 From 565e86669753c9c997dc3b75df3c83ae88ad0e15 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 9 Jun 2024 12:47:57 +0200 Subject: [PATCH 22/49] less shit --- _maps/shuttles/independent/independent_dwayne.dmm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 4e1614934177..4a11c152f06f 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -360,26 +360,18 @@ }, /obj/item/storage/backpack/satchel/explorer, /obj/item/storage/backpack/satchel/explorer, -/obj/item/storage/backpack/satchel/explorer, -/obj/item/clothing/under/utility, /obj/item/clothing/under/utility, /obj/item/clothing/under/utility, /obj/item/clothing/under/utility/skirt, /obj/item/clothing/under/utility/skirt, -/obj/item/clothing/under/utility/skirt, -/obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/workboots, /obj/item/clothing/shoes/workboots, -/obj/item/clothing/shoes/workboots, -/obj/item/clothing/suit/jacket/leather/duster, /obj/item/clothing/suit/jacket/leather/duster, /obj/item/clothing/suit/jacket/leather/duster, /obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/fingerless, -/obj/item/clothing/gloves/fingerless, -/obj/item/clothing/head/cowboy, /obj/item/clothing/head/cowboy, /obj/item/clothing/head/cowboy, /turf/open/floor/wood, From 429f6ba3a57669fc437955d54498984aaba60064 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 9 Jun 2024 16:51:26 +0200 Subject: [PATCH 23/49] swaps these two --- _maps/shuttles/independent/independent_dwayne.dmm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 4a11c152f06f..a99c85f2c1a3 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -1107,10 +1107,10 @@ /area/ship/hallway/central) "pl" = ( /obj/structure/table/reinforced, -/obj/item/radio/intercom/wideband/table{ - dir = 1; +/obj/item/radio/intercom/table{ pixel_x = 5; - pixel_y = 3 + pixel_y = 3; + dir = 1 }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) @@ -2151,7 +2151,8 @@ /area/ship/cargo) "IF" = ( /obj/structure/table/reinforced, -/obj/item/radio/intercom/table{ +/obj/item/radio/intercom/wideband/table{ + dir = 2; pixel_x = 5; pixel_y = -2 }, From 31420c43ee8015a53f579245b41b09fef2144f15 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:34:03 +0200 Subject: [PATCH 24/49] washing machine --- .../independent/independent_dwayne.dmm | 40 +++++++------------ 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index a99c85f2c1a3..461230c97078 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -1052,12 +1052,6 @@ /obj/item/radio{ pixel_y = 5 }, -/obj/item/radio{ - pixel_y = 5 - }, -/obj/item/radio{ - pixel_y = 5 - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew/cryo) "oJ" = ( @@ -1882,10 +1876,10 @@ pixel_y = 28; layer = 2.89 }, -/obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, +/obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel/patterned, /area/ship/crew/toilet) "Ex" = ( @@ -2125,8 +2119,14 @@ /area/ship/engineering) "HP" = ( /obj/machinery/light/dim/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/structure/toilet{ + dir = 8; + pixel_y = 7; + pixel_x = 6 + }, +/obj/effect/decal/cleanable/vomit/old{ + pixel_y = 13; + pixel_x = -10 }, /turf/open/floor/plasteel/patterned, /area/ship/crew/toilet) @@ -2955,15 +2955,8 @@ /turf/open/floor/plating, /area/ship/cargo) "Tl" = ( -/obj/structure/toilet{ - dir = 1; - pixel_y = 0 - }, -/obj/effect/decal/cleanable/vomit/old{ - pixel_y = 12; - pixel_x = -6 - }, -/obj/item/radio/intercom/directional/east, +/obj/machinery/washing_machine, +/obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/patterned, /area/ship/crew/toilet) "Tz" = ( @@ -3041,12 +3034,7 @@ /obj/item/reagent_containers/hypospray/medipen/survival{ pixel_y = -4 }, -/obj/item/storage/pill_bottle/mining{ - pixel_x = -6 - }, -/obj/item/storage/pill_bottle/charcoal/less{ - pixel_x = 5 - }, +/obj/item/storage/pill_bottle/charcoal/less, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "UP" = ( From 81c59adb4cf605b8399a6b20588cb0ebb36e4d67 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 10 Jun 2024 22:51:08 +0200 Subject: [PATCH 25/49] bridge --- .../independent/independent_dwayne.dmm | 165 +++++++++++------- 1 file changed, 101 insertions(+), 64 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 461230c97078..d12829649379 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -9,8 +9,15 @@ /obj/structure/cable/cyan{ icon_state = "5-8" }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 4 + }, +/obj/item/kirbyplants/fullysynthetic{ + pixel_x = 10 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/plasteel/tech, /area/ship/hallway/central) "ap" = ( /turf/closed/wall, @@ -56,9 +63,6 @@ /obj/machinery/computer/cargo/express/retro{ dir = 8 }, -/obj/machinery/firealarm/directional/south{ - pixel_x = -9 - }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "aS" = ( @@ -459,6 +463,7 @@ icon_state = "0-1" }, /obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned, /area/ship/crew/toilet) "hd" = ( @@ -499,7 +504,7 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "hK" = ( -/obj/structure/sign/poster/contraband/tools{ +/obj/structure/sign/poster/contraband/gec{ pixel_x = 32 }, /obj/machinery/atmospherics/components/unary/tank/toxins{ @@ -845,9 +850,6 @@ /area/ship/engineering) "mJ" = ( /obj/structure/table/reinforced, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 8 - }, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable/cyan{ icon_state = "0-10" @@ -864,6 +866,9 @@ pixel_x = -6; pixel_y = 11 }, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 1 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "mR" = ( @@ -1106,6 +1111,9 @@ pixel_y = 3; dir = 1 }, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 1 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "pn" = ( @@ -1276,14 +1284,24 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "sM" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/door/airlock/command/glass{ + dir = 4; + name = "Bridge" + }, /obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 4 + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) "sP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1694,7 +1712,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/item/kirbyplants/random{ +/obj/item/kirbyplants/fullysynthetic{ pixel_x = -10 }, /obj/effect/turf_decal/industrial/warning{ @@ -1868,6 +1886,24 @@ /obj/effect/decal/cleanable/ash, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) +"DR" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/item/paperplane{ + dir = 4; + pixel_x = 14; + pixel_y = -8 + }, +/turf/open/floor/plating, +/area/ship/hallway/central) "Ee" = ( /obj/structure/sink{ pixel_y = 19 @@ -1971,11 +2007,6 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "FN" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 20 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -2016,23 +2047,17 @@ /turf/open/floor/wood, /area/ship/crew/dorm) "Gr" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/door/airlock/command/glass{ - dir = 4; - name = "Bridge" +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -19 }, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 8 +/turf/open/floor/plasteel/stairs{ + dir = 4; + color = "#555555" }, -/turf/open/floor/plasteel/dark, /area/ship/bridge) "Gx" = ( /obj/item/radio/intercom/directional/south, @@ -2156,6 +2181,7 @@ pixel_x = 5; pixel_y = -2 }, +/obj/effect/turf_decal/corner/opaque/ntblue/half, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "IJ" = ( @@ -2373,7 +2399,6 @@ /obj/item/reagent_containers/food/drinks/waterbottle/large, /obj/item/reagent_containers/food/snacks/canned/beans, /obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/item/reagent_containers/food/snacks/candy, /obj/item/reagent_containers/food/snacks/candy, /turf/open/floor/plasteel/grimy, @@ -2428,7 +2453,6 @@ /area/ship/storage/eva) "Mz" = ( /obj/machinery/holopad/emergency/command, -/obj/machinery/light/directional/west, /obj/effect/turf_decal/box/white{ color = "#283674" }, @@ -2593,9 +2617,6 @@ /area/ship/cargo) "Oz" = ( /obj/structure/table/reinforced, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 8 - }, /obj/machinery/airalarm/directional/west, /obj/item/spacecash/bundle/c1000{ pixel_x = -2; @@ -2609,21 +2630,28 @@ pixel_x = 17; pixel_y = 5 }, +/obj/effect/turf_decal/corner/opaque/ntblue/half, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "OJ" = ( /turf/template_noop, /area/template_noop) "OL" = ( -/obj/item/kirbyplants/random{ - pixel_x = 10 +/obj/machinery/light/directional/west, +/obj/structure/filingcabinet/filingcabinet{ + dir = 4; + pixel_x = -10; + density = 0 }, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 4 +/obj/effect/turf_decal/corner/opaque/ntblue/border{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/item/flashlight/flare, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) "OP" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/structure/cable/yellow{ @@ -2889,6 +2917,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "RU" = ( @@ -2904,17 +2935,27 @@ /turf/open/floor/plating, /area/ship/storage/eva) "Se" = ( -/obj/structure/cable/cyan{ - icon_state = "4-10" +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/door/airlock/command/glass{ + dir = 4; + name = "Bridge" + }, /obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 4 + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/structure/cable/cyan{ + icon_state = "4-10" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) "Sg" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3167,26 +3208,17 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Xm" = ( -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, /obj/structure/cable/cyan{ icon_state = "5-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/airlock/command/glass{ +/obj/machinery/firealarm/directional/north, +/turf/open/floor/plasteel/stairs{ dir = 4; - name = "Bridge" - }, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 8 + color = "#555555" }, -/turf/open/floor/plasteel/dark, /area/ship/bridge) "Xn" = ( /obj/effect/turf_decal/techfloor{ @@ -3201,7 +3233,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/corner/opaque/ntblue/half{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Xw" = ( @@ -3326,6 +3360,9 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/industrial/caution{ + dir = 4 + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "ZQ" = ( @@ -3691,7 +3728,7 @@ uc uc uc my -lv +DR Gx eM eM @@ -3843,7 +3880,7 @@ JH Gl ap Se -OL +wv sM Um bx @@ -3862,7 +3899,7 @@ VZ rE wv Xm -wv +OL Gr wv rE From 7aadf9781dff2df2a8060b9b66835cc32bf8e482 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 10 Jun 2024 23:14:51 +0200 Subject: [PATCH 26/49] No. --- _maps/shuttles/independent/independent_dwayne.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index d12829649379..2a9b37943b47 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -2041,7 +2041,7 @@ /area/ship/external/dark) "Gl" = ( /obj/structure/bed, -/obj/item/bedsheet/random, +/obj/item/bedsheet/dorms, /obj/machinery/airalarm/directional/east, /obj/item/radio/intercom/directional/south, /turf/open/floor/wood, @@ -2258,7 +2258,7 @@ /area/ship/storage/eva) "JH" = ( /obj/structure/bed, -/obj/item/bedsheet/random, +/obj/item/bedsheet/dorms, /obj/structure/cable/yellow{ icon_state = "4-10" }, @@ -3367,7 +3367,7 @@ /area/ship/engineering) "ZQ" = ( /obj/structure/bed, -/obj/item/bedsheet/random, +/obj/item/bedsheet/dorms, /turf/open/floor/wood, /area/ship/crew/dorm) "ZR" = ( From c7ee314730d9ee0c9a04998e2111118cea333dfc Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:56:04 +0200 Subject: [PATCH 27/49] cables --- .../independent/independent_dwayne.dmm | 164 +++++++++--------- 1 file changed, 83 insertions(+), 81 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 2a9b37943b47..f62be68596f3 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -25,7 +25,10 @@ "as" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/cyan{ - icon_state = "5-8" + icon_state = "6-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-6" }, /turf/open/floor/plating, /area/ship/storage/eva) @@ -63,6 +66,9 @@ /obj/machinery/computer/cargo/express/retro{ dir = 8 }, +/obj/machinery/firealarm/directional/south{ + pixel_x = -10 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "aS" = ( @@ -107,9 +113,6 @@ /area/ship/cargo) "bf" = ( /obj/effect/turf_decal/industrial/warning, -/obj/structure/cable/cyan{ - icon_state = "6-9" - }, /turf/open/floor/plating, /area/ship/cargo) "bj" = ( @@ -124,13 +127,8 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "bo" = ( -/obj/effect/turf_decal/industrial/warning, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/cyan{ - icon_state = "5-10" - }, /obj/structure/cable/cyan{ - icon_state = "5-9" + icon_state = "2-9" }, /turf/open/floor/plating, /area/ship/cargo) @@ -172,9 +170,6 @@ /area/ship/crew/toilet) "bO" = ( /obj/effect/decal/cleanable/blood/old, -/obj/structure/cable/cyan{ - icon_state = "5-10" - }, /turf/open/floor/plating, /area/ship/storage/eva) "bP" = ( @@ -431,18 +426,6 @@ "gu" = ( /turf/closed/wall/r_wall/yesdiag, /area/ship/cargo) -"gz" = ( -/obj/effect/turf_decal/corner/opaque/yellow/half{ - dir = 1 - }, -/obj/structure/cable/cyan{ - icon_state = "5-10" - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/storage/eva) "gF" = ( /obj/machinery/power/shuttle/engine/fueled/plasma{ dir = 4 @@ -519,6 +502,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/cable/cyan{ + icon_state = "5-10" + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "hZ" = ( @@ -551,7 +537,7 @@ id = "dwayne_mining" }, /obj/structure/cable/cyan{ - icon_state = "0-6" + icon_state = "0-2" }, /turf/open/floor/plating, /area/ship/storage/eva) @@ -668,6 +654,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/cable/cyan{ + icon_state = "5-10" + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "kO" = ( @@ -765,14 +754,20 @@ /obj/item/c_tube{ pixel_y = 3 }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/ship/cargo) "mr" = ( /obj/structure/cable/cyan{ - icon_state = "6-9" + icon_state = "1-2" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, /turf/open/floor/plating, -/area/ship/cargo) +/area/ship/storage/eva) "ms" = ( /obj/machinery/computer/helm/viewscreen/directional/north, /obj/structure/cable/yellow{ @@ -850,10 +845,6 @@ /area/ship/engineering) "mJ" = ( /obj/structure/table/reinforced, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/cyan{ - icon_state = "0-10" - }, /obj/item/modular_computer/laptop/preset/civilian{ pixel_x = 13; pixel_y = 4 @@ -1084,7 +1075,10 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/cyan{ - icon_state = "1-2" + icon_state = "1-10" + }, +/obj/structure/cable/cyan{ + icon_state = "1-6" }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) @@ -1338,12 +1332,6 @@ /turf/open/floor/plating, /area/ship/cargo) "tX" = ( -/obj/structure/cable/cyan{ - icon_state = "2-5" - }, -/obj/structure/cable/cyan{ - icon_state = "2-9" - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "uc" = ( @@ -1357,13 +1345,13 @@ dir = 8 }, /obj/effect/turf_decal/ntspaceworks_big/two, +/obj/structure/cable/cyan{ + icon_state = "6-9" + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "ul" = ( /obj/effect/decal/cleanable/oil, -/obj/structure/cable/cyan{ - icon_state = "5-10" - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "uP" = ( @@ -1376,7 +1364,7 @@ locked = 1 }, /obj/structure/cable/cyan{ - icon_state = "0-5" + icon_state = "0-1" }, /turf/open/floor/plating, /area/ship/cargo) @@ -1663,6 +1651,9 @@ /obj/effect/turf_decal/corner/opaque/yellow{ dir = 8 }, +/obj/structure/cable/cyan{ + icon_state = "6-9" + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "zI" = ( @@ -1676,10 +1667,13 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "zK" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/ship/storage/eva) "zQ" = ( @@ -1951,12 +1945,6 @@ dir = 1 }, /obj/structure/ore_box, -/obj/structure/cable/cyan{ - icon_state = "6-9" - }, -/obj/structure/cable/cyan{ - icon_state = "6-10" - }, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, @@ -2050,10 +2038,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -19 - }, +/obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/stairs{ dir = 4; color = "#555555" @@ -2068,9 +2053,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/ntspaceworks_big/one, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "GN" = ( @@ -2108,7 +2090,10 @@ id = "dwayne_mining" }, /obj/structure/cable/cyan{ - icon_state = "0-10" + icon_state = "0-2" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, /turf/open/floor/plating, /area/ship/storage/eva) @@ -2254,6 +2239,9 @@ /area/ship/bridge) "JE" = ( /obj/effect/decal/cleanable/ash, +/obj/structure/cable/cyan{ + icon_state = "1-10" + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "JH" = ( @@ -2338,6 +2326,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/ntspaceworks_big/seven, +/obj/structure/cable/cyan{ + icon_state = "6-9" + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "LH" = ( @@ -2449,6 +2440,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/cyan{ + icon_state = "5-10" + }, /turf/open/floor/plating, /area/ship/storage/eva) "Mz" = ( @@ -2556,6 +2550,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/cyan{ + icon_state = "6-9" + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "NT" = ( @@ -2617,7 +2614,6 @@ /area/ship/cargo) "Oz" = ( /obj/structure/table/reinforced, -/obj/machinery/airalarm/directional/west, /obj/item/spacecash/bundle/c1000{ pixel_x = -2; pixel_y = 0 @@ -2631,6 +2627,7 @@ pixel_y = 5 }, /obj/effect/turf_decal/corner/opaque/ntblue/half, +/obj/machinery/newscaster/directional/west, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "OJ" = ( @@ -2692,6 +2689,9 @@ /obj/effect/spawner/lootdrop/plushie, /obj/effect/spawner/lootdrop/plushie, /obj/effect/spawner/lootdrop/plushie, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "Pd" = ( @@ -2701,9 +2701,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "Pe" = ( @@ -2778,12 +2775,6 @@ /obj/item/folder, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/ntspaceworks_big/five, -/obj/structure/cable/cyan{ - icon_state = "1-10" - }, -/obj/structure/cable/cyan{ - icon_state = "1-6" - }, /obj/item/pen, /obj/item/pen, /turf/open/floor/plasteel/patterned/grid, @@ -2837,9 +2828,6 @@ /obj/item/storage/bag/ore, /obj/item/storage/bag/ore, /obj/item/storage/bag/ore, -/obj/structure/cable/cyan{ - icon_state = "6-9" - }, /obj/structure/closet/crate/miningcar{ name = "mining cart" }, @@ -3076,6 +3064,9 @@ pixel_y = -4 }, /obj/item/storage/pill_bottle/charcoal/less, +/obj/structure/cable/cyan{ + icon_state = "5-10" + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "UP" = ( @@ -3157,7 +3148,10 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/corner/opaque/yellow/half, /obj/structure/cable/cyan{ - icon_state = "1-2" + icon_state = "2-5" + }, +/obj/structure/cable/cyan{ + icon_state = "2-9" }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) @@ -3211,10 +3205,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/cyan{ - icon_state = "5-8" + icon_state = "0-8" + }, +/obj/machinery/light_switch{ + dir = 2; + pixel_x = -12; + pixel_y = 20 }, -/obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel/stairs{ dir = 4; color = "#555555" @@ -3297,7 +3296,7 @@ locked = 1 }, /obj/structure/cable/cyan{ - icon_state = "0-9" + icon_state = "0-1" }, /turf/open/floor/plating, /area/ship/cargo) @@ -3308,7 +3307,10 @@ /obj/item/trash/can/food/beans, /obj/effect/spawner/lootdrop/maintenance, /obj/structure/cable/cyan{ - icon_state = "6-8" + icon_state = "2-5" + }, +/obj/structure/cable/cyan{ + icon_state = "5-8" }, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) @@ -3569,7 +3571,7 @@ YJ "} (11,1,1) = {" in -Ph +mr as Un oB @@ -3602,7 +3604,7 @@ cL zI UD FR -bo +Nf Ip "} (13,1,1) = {" @@ -3658,13 +3660,13 @@ Hh zc uk Jq -mr +FP Nf Ip "} (16,1,1) = {" ZK -gz +eu ww Mo dx @@ -3696,7 +3698,7 @@ eM JZ bl Jn -FP +bo OW YN "} From 2ff9faf9a03ce25f1f021605436acd78561e711f Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 14 Jun 2024 20:37:38 +0200 Subject: [PATCH 28/49] kills u --- _maps/shuttles/independent/independent_dwayne.dmm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index f62be68596f3..4762055ba4c3 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -2831,7 +2831,6 @@ /obj/structure/closet/crate/miningcar{ name = "mining cart" }, -/obj/item/pickaxe/mini, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "QI" = ( @@ -3258,6 +3257,10 @@ "XC" = ( /obj/structure/chair/sofa/brown/old/right/directional/south, /obj/item/radio/intercom/directional/north, +/obj/item/cigbutt/cigarbutt{ + pixel_x = 8; + pixel_y = -1 + }, /turf/open/floor/wood, /area/ship/crew/canteen) "YA" = ( From a2df3124c64d2ac5e83d0234434df96961c33b73 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 18 Jun 2024 18:49:32 +0200 Subject: [PATCH 29/49] minor stuff --- _maps/shuttles/independent/independent_dwayne.dmm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 4762055ba4c3..c43f23c147b4 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -1399,7 +1399,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/effect/turf_decal/number/zero, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) @@ -2092,9 +2091,6 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, /turf/open/floor/plating, /area/ship/storage/eva) "GW" = ( @@ -2592,7 +2588,7 @@ dir = 1 }, /obj/structure/chair/comfy/shuttle{ - dir = 8 + dir = 2 }, /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -2760,7 +2756,7 @@ dir = 8 }, /obj/structure/chair/comfy/shuttle{ - dir = 8 + dir = 1 }, /obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel/tech/techmaint, From 2072078b3e68d8ca460a584dc3ba9e384a205e0c Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Thu, 20 Jun 2024 13:03:24 +0200 Subject: [PATCH 30/49] combustion thrusters and other unrelated stuff --- .../independent/independent_dwayne.dmm | 76 +++++++++++-------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 621f5f81ec06..b0b939e95803 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -217,6 +217,7 @@ /obj/item/clothing/suit/jacket/leather/duster/command, /obj/item/clothing/suit/armor/vest/capcarapace/duster, /obj/item/clothing/gloves/color/white, +/obj/item/clothing/head/HoS/cowboy, /obj/item/clothing/head/caphat/cowboy, /obj/machinery/light_switch{ dir = 1; @@ -316,11 +317,14 @@ /turf/closed/wall, /area/ship/cargo) "fl" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ - dir = 8 +/obj/machinery/atmospherics/components/trinary/mixer{ + dir = 1; + name = "fuel mixer"; + node1_concentration = 0.33; + node2_concentration = 0.67; + target_pressure = 500 }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "fp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -394,9 +398,7 @@ /turf/open/floor/plating, /area/ship/engineering) "gm" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/shuttle/fire_heater, /obj/machinery/door/window/northright{ dir = 4; name = "Engine Access" @@ -427,9 +429,7 @@ /turf/closed/wall/r_wall/yesdiag, /area/ship/cargo) "gF" = ( -/obj/machinery/power/shuttle/engine/fueled/plasma{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/fire, /turf/open/floor/plating/airless, /area/ship/engineering) "gT" = ( @@ -490,9 +490,11 @@ /obj/structure/sign/poster/contraband/gec{ pixel_x = 32 }, -/obj/machinery/atmospherics/components/unary/tank/toxins{ - dir = 8 +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 8; + name = "connector port (Fuel)" }, +/obj/machinery/portable_atmospherics/canister/hydrogen, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "hO" = ( @@ -514,11 +516,10 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/cable/cyan{ icon_state = "2-4" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "ig" = ( /obj/machinery/atmospherics/components/unary/tank/air{ @@ -676,6 +677,14 @@ /obj/structure/cable/yellow{ icon_state = "0-6" }, +/obj/item/reagent_containers/glass/maunamug{ + pixel_x = 10; + pixel_y = 2 + }, +/obj/item/newspaper{ + pixel_x = -9; + pixel_y = 1 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "ld" = ( @@ -898,7 +907,7 @@ /area/ship/engineering) "nJ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/layer2{ - name = "connector port (air)" + name = "connector port (Air)" }, /obj/machinery/light_switch{ dir = 8; @@ -957,6 +966,7 @@ }, /obj/item/storage/belt/utility, /obj/item/clothing/head/hardhat/white, +/obj/item/clothing/head/hardhat/orange, /obj/item/clothing/head/cowboy/sec, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/meson/engine/tray, @@ -1289,7 +1299,8 @@ }, /obj/machinery/door/airlock/command/glass{ dir = 4; - name = "Bridge" + name = "Bridge"; + req_access_txt = "19" }, /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 @@ -1685,14 +1696,15 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "zY" = ( -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 8; - name = "connector port (fuel)" - }, /obj/structure/sign/warning/fire{ pixel_y = -20; pixel_x = -10 }, +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 8; + name = "connector port (Fuel)" + }, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "AD" = ( @@ -1725,6 +1737,7 @@ dir = 9 }, /obj/item/radio/intercom/directional/south, +/obj/effect/decal/cleanable/glass, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "AQ" = ( @@ -1798,9 +1811,7 @@ /turf/closed/wall/yesdiag, /area/ship/engineering) "CD" = ( -/obj/machinery/atmospherics/components/unary/shuttle/heater{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/shuttle/fire_heater, /obj/machinery/door/window/northleft{ dir = 4; name = "Engine Access" @@ -2000,6 +2011,8 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "FP" = ( +/obj/structure/closet/crate/large, +/obj/machinery/portable_atmospherics/canister/hydrogen, /turf/open/floor/plating, /area/ship/cargo) "FR" = ( @@ -2840,8 +2853,6 @@ /obj/structure/cable/cyan{ icon_state = "1-10" }, -/obj/structure/closet/crate/large, -/obj/machinery/portable_atmospherics/canister/hydrogen, /turf/open/floor/plating, /area/ship/engineering) "QO" = ( @@ -2931,7 +2942,8 @@ }, /obj/machinery/door/airlock/command/glass{ dir = 4; - name = "Bridge" + name = "Bridge"; + req_access_txt = "19" }, /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 @@ -3099,22 +3111,22 @@ dir = 4 }, /obj/machinery/light/directional/west, +/obj/item/reagent_containers/food/drinks/soda_cans/cola{ + pixel_y = 14; + pixel_x = 3 + }, /turf/open/floor/wood, /area/ship/crew/dorm) "Vv" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "engine fuel pump" - }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plating, /area/ship/engineering) "VP" = ( /obj/machinery/airalarm/directional/south, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 5 }, -/obj/effect/decal/cleanable/glass, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "VZ" = ( From ce2bca8b31e3c7e5579defb9a78bfef512059cc1 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 21 Jun 2024 20:32:00 +0200 Subject: [PATCH 31/49] NT decals --- .../independent/independent_dwayne.dmm | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index b0b939e95803..df74c3be3872 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -120,7 +120,6 @@ /area/ship/crew/toilet) "bl" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/ntspaceworks_big/four, /obj/structure/chair/office{ dir = 1 }, @@ -257,6 +256,9 @@ /obj/item/ammo_box/c38_box, /obj/item/ammo_box/c38_box, /obj/structure/closet/crate/secure/weapon, +/obj/effect/turf_decal/ntspaceworks_big/two{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "dy" = ( @@ -507,6 +509,7 @@ /obj/structure/cable/cyan{ icon_state = "5-10" }, +/obj/effect/turf_decal/ntspaceworks_big/three, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "hZ" = ( @@ -658,6 +661,9 @@ /obj/structure/cable/cyan{ icon_state = "5-10" }, +/obj/effect/turf_decal/ntspaceworks_big/three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "kO" = ( @@ -924,6 +930,9 @@ pixel_x = 3 }, /obj/item/gun/energy/kinetic_accelerator, +/obj/effect/turf_decal/ntspaceworks_big/seven{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "nY" = ( @@ -1343,6 +1352,9 @@ /turf/open/floor/plating, /area/ship/cargo) "tX" = ( +/obj/effect/turf_decal/ntspaceworks_big/eight{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "uc" = ( @@ -1355,7 +1367,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/ntspaceworks_big/two, /obj/structure/cable/cyan{ icon_state = "6-9" }, @@ -1674,6 +1685,7 @@ dir = 6 }, /obj/item/cigbutt, +/obj/effect/turf_decal/ntspaceworks_big/two, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "zK" = ( @@ -2064,7 +2076,7 @@ /obj/structure/reagent_dispensers/watertank, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/effect/turf_decal/ntspaceworks_big/one, +/obj/effect/turf_decal/ntspaceworks_big/four, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "GN" = ( @@ -2190,6 +2202,9 @@ "IK" = ( /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt, +/obj/effect/turf_decal/ntspaceworks_big/five{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "IT" = ( @@ -2229,12 +2244,10 @@ /area/ship/crew/canteen) "Jn" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/ntspaceworks_big/eight, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "Jq" = ( /obj/structure/closet/crate/engineering, -/obj/effect/turf_decal/ntspaceworks_big/six, /obj/item/stack/sheet/plastic/five, /obj/item/stack/sheet/glass/twenty, /obj/item/stack/sheet/metal/twenty, @@ -2334,7 +2347,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/ntspaceworks_big/seven, /obj/structure/cable/cyan{ icon_state = "6-9" }, @@ -2580,6 +2592,7 @@ /area/ship/storage/eva) "NW" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/ntspaceworks_big/five, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "Op" = ( @@ -2619,6 +2632,7 @@ /obj/item/chair/plastic{ pixel_y = 11 }, +/obj/effect/turf_decal/ntspaceworks_big/one, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "Oz" = ( @@ -2710,6 +2724,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/turf_decal/ntspaceworks_big/four{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "Pe" = ( @@ -2783,9 +2800,9 @@ /obj/item/folder/blue, /obj/item/folder, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/ntspaceworks_big/five, /obj/item/pen, /obj/item/pen, +/obj/effect/turf_decal/ntspaceworks_big/eight, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "Qe" = ( @@ -3076,6 +3093,7 @@ /obj/structure/cable/cyan{ icon_state = "5-10" }, +/obj/effect/turf_decal/ntspaceworks_big/six, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "UP" = ( From 4fe7d0ff3acc2a7f59c6cc01572dcda6a2679850 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 24 Jun 2024 10:22:50 +0200 Subject: [PATCH 32/49] conflict --- _maps/shuttles/independent/independent_dwayne.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index df74c3be3872..38e58c82454d 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -3071,7 +3071,7 @@ /obj/item/gun/ballistic/shotgun/flamingarrow, /obj/item/gun/ballistic/shotgun/flamingarrow, /obj/item/gun/ballistic/shotgun/flamingarrow, -/obj/structure/guncase/shotgun{ +/obj/structure/guncloset/shotgun{ name = "rifle locker" }, /turf/open/floor/plasteel/patterned/grid, From 15f24cff41930a9ab1ed5b2be0b1659de37838aa Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 25 Jun 2024 14:42:33 +0200 Subject: [PATCH 33/49] un-merges engi and foreman --- _maps/configs/independent_dwayne.json | 6 +- .../independent/independent_dwayne.dmm | 57 ++++++++++++------- .../clothing/outfits/factions/independent.dm | 44 +++++++------- 3 files changed, 64 insertions(+), 43 deletions(-) diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json index 1faf9a108fdf..4556db9fdc09 100644 --- a/_maps/configs/independent_dwayne.json +++ b/_maps/configs/independent_dwayne.json @@ -23,7 +23,7 @@ "slots": 1 }, "Foreman": { - "outfit": "/datum/outfit/job/independent/ce/western", + "outfit": "/datum/outfit/job/independent/quartermaster/western", "officer": true, "slots": 1 }, @@ -31,6 +31,10 @@ "outfit": "/datum/outfit/job/independent/miner/hazard", "slots": 2 }, + "Mechanic": { + "outfit": "/datum/outfit/job/independent/engineer", + "slots": 1 + }, "Deckhand": { "outfit": "/datum/outfit/job/independent/assistant", "slots": 1 diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 38e58c82454d..fe28bf3a8a36 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -208,7 +208,6 @@ open_sound = 'sound/machines/wooden_closet_open.ogg' }, /obj/item/storage/backpack/satchel/cap, -/obj/item/storage/backpack/captain, /obj/item/storage/backpack/messenger/com, /obj/item/clothing/under/rank/command/captain, /obj/item/clothing/under/rank/command/captain/skirt, @@ -365,6 +364,7 @@ }, /obj/item/storage/backpack/satchel/explorer, /obj/item/storage/backpack/satchel/explorer, +/obj/item/storage/backpack/satchel/explorer, /obj/item/clothing/under/utility, /obj/item/clothing/under/utility, /obj/item/clothing/under/utility/skirt, @@ -379,6 +379,8 @@ /obj/item/clothing/gloves/fingerless, /obj/item/clothing/head/cowboy, /obj/item/clothing/head/cowboy, +/obj/item/clothing/glasses/heat, +/obj/item/clothing/glasses/heat, /turf/open/floor/wood, /area/ship/crew/dorm) "fY" = ( @@ -683,14 +685,14 @@ /obj/structure/cable/yellow{ icon_state = "0-6" }, -/obj/item/reagent_containers/glass/maunamug{ - pixel_x = 10; - pixel_y = 2 - }, /obj/item/newspaper{ pixel_x = -9; pixel_y = 1 }, +/obj/item/reagent_containers/food/drinks/mug{ + pixel_x = 10; + pixel_y = 3 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "ld" = ( @@ -959,27 +961,17 @@ /area/ship/storage/eva) "om" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/structure/closet/secure_closet/wall/directional/west{ - icon_state = "cargo_wall"; - name = "Foreman's locker"; - req_access_txt = "56" +/obj/structure/closet/wall/orange/directional/west{ + name = "Mechanic's locker" }, -/obj/item/storage/backpack/industrial, +/obj/effect/decal/cleanable/oil/streak, /obj/item/storage/backpack/satchel/eng, -/obj/item/clothing/shoes/workboots, -/obj/item/clothing/under/rank/security/detective, +/obj/item/storage/backpack/messenger/engi, +/obj/item/clothing/under/rank/engineering/engineer, /obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/jacket/leather/duster{ - name = "foreman's duster"; - desc = "A long, utilitarian leather coat. Ideal for protecting its wearer from rain, sun, dust and paperwork." - }, -/obj/item/storage/belt/utility, -/obj/item/clothing/head/hardhat/white, -/obj/item/clothing/head/hardhat/orange, -/obj/item/clothing/head/cowboy/sec, +/obj/item/clothing/suit/toggle/hazard, +/obj/item/clothing/head/hardhat/dblue, /obj/item/clothing/glasses/welding, -/obj/item/clothing/glasses/meson/engine/tray, -/obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "or" = ( @@ -1016,6 +1008,23 @@ }, /obj/machinery/light/directional/east, /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet{ + req_access_txt = "19"; + icon_state = "qm"; + name = "Foreman's locker" + }, +/obj/item/storage/backpack/satchel/eng, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/under/rank/security/detective, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/jacket/leather/duster{ + name = "foreman's duster"; + desc = "A long, utilitarian leather coat. Ideal for protecting its wearer from rain, sun, dust and paperwork." + }, +/obj/item/clothing/gloves/fingerless, +/obj/item/clothing/head/cowboy/sec, +/obj/item/clothing/head/hardhat/orange, +/obj/item/clothing/head/hardhat/white, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "oB" = ( @@ -1067,6 +1076,9 @@ /obj/item/radio{ pixel_y = 5 }, +/obj/item/radio{ + pixel_y = 5 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew/cryo) "oJ" = ( @@ -2091,6 +2103,7 @@ /obj/item/pickaxe/drill{ pixel_y = -2 }, +/obj/item/radio/weather_monitor, /obj/item/pinpointer/mineral{ pixel_y = 4 }, diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm index e503fb785263..bc2e23dc54c3 100644 --- a/code/modules/clothing/outfits/factions/independent.dm +++ b/code/modules/clothing/outfits/factions/independent.dm @@ -406,26 +406,6 @@ box = /obj/item/storage/box/survival/engineer chameleon_extras = /obj/item/stamp/ce -/datum/outfit/job/independent/ce/western - name = "Independent - Foreman (Western)" // Something between CE and QM - - belt = /obj/item/storage/belt/utility/full/engi // Indies probably don't need adv. tools - uniform = /obj/item/clothing/under/rank/security/detective - suit = /obj/item/clothing/suit/hazardvest - dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo - shoes = /obj/item/clothing/shoes/workboots - head = /obj/item/clothing/head/cowboy/sec - gloves = /obj/item/clothing/gloves/color/yellow - glasses = /obj/item/clothing/glasses/sunglasses - r_pocket = /obj/item/clipboard - -/datum/outfit/job/independent/ce/western/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - ..() - if(visualsOnly) - return - var/obj/item/card/id/W = H.wear_id // All of QM's access. - W.access += list(ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_VAULT) - // Medical Doctor /datum/outfit/job/independent/doctor @@ -565,6 +545,30 @@ chameleon_extras = /obj/item/stamp/qm + +/datum/outfit/job/independent/quartermaster/western + name = "Independent - Quartermaster (Western)" + + belt = /obj/item/storage/belt/utility/full + uniform = /obj/item/clothing/under/rank/security/detective + suit = /obj/item/clothing/suit/hazardvest + shoes = /obj/item/clothing/shoes/workboots + gloves = /obj/item/clothing/gloves/fingerless + glasses = /obj/item/clothing/glasses/sunglasses + head = /obj/item/clothing/head/cowboy/sec + l_hand = null + r_pocket = /obj/item/clipboard + + backpack = /obj/item/storage/backpack/industrial + satchel = /obj/item/storage/backpack/satchel/eng + +/datum/outfit/job/independent/quartermaster/western/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + var/obj/item/card/id/W = H.wear_id + W.access += list(ACCESS_HEADS) + /datum/outfit/job/independent/miner name = "Independent - Miner" jobtype = /datum/job/mining From 3753285c78f2a687b4c2c429bb965b11f3743d34 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 25 Jun 2024 15:02:01 +0200 Subject: [PATCH 34/49] better solution --- _maps/shuttles/independent/independent_dwayne.dmm | 11 +++++------ code/modules/clothing/outfits/factions/independent.dm | 7 ------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index fe28bf3a8a36..1f41aed0476b 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -1008,10 +1008,9 @@ }, /obj/machinery/light/directional/east, /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet{ - req_access_txt = "19"; - icon_state = "qm"; - name = "Foreman's locker" +/obj/structure/closet/secure_closet/quartermaster{ + populate = 0; + name = "\proper Foreman's locker" }, /obj/item/storage/backpack/satchel/eng, /obj/item/clothing/shoes/workboots, @@ -1321,7 +1320,7 @@ /obj/machinery/door/airlock/command/glass{ dir = 4; name = "Bridge"; - req_access_txt = "19" + req_one_access = list(20,41) }, /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 @@ -2973,7 +2972,7 @@ /obj/machinery/door/airlock/command/glass{ dir = 4; name = "Bridge"; - req_access_txt = "19" + req_one_access = list(20,41) }, /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 8 diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm index bc2e23dc54c3..1a6cde49b08f 100644 --- a/code/modules/clothing/outfits/factions/independent.dm +++ b/code/modules/clothing/outfits/factions/independent.dm @@ -562,13 +562,6 @@ backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel/eng -/datum/outfit/job/independent/quartermaster/western/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - ..() - if(visualsOnly) - return - var/obj/item/card/id/W = H.wear_id - W.access += list(ACCESS_HEADS) - /datum/outfit/job/independent/miner name = "Independent - Miner" jobtype = /datum/job/mining From 3057e7c53556dee0f20aab03895d002b05c8142a Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:17:41 +0200 Subject: [PATCH 35/49] kills the KA --- .../shuttles/independent/independent_dwayne.dmm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 1f41aed0476b..a59deddbbef6 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -926,15 +926,10 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "nL" = ( -/obj/structure/closet/crate/large, -/obj/item/flashlight/seclite{ - pixel_y = -6; - pixel_x = 3 - }, -/obj/item/gun/energy/kinetic_accelerator, /obj/effect/turf_decal/ntspaceworks_big/seven{ dir = 1 }, +/obj/structure/ore_box, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "nY" = ( @@ -2096,13 +2091,15 @@ }, /obj/machinery/light/directional/east, /obj/structure/closet/crate/engineering, +/obj/item/t_scanner/adv_mining_scanner/lesser{ + pixel_y = -3 + }, /obj/item/pickaxe/drill{ pixel_y = -2 }, /obj/item/pickaxe/drill{ pixel_y = -2 }, -/obj/item/radio/weather_monitor, /obj/item/pinpointer/mineral{ pixel_y = 4 }, @@ -2679,9 +2676,12 @@ dir = 8 }, /obj/item/flashlight/flare, -/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/breath, /obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/gun/ballistic/revolver/detective, +/obj/item/ammo_box/c38, +/obj/item/ammo_box/c38, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "OP" = ( @@ -3065,7 +3065,6 @@ /obj/effect/turf_decal/corner/opaque/yellow/half{ dir = 4 }, -/obj/structure/ore_box, /obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) From 281af3e673f8a259afdc40b9809f0e6a675cc85d Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:23:30 +0200 Subject: [PATCH 36/49] accidental enter --- code/modules/clothing/outfits/factions/independent.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm index 1a6cde49b08f..4fb28b9e1d48 100644 --- a/code/modules/clothing/outfits/factions/independent.dm +++ b/code/modules/clothing/outfits/factions/independent.dm @@ -545,7 +545,6 @@ chameleon_extras = /obj/item/stamp/qm - /datum/outfit/job/independent/quartermaster/western name = "Independent - Quartermaster (Western)" From 300e0ba5252c72c37292014cfc699faad0e9bd7e Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 1 Jul 2024 01:22:45 +0200 Subject: [PATCH 37/49] like a bunch of changes again --- .../independent/independent_dwayne.dmm | 324 +++++++++++------- 1 file changed, 200 insertions(+), 124 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index a59deddbbef6..8030f23aa914 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -9,14 +9,17 @@ /obj/structure/cable/cyan{ icon_state = "5-8" }, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 4 - }, /obj/item/kirbyplants/fullysynthetic{ pixel_x = 10 }, /obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom/directional/east, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/cyan{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/corner/opaque/black{ + dir = 6 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "ap" = ( @@ -56,6 +59,10 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) @@ -88,7 +95,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood, +/turf/open/floor/carpet, /area/ship/crew/dorm) "aY" = ( /obj/structure/sink/kitchen{ @@ -179,6 +186,9 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "bW" = ( @@ -222,7 +232,9 @@ pixel_x = 11; pixel_y = -19 }, -/turf/open/floor/wood, +/turf/open/floor/wood{ + icon_state = "wood-broken5" + }, /area/ship/crew/dorm) "cw" = ( /obj/machinery/door/poddoor/preopen{ @@ -239,7 +251,7 @@ }, /obj/structure/closet/crate, /obj/machinery/firealarm/directional/north, -/obj/item/circuitboard/machine/space_heater, +/obj/item/circuitboard/machine/pipedispenser, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) @@ -390,6 +402,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/insectguts, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "gf" = ( @@ -469,6 +484,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "hy" = ( @@ -567,21 +585,12 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/industrial/warning, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "iZ" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/engineering{ - dir = 4; - name = "Engineering" - }, /obj/effect/turf_decal/techfloor{ - dir = 8 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -589,8 +598,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/cyan{ + icon_state = "0-9" + }, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering) "ja" = ( /obj/effect/turf_decal/corner/opaque/yellow/half{ dir = 4 @@ -738,13 +752,15 @@ /turf/open/floor/plating, /area/ship/hallway/central) "lD" = ( -/obj/effect/turf_decal/techfloor{ - dir = 5 - }, /obj/structure/cable/yellow{ icon_state = "4-9" }, -/obj/effect/decal/cleanable/oil, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "ma" = ( @@ -760,9 +776,6 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/structure/cable/cyan{ - icon_state = "1-10" - }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering) @@ -836,27 +849,22 @@ /turf/open/floor/plating, /area/ship/engineering) "mE" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /obj/effect/turf_decal/techfloor{ - dir = 8 + dir = 5 }, +/obj/effect/decal/cleanable/oil, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/cyan{ - icon_state = "6-10" +/obj/machinery/light_switch{ + dir = 2; + pixel_y = 20 }, -/obj/machinery/door/airlock/engineering{ - dir = 4; - name = "Engineering" +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering) "mF" = ( /turf/closed/wall, /area/ship/engineering) @@ -904,25 +912,16 @@ "nr" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/button/door{ - id = "dwayne_engines"; - name = "Aft Window Control"; - pixel_x = -20; - pixel_y = 0; - dir = 4 +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "nJ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/layer2{ name = "connector port (Air)" }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = 10 - }, -/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "nL" = ( @@ -941,6 +940,9 @@ dir = 8 }, /obj/structure/cable/cyan, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "of" = ( @@ -967,6 +969,9 @@ /obj/item/clothing/suit/toggle/hazard, /obj/item/clothing/head/hardhat/dblue, /obj/item/clothing/glasses/welding, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "or" = ( @@ -1317,18 +1322,19 @@ name = "Bridge"; req_one_access = list(20,41) }, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/black{ + dir = 9 + }, +/turf/open/floor/plasteel/stairs{ + dir = 4; + color = "#555555" }, -/turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "sP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, +/turf/open/floor/carpet, /area/ship/crew/dorm) "sZ" = ( /obj/machinery/cryopod, @@ -1572,8 +1578,20 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "yu" = ( -/turf/closed/wall, -/area/ship/hallway/central) +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "5-8" + }, +/obj/machinery/light/directional/east, +/obj/structure/frame/machine{ + anchored = 1; + state = 2; + icon_state = "box_1" + }, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering) "yx" = ( /obj/structure/closet/wall/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -1711,6 +1729,9 @@ icon_state = "2-5" }, /obj/item/storage/toolbox/emergency, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "zY" = ( @@ -1741,13 +1762,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/structure/sign/warning/electricshock{ - pixel_x = -25; - pixel_y = 5 - }, -/obj/structure/cable/cyan{ - icon_state = "2-9" - }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "AE" = ( @@ -1756,6 +1771,9 @@ }, /obj/item/radio/intercom/directional/south, /obj/effect/decal/cleanable/glass, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "AQ" = ( @@ -2062,7 +2080,7 @@ /obj/item/bedsheet/dorms, /obj/machinery/airalarm/directional/east, /obj/item/radio/intercom/directional/south, -/turf/open/floor/wood, +/turf/open/floor/carpet, /area/ship/crew/dorm) "Gr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -2139,6 +2157,9 @@ /obj/structure/cable/cyan{ icon_state = "4-5" }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "Hh" = ( @@ -2281,7 +2302,7 @@ /obj/structure/cable/yellow{ icon_state = "4-10" }, -/turf/open/floor/wood, +/turf/open/floor/carpet, /area/ship/crew/dorm) "JZ" = ( /obj/effect/turf_decal/corner/opaque/yellow/half{ @@ -2377,7 +2398,7 @@ /obj/structure/extinguisher_cabinet/directional/south{ pixel_x = 7 }, -/turf/open/floor/wood, +/turf/open/floor/carpet, /area/ship/crew/dorm) "LJ" = ( /obj/structure/table/reinforced, @@ -2450,6 +2471,9 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "Mk" = ( @@ -2513,12 +2537,16 @@ /area/ship/crew/dorm) "MQ" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable/cyan{ - icon_state = "0-5" - }, /obj/item/cigbutt, /obj/effect/turf_decal/techfloor, +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/button/door{ + id = "dwayne_engines"; + name = "Aft Window Control"; + pixel_x = -20; + pixel_y = 0; + dir = 4 + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "MT" = ( @@ -2534,14 +2562,14 @@ /turf/open/floor/plating, /area/ship/cargo) "Nw" = ( -/obj/effect/turf_decal/techfloor{ - dir = 4 +/obj/structure/cable/cyan{ + icon_state = "4-8" }, +/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable/cyan{ - icon_state = "5-8" + icon_state = "6-8" }, -/obj/machinery/light/directional/east, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plating, /area/ship/engineering) "NC" = ( /obj/structure/cable/yellow{ @@ -2588,14 +2616,26 @@ "NT" = ( /obj/structure/closet/cardboard, /obj/effect/spawner/lootdrop/glowstick, -/obj/effect/spawner/lootdrop/glowstick, -/obj/effect/spawner/lootdrop/glowstick, -/obj/effect/spawner/lootdrop/glowstick, -/obj/effect/spawner/lootdrop/glowstick, -/obj/effect/spawner/lootdrop/glowstick, +/obj/effect/spawner/lootdrop/glowstick{ + pixel_y = 2 + }, +/obj/effect/spawner/lootdrop/glowstick{ + pixel_y = -3; + pixel_x = 7 + }, +/obj/effect/spawner/lootdrop/glowstick{ + pixel_x = -6 + }, +/obj/effect/spawner/lootdrop/glowstick{ + pixel_y = -3 + }, +/obj/effect/spawner/lootdrop/glowstick{ + pixel_x = 2; + pixel_y = 3 + }, /obj/item/stack/marker_beacon/thirty{ - pixel_y = -5; - pixel_x = -5 + pixel_y = -6; + pixel_x = -6 }, /turf/open/floor/plating, /area/ship/storage/eva) @@ -2775,7 +2815,9 @@ /mob/living/simple_animal/turtle{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood{ + icon_state = "wood-broken2" + }, /area/ship/crew/dorm) "Px" = ( /obj/effect/turf_decal/corner/opaque/yellow, @@ -2888,18 +2930,18 @@ /obj/effect/turf_decal/corner/opaque/yellow/three_quarters{ dir = 1 }, +/obj/item/cigbutt, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "RA" = ( -/obj/effect/turf_decal/techfloor{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/techfloor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/industrial/warning, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "RJ" = ( @@ -2942,8 +2984,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 4 +/obj/effect/turf_decal/corner/opaque/black{ + dir = 6 }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) @@ -2974,25 +3016,39 @@ name = "Bridge"; req_one_access = list(20,41) }, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 8 - }, /obj/structure/cable/cyan{ icon_state = "4-10" }, -/turf/open/floor/plasteel/mono/dark, +/obj/effect/turf_decal/corner/opaque/black{ + dir = 9 + }, +/turf/open/floor/plasteel/stairs{ + dir = 4; + color = "#555555" + }, /area/ship/bridge) "Sg" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/airalarm/directional/north, +/obj/structure/cable/cyan{ + icon_state = "6-10" + }, +/obj/machinery/door/airlock/engineering{ + dir = 4; + name = "Engineering" + }, /obj/effect/turf_decal/industrial/warning{ - dir = 8 + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) "St" = ( /obj/machinery/door/poddoor/preopen{ id = "dwayne_windows"; @@ -3035,9 +3091,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood{ - icon_state = "wood-broken2" - }, +/turf/open/floor/wood, /area/ship/crew/dorm) "TO" = ( /obj/effect/turf_decal/corner/opaque/yellow/half, @@ -3153,7 +3207,7 @@ /area/ship/engineering) "VP" = ( /obj/machinery/airalarm/directional/south, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ +/obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 }, /turf/open/floor/plasteel/tech/grid, @@ -3223,7 +3277,9 @@ pixel_x = -8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/wood, +/turf/open/floor/wood{ + icon_state = "wood-broken4" + }, /area/ship/crew/dorm) "Xk" = ( /obj/effect/turf_decal/corner/opaque/yellow/half, @@ -3264,14 +3320,18 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "Xo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/obj/effect/turf_decal/corner/opaque/ntblue/half{ - dir = 4 +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/corner/opaque/black{ + dir = 6 }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) @@ -3323,6 +3383,9 @@ dir = 10 }, /obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "YJ" = ( @@ -3357,21 +3420,25 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "Zj" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/machinery/door/firedoor/border_only{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/machinery/door/firedoor/border_only{ + dir = 8 }, -/obj/effect/turf_decal/industrial/warning{ +/obj/machinery/door/airlock/engineering{ + dir = 4; + name = "Engineering" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/structure/cable/cyan{ - icon_state = "0-1" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) "Zv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -3412,9 +3479,18 @@ "ZQ" = ( /obj/structure/bed, /obj/item/bedsheet/dorms, -/turf/open/floor/wood, +/turf/open/floor/carpet, /area/ship/crew/dorm) "ZR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /obj/structure/sign/poster/official/safety_internals{ pixel_y = -32 }, @@ -3601,7 +3677,7 @@ Jg vb uc Sg -AD +mF Zj eM pS @@ -3620,7 +3696,7 @@ oB Wi uc aI -lv +AD ZR eM CS From 4807252b985e6f4e65359146d37e23c0f3ebd390 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:33:50 +0200 Subject: [PATCH 38/49] kills object cash --- _maps/configs/independent_dwayne.json | 1 + .../independent/independent_dwayne.dmm | 20 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json index 4556db9fdc09..5bf0a946b950 100644 --- a/_maps/configs/independent_dwayne.json +++ b/_maps/configs/independent_dwayne.json @@ -15,6 +15,7 @@ "Mining", "Cargo" ], + "starting_funds": 4000, "limit": 1, "job_slots": { "Captain": { diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 8030f23aa914..3dc7c0666a8b 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -189,6 +189,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, +/obj/item/cigbutt, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "bW" = ( @@ -516,7 +517,6 @@ dir = 8; name = "connector port (Fuel)" }, -/obj/machinery/portable_atmospherics/canister/hydrogen, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "hO" = ( @@ -1728,7 +1728,6 @@ /obj/structure/cable/cyan{ icon_state = "2-5" }, -/obj/item/storage/toolbox/emergency, /obj/effect/turf_decal/industrial/warning{ dir = 8 }, @@ -2537,7 +2536,6 @@ /area/ship/crew/dorm) "MQ" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/item/cigbutt, /obj/effect/turf_decal/techfloor, /obj/effect/turf_decal/industrial/warning, /obj/machinery/button/door{ @@ -2686,20 +2684,17 @@ /area/ship/cargo) "Oz" = ( /obj/structure/table/reinforced, -/obj/item/spacecash/bundle/c1000{ - pixel_x = -2; - pixel_y = 0 - }, -/obj/item/spacecash/bundle/c1000{ - pixel_x = -3; - pixel_y = 4 - }, /obj/item/megaphone/cargo{ - pixel_x = 17; + pixel_x = 14; pixel_y = 5 }, /obj/effect/turf_decal/corner/opaque/ntblue/half, /obj/machinery/newscaster/directional/west, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/pen/fourcolor, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "OJ" = ( @@ -2942,6 +2937,7 @@ dir = 8 }, /obj/effect/turf_decal/industrial/warning, +/obj/item/cigbutt, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "RJ" = ( From a7fc639b7b061e6c09670a086c391931d040268b Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:07:00 +0200 Subject: [PATCH 39/49] minor --- .../independent/independent_dwayne.dmm | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 3dc7c0666a8b..b60b9c670fec 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -226,7 +226,6 @@ /obj/item/clothing/suit/jacket/leather/duster/command, /obj/item/clothing/suit/armor/vest/capcarapace/duster, /obj/item/clothing/gloves/color/white, -/obj/item/clothing/head/HoS/cowboy, /obj/item/clothing/head/caphat/cowboy, /obj/machinery/light_switch{ dir = 1; @@ -267,7 +266,9 @@ /obj/item/ammo_box/c38_box, /obj/item/ammo_box/c38_box, /obj/item/ammo_box/c38_box, -/obj/structure/closet/crate/secure/weapon, +/obj/structure/closet/crate/secure/plasma{ + name = "secure crate" + }, /obj/effect/turf_decal/ntspaceworks_big/two{ dir = 1 }, @@ -1828,10 +1829,6 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) -"Cn" = ( -/obj/structure/catwalk, -/turf/closed/wall, -/area/ship/engineering) "Cp" = ( /obj/machinery/light/directional/west, /obj/machinery/mineral/unloading_machine{ @@ -1958,7 +1955,7 @@ /turf/open/floor/plasteel/patterned, /area/ship/crew/toilet) "Ex" = ( -/obj/structure/window/fulltile, +/obj/structure/window/reinforced/fulltile, /obj/structure/grille, /obj/machinery/door/firedoor/window, /turf/open/floor/plating, @@ -2162,7 +2159,7 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "Hh" = ( -/obj/structure/window/fulltile, +/obj/structure/window/reinforced/fulltile, /obj/structure/grille, /obj/machinery/door/firedoor/window, /turf/open/floor/plating, @@ -2704,8 +2701,7 @@ /obj/machinery/light/directional/west, /obj/structure/filingcabinet/filingcabinet{ dir = 4; - pixel_x = -10; - density = 0 + pixel_x = -10 }, /obj/effect/turf_decal/corner/opaque/ntblue/border{ dir = 8 @@ -2717,6 +2713,7 @@ /obj/item/gun/ballistic/revolver/detective, /obj/item/ammo_box/c38, /obj/item/ammo_box/c38, +/obj/item/extinguisher/mini, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "OP" = ( @@ -3555,7 +3552,7 @@ OJ mF gF aD -Cn +mF fy WL Ou @@ -3563,7 +3560,7 @@ Qp PH WL Pe -Cn +mF aD gF mF From ca7b146a1458c3650eac7c49047fbe223a214b71 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sat, 6 Jul 2024 01:33:19 +0200 Subject: [PATCH 40/49] atmos hotfix --- .../shuttles/independent/independent_dwayne.dmm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index b60b9c670fec..e836e3d8c06e 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -547,7 +547,8 @@ /area/ship/engineering) "ig" = ( /obj/machinery/atmospherics/components/unary/tank/air{ - dir = 1 + dir = 1; + piping_layer = 2 }, /obj/machinery/light/directional/east, /turf/open/floor/plasteel/tech/grid, @@ -700,8 +701,8 @@ /obj/structure/cable/yellow{ icon_state = "0-6" }, -/obj/item/newspaper{ - pixel_x = -9; +/obj/item/paper/guides/jobs/engi/combustion_thruster{ + pixel_x = -5; pixel_y = 1 }, /obj/item/reagent_containers/food/drinks/mug{ @@ -955,6 +956,11 @@ dir = 4 }, /obj/machinery/suit_storage_unit/independent/mining/eva, +/obj/item/toy/figure/miner{ + pixel_y = 17; + toysay = "Careful out there! Frontier is deadly this time of the year!... Or any time of the year, actually..."; + pixel_x = -4 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "om" = ( @@ -2220,7 +2226,7 @@ /obj/machinery/vending/cigarette, /obj/item/toy/figure/miner{ pixel_y = 17; - toysay = "Careful out there! Frontier is deadly this time of the year!"; + toysay = "Careful out there! Frontier is deadly this time of the year!... Or any time of the year, actually..."; pixel_x = -4 }, /turf/open/floor/plasteel/tech, @@ -3332,7 +3338,8 @@ /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/salad/oatmeal{ pixel_y = 14; - pixel_x = 10 + pixel_x = 10; + desc = "A nice bowl of oatmeal. You aren't quite sure how long it's been sitting here." }, /obj/structure/cable/yellow{ icon_state = "4-9" From 0a9cfc43830048f4137b6697d5879390585ca4a4 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 8 Jul 2024 23:57:45 +0200 Subject: [PATCH 41/49] Honestly just. Just this. --- .../independent/independent_dwayne.dmm | 83 ++++++++----------- .../modular_computers/hardware/_hardware.dm | 5 +- 2 files changed, 35 insertions(+), 53 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index e836e3d8c06e..93dcbc774104 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -70,12 +70,12 @@ /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 4 }, -/obj/machinery/computer/cargo/express/retro{ - dir = 8 - }, /obj/machinery/firealarm/directional/south{ pixel_x = -10 }, +/obj/machinery/modular_computer/console/preset/command{ + dir = 8 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "aS" = ( @@ -226,6 +226,7 @@ /obj/item/clothing/suit/jacket/leather/duster/command, /obj/item/clothing/suit/armor/vest/capcarapace/duster, /obj/item/clothing/gloves/color/white, +/obj/item/clothing/head/caphat, /obj/item/clothing/head/caphat/cowboy, /obj/machinery/light_switch{ dir = 1; @@ -872,21 +873,17 @@ /area/ship/engineering) "mJ" = ( /obj/structure/table/reinforced, -/obj/item/modular_computer/laptop/preset/civilian{ - pixel_x = 13; - pixel_y = 4 - }, -/obj/item/computer_hardware/card_slot{ - pixel_x = -7; - pixel_y = 1 - }, -/obj/item/computer_hardware/printer/mini{ - pixel_x = -6; - pixel_y = 11 - }, /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 1 }, +/obj/item/radio/weather_monitor{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/reagent_containers/food/drinks/waterbottle/empty{ + pixel_x = -8; + pixel_y = 6 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "mR" = ( @@ -1136,15 +1133,10 @@ /turf/open/floor/plating, /area/ship/hallway/central) "pl" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom/table{ - pixel_x = 5; - pixel_y = 3; - dir = 1 - }, /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 1 }, +/obj/machinery/computer/crew, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "pn" = ( @@ -1410,12 +1402,15 @@ /turf/open/floor/plating, /area/ship/cargo) "uT" = ( -/obj/machinery/computer/helm/retro{ - dir = 8 - }, /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 4 }, +/obj/structure/table/reinforced, +/obj/item/radio/intercom/wideband/table{ + dir = 4; + pixel_y = 0; + pixel_x = 5 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "vb" = ( @@ -1794,9 +1789,6 @@ /turf/open/floor/plating, /area/ship/hallway/central) "AY" = ( -/obj/machinery/computer/monitor/retro{ - dir = 8 - }, /obj/structure/sign/poster/rilena/random{ pixel_x = 32 }, @@ -1809,6 +1801,10 @@ /obj/structure/cable/yellow{ icon_state = "9-10" }, +/obj/machinery/computer/monitor{ + dir = 8; + icon_state = "computer-left" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "Bq" = ( @@ -1821,9 +1817,6 @@ /turf/open/floor/plating/airless, /area/ship/bridge) "Bx" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "BX" = ( @@ -2213,13 +2206,10 @@ /turf/open/floor/plating, /area/ship/cargo) "IF" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom/wideband/table{ - dir = 2; - pixel_x = 5; - pixel_y = -2 - }, /obj/effect/turf_decal/corner/opaque/ntblue/half, +/obj/machinery/computer/cargo/express{ + dir = 1 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "IJ" = ( @@ -2358,10 +2348,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "Kz" = ( -/obj/machinery/computer/crew/retro{ - pixel_y = 0; - dir = 8 - }, /obj/effect/turf_decal/corner/opaque/ntblue/half{ dir = 4 }, @@ -2372,6 +2358,9 @@ pixel_y = 20; dir = 2 }, +/obj/machinery/computer/helm{ + dir = 8 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "KO" = ( @@ -2592,7 +2581,8 @@ }, /obj/machinery/light/directional/east, /obj/machinery/power/solar_control{ - dir = 8 + dir = 8; + icon_state = "computer-right" }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) @@ -2687,17 +2677,11 @@ /area/ship/cargo) "Oz" = ( /obj/structure/table/reinforced, -/obj/item/megaphone/cargo{ - pixel_x = 14; - pixel_y = 5 - }, /obj/effect/turf_decal/corner/opaque/ntblue/half, /obj/machinery/newscaster/directional/west, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 4 +/obj/item/megaphone/cargo{ + pixel_y = 5 }, -/obj/item/pen/fourcolor, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "OJ" = ( @@ -2719,7 +2703,6 @@ /obj/item/gun/ballistic/revolver/detective, /obj/item/ammo_box/c38, /obj/item/ammo_box/c38, -/obj/item/extinguisher/mini, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "OP" = ( diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm index 4aa6fcc4d01f..5ff3480977c9 100644 --- a/code/modules/modular_computers/hardware/_hardware.dm +++ b/code/modules/modular_computers/hardware/_hardware.dm @@ -22,9 +22,8 @@ /obj/item/computer_hardware/New(obj/L) ..() - if(!pixel_x || !pixel_y) // Allows mapping those in, without random pixelshifts. - pixel_x = base_pixel_x + rand(-8, 8) - pixel_y = base_pixel_y + rand(-8, 8) + pixel_x = base_pixel_x + rand(-8, 8) + pixel_y = base_pixel_y + rand(-8, 8) /obj/item/computer_hardware/Destroy() if(holder) From a7c7c2469acd8b8f3bca0b16375d14465e3fef31 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 9 Jul 2024 00:03:13 +0200 Subject: [PATCH 42/49] missed the cryopod --- _maps/shuttles/independent/independent_dwayne.dmm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 93dcbc774104..6c673c19f37a 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -878,11 +878,10 @@ }, /obj/item/radio/weather_monitor{ pixel_x = 5; - pixel_y = 3 + pixel_y = 7 }, -/obj/item/reagent_containers/food/drinks/waterbottle/empty{ - pixel_x = -8; - pixel_y = 6 +/obj/item/reagent_containers/food/drinks/mug{ + pixel_x = -8 }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) @@ -2700,9 +2699,9 @@ /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/breath, /obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/gun/ballistic/revolver/detective, /obj/item/ammo_box/c38, /obj/item/ammo_box/c38, +/obj/item/gun/ballistic/revolver/detective, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) "OP" = ( @@ -2805,7 +2804,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/computer/cryopod/retro/directional/east, +/obj/machinery/computer/cryopod/directional/east, /obj/machinery/light_switch{ dir = 1; pixel_x = -12; From 5b77d2b1f08bb9eaaf4fb8f650b9e802c9846bd6 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 9 Jul 2024 00:26:35 +0200 Subject: [PATCH 43/49] minor stuff --- .../independent/independent_dwayne.dmm | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 6c673c19f37a..e72d3fdf9764 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -59,11 +59,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "aR" = ( @@ -216,7 +219,8 @@ name = "Captain's wardobe"; req_access_txt = "20"; close_sound = 'sound/machines/wooden_closet_close.ogg'; - open_sound = 'sound/machines/wooden_closet_open.ogg' + open_sound = 'sound/machines/wooden_closet_open.ogg'; + desc = "It's a card-locked cabinet." }, /obj/item/storage/backpack/satchel/cap, /obj/item/storage/backpack/messenger/com, @@ -268,7 +272,8 @@ /obj/item/ammo_box/c38_box, /obj/item/ammo_box/c38_box, /obj/structure/closet/crate/secure/plasma{ - name = "secure crate" + name = "ammo crate"; + desc = "A secure ammo crate." }, /obj/effect/turf_decal/ntspaceworks_big/two{ dir = 1 @@ -1759,10 +1764,13 @@ /obj/item/kirbyplants/fullysynthetic{ pixel_x = -10 }, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "AE" = ( @@ -2623,9 +2631,9 @@ pixel_x = 2; pixel_y = 3 }, -/obj/item/stack/marker_beacon/thirty{ - pixel_y = -6; - pixel_x = -6 +/obj/effect/spawner/lootdrop/glowstick{ + pixel_x = -4; + pixel_y = -4 }, /turf/open/floor/plating, /area/ship/storage/eva) @@ -3118,7 +3126,8 @@ /obj/item/gun/ballistic/shotgun/flamingarrow, /obj/item/gun/ballistic/shotgun/flamingarrow, /obj/structure/guncloset/shotgun{ - name = "rifle locker" + name = "rifle locker"; + desc = "A locker that holds rifles." }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) @@ -3470,12 +3479,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, /obj/structure/sign/poster/official/safety_internals{ pixel_y = -32 }, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) From 06946e4d209634c24e9276e44d56d89c2a26055f Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Wed, 10 Jul 2024 23:32:34 +0200 Subject: [PATCH 44/49] minor stuff --- _maps/shuttles/independent/independent_dwayne.dmm | 12 ++++++------ .../modules/clothing/outfits/factions/independent.dm | 6 ++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index e72d3fdf9764..d5e83c0e660f 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -260,6 +260,10 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) +"dh" = ( +/obj/structure/sign/number/random, +/turf/closed/wall/r_wall, +/area/ship/crew/canteen) "dx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -957,11 +961,6 @@ dir = 4 }, /obj/machinery/suit_storage_unit/independent/mining/eva, -/obj/item/toy/figure/miner{ - pixel_y = 17; - toysay = "Careful out there! Frontier is deadly this time of the year!... Or any time of the year, actually..."; - pixel_x = -4 - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/storage/eva) "om" = ( @@ -1449,6 +1448,7 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "vm" = ( +/obj/structure/sign/number/random, /turf/closed/wall/r_wall, /area/ship/crew/toilet) "vn" = ( @@ -3906,7 +3906,7 @@ Um Um Um Um -nY +dh OJ "} (23,1,1) = {" diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm index 4fb28b9e1d48..7b7029f82b1c 100644 --- a/code/modules/clothing/outfits/factions/independent.dm +++ b/code/modules/clothing/outfits/factions/independent.dm @@ -540,7 +540,7 @@ dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo shoes = /obj/item/clothing/shoes/sneakers/brown glasses = /obj/item/clothing/glasses/sunglasses - l_hand = /obj/item/clipboard + r_pocket = /obj/item/clipboard backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1) chameleon_extras = /obj/item/stamp/qm @@ -548,15 +548,13 @@ /datum/outfit/job/independent/quartermaster/western name = "Independent - Quartermaster (Western)" - belt = /obj/item/storage/belt/utility/full + belt = /obj/item/storage/belt/utility/full // securing stuff and minor renovations uniform = /obj/item/clothing/under/rank/security/detective suit = /obj/item/clothing/suit/hazardvest shoes = /obj/item/clothing/shoes/workboots gloves = /obj/item/clothing/gloves/fingerless glasses = /obj/item/clothing/glasses/sunglasses head = /obj/item/clothing/head/cowboy/sec - l_hand = null - r_pocket = /obj/item/clipboard backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel/eng From 608edf78dfcbbfedc660854aaf855764fee37637 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Thu, 11 Jul 2024 12:48:56 +0200 Subject: [PATCH 45/49] seperates this gonna look weird until the other PR is merged, sorry --- icons/obj/machines/mining_machines.dmi | Bin 5590 -> 4275 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/machines/mining_machines.dmi b/icons/obj/machines/mining_machines.dmi index 2818df55ce165f4d7db5393d176e66729fcff9e8..42b4495ca5deb7517388811e969f16093e82c970 100644 GIT binary patch literal 4275 zcmYLMc{r5)*T0RyO!n;i43Z_Xo6wj^j6Dj;SVkU8vPO|GV`Pa2^%TmILZvKaFT!Mt z$YdKL#!|vt3{A#h{N{Py_jkSbb=~*(KIii}=X}n&&OhH<&Q2J?L$Zee01&jbIenIM z(*AiN+?=oW*27T%;No|7aJA~}?BsZ!zv|4*eU8IL>LP4x3L=3>-2=`87%)HJm^gq+ zrQ&n}6bcm=44`a0l;JWkn2eH=w7(tvhPTw+aJjrl{rWU>8zX5&MJaa^j}8D(RaL!) zzHtBmCrl0TM0;x+^}2dg>0?uzpJpk>$mJ}`|1Y?wr=p>egr}PPF>Uz808=A`q6Y*5 zJ0XpL0jDhWR8(aFXY~SSz#+x#pwn{)8+vAa;tEVyFMI-LVh-zNh(#%{c;N6hJfX#XphB4aK^gabfa zQN=lXA)>B`_vkspw>&8fF_ZAyy)C&~1!+PQNVUw1-f65$iZY~kFwnGkdp6+<(z|M+ zkf75ncLg+9;U44E$NdNqq~UN;SjD;s{8v%IF5F~>aP@|)UpfqCCe6Plim@5|*^`S9 z-4qCC4_d>&$aj|(roxne7SZ~o*1ivobq8Qarn*SMme-dPu?nIhulwV;~TUYPmu3{JBi(e~Ue=f%SBY)2Q zDuQ62DEdmf`ch@rF3=}%O19f8!VN9K-BPx+keNl4AHE`ucj^L(fsKIa`j zyu@%^+hc(+{a>Nv93<;+Ez5LtTjuZdHDBm3QxyHmvZ;ny^s&&cKZI z#vSE;mYDmC5Mog^COL3j=?EfKOUY+`_2od0O2pn`&k?i*Qi#^VqQ`~O^tt_u7U=UH zC73JKISaHXQJMkxUQ(W6bBU2C3ccme!X-t>Y`f~I0ji-(q(C%>gxI0n_PG}2zv(Z;?Bn=7A#@)QzT{R`iJ z%Wh0EO_zdn^bP!NA1+culcJI4igHSgGeOS@h5R{Ri)M=ibNYHQ`|ns*C5}=UMeNM` z^iE1#Xo4R;=7jFHlx`P~0I9E6>JNrz(3z__qVN;5ut!{qKwtD1>zlKY-?TWP7qutY z)7stq7T+(FY}V{zGm;%XCn}@N{OW(&_RD9ww?g{fdhrit|H&zk_X0nQk8#u!$o%mm z`{ELR9{je7H6~U<#aA7%geUrJi>vtRw%I4V+#Ll~ao?8zOCPlc9O0|%hU3=&6+RhG z9jQ$|2AQI6#A8iHZv0^GjfPhduvwMU9$egupXuLn+l{>))>}h0Jz=tVn!c^b?c+DznzRl_zZ14v4BWo%_XmBl{qM!v&DwEJ;3rA(bfDd{qp^VAsaQX> zm0#=Aezy!~_=)>Qukmr8N9{<#2HMvMP3`vFjwc6G+6AKmj_VezKhwJn+qpu&_r_o5 zA0KzoKaAh_-MX$wnYA>fWQ~qeYsZnnV&*Q3{5!4s-NOd1zJ*+g&-oJik-FnD@jXyX$q>c;z*HYnW z+hGfuob9}r-0nTtUo_Ckw4?8DeAC$GV>HTWqof6C^*sHQnRF#?#L|H^O{-_SE5|nq z@9e9>lW-8>=SeV7N)n*u9>^uviqBDFJLcJ??cdFNSKu)pr_SYTEnh_06ZW0?`SuC7xCZ#+PbIltc?M;O$njYqJ>>! zv==41s@}v4g|J2gx7H#uN)x+mN2bIZh)bLaq^zyiP3ZevEUdNyy=T){W-)3n>}5^Z zBol3oXJHyerd$M05+TvQ_-sjd>VoBifXjC{ZF%7_kWBi6@DJ&A2FPF#3?H|zaELMh zck(|W-R=rP;Uo9G-M^erz3z~<28MC0VwKb}V{mNqmrrb)KlObRJig?~;2tgJx9YB> zJ6x*0a8NegwpffTfpCPvw1q?nEwWp zN-otNm2o+D@(-M$vW1E(Vpf{#So$>BHK9RX@#U{c8F__Ca30wktTK?}8WG2Pfn{9+ z^l&Th#I3!(P_!q8N|4F=?aoB3w3m zFbRYMKkP{R!}zjhnpwUEN3Gw!&atG@L*{BAo2=TWv(L2)ZtdE~2%hN>J@DW*cYjBg zpvetB8p2*aLMV@`ici^M{Mw$I^QL98kNVmHmpHAbxo-T?uA!aMIQW?=i?ZXyz$IX< zFiiW!5I}>2t1a>@;$OeEmsuEDe7!pK1zQzg&*nW0EY&hhGJx`f>UTY>H!erKW_{&A z$maTD!O+(%xtqe5zh5l~G4EWXF2@`8Rl%A)!H6Q{GNNnDGwx1{nxc&UT^OPqx%{El z33m8=PnmW89am!4N_0G-h3gbJuTLV(Dnw|nOcgQHRxS!lN{1XH#j3U3X7jGZt`0K3 zh`3gtVFZOigevCVfLw>qy=HngmCDmU278U0$a$|A?&1n)FIdHjILjBsUQUy(>fSAc z<6m0{N3AMX3e!d^n{l!Gf@ABq(N9~-(?)XE>vYj{9q*Q#N1ePhI!!Z-3_K~%YPG)- z)yP^`qObP2VX|lvM#=UqYKT@du@)z1x4uL7ec*xnY39ODRxeB9hMuUq5v4nnxqI(- zx)H(8)Hd88LQjX^fDEAzp|2paP>6^t#^pXOk|i&+aT2=mE}yomwYhoNP^?tUl`-V0 zV0Brq`b0UBYMctmwfg)5toI3DZLPOGeBMzCvvYw*GS$y%CZmQw=HNay$=2Wk|sZFe00re?4L&N zAiJ$yCO{QMafZS!Vvi_Do8dC2BC(mH({&oMS4OjV$DX=EIlOsb>PO#OyU~GqH*D`h z5w0Kl#3$o_swhyQXB?~tZn@Z6)zb)NVN}B#aB%D^^;)a_Q(QiEm27(%+L0UMVaNXU zZ?GT(E?&GXXMFCV#5o>q>?U8dPp65l$x>CHCV=r&(+RO{@U&z7bBPFq}6|?ADw*Y{wH&H+};i! zgvI5y=gH<62fJ$;&2pnPo*O-+10xG|<*5PQ4X15+UZWCe2AQT5@>aFB@5>g8Ke--HK>!7%v=>c~RCV+ZB4iOwp{l2?R2 zrv|Omy1tLQrCdAJ`jl1Lgwdeb{(NuXkz|*Z-)Kj1N_L_=cs~Sx{;R*r75X-^9+cjm zC%K*sE3d8SxdB&qQguqy)~-3+kblLv+K!SMq?1@Z^4o~N7I|}HU~D;0$9IbgG4}A* zTr#|8OGyqAN~~sWaE0A$4_u2#hbPRqx=kt_^Bv!gA#ynPZWe&U%u^VR4RMuw7jlE) zq*C+Gt&uLtzP|QZ`CzkCmV|u$}P|>UNU?yz*;h~RStitno zUV`aL>r;hS$L99H?(gUOZu|*UU^D~CZjnrS$-4^}hT3Tyk9-mfC$$BsT6`;_IO5NJQmgogKOvuB8fa*7V*UHX+_6L_?A$VCxq*?Ky-8x= zv!SsiOFj@EO@n7n`$Hqk_bMlCS18LNJryzcd_P7E_P7lWre9=WD0N>R5A#6I&Ya1e z&-5Aj#!(>}^TMR*?Ku|Y$_&PtCX41MlRHCcn`lxLdP4_aaBJtNwx(2eOtHMyR6ay0 zp_8#-TW`|#zo9D;n&h-vp)HZn?p1vgbao+_q=@k1e>)~ef^h^M`9S4kLG;_W$w;ho z(Y0b0Hf%L|m4$Smj4l6WBwyQEWm(vXB(w#|qXV+5|7Jg}o#S6Dz)j9=#|*MPBQNbc z`gTZV#m2V<-PW$|c(AssOeZU?ziD6x)~siB*FXOM|0sbJ$pNE5qT_W2WYgN(#G2zYQ#SwZ3%Fym904|SS_^}FnwNC>khbiHDheXD!j@#H*CPx%IS2?DID=Xu#*WI literal 5590 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 YD%QWp!x(4iKOrF|1{V4+&bko)2es~X?*IS* From a949c726ef27b9c50fdbab6248e87b34b2582799 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 12 Jul 2024 12:14:39 +0200 Subject: [PATCH 46/49] civilian --- _maps/configs/independent_dwayne.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json index 5bf0a946b950..26027d6fb524 100644 --- a/_maps/configs/independent_dwayne.json +++ b/_maps/configs/independent_dwayne.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Mark.II Dwayne-class Long Range Mining Transport", - "prefix": "ISV", + "prefix": "SV", "namelists": [ "GENERAL", "SPACE", From ba12e65107350ab7282b4c182da606cee4eef33d Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 16 Jul 2024 13:34:09 +0200 Subject: [PATCH 47/49] conflict --- _maps/shuttles/independent/independent_dwayne.dmm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 475b83417404..360be1f565cb 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -2214,7 +2214,7 @@ /area/ship/cargo) "IF" = ( /obj/effect/turf_decal/corner/opaque/ntblue/half, -/obj/machinery/computer/cargo/express{ +/obj/machinery/computer/cargo{ dir = 1 }, /turf/open/floor/plasteel/mono/dark, @@ -2997,9 +2997,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/computer/cargo/express/retro{ - dir = 8 - }, /obj/machinery/door/airlock/command/glass{ dir = 4; name = "Bridge"; @@ -3011,6 +3008,9 @@ /obj/effect/turf_decal/corner/opaque/black{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/plasteel/stairs{ dir = 4; color = "#555555" From 03abf6c3f8504f6859eea47141419efe832d1662 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sat, 3 Aug 2024 13:27:53 +0200 Subject: [PATCH 48/49] sigh --- icons/obj/machines/mining_machines.dmi | Bin 4275 -> 5544 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/machines/mining_machines.dmi b/icons/obj/machines/mining_machines.dmi index 42b4495ca5deb7517388811e969f16093e82c970..bcd6235d26a659e7486294904c248811812f66f7 100644 GIT binary patch literal 5544 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 Ap8x;= literal 4275 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 From 7bbdd1d140e757ab0336e3183ac91c264356676f Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sat, 3 Aug 2024 21:12:19 +0200 Subject: [PATCH 49/49] belt --- _maps/shuttles/independent/independent_dwayne.dmm | 1 + code/modules/clothing/outfits/factions/independent.dm | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 360be1f565cb..533709f94692 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -1027,6 +1027,7 @@ name = "foreman's duster"; desc = "A long, utilitarian leather coat. Ideal for protecting its wearer from rain, sun, dust and paperwork." }, +/obj/item/storage/belt/utility/full, /obj/item/clothing/gloves/fingerless, /obj/item/clothing/head/cowboy/sec, /obj/item/clothing/head/hardhat/orange, diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm index 7b7029f82b1c..f89d39a4d8d3 100644 --- a/code/modules/clothing/outfits/factions/independent.dm +++ b/code/modules/clothing/outfits/factions/independent.dm @@ -548,7 +548,6 @@ /datum/outfit/job/independent/quartermaster/western name = "Independent - Quartermaster (Western)" - belt = /obj/item/storage/belt/utility/full // securing stuff and minor renovations uniform = /obj/item/clothing/under/rank/security/detective suit = /obj/item/clothing/suit/hazardvest shoes = /obj/item/clothing/shoes/workboots