From dcc07d341bc207e1080ee523ae980569a3ccb992 Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Fri, 10 Jan 2025 08:16:48 -0800 Subject: [PATCH 01/18] Does the thing --- _maps/configs/srm_vagrant.json | 45 + _maps/shuttles/roumain/srm_vagrant.dmm | 3663 +++++++++++++++++ code/game/objects/items/plushes.dm | 41 + .../turfs/open/floor/plating/misc_plating.dm | 4 + .../turfs/open/floor/plating/rockplanet.dm | 16 + icons/obj/plushes.dmi | Bin 32513 -> 33001 bytes 6 files changed, 3769 insertions(+) create mode 100644 _maps/configs/srm_vagrant.json create mode 100644 _maps/shuttles/roumain/srm_vagrant.dmm diff --git a/_maps/configs/srm_vagrant.json b/_maps/configs/srm_vagrant.json new file mode 100644 index 000000000000..5ef25137a67e --- /dev/null +++ b/_maps/configs/srm_vagrant.json @@ -0,0 +1,45 @@ +{ + "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "map_name": "Vagrant-class Hunting Vessel", + "faction": "/datum/faction/srm", + "prefix": "SRSV", + "namelists": [ + "SAINT-ROUMAIN", + "BEASTS" + ], + "map_short_name": "Vagrant-class", + "map_path": "_maps/shuttles/roumain/srm_vagrant.dmm", + "description": "A lighter hunting vessel of the Saint-Roumian-Militia, issued to modest Montagnes seeking either to prove themselves or who have a fondness for simplicity. While smaller than other vessels among the Militia, the Vagrant is considerably cheaper than other options and features a rocky terrarium which has yet to be populated with a fresh abundance of life. The poor soil provides a challenge that encourages its' crew to collect herbs one finds along their path, while still posessing a vital tree from the owning Montagnes’ home planet. To build a healthy ecosystem between this oak and wild, foreign plants is seen as a great accomplishment. As a highly religious ascetic order, the SRM supplies the Vagrant with supplies to achieve this goal and expects the crew aboard to learn how to perform medicine in more “natural” ways, using herbs and plants found in the wilderness, and then grown in house. The ship is captained by a Montagne, who oversees a team of Hunters, and Shadows apprenticing them.", + "tags": [ + "Botany", + "Combat", + "Generalist" + ], + "map_id": "srm_vagrant", + "limit": 1, + "job_slots": { + "Hunter Montagne": { + "outfit": "/datum/outfit/job/roumain/captain", + "officer": true, + "slots": 1 + }, + "Flamebearer": { + "outfit": "/datum/outfit/job/roumain/flamebearer", + "officer": true, + "slots": 1 + }, + "Machinist": { + "outfit": "/datum/outfit/job/roumain/engineer", + "slots": 1 + }, + "Hunter": { + "outfit": "/datum/outfit/job/roumain/security", + "slots": 1 + }, + "Shadow": { + "outfit": "/datum/outfit/job/roumain/assistant", + "slots": 2 + } + }, + "enabled": true +} diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm new file mode 100644 index 000000000000..e3f61c2d2041 --- /dev/null +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -0,0 +1,3663 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ag" = ( +/obj/structure/cable{ + icon_state = "2-9" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"ah" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"ai" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/jukebox/boombox, +/obj/structure/table/wood, +/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/ship, +/area/ship/roumain) +"ap" = ( +/obj/structure/flora/rock/rockplanet{ + icon_state = "redrock2" + }, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"aE" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/structure/table/wood/fancy, +/obj/item/flashlight/lamp/green{ + pixel_y = 0; + pixel_x = 0 + }, +/obj/effect/turf_decal/siding/brown/corner, +/turf/open/floor/wood/birch, +/area/ship/bridge) +"aG" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/wood/walnut, +/area/ship/medical) +"aJ" = ( +/obj/structure/closet/crate/wooden{ + anchored = 1 + }, +/obj/item/reagent_containers/food/snacks/meat/steak, +/obj/item/reagent_containers/food/snacks/meat/steak, +/obj/item/reagent_containers/food/snacks/meat/steak, +/obj/item/reagent_containers/food/snacks/meat/steak, +/obj/item/reagent_containers/food/snacks/meat/steak/chicken, +/obj/item/reagent_containers/food/snacks/meat/steak/chicken, +/obj/item/reagent_containers/food/snacks/grown/carrot, +/obj/item/reagent_containers/food/snacks/grown/carrot, +/obj/item/food/bread/plain, +/obj/item/reagent_containers/food/snacks/grown/apple, +/obj/item/reagent_containers/food/snacks/grown/apple, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"bz" = ( +/obj/structure/destructible/tribal_torch{ + pixel_x = 10; + pixel_y = 3 + }, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/birch, +/area/ship/security) +"bF" = ( +/turf/template_noop, +/area/template_noop) +"bG" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"bH" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"bT" = ( +/obj/machinery/atmospherics/components/unary/shuttle/heater{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantengineshuts"; + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"bZ" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/electrical) +"cc" = ( +/obj/structure/destructible/tribal_torch{ + pixel_x = -9; + pixel_y = 3 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/wood/walnut, +/area/ship/security) +"cf" = ( +/mob/living/simple_animal/chicken, +/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/area/ship/roumain) +"cn" = ( +/obj/structure/platform/wood{ + dir = 4 + }, +/obj/structure/railing/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 9 + }, +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/mug/tea{ + pixel_y = 3; + pixel_x = 3 + }, +/obj/item/paper_bin/bundlenatural{ + pixel_y = 4; + pixel_x = 4; + layer = 2.9 + }, +/obj/item/pen/charcoal{ + pixel_x = -7; + pixel_y = 3; + layer = 2.8 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"cL" = ( +/obj/machinery/shower{ + pixel_y = 24 + }, +/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/door/window, +/obj/structure/curtain/bounty, +/obj/item/soap/deluxe, +/turf/open/floor/plasteel/mono, +/area/ship/engineering/electrical) +"cZ" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/electrical) +"df" = ( +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"dj" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantatriumshuts" + }, +/turf/open/floor/plating, +/area/ship/roumain) +"dt" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantatriumshuts"; + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plating, +/area/ship/roumain) +"dE" = ( +/obj/structure/table/wood/fancy, +/obj/item/disk/holodisk/roumain{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/book/manual/srmlore{ + pixel_y = 4; + pixel_x = 2 + }, +/obj/item/candle{ + layer = 2.9; + pixel_x = 7; + pixel_y = 18 + }, +/obj/item/candle{ + layer = 5.1; + pixel_x = 11; + pixel_y = 17 + }, +/obj/item/candle{ + layer = 5.1; + pixel_x = -5; + pixel_y = 18 + }, +/obj/item/candle{ + layer = 5.1; + pixel_x = -9; + pixel_y = 17 + }, +/obj/item/candle{ + layer = 5.1; + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/candle{ + layer = 5.1; + pixel_x = 10; + pixel_y = -1 + }, +/obj/item/candle{ + layer = 5.1; + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/candle{ + layer = 5.1; + pixel_x = -9; + pixel_y = -1 + }, +/turf/open/floor/grass/ship, +/area/ship/roumain) +"dG" = ( +/obj/structure/table/wood, +/obj/item/book/manual/trickwines_4_brewers{ + pixel_x = -6; + pixel_y = 1 + }, +/obj/item/reagent_containers/food/drinks/breakawayflask{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/reagent_containers/food/drinks/breakawayflask{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/reagent_containers/food/drinks/breakawayflask{ + pixel_x = -6; + pixel_y = 14 + }, +/turf/open/floor/wood/walnut, +/area/ship/medical) +"dW" = ( +/turf/closed/wall/r_wall/yesdiag, +/area/ship/engineering/engine) +"es" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/structure/fermenting_barrel/distiller, +/turf/open/floor/wood/walnut, +/area/ship/medical) +"eN" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "vagrantbaydoors" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 1; + id = "vagrant_holo" + }, +/obj/structure/cable{ + icon_state = "0-9" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"eS" = ( +/obj/structure/platform/wood{ + dir = 9 + }, +/obj/structure/destructible/tribal_torch{ + pixel_x = 1; + pixel_y = -7 + }, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"fa" = ( +/obj/machinery/hydroponics/soil, +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) +"fd" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantengineshuts" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/engineering/electrical) +"fm" = ( +/obj/structure/chair/pew/right, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"fT" = ( +/obj/machinery/advanced_airlock_controller{ + pixel_x = -25 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"fY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/wood/birch, +/area/ship/security) +"fZ" = ( +/obj/structure/cable{ + icon_state = "4-9" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/electrical) +"gg" = ( +/obj/structure/chair/pew/left{ + dir = 1 + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/area/ship/roumain) +"gz" = ( +/obj/structure/closet/secure_closet/flamebearer, +/obj/item/clothing/accessory/waistcoat/roumain, +/obj/item/storage/backpack/satchel/leather, +/obj/item/melee/knife/hunting, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/clothing/shoes/cowboy, +/obj/item/flashlight/lantern, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/lighter, +/obj/item/clothing/head/cowboy/sec/roumain/flamebearer, +/obj/item/clothing/suit/armor/roumain/flamebearer, +/obj/item/clothing/under/suit/roumain, +/obj/effect/turf_decal/siding/brown/corner, +/turf/open/floor/wood/birch, +/area/ship/security) +"gJ" = ( +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"gP" = ( +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"gQ" = ( +/turf/closed/wall/r_wall, +/area/ship/medical) +"gV" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medical Bay" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/drip{ + pixel_y = -1; + pixel_x = -6 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/wood/walnut, +/area/ship/medical) +"hb" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantengineshuts"; + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"hq" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/ship, +/area/ship/roumain) +"hr" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket/wooden, +/obj/item/storage/bag/trash, +/obj/effect/turf_decal/siding/brown{ + dir = 9 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"hS" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "vagrantbaydoors" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"ia" = ( +/turf/closed/wall/r_wall, +/area/ship/bridge) +"ie" = ( +/obj/docking_port/stationary{ + width = 30; + height = 15; + dwidth = 15 + }, +/turf/template_noop, +/area/template_noop) +"iq" = ( +/obj/structure/rack, +/obj/item/stack/sheet/metal/twenty{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/stack/sheet/glass/twenty{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/stack/sheet/mineral/wood/twentyfive, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"iU" = ( +/obj/structure/flora/ausbushes/sparsegrass/hell{ + desc = "A sparse patch of grass without color."; + light_power = 1; + light_range = 0; + name = "dead grass" + }, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"iW" = ( +/obj/structure/closet/secure_closet/montagnes{ + anchored = 1 + }, +/obj/item/clothing/accessory/waistcoat/roumain, +/obj/item/storage/guncase/pistol/montagne, +/obj/item/storage/box/ammo/a44roum, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/storage/fancy/candle_box{ + pixel_y = 3; + pixel_x = 8 + }, +/obj/item/flashlight/lantern, +/obj/item/lighter{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/clothing/head/cowboy/sec/roumain/montagne, +/obj/item/clothing/suit/armor/roumain/montagne, +/obj/item/clothing/under/suit/roumain, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/cowboy, +/obj/item/melee/knife/combat, +/obj/item/storage/backpack/satchel/leather, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 4 + }, +/turf/open/floor/wood/birch, +/area/ship/bridge) +"ja" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/wood/walnut, +/area/ship/engineering/electrical) +"jj" = ( +/obj/structure/flora/rock/rockplanet, +/obj/structure/platform/wood{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"jo" = ( +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "6-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"jw" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/structure/curtain/cloth, +/obj/item/bedsheet/brown, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/bed{ + dir = 8; + icon_state = "dirty_mattress" + }, +/turf/open/floor/wood/walnut, +/area/ship/medical) +"jy" = ( +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/eva{ + pixel_x = -8 + }, +/obj/item/clothing/head/helmet/space/eva{ + pixel_y = 8; + pixel_x = 8 + }, +/obj/item/clothing/mask/breath{ + pixel_y = 9; + pixel_x = -6 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 4; + pixel_y = -6 + }, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"jB" = ( +/turf/open/floor/wood/birch, +/area/ship/cargo) +"jM" = ( +/turf/open/floor/engine/hull, +/area/ship/external/dark) +"jZ" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantatriumshuts"; + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/roumain) +"kl" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/area/ship/roumain) +"km" = ( +/obj/structure/closet/emcloset/wall/directional/east, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{ + dir = 8 + }, +/obj/item/clothing/suit/space/eva{ + pixel_x = -8 + }, +/obj/item/clothing/head/helmet/space/eva{ + pixel_y = 8; + pixel_x = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"ky" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/bonfire, +/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/ship, +/area/ship/roumain) +"kD" = ( +/obj/machinery/computer/helm{ + dir = 8; + icon_state = "computer-left" + }, +/turf/open/floor/wood/walnut, +/area/ship/bridge) +"kJ" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantengineshuts"; + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/electrical) +"kR" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantwindowshuts" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/medical) +"kZ" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/structure/destructible/tribal_torch, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"lg" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-5" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"lo" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "6-8" + }, +/obj/structure/cable{ + icon_state = "5-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"lp" = ( +/obj/machinery/cryopod/poor{ + dir = 8 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/turf/open/floor/wood/birch, +/area/ship/crew/cryo) +"lw" = ( +/obj/machinery/power/shuttle/engine/fueled/plasma, +/turf/open/floor/plating, +/area/ship/engineering/electrical) +"lA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"lM" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-10" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"lQ" = ( +/obj/machinery/holopad/emergency/command, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/wood/walnut, +/area/ship/bridge) +"lW" = ( +/obj/item/reagent_containers/glass/mortar/bone, +/obj/item/pestle{ + pixel_y = 6 + }, +/obj/item/reagent_containers/hypospray/medipen/survival{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/item/reagent_containers/hypospray/medipen/survival{ + pixel_x = 7 + }, +/obj/item/reagent_containers/syringe/antiviral{ + pixel_y = 1; + pixel_x = 8 + }, +/obj/item/reagent_containers/glass/bottle/formaldehyde, +/obj/item/reagent_containers/glass/bottle/formaldehyde, +/obj/structure/closet/cabinet, +/turf/open/floor/wood/walnut, +/area/ship/medical) +"lX" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/components/binary/valve/layer4{ + dir = 1; + name = "Disposals Outlet Valve" + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"mi" = ( +/turf/closed/wall/r_wall/yesdiag, +/area/ship/cargo) +"mn" = ( +/obj/machinery/power/shuttle/engine/fueled/plasma, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"mo" = ( +/obj/structure/cable{ + icon_state = "6-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"mz" = ( +/obj/structure/flora/rock/rockplanet{ + icon_state = "redrock3" + }, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"mZ" = ( +/obj/structure/railing/wood, +/obj/structure/railing/wood{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plasteel/stairs/wood/walnut{ + dir = 4 + }, +/area/ship/cargo) +"nc" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/table/wood/fancy, +/obj/item/paper_bin/bundlenatural{ + pixel_y = 7; + pixel_x = -5; + layer = 2.9 + }, +/obj/item/pen/charcoal{ + pixel_x = 4; + pixel_y = 0; + layer = 2.8 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/turf/open/floor/wood/birch, +/area/ship/bridge) +"ni" = ( +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 1; + piping_layer = 2 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"nk" = ( +/obj/structure/flora/grass/rockplanet/dead, +/obj/machinery/hydroponics/soil, +/obj/structure/platform/wood{ + dir = 4 + }, +/obj/structure/railing/wood{ + dir = 4 + }, +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) +"no" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/wood{ + name = "Restroom" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/wood/walnut, +/area/ship/engineering/electrical) +"os" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"oB" = ( +/obj/structure/fermenting_barrel{ + anchored = 1 + }, +/turf/open/floor/grass/ship, +/area/ship/roumain) +"oC" = ( +/obj/structure/flora/tree/srm, +/obj/item/candle{ + layer = 5.1; + pixel_x = -10; + pixel_y = -2 + }, +/obj/item/candle{ + layer = 5.1; + pixel_x = 13; + pixel_y = -3 + }, +/obj/item/candle{ + layer = 5.1; + pixel_x = 0; + pixel_y = -4 + }, +/obj/item/candle{ + layer = 5.1; + pixel_x = -5; + pixel_y = -1 + }, +/turf/open/floor/grass/ship, +/area/ship/roumain) +"oO" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ + dir = 4 + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) +"ph" = ( +/obj/structure/closet/secure_closet/shadow, +/obj/item/clothing/head/cowboy/sec/roumain/shadow, +/obj/item/clothing/suit/armor/roumain/shadow, +/obj/item/melee/knife/hunting, +/obj/item/clothing/accessory/waistcoat/roumain, +/obj/item/storage/backpack/satchel/leather, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/lighter, +/obj/item/flashlight/lantern, +/obj/item/clothing/under/suit/roumain, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/turf/open/floor/wood/birch, +/area/ship/security) +"pp" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "4-10" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + name = "Air Supply Pump" + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"ps" = ( +/obj/effect/turf_decal/industrial/warning, +/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"pD" = ( +/obj/item/roller, +/obj/item/storage/firstaid/regular, +/obj/structure/closet/crate/medical, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"pN" = ( +/obj/structure/sink{ + dir = 8; + pixel_y = 8; + pixel_x = 16 + }, +/obj/structure/destructible/tribal_torch{ + pixel_x = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood/walnut, +/area/ship/engineering/electrical) +"qh" = ( +/obj/structure/platform/wood{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "1-6" + }, +/obj/structure/destructible/tribal_torch, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"qu" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"qK" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"qM" = ( +/obj/structure/flora/ausbushes/sparsegrass/hell{ + desc = "A sparse patch of grass without color."; + light_power = 1; + light_range = 0; + name = "dead grass" + }, +/mob/living/simple_animal/chicken, +/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/area/ship/roumain) +"qN" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantatriumshuts"; + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/roumain) +"qQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/structure/closet/secure_closet/shadow, +/obj/item/clothing/head/cowboy/sec/roumain/shadow, +/obj/item/clothing/suit/armor/roumain/shadow, +/obj/item/melee/knife/hunting, +/obj/item/clothing/accessory/waistcoat/roumain, +/obj/item/storage/backpack/satchel/leather, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/lighter, +/obj/item/flashlight/lantern, +/obj/item/clothing/under/suit/roumain, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 4 + }, +/turf/open/floor/wood/birch, +/area/ship/security) +"qR" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"re" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 10 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"rg" = ( +/obj/structure/cable{ + icon_state = "1-10" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"rz" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled/corner, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"rH" = ( +/obj/machinery/atmospherics/components/unary/shuttle/heater{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantengineshuts"; + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/electrical) +"rY" = ( +/obj/structure/railing/wood, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) +"sF" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"sH" = ( +/obj/machinery/door/airlock/glass{ + dir = 4; + name = "Atrium" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/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 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"sI" = ( +/obj/item/clothing/head/hardhat/solgov, +/obj/item/storage/toolbox/mechanical, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/head/welding, +/obj/item/clothing/suit/hazardvest/roumain, +/obj/item/clothing/head/cowboy/sec/roumain/machinist, +/obj/item/clothing/under/suit/roumain, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/storage/belt, +/obj/structure/closet/secure_closet/machinist{ + anchored = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/item/storage/toolbox/electrical, +/obj/item/clothing/gloves/color/yellow, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"sP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/solgov/roumain, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/clothing/mask/breath, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/birch, +/area/ship/bridge) +"sV" = ( +/obj/structure/platform/wood{ + dir = 10 + }, +/obj/structure/railing/wood, +/obj/structure/bed{ + dir = 8; + icon_state = "dirty_mattress" + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"sW" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"ti" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/destructible/tribal_torch{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"tA" = ( +/obj/structure/destructible/tribal_torch{ + pixel_x = 10; + pixel_y = 0 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/turf/open/floor/wood/birch, +/area/ship/bridge) +"un" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"uy" = ( +/turf/closed/wall/r_wall/yesdiag, +/area/ship/medical) +"uV" = ( +/obj/structure/chair/pew/left, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"vk" = ( +/obj/machinery/button/door{ + id = "vagrantatriumshuts"; + name = "Atrium Shutters"; + dir = 8; + pixel_y = 1; + pixel_x = 21; + layer = 2.7 + }, +/obj/structure/table/wood/fancy, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + pixel_y = 16; + pixel_x = 5 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_y = 16; + pixel_x = -6 + }, +/obj/item/clothing/mask/cigarette/cigar/havana{ + pixel_x = 7; + pixel_y = -1 + }, +/obj/item/storage/box/matches{ + pixel_y = 8; + pixel_x = -9 + }, +/obj/machinery/button/door{ + id = "vagrantbridgeshutters"; + dir = 8; + pixel_x = 21; + name = "Bridge shutters"; + pixel_y = 10; + layer = 2.6 + }, +/obj/machinery/button/door{ + id = "vagrantwindowshuts"; + dir = 8; + pixel_x = 21; + name = "Window Shutters"; + pixel_y = -8; + layer = 2.8 + }, +/turf/open/floor/wood/walnut, +/area/ship/bridge) +"vq" = ( +/obj/machinery/button/shieldwallgen{ + dir = 8; + pixel_x = 19; + pixel_y = -4; + id = "vagrant_holo" + }, +/obj/machinery/button/door{ + dir = 8; + id = "vagrantbaydoors"; + name = "blast door control"; + pixel_x = 21; + pixel_y = 7 + }, +/obj/structure/destructible/tribal_torch, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"wJ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"wP" = ( +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"wV" = ( +/obj/structure/flora/grass/rockplanet/dead, +/obj/structure/closet/crate/hydroponics, +/obj/item/hatchet, +/obj/item/shovel{ + pixel_x = 5 + }, +/obj/item/cultivator/rake{ + pixel_x = -4 + }, +/obj/item/storage/bag/plants, +/obj/item/reagent_containers/glass/bucket/wooden{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/bucket/wooden{ + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) +"wY" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/destructible/tribal_torch{ + pixel_x = -8; + pixel_y = 1 + }, +/turf/open/floor/wood/walnut, +/area/ship/medical) +"xc" = ( +/turf/closed/wall/r_wall, +/area/ship/engineering/electrical) +"xt" = ( +/obj/machinery/computer/cryopod/retro/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/wood/walnut, +/area/ship/crew/cryo) +"xA" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"xK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"xS" = ( +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass/ship, +/area/ship/roumain) +"xU" = ( +/obj/structure/chair/wood/wings{ + dir = 4 + }, +/turf/open/floor/wood/walnut, +/area/ship/bridge) +"yb" = ( +/obj/structure/railing/corner/wood, +/obj/structure/railing/corner/wood{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"yc" = ( +/obj/structure/platform/wood, +/obj/structure/railing/wood, +/obj/structure/bed{ + dir = 8; + icon_state = "dirty_mattress" + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"yD" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "4-9" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 1 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"yF" = ( +/obj/structure/kitchenspike, +/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/area/ship/roumain) +"yI" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"yU" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"yX" = ( +/obj/structure/table/wood, +/obj/item/storage/pill_bottle/dice{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/storage/fancy/cigarettes/cigars{ + pixel_x = 1; + pixel_y = 4 + }, +/obj/item/lighter{ + pixel_x = 9; + pixel_y = -3 + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"za" = ( +/obj/structure/destructible/tribal_torch, +/obj/structure/platform/wood{ + dir = 4 + }, +/obj/structure/railing/wood{ + dir = 4 + }, +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) +"zd" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/grown/ash_flora/puce{ + pixel_y = 6; + pixel_x = -6 + }, +/obj/item/reagent_containers/food/snacks/meat/slab/bear{ + pixel_y = 4; + pixel_x = 2 + }, +/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf{ + pixel_x = 7 + }, +/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit{ + pixel_y = -2 + }, +/turf/open/floor/wood/walnut, +/area/ship/medical) +"zP" = ( +/turf/closed/wall/r_wall, +/area/ship/engineering/engine) +"Ab" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantbridgeshutters"; + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"Ag" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/toxins, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"Ar" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/eva{ + pixel_x = -8 + }, +/obj/item/clothing/head/helmet/space/eva{ + pixel_y = 8; + pixel_x = 8 + }, +/obj/item/clothing/mask/breath{ + pixel_y = 9; + pixel_x = -6 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 4; + pixel_y = -6 + }, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"AB" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/destructible/tribal_torch{ + pixel_x = 9; + pixel_y = 0 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/button/door{ + id = "vagrantengineshuts"; + name = "Engine Shutters"; + dir = 1; + pixel_x = -7; + pixel_y = -20 + }, +/turf/open/floor/plating, +/area/ship/engineering/electrical) +"Bq" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"BD" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantatriumshuts" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/roumain) +"BO" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"BY" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/area/ship/roumain) +"Cb" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/destructible/tribal_torch, +/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/area/ship/roumain) +"Cp" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantbridgeshutters" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"CG" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"Dc" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"Df" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "vagrantbaydoors" + }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + id = "vagrant_holo" + }, +/obj/structure/cable{ + icon_state = "0-10" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"Dj" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"Dl" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"DJ" = ( +/obj/structure/sink/puddle, +/turf/open/floor/grass/ship, +/area/ship/roumain) +"Eo" = ( +/obj/structure/railing/wood, +/turf/open/floor/plasteel/stairs/wood/walnut{ + dir = 4 + }, +/area/ship/roumain) +"EM" = ( +/obj/machinery/door/airlock/external, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"Fa" = ( +/obj/machinery/autolathe, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"Fr" = ( +/obj/structure/chair/pew/right{ + dir = 1 + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"Fs" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/table/wood/fancy, +/obj/item/folder/red{ + pixel_x = 3; + pixel_y = 39 + }, +/obj/item/binoculars{ + pixel_x = -4 + }, +/obj/item/megaphone{ + pixel_y = 9; + pixel_x = 3 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/turf/open/floor/wood/birch, +/area/ship/bridge) +"FA" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"FJ" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"FK" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"Gf" = ( +/obj/structure/closet/firecloset/wall/directional/north, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"Gg" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"Go" = ( +/obj/docking_port/mobile{ + dir = 2; + preferred_direction = 4; + port_direction = 8 + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) +"Gu" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/flora/grass/rockplanet/dead, +/obj/structure/railing/corner, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"GT" = ( +/turf/open/floor/plasteel/stairs/wood/walnut{ + dir = 4 + }, +/area/ship/roumain) +"GV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) +"GZ" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantbridgeshutters"; + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"Hg" = ( +/obj/structure/closet/secure_closet/hunter, +/obj/item/clothing/accessory/waistcoat/roumain, +/obj/item/storage/backpack/satchel/leather, +/obj/item/melee/knife/survival, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/lighter, +/obj/item/clothing/suit/armor/witchhunter, +/obj/item/flashlight/lantern, +/obj/item/clothing/head/cowboy/sec/roumain, +/obj/item/clothing/suit/armor/roumain, +/obj/item/clothing/under/suit/roumain, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/turf/open/floor/wood/birch, +/area/ship/security) +"Hn" = ( +/turf/closed/wall/r_wall/yesdiag, +/area/ship/engineering/electrical) +"Hy" = ( +/obj/machinery/power/terminal, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + layer = 3 + }, +/turf/open/floor/plating, +/area/ship/engineering/electrical) +"HC" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"HU" = ( +/turf/closed/wall/r_wall, +/area/ship/security) +"HZ" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/toxins, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"Ii" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/flora/grass/rockplanet/dead, +/obj/effect/turf_decal/sand/plating, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"Ik" = ( +/obj/structure/flora/rock/rockplanet{ + icon_state = "redrock3" + }, +/obj/structure/platform/wood{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"Il" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"Io" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/seeds/coffee, +/obj/item/seeds/coffee, +/obj/item/seeds/tea, +/obj/item/seeds/tea, +/obj/item/seeds/tobacco, +/obj/item/seeds/tobacco, +/obj/item/seeds/carrot, +/obj/item/seeds/lavaland/puce, +/obj/item/seeds/lavaland/puce, +/obj/item/seeds/carrot, +/obj/item/seeds/wheat, +/obj/item/seeds/wheat, +/obj/item/seeds/lavaland/cactus, +/obj/item/seeds/lavaland/cactus, +/obj/item/seeds/lavaland/porcini, +/obj/item/seeds/lavaland/porcini, +/obj/item/seeds/lavaland/polypore, +/obj/item/seeds/lavaland/polypore, +/obj/item/seeds/lavaland/inocybe, +/obj/item/seeds/lavaland/inocybe, +/obj/item/seeds/lavaland/ember, +/obj/item/seeds/lavaland/ember, +/obj/item/seeds/cotton, +/obj/item/seeds/cotton, +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) +"IZ" = ( +/obj/structure/crate_shelf, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"Ja" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"Jb" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"Jh" = ( +/obj/structure/table/wood/fancy, +/obj/item/radio/intercom/wideband/table{ + dir = 1; + pixel_y = 2; + pixel_x = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/birch, +/area/ship/bridge) +"Jp" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"Jx" = ( +/turf/closed/wall/r_wall/yesdiag, +/area/ship/security) +"JE" = ( +/turf/closed/wall/r_wall/yesdiag, +/area/ship/bridge) +"JR" = ( +/obj/effect/turf_decal/stoneborder{ + dir = 1 + }, +/obj/effect/turf_decal/stoneborder, +/obj/structure/window/reinforced/tinted/frosted, +/obj/item/reagent_containers/glass/bucket/wooden{ + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/engineering/electrical) +"Kx" = ( +/obj/structure/platform/wood{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"KD" = ( +/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/ship, +/area/ship/roumain) +"KN" = ( +/obj/item/toy/plush/landmine, +/turf/open/floor/engine/hull, +/area/ship/external/dark) +"KQ" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"KR" = ( +/obj/structure/cable{ + icon_state = "5-8" + }, +/obj/structure/cable{ + icon_state = "6-8" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"KW" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantwindowshuts" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/crew/cryo) +"Lb" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/stack/ore/glass/basalt{ + amount = 25; + pixel_y = -2; + pixel_x = -9 + }, +/obj/item/stack/ore/glass/basalt{ + amount = 25; + pixel_y = -2; + pixel_x = -9 + }, +/obj/item/stack/ore/glass/basalt{ + amount = 25; + pixel_y = -2; + pixel_x = -9 + }, +/obj/item/stack/ore/glass/basalt{ + amount = 25; + pixel_y = -2; + pixel_x = -9 + }, +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) +"Lp" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantwindowshuts" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/security) +"LM" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/destructible/tribal_torch{ + pixel_x = -9; + pixel_y = 1 + }, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"LO" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"LP" = ( +/obj/structure/cable{ + icon_state = "5-8" + }, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"LW" = ( +/obj/structure/flora/ausbushes/sparsegrass/hell{ + desc = "A sparse patch of grass without color."; + light_power = 1; + light_range = 0; + name = "dead grass" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"Me" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_y = 11; + pixel_x = 0 + }, +/obj/item/flashlight/lantern{ + pixel_y = 6; + pixel_x = 7 + }, +/obj/item/radio{ + pixel_y = 7; + pixel_x = -5 + }, +/obj/item/radio{ + pixel_y = 7; + pixel_x = -5 + }, +/obj/item/radio{ + pixel_y = 7; + pixel_x = -5 + }, +/obj/item/radio{ + pixel_y = 7; + pixel_x = -5 + }, +/obj/item/radio{ + pixel_y = 7; + pixel_x = -5 + }, +/obj/item/flashlight/lantern{ + pixel_y = 6; + pixel_x = 7 + }, +/obj/item/flashlight/lantern{ + pixel_y = 6; + pixel_x = 7 + }, +/obj/item/flashlight/lantern{ + pixel_y = 6; + pixel_x = 7 + }, +/obj/item/flashlight/lantern{ + pixel_y = 6; + pixel_x = 7 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/item/lighter{ + pixel_x = 1; + pixel_y = -5 + }, +/obj/item/lighter{ + pixel_x = 1; + pixel_y = -5 + }, +/obj/item/lighter{ + pixel_x = 1; + pixel_y = -5 + }, +/obj/item/lighter{ + pixel_x = 1; + pixel_y = -5 + }, +/obj/item/lighter{ + pixel_x = 1; + pixel_y = -5 + }, +/obj/item/lighter{ + pixel_x = 1; + pixel_y = -5 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/turf/open/floor/wood/birch, +/area/ship/crew/cryo) +"Mq" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) +"My" = ( +/turf/closed/wall/r_wall, +/area/ship/roumain) +"MC" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/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, +/obj/structure/destructible/tribal_torch, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"MO" = ( +/obj/machinery/door/airlock/glass{ + name = "Cryopods" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/wood/walnut, +/area/ship/crew/cryo) +"Ni" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"Nr" = ( +/obj/machinery/computer/cargo{ + dir = 8; + icon_state = "computer-right" + }, +/turf/open/floor/wood/walnut, +/area/ship/bridge) +"NN" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/industrial/warning, +/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"NQ" = ( +/obj/structure/platform/wood{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"NS" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"Ob" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/flora/grass/rockplanet/dead, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"On" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"Op" = ( +/turf/open/floor/grass/ship, +/area/ship/roumain) +"OC" = ( +/obj/structure/flora/grass/rockplanet/dead, +/turf/open/floor/grass/ship, +/area/ship/roumain) +"OH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/wood/walnut, +/area/ship/security) +"Pj" = ( +/obj/structure/platform/wood{ + dir = 9 + }, +/obj/structure/bed{ + dir = 8; + icon_state = "dirty_mattress" + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"Pt" = ( +/obj/structure/platform/wood{ + dir = 1 + }, +/obj/structure/bed{ + dir = 8; + icon_state = "dirty_mattress" + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"PC" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/plating, +/area/ship/engineering/electrical) +"PE" = ( +/obj/structure/railing/corner/wood, +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) +"PS" = ( +/turf/open/floor/wood/walnut, +/area/ship/security) +"Qa" = ( +/obj/structure/platform/wood{ + dir = 4 + }, +/obj/structure/railing/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 10 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"Qo" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/table/wood, +/obj/machinery/cell_charger, +/turf/open/floor/plating, +/area/ship/engineering/electrical) +"Qs" = ( +/obj/machinery/door/airlock/security/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/turf/open/floor/wood/birch, +/area/ship/security) +"QA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/structure/table/wood/fancy, +/obj/machinery/fax/roumain, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/wood/birch, +/area/ship/bridge) +"Rk" = ( +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) +"RA" = ( +/obj/structure/cable{ + icon_state = "0-1" + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/wood/walnut, +/area/ship/crew/cryo) +"RH" = ( +/obj/structure/rack, +/obj/machinery/door/window/brigdoor/westleft, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = -2; + pixel_y = -8 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = -2; + pixel_y = -5 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 7; + pixel_y = -7 + }, +/obj/item/ammo_box/magazine/illestren_a850r{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/storage/box/ammo/a12g_buckshot, +/obj/item/storage/box/ammo/a12g_buckshot, +/obj/item/storage/toolbox/ammo/a850r, +/turf/open/floor/wood/walnut, +/area/ship/security) +"Ss" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/sand/plating, +/obj/structure/railing, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"Sx" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"SR" = ( +/obj/structure/table/wood, +/obj/item/toy/cards/deck{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/toy/cards/deck/tarot{ + pixel_y = 7; + pixel_x = 8 + }, +/obj/item/toy/cards/deck/kotahi{ + pixel_y = 10; + pixel_x = -4 + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"SV" = ( +/turf/closed/wall/r_wall, +/area/ship/cargo) +"Td" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"Te" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/destructible/tribal_torch, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"TE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/wood/walnut, +/area/ship/bridge) +"TU" = ( +/obj/machinery/power/ship_gravity, +/obj/structure/cable{ + icon_state = "0-9" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"Uh" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"Uj" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/area/ship/roumain) +"Ut" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantatriumshuts"; + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/roumain) +"UF" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/turf/open/floor/wood/birch, +/area/ship/cargo) +"UH" = ( +/obj/machinery/power/shuttle/engine/electric, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"UT" = ( +/obj/structure/bedsheetbin{ + pixel_x = -3; + pixel_y = -8 + }, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"UV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/storage/toolbox/fishing{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/item/storage/toolbox/fishing{ + pixel_x = 1; + pixel_y = 0 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/turf/open/floor/wood/birch, +/area/ship/security) +"Ve" = ( +/turf/open/floor/wood/walnut, +/area/ship/bridge) +"Vy" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantbridgeshutters" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"Vz" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/airalarm/directional/north, +/obj/structure/destructible/tribal_torch, +/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/area/ship/roumain) +"VB" = ( +/obj/machinery/door/airlock/command, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/turf/open/floor/wood/birch, +/area/ship/bridge) +"VE" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"VG" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/rack, +/obj/item/storage/bag/ore, +/obj/item/pickaxe{ + pixel_x = 1; + pixel_y = 8 + }, +/obj/item/pickaxe{ + pixel_x = 1; + pixel_y = 8 + }, +/obj/item/mining_scanner{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"VI" = ( +/obj/structure/cable{ + icon_state = "6-8" + }, +/turf/open/floor/wood/walnut, +/area/ship/bridge) +"VL" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"VO" = ( +/obj/machinery/door/window/brigdoor/westright, +/obj/structure/guncloset{ + anchored = 1 + }, +/obj/item/gun/ballistic/rifle/illestren/factory{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/gun/ballistic/shotgun/flamingarrow/conflagration, +/obj/item/gun/ballistic/rifle/illestren/factory{ + pixel_x = -4; + pixel_y = -5 + }, +/turf/open/floor/wood/walnut, +/area/ship/security) +"Wg" = ( +/obj/machinery/power/port_gen/pacman, +/obj/item/stack/sheet/mineral/plasma/twenty, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"Ws" = ( +/obj/structure/destructible/tribal_torch{ + pixel_x = -9; + pixel_y = 1 + }, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"Wu" = ( +/turf/closed/wall/r_wall, +/area/ship/crew/cryo) +"Ww" = ( +/obj/structure/chair/wood/wings{ + dir = 4 + }, +/turf/open/floor/wood/walnut, +/area/ship/cargo) +"WM" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/trimline/opaque/orange/filled, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) +"WO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/item/melee/spear/bone{ + pixel_y = 2; + pixel_x = 0 + }, +/obj/item/melee/spear/bone{ + pixel_y = 8; + pixel_x = -6 + }, +/obj/item/melee/spear/bone{ + pixel_y = 0; + pixel_x = 4 + }, +/obj/item/melee/spear/bone{ + pixel_y = 5; + pixel_x = -3 + }, +/turf/open/floor/wood/birch, +/area/ship/security) +"WU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/machinery/airalarm/directional/east, +/obj/item/kirbyplants/random, +/turf/open/floor/wood/birch, +/area/ship/security) +"XB" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantatriumshuts" + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plating, +/area/ship/roumain) +"XG" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"XO" = ( +/obj/machinery/power/shuttle/engine/electric, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/ship/engineering/electrical) +"Yr" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plating/asteroid/rockplanet/ship, +/area/ship/roumain) +"YL" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters{ + id = "vagrantbridgeshutters"; + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/bridge) +"Ze" = ( +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) +"ZA" = ( +/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/area/ship/roumain) +"ZF" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/drip{ + pixel_y = -4 + }, +/turf/open/floor/wood/walnut, +/area/ship/medical) +"ZI" = ( +/obj/structure/chair/wood/wings{ + dir = 4 + }, +/obj/item/toy/plush/frederick, +/turf/open/floor/wood/walnut, +/area/ship/bridge) +"ZO" = ( +/obj/structure/cable{ + icon_state = "2-9" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 5 + }, +/turf/open/floor/wood/birch, +/area/ship/bridge) + +(1,1,1) = {" +bF +bF +bF +bF +bF +bF +bF +bF +Ut +qN +qN +jZ +dt +bF +bF +bF +bF +bF +bF +bF +"} +(2,1,1) = {" +bF +bF +bF +bF +bF +bF +bF +bF +BD +Io +Lb +wV +XB +bF +bF +bF +bF +bF +bF +bF +"} +(3,1,1) = {" +bF +bF +bF +bF +bF +bF +bF +Ut +dj +Op +Op +Rk +dj +dt +bF +bF +bF +bF +bF +bF +"} +(4,1,1) = {" +bF +bF +bF +bF +bF +bF +bF +BD +Op +Op +oC +OC +oB +XB +bF +bF +bF +bF +bF +bF +"} +(5,1,1) = {" +bF +bF +bF +bF +bF +bF +Ut +dj +xS +Rk +DJ +OC +fa +dj +dt +bF +bF +bF +bF +bF +"} +(6,1,1) = {" +bF +bF +bF +bF +bF +bF +My +za +nk +Mq +dE +PE +nk +za +My +bF +bF +bF +bF +bF +"} +(7,1,1) = {" +bF +bF +bF +lw +XO +XO +My +Ik +sV +Rk +Rk +rY +Pj +jj +My +UH +UH +mn +bF +bF +"} +(8,1,1) = {" +bF +bF +Hn +rH +kJ +kJ +xc +UT +yc +GT +GT +Eo +Pt +ap +zP +hb +hb +bT +dW +bF +"} +(9,1,1) = {" +bF +bF +xc +cZ +bZ +PC +xc +ZA +ZA +iU +gJ +gJ +qM +Ja +zP +xA +lg +VL +zP +bF +"} +(10,1,1) = {" +bF +bF +xc +HZ +rz +LP +xc +yF +Uj +hq +ai +Il +gJ +kl +FA +lM +VE +Ag +zP +bF +"} +(11,1,1) = {" +bF +bF +xc +ni +pp +Qo +xc +mz +gJ +Gu +sW +Jb +gJ +yI +zP +Dl +jo +Ze +zP +bF +"} +(12,1,1) = {" +bF +oO +xc +sI +mo +AB +xc +wJ +LW +Ss +ky +Ii +Ob +NS +zP +ti +Bq +TU +zP +KN +"} +(13,1,1) = {" +bF +GV +fd +Wg +lX +fZ +Ni +qR +gJ +Gg +ah +qK +iU +yI +zP +zP +zP +zP +zP +jM +"} +(14,1,1) = {" +bF +bF +Hn +xc +Hy +WM +xc +LO +df +Jp +aJ +Uh +df +MC +gQ +wY +lW +gQ +uy +bF +"} +(15,1,1) = {" +bF +bF +jM +xc +xc +xc +xc +Cb +cf +Uj +KD +gJ +ZA +NS +gV +ZF +jw +kR +bF +bF +"} +(16,1,1) = {" +bF +bF +jM +EM +fT +ps +EM +Yr +XG +uV +yX +gg +df +yI +gQ +aG +dG +kR +bF +bF +"} +(17,1,1) = {" +bF +bF +jM +EM +km +NN +BO +bH +qu +fm +SR +Fr +FJ +Dj +gQ +es +zd +gQ +bF +bF +"} +(18,1,1) = {" +ie +bF +jM +Hn +xc +xc +xc +xc +yU +df +iU +XG +NS +Wu +Wu +Wu +Wu +uy +bF +bF +"} +(19,1,1) = {" +bF +bF +bF +bF +xc +cL +ja +no +bG +BY +XG +FJ +CG +MO +RA +xt +KW +bF +bF +bF +"} +(20,1,1) = {" +bF +bF +bF +bF +xc +JR +pN +xc +My +Vz +ZA +Te +My +Wu +Me +lp +Wu +bF +bF +bF +"} +(21,1,1) = {" +bF +bF +bF +JE +ia +ia +ia +ia +ia +Td +KQ +Sx +HU +HU +HU +HU +HU +Jx +bF +bF +"} +(22,1,1) = {" +bF +bF +bF +Vy +aE +nc +Fs +iW +ia +SV +sH +SV +HU +gz +Hg +ph +qQ +HU +bF +bF +"} +(23,1,1) = {" +bF +bF +bF +Vy +sP +Ve +VI +tA +ia +LM +lo +Ws +HU +bz +PS +PS +UV +Lp +bF +bF +"} +(24,1,1) = {" +bF +bF +bF +Vy +QA +lQ +TE +ZO +VB +rg +UF +ag +Qs +fY +OH +OH +WO +Lp +bF +bF +"} +(25,1,1) = {" +bF +bF +bF +Vy +Jh +xU +ZI +vk +ia +Gf +Dc +Ww +HU +cc +PS +PS +WU +Lp +bF +bF +"} +(26,1,1) = {" +bF +bF +bF +YL +Cp +kD +Nr +ia +ia +Qa +yb +cn +HU +HU +VO +RH +HU +Jx +bF +bF +"} +(27,1,1) = {" +bF +bF +bF +bF +Ab +GZ +ia +ia +Kx +qh +mZ +eS +NQ +HU +HU +HU +Jx +bF +bF +bF +"} +(28,1,1) = {" +bF +bF +bF +bF +bF +bF +SV +IZ +hr +HC +yD +HC +re +wP +SV +bF +bF +bF +bF +bF +"} +(29,1,1) = {" +bF +bF +bF +bF +bF +bF +SV +VG +lA +sF +os +xK +un +Ar +SV +bF +bF +bF +bF +bF +"} +(30,1,1) = {" +bF +bF +bF +bF +bF +bF +SV +iq +pD +jB +FK +jB +gP +jy +SV +bF +bF +bF +bF +bF +"} +(31,1,1) = {" +bF +bF +bF +bF +bF +bF +SV +Fa +kZ +On +KR +On +vq +jy +SV +bF +bF +bF +bF +bF +"} +(32,1,1) = {" +bF +bF +bF +bF +bF +bF +mi +SV +SV +Df +hS +eN +SV +SV +mi +bF +bF +bF +bF +bF +"} +(33,1,1) = {" +bF +bF +bF +bF +bF +bF +bF +jM +jM +jM +jM +jM +jM +Go +bF +bF +bF +bF +bF +bF +"} diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index dd00d3abd1fd..03c37fbce833 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -863,3 +863,44 @@ 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/item/toy/plush/frederick + name = "Frederick plushie" + desc = "A plushie of Frederick, a lovable dragon head cricket." + icon_state = "plushie_frederick" + gender = MALE + +/obj/item/toy/plush/landmine + name = "\improper G-80 Landmine plushie" + desc = "A plushie depicting an adorable anti-infantry explosive. Just don't step on it." + icon = 'icons/obj/landmine.dmi' + icon_state = "mine_armed" + should_squeak = FALSE + +/obj/item/toy/plush/landmine/Initialize() + . = ..() + var/static/list/loc_connections = list( + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), + COMSIG_ATOM_EXITED = PROC_REF(on_exited), + ) + AddElement(/datum/element/connect_loc, loc_connections) + +/obj/item/toy/plush/landmine/proc/on_entered(datum/source, atom/movable/arrived) + SIGNAL_HANDLER + if(!(arrived.movement_type == GROUND)) + return + + if(ismob(arrived)) + var/mob/living/fool = arrived + fool.do_alert_animation(fool) + fool.Immobilize(15 DECISECONDS, TRUE) // Shorter because it's fake + to_chat(fool, span_userdanger("You step on \the [src] and freeze.")) + visible_message(span_danger("[icon2html(src, viewers(src))] *click*")) + playsound(src, 'sound/machines/click.ogg', 100, TRUE) + +/obj/item/toy/plush/landmine/proc/on_exited(datum/source, atom/movable/gone) + SIGNAL_HANDLER + if(!isturf(loc) || iseffect(gone) || istype(gone, /obj/item/mine)) + return + playsound(src, 'sound/items/mine_activate_short.ogg', 80, FALSE) + diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm index 684420c8eb89..1a6c4e867dad 100644 --- a/code/game/turfs/open/floor/plating/misc_plating.dm +++ b/code/game/turfs/open/floor/plating/misc_plating.dm @@ -276,3 +276,7 @@ heavyfootstep = FOOTSTEP_GENERIC_HEAVY tiled_dirt = FALSE + /turf/open/floor/plating/sandy_dirt/ship + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE + diff --git a/code/game/turfs/open/floor/plating/rockplanet.dm b/code/game/turfs/open/floor/plating/rockplanet.dm index 7e52dc85aafd..2367bf0e2228 100644 --- a/code/game/turfs/open/floor/plating/rockplanet.dm +++ b/code/game/turfs/open/floor/plating/rockplanet.dm @@ -11,6 +11,10 @@ digResult = /obj/item/stack/ore/glass/rockplanet light_color = COLOR_ROCKPLANET_LIGHT +/turf/open/floor/plating/asteroid/rockplanet/ship + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE + /turf/open/floor/plating/asteroid/rockplanet/lit light_range = 2 light_power = 0.6 @@ -28,10 +32,18 @@ baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit turf_type = /turf/open/floor/plating/asteroid/rockplanet/lit +/turf/open/floor/plating/asteroid/rockplanet/cracked/ship + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE + /turf/open/floor/plating/asteroid/rockplanet/wet icon_state = "wet_soft0" base_icon_state = "wet_soft" +/turf/open/floor/plating/asteroid/rockplanet/wet/ship + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE + /turf/open/floor/plating/asteroid/rockplanet/wet/lit light_range = 2 light_power = 0.6 @@ -41,6 +53,10 @@ icon_state = "wet_cracked0" base_icon_state = "wet_cracked" +/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/ship + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE + /turf/open/floor/plating/asteroid/rockplanet/wet/cracked/lit light_range = 2 light_power = 0.6 diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index 2c982a8ac8f9c4b273e83a6c8401e413f50b53d9..2ca4cc2875b7af9d68c2c210158f4146af6f4ac1 100644 GIT binary patch delta 14476 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 z zRGTS-y?5;PEaozrj#?&Cd{wZCSb{gaV=7I=%dW%DxwlK2;C#l^I6Ul6^bErY zQCkgitbMNeMpVZA#zyEDfD7^S%5KCAFTQkcwJHxkh&(HBD}x_yFb%6Of>8*4?JHHT zN8D^LFDKgHjohE&(UMdqA^BFA*WLxn0d=w*Dh(OEI!;hh65aq{*MZ;}OM$hy*W4jw zl;acPRqq?pB5P)23QA5K3W2D}g}s@*S;r?VNPWFB!n?7MKLn31gTSMn27Ckl#+$nr z0q%|uGpBTq%xRB20MD0$_CUB?kD@!CX3uD%d@lh{9es) z(%3f_qrhajO%B@}BSRIotm+s>{wPaO`aNME{CB z11&3yCFjfemMK^6{@JAL4OcW=l9S2?L3X->BVeeii3|+TL24z7ANZv5ywX|&NHDfYoZc8zJKj1g;<;zgM7o>m){&$fN<-_S)} z-L8RNQGQIHd?Aq6d`G>cT+EwKc)^RDJ)>+T_}S=AMWktPpjXgMFtJk@%yDCP&CkVb ziwukeBbhw6Udf$|dW4dvRKkeyYvHX@;%LO*Zd<~T?H9tZW0$bdKeV4 zt7-mORAQxBP;ubP@gmvG#dbGAPDqlndY3R6d{LMc=q83$n1^MXDGpzMWGHAlJEOm~ zD*DP9V%;t}$V5TG)z$&`)MW4n9$?+JiDy1Rc}=$#+1uTXIIXE!>IqqX6j_LlaB_st z^+h!%BS8&kp?F;8U$)>OnYbcWX~eWV#=K%#rLph<*Gzzy;laJ!nds+SEe2Po>N#f`>212Q=wTc2d&I@}Kp?3bh;okzV+nzyb_7$uE`Dsx5S z-gr<_+9J!n&WvZ!*n^8T`B3|)2C4BR5-_NjUIiXV0xZ#SGx0&nF;j^T2?*_E z85bcDj#r-UGO9aJ77e_1 z3y*0xa+&}e)p=7zc9*>B9JLW) z*}^}w(S36Phv*Q{I#hAX{d@uNtjO}`O03Y(Gh;Dus)(U(rNku)+Dlu22S1Jw8Yua} zY4o5cqI4`+h0jeXb$v%>QIxY85vm_dkf9kEh)45c^ki*E+};oQZ^;qlDXq4?H77?Z51jdd=cWSRLR$Gq3hjy;>Tjdf*iH(&$l%W{V+N`bNS z_!0rZC<)gPSV;I&XGGh6=bV|t;g#+Ynq}nLYFvPwko--|(-JH7&7L+LZNP7<7Pvz0 zT@izhIjX&A8xAOaF%Aaw!4nk)F~K_5LM1Zqr(P`U3WFxHwtkLQ^SKFW*;4GcyS1Pf z#{c93u6cNt6|5m+V*#qFg3db=bUMBqSYS3o@AlP?UiKKWF3~S>1OzWWpg~^#>Z{~9 z_F;W?M;^#hSG@$UlD@;?uvJ2cW)$_>W1G|{rnj;YzXDPgr_Z5Gd0kQpWlVZH?8C@yaEUm6JduEy(0ySfHzcHg@5J}cvG!Z}_l_`h zf|X9hs2P9g;K$>YASu}c+u+^r%#e&Ftl#_Zu7pok7%K`|;l!*^xA$eJ;Kg-Cnw5cW zB173&!=MT88y1KTNx+Cd9v5YjQPE{FQ31LYHQ|$KfIn~$kkfs>XS5Jw{3UUu&MB=; zgo?=Oi3LSpl<@ug!af4P(qCONzZJSnIC+5FB#f5JihlnURMQe3_gV65^cSallPdD= ziV%;ZpkHRc)lN8sz}Wzo&xli zf9IUzVzx&gk$l`c;L;rF1KsZtae8e*FSoQU0o42YjK|ppIMuKRGyyf-#As1E; z`T`k-`7m)t1d|GHV5jL=g)GEl$L6QQXtvn-ON*uxr1*q(eOx@)1uhy9lg^NG-9av1 z&Z9Yc!)7O&5O?%9>$cX`d5Jd?*O1{-`0tC$Z+h4x&40!@8bQ|znUZQeDQsltX$Z%D zl7IP3>PPdvfiuIO@}=~iP`K-|ySpHZKc;PvI^#|=MPGIGEwBM6aI8GxzAh7g?iuzE zML}8-S&w;sZFogIF0V@A5}ru#nFe$V1`y9QpZ@@T1+Gl&qz2Bpu1DoSuerR{DO*^L zYzLe8-Wp8MV-5;A$Z6GqE?V-lWcvJUg+dU@g%n(FE6|?Z&6D@GD-5629?D=J&VB1> z^mwduO$O%ppF^Ba(gV)-{-~>wBCoD;Lo1fP=Wa}jXVm(hBYE9R{)-Z%_ttwS{(%!= zZ|brBg$-$s7HRTFf04&n28zIi7#s=pqdg!k8YSKe5%|Mytj?j%;fEHUPy%-CzQ*ZM z(kSR$yxpX_arD(yg?9Ia&;ABB)1ELyMu;xPu-_uqvhogMq~N`8A%RFC=gK-4!Tlh_t=sT zVbAUUJ(ZyYZ~IP2NJ#IN=IO-7DxShWr#ZMO@sl2FA`G2OUz`3=>eix)qoankf+s)l zou%4Qz7)d7+_S>_27?)MElm*A9wzDYixu=Hv?bTyZMLe3C7zziuY`v5%~#>#o>-;6 z^u8_pnN^tvOh~fk`$|gk$gEMj-IZJ5w6dg^Sq-J($gFzM;TBJmz>QUWIZ#ofzFL#P z-%(K$4-FZE{UTC)ga+ibv@kDCvQbmRa-yX70_s*D;#E&jrZ!-d^a%;aimhc zNk*D1v}AH}ePO0&5+mhHj3yKW{+xQ*7(0Tvw#=QtIQ=a)duLSBkaZFiKdW(Q-kpdu z-obqR)Z^Gx2f@A~2LhQncMWL%Ov4yyR!tQ!5`2crjjwJ`SY$*^%_dVoGIr?4@{L%1 zbz8=K@vY@N`Vs9%0m#e+OxkQn#``8*aZT~C>S)-KiwbNEHH$vmfSBaE=!+OTvBt}? z+ARaz-wslcG$@SOo80!)%C)YKufSdz z8MLZGAeE@zLHR`LR1zh@2};H+xM#IoE4AP`9_v`8%OIB!o~b|DPLq|d<+W7DS4dr0 zF458|F5F`)bFPpf*Cnpd<$K8kqld4U0Q-YHhOm%OpT{dX2&B0|cB};b{$=G6x;&7a z0%eTF$HrbMI2V_6dawOX8UZB-3Jp-8FW6+&MNC%+1@FG%mX3RrDk#W_J@R-%DEpu< z9;OwP&&W#Q*gLSb8d754c;$(UjXgZh4=?vN&)BJR%C8<~%Jtk5{Ko}6&ie$DutXdj z&RL=%ipc!sy9(gsX4@M-INC4+sf(Y2^|RBb z?srqm_gFfR78XgVSArX+U7bKtWf9$_G4_x_B?ZYb!bfDW4@k6lTSW_9S;cDk4>g2(hO3zCz`bW}Zst49di4{X0&^fdJbcWWH5ZeP zZr_2huDQu{evnk6AkO5%L4v>HHt+2<$OH2C;MynODXq^8PpTwgL8A8rNz{syWJly9 zO6_?y1r4M*FQaw_vTCMm?*7N{_Ag5}PKF=2|yS^WpMG5$Km=*UkiX*2H=sf}0 zaZ|P!*Ox{zLm9+kmc!4i6TKPT$(-R?|D1XWFJ zL9DM4{O(e8k_fPE;9|Hal}96*hG} zULA!c@b0J^`GAws{i3|Ht2LGiEP?WP&yi9nOy9Xk+G#`vzn;3SA7qAvdv>DVHPC=j zS~|ZB&fBvp4vE7BwXBx+ghds9rNAH<(-~uzY;wa1Td`Epd!!2wzl)n#*W_@Nruozl z2?&1l2Z*pM6veyjJ~{7i!WD8ZuD^`;B!{q(Q#oP^yPxt%>z93H_66wq-Y6#t@@K*M zSM=1k6ktExS`*#oNW1qnLe{%o4I{31wFj04Kb}>;Lf+l38<_Jp%JIM0tam9>dv`$t zc71e@Q+K>v;g_6Ye#jXfE7&3kWUI3#xGD%(f=Z3I?gc-$V4yeqR#B1b(d)s;MD;f$ zRG6W4*#A*3M{=meA>74J1|A}V3H( zFuGOCt^FrBvdH$PP>xxlEG$qzck{xkMO!Hi{gO)^~_CcBn!dj?-jV4T4XYK-=zw72g!VGA7kM;fq5cm5R$Jga#c$A}| zHB20KLEq(%IF0Y+T)0U-FkUdR_`Qsjk(9(>^XF!EeQUH`9QW0EgGM7z7e89I-Z{vA3K6 delta 13985 zcmajF1yEf<(XQS#1IK zU!ol@i}=Lb8lvT0VJ2KG(sI*jsFC--DHr+@=%>@97o!mPjN6^G+b{h)7)l3;=Ao9~ z=u#>f0VvBy92uPWlMGrF{nx0zs8xSE5l8=aZk9L$2w(cV8YyFFh-f6A>8#02>IBB2 zL=nEP>nNkHA7ekp{(YL(U*+gNB}Mqz;-#!>o5RK|S8~|jA3;Xn;As}uJde`ZTuDFf z5S%>3#>pi=xkmqqsFYJ*i$kPG=Cb{kXG4Y5BCUQBQ&TLN$Zev|&*G598)K%YkSw5i zroUq71q>>DB(u~xX8-v2S^6rwN_c(|)mjE?Jid?Cn)I64f8EV5U9fXMc z;_y2MvPh`sbXs@HW7da5p3=cz?<-;OQ1R{e%22wu_icf_XL-c8B8XIUOjrm731OJy zYU??;Bkb9KO6AY*eEIuRv~G!5rq?td;RsR?NX;^|Kmj<%jNCAMyz(*+DvWqGr=ii2 zz)XvRPt@8WppTmvxjr;n$L5KnEfEY4gPSTlRP}oYrOG5S^SnzUK$bK#hY}DdOW^ZJ zFw^ebJrG-a+B|1(u1UD#&E7o?6m}bH5k;q3Js(R;dygZJbG7XQk&u-oU}fDyg`)=e zP%hHO)B_jJ96Q4ukCmrZXm@8~Z5Vg4W1GLS(ey~#A5?yfZT`#uLw%!weq)fHQ>jT6 z^7&@Z#!jk1!^@o#&};aooz?EATku@dB9FW2Bwp%vuS*`?AfEGz{XuJ_8IZ{JU%5wo zYM5*KLk;6fEuVPs>2wb%RUqn-r|OJtgrOe+;yX9Yma@Mm%%R92Oa8Z)A$2zNi`GXZ z;cfo6toNN;WQ-4F^#Klx;05?{H7Tz-chx_|xvsy!@G{^c9zV0+>FAuw=<1opA|&Zn zs6N`2Dzxf-j<$*)-|++VM;Gag_rAT&*VC8IA$6KOr=z>b(`L`9=6)#Ry&w}ruLn*v zSQ*={d48c9Ed;M|5ZT=|yk&N`!^_iF8J#qT9%Tw(di`1Iynmkkaq1Xdsh#bQ$rb)n z%ZkBfx;Q+U`*birF$cpJ&btRa+uK@Y3>a}&d--6Q5}$g=n-ERKx2&~$`sVhoX5}!} ztpbwp1=*b!RU|EF%X)o@%{RLoxHj*QD#&}brNm=OgTO9Btrrm=LF>n3nme|6D@?!6 zh^yiESz-na+XEq@0(VJ<_KrNko$~Qjij&3}E2-BxT9gQa97SOBH4;Nb-f7lw0|(4F z5}AKxoI=z(O481SXHnPiZ4?DxpJ_|>he&Y=Ws)Xt!+oq9kbQ1@+XsPee{*V`I<40x2aWrBL;SNrpd_<2Aa?ScasA2F@o; ziju@}XY+2}v(6+l+uwKXszZIj1YbOG#rdNGMqO{`rPqBpGi#17^lfI2b4~Dzj|#nX zel$*2_d%qTMQOE$(>BvU%`3MeLLE4z8%ED6zLM%?IE>Zmi8rIXVBvofjP) z{p5Cb+#UCE@?*Z`KpYM6o)~_p*WvErd8RnxuW7gVl$6jvi>=_#x?JOJ?Cpiol($yd z;5Dp>EUuFIeES#o`7?5MG@(d%yKuor3@RA8YJQXHV$reCE#Zxt)J`w%+eTO9;k?)G z{|vJ%$gJ_QSytBb-@)g9WU=J?nidNjt0x%|Y$@zGHRts)gkO-)>4G!o(o zr|+fZ<<{HX7n32ujubEG4CLH+x*x=Ru`1Hj#3G@F8+i+=9hk$)Bsv%x+FNa^;`L;I4WoyLkU4OaoJ z9BB7M+%7tHxkp+~&_yLWCa$pxLKc(7_=am+UcSj)16X zo8LnIVy`Yt=YOJSFZmBO2V4Gv*4-a+pH(aa@b30KHkiuo5yN*gaa+j65n<(#pQ3^; z3{(KT0#C!J*Z;mcFdpY55Nk114GrYNYgrSY!6vt=YQG-4wz_;90XX|8V@F-qNCS096K(bWJd!<2j(poqFk;X_JqBC zg{8;mFh1pB?yda5+?%{NzcW5Z@c6tfl$j9|zGC6x{K#TVpY-L6GCMna+!tjvE*SA0 zc`NE%cTd>u*m*<=sV}%l_w+o4P#fbHk z1A=Oz2_V$1Cp;)#JV5Wai|;~q)@X^U$$Rb_I9#|1nV!&&I)mXaV!*E52bx8bH)uR( ziblLtkhQfn2^(>vW*1Sy$B5t4g9C$uP{`S$scQ-}A?W0@nYwodXF3XaJe=KI6+3c- z#A8W3m!;1u)bkf1VSdnAsM3HzS`k(}4lr-d`{_HJ2j50-@|{6#bGfx14)z;6=+ZE9 zK$1+f(PeT3$ca${ek>vRPazl`6`T;=?E!QdfI5p?KN|QBdz?_)lZ_a*XpR4I7v6VD zat*0fzxewXI+4c$&>r;&wi_iU9f1)C6p}UQ@q> zA>uuP_a9AD9`Sj3w0ryer<}PJiPbuNk0LD1;qe^uFK@qPE)iTd$bz;K?l}9()HWyd zF{ZW~kYDJWkic3l{jgS$#&GBqdGh5uH0$+V45x19e3yr^1_LH&MLJoJIjv-$U#u_D z6>*mO{WhT%WrlnO0?l{;G-hUIc;|)i62@11L1LBc?pgR&zb!3|E{u!R8FVvivWR}a zIAo2DDN%eQ8%fl?EHEwzYXqpTdD0ca;?=sJn{Jlm+j>hrXJBJ{p5NL?5?4jQz0fT9 z1~GvuKO8j7mQqyE@r0)QtyM37+xXGt*o}{x@44yHtEk`(WUUgYna z|D})x{p>iG`jN8f-|vV&txeU7%j~bs7K#OV6Rw-d->9p@JA+UWbB+;f>gr@=b)vf- zI|y_HD(mX3jtR)byt%;`;(beA{WYS3O(fGh7`D$9uj}?A78sH>GJ3@>b2NWXn0NX0 z`}h9MY}cnA095IoyHvBRPqjhRBr@L18Zctzp55vEP2tdPNII;a^nUapKIPcHMdFrM8~lCU}Fme+rWSj81}0sZ&joa7X-pj?@!hKtN!QRLdovrG;@7swsSB!Fr`M&AGP0b-Q}4Wliz(U?*?l6 z3x7BZV@>NGch&xEc3yX-%zDKsEA2sniQ4Ddx3`ht=LS6b@v`%h(#AjQrY*E@DN$p3 ziq`bBbV{_md8tQ5eYO!!b5g{_#2tbvO_#gAzMSR7yHZnCsR{1vMgQp^N>FeLlc8k~ zPbxnhRBjDznfbu%$dntgs0c7yH-Fg?SUy*4G}i z_5@gz@=f5m(xIB-k9T~(fB&ACn1DAmiQL_tkMGTvk%6%r(A!%D&qGZf2Pjq+S8b$4 ztZke^FJxuV^R{nQd>J{MbVDx_x=YqGtpt{IsT}=hCka79c6+y><$TsI;NF#+XIVJ8iuOve2FKSDq-;l?y1jUfGd<`6vCb+?Jr;Gq!l42$cu#ajcKQ0i& zN7Ym8*=a9gc9e%%szmYTeEM;zyC>dLC&(yA!c38`NaJfzi&jUo!M{*fT&!`lfJjEG z+RaspxXoV@DFqa37_AY_O75o?p-*xcqS6ENRq(J~r{b9Rsjs&xoO#}>WD{oCCxS*_ zNs^>MpO^LOgWTEK83gip)i2Hrx!Nzzeg?rH;YG?6@yOfiKly7wtm>dIx5Y@M zB=o3&{hV=ubWhTlv+eY|0%%7gnGRJ)naC~vnDe{PZ)^!>X3}UT;+2?}|mGo@QyV;pE2ROl7 z)K~P3_O7OmRITBSxe-_Gk%N3`Hk*rogJw^u48sOx(~1F4L4>ylNmP6~YATe2EgV+b zf;s(oM;j*f0GZ66mDXX$FX`!B2Z~iw7L0G)8QSj|{aLNDVg4tcodRVWyNmj)JyZq{ zn)^IlX?0p*PA2*#I(Mj^*IO&E_NO0IUcWxo{T4Z8@!*iw7rxr;<#fSb`HMB6arCw8 z?iht`|-tBUZ1Gk)O>{E(c~sQzTx@$ zSB$zOD7BzK$)s0oqK(ab!_(yksVpP(;Cc$?SZ-AJu$>YO$n98Ql3c0XAHkT(n``bcMbdAu_O#`f#A|^AYFKVJ!5n9@f1~-P zU>3;&Y*Z3Ks0p8S!WC7PI31RSVyD|IuQ@?&6!VI1L{_i%S{fb3&efl0XIzF113=Gj zok#67ic{H=tklx^A7t|RJI)KO(q0xvXTq#CbZrXtdrBL#74mmQuQM(s0H72DQx_!f zWvKC_7ZD--BIvYJ%k`!ngNBCYiTrAwH@c^%hnj{aaGDYu8=jLx{dpe81V6n{(C49~ zny!u8che1*vJq=h+@ROaq!JJ!1jW*^miMCxX!#-&;7e?F(6~!Q(t=?Y=?6BK*t)!6 zW^^Q~*1X4Gr~xn4v__Sjm-1UhFoViCL`mNv73lO>Ut$}F~ZXuH{=i2U@!T(}H*LN1njSoaJN6HBeD-h&s( zaZ;t;9zmut1fw!|)@7B$8?{?~_qvZDvLx+Zo>R!FRTa%1fOzL z8%~Kh41?7^_nH8eNRfmb2wC`S^TSliDV)883`c}DMW*{xg%a1wnSCZdoN4MMPeXuv zB9HE_kmrG#nV+1*fZq1N&YDuvag&Bqy|Pp^36~N9E85nI-&nmoe$}Q$T#(*xvoF9NMtU-GQN++)9M8FyztlFX)eO^dSsL)DC=5WRtbSIJhTWTD;AFjaru`k z#nm{Cd^s}^v$(p@D*r?XO4rgNCi0N<&jS}2%024&`I7(>6LYRQ{#pf(Q zSC^2}s3}+trZl5?cZBA+MP;!PoS#o;F6hiq`>t2T(#mSR_`Kaz67E?crP=$}R`9Ho z8izfT(c%{NXZ-PFS{w7I*r$q$pQff^z|HB;F}Tz(f_RVk=}M6(!f{YHrVCen%d4y% zL&a5CAhOVTAYo41`wTr1LL37xG*5lmmUY{pRC#81D1DV2_bX7|@|TjyNM!!wM$oN2vj(3}tpOG_lk*OC(RZ9G!a zh(?XJU?(&V*w*ycHQ!lySXjq~GgVhZa6QwH_|!cJQpkkfqi$L1H|GcO%tvH*DnYQX zT)sITxpQ)^4TeOuMhs-4dDIqp!MMz~Yp8`t7xS0Hns7DQ5EDL+Hx1Y+D00YIF*K~% zI5=Pk{wjCK{%MBlGaPKWjfcn5mxiCC`N!z6Pmb36N8k}2KI1wE9yqN0bKBLIq*TuRpGe;Zmvyvwb;$)=MqH#BNPHAc6V8gmoDRV|fMo$}LEOTo^JijJq zW=0#*vGW5sdm^CnS1~dFcX1I6Zjs8DJC|%F1vNR-#cGHUOnerR|&J_Se#off}?K*HuL1OG#Xfq?{xA`=8R3#QWM?$*}Y%r`9v{OZd4 zS*!K|1VVnHC?lzDOy4tL^OMzgIkLG~6xMv!l9-CL7D!?eH896+Bv?zxkdOoZbQgI;c4zdByVWAH-heL(~c*0}QSq@T@FK z+zk*uIG`=2aW}#V{KWkq6ylVt;OE*tU)ojlnc0R@Og<4ypG*W!3npp5%@*Q>6i&Dd z0I{9KAEbvz`9VbRgf4je!@ZyO4TX1s&z;;81R)d6;sqw(L&JqXRpnq1YF=Kckxwrm z5^DVkZIk~&G9E&BxpQ_igoTCCPu*NyArom5etu$*iRmioMS+;{Cw{wBgsZEosXq)O zo)4pf{SNH@;Ub_xxwQjl|Aj+7JQx@lpzn_Nq=-NEhWhdUcO2~$Dw)a8>&T1!HV8Hz z1srrX|HC>@F>t4m?t{VH%6T-$OanG%L`JN6vDy0-w&-6Q#34v%P!Z_ z($aLw+Yx1Eo;;O*C8i8I7&|E=73F8#Rsa<1aG6X=HM(x2!%_!E;UZoLuvBJqdxZe5_-Bpz>yS5#I-?3Z^ID)N8LLP|=CO+pg>=@UwDNXYs|ZzQp( zC;Kj7%E!kSMIoB}ztK@r#(;D(GBQuz_s^d{=)mdn^71?gL=e9QZK^mo7pkG5VQXtE zVQb6G%gejAzTPwg<-@<`S*WxwL-O$O(633(TG&50*xcu1wvm!(F{gg<}&)Nl4ITR4591y5)tB_(q@V<;#n-Vb+;QYa^2+VE03o+|&v*{->z zWx?598b-r9>Fw(;#B3nJBHnCn>8A&DNakNj8*x_>Y^93n+oUMF zh#llwYtoC0i<48*{hREID1-tVd^pe&r@j>uY+nC`G@r%(S6D8Hht%2kI4nMeUxn{x zn|zC}qbHNfpl#UUGIOMB!}W#6&9PwYo!kr${(UMV#q*#3xH#;vs3>e)+^+iV?QI$^ zE-WXaxA`laKji+~FJM300b<4Wv!!N>uCA_eiHV4}U7AB}l|a&ee_B#fk{jGwU}CVC z3`XA4Qg$$jD)uFu(;D&Avf!7UZ{$85L4VIuBlRZa$}bDh-qH-a*snM{r4sw1@XGt8 z22EQvPkJ@AslbTrh2E#B5eqQJqM&U{DKZm9%sak|Vohh4l4lTOw3mWeHvE#KlC*^r z=;$&4jQb?Wse7ucM|bxI${V2n-I2pp`k6|Y=|LAy_E*un60ez}3WjGkZ2t|+9k!$l zU#$FVk%D#z7KbKIa?+-fDKYC<@P{9tzh;5Z6Xru@_8L1}2iPOmJI2!3s9S4d$ zh3}#mPi=r(WH665ZNS6Dt=wIHR8JXMh|kC%XRoJJfp##->V*ddA<8AU7idRM(ziWg zxrMj4i#NC0O*1<9?(+S%8Rky_^=a@bSshaOZ(aB4t4)KF(SLZRa`nRm%p%4iMyL@1 zPJ%kN$*Q22TAQ}vL575TiPOZyJmsxLPZK|^FFVo;DcpE9!Wf}#Zko*bf-ok~V^w<0 zDM33%GZ=a%CvkLuyA(|Uxx_2AmyI~bR#WUZdpp?rSHVYvc7Nq$6kbKzgS|B{H!)4$Ty zqMdYCiKObMp{AzpAnKws009gTl>q+Fu*Cl#l`y0=$$%SPbo*KlJ-e9V|AMJqSO<9AcPA!;II8 zCs$jk!8xmr6`6*n`z}KhUsGXtdUi!_COXga6GL)VmvP;?FdKez0qxfyxE%L6j=JDi zkV%i>P>GvOv<&?W94US4>_~4b+h9u15$2s8aO?08gaVA!V&oKCH`DpQc`xD#{_w`i zUxG2hhQJTM^nN^+dwO*}rWtsyAUU)YPc#}ZxPd>_k%LSnOFz5R<`uCVU069J^0 z!h*5WVA42=LQc&9am zQezzFo>_FU)zgcLHdLsF5_~VDupngjmxv}HP0jfzss5EZg?e*Cz=N1b?iga*-``E?*hN%w`xYCGtsu7BzAnvYHV!_x@JcUzZ~TdPnQePA4W+n~X*FXa$ozld}uz z29OSK-SLXYM`Rx)#?b77ez}5xNgr?;HxZ2ms7#GHZT>TR-uJmua<3Y0^@2gCUZ_?uW zMEDC1Dq8Wd{$8J;+h4%ZVM40ZP)OR!vxjISbTz?0+p%i|%xf?G*@`W8XaNxDa5|0T zOxU{O_V#xTp3Z8ylJ-WHD;bHo+WO9X6YiFMsMzs69hJHctIBM+0Rl-$69@L`A2KSt zEobFn4wC6+ySo=3=2GjV>SC4V-|u{AZ#Fu)63k!2b=WkwX%jy#%txCFX0bsQ~qQ6%V5f1LJC zS9u{#2Y?FA(-3+q~5Hz(1sx{sD(n8MLG$X~X3i=d=VfDKpnKu0H> z5R(ju5+ug}u?AqnyM+k~Z!@m7T?i`>PXf=urh_&f`c)T3QPo0yiww5lp*POJo9G&g zbWR*~e7WoAh05F4`$SwFa_~2L$X|L*9x)-%TJLx;gDn z8jdOQa2q4UeV^*$Z}df(F~!Q5dEgKmb#?p!?KA#{63?QNn9cRk*B*cDh2VtZ$mVHQ zL4A4Pa?!@Qyz8{b5U4ZhB(@~Oy$B= zAnvUaZ;&!Tm>Mc1Y7th$SFJUzkE1j5OAB0_@TYCVPKYNbqEgg@%EH2uwA&MY0;F<7 zM}CEd_+-Gao}W7(iTKC&bS+_MZN{Dxt~#xVnOi!HfRzzKjj9NRze1)7A6JtfAL_oM zxC;(NUoAk7jI2!`VSjWgN%(AXVDH5-i6H(`9$KN_Fumv~??)#cFXRLyebP@!h^ZCoK7u0S z?fUnJ&7B>&A}jH(PP1hwB$)X@70b;-((_&V)Tv5QEzi4F)c``}opBp+VB&8z?+>b1 zN<16ue29is<{@3-CLrt-j4dQAT$QGNX?=5W?6k;gl=_Uh;>EXD$jxNia@I)wW{)?Y zPkIAH7I|ulypoBk&eCwmL+>>lK{!Mwv>B&jfGF${(FX0F6LYH)R77I~fF;+~#(4zr#^T zpdLRSXxM1LOc(NVR^eb={putjk(b5Ko9g8&->P04*!DEO3)j;6$)Q+t=E)();fzM< zzHqy%Wl~Dkisj?s41W>!=&gyf1|;CkB1ibu3qX^R5>{+kz2V~ODy3t^ zz(xtVT4j2}y?=BB!RK24F2(UwNFwJenLW1sNne zJ?o-T&G!66u};vGeAHbGVjX;p@0fn8Qp(JS;AOx*efku4)SVKHViOTKa^$_u;Xi&4 zh5__@k++Wk_WPI!=)}2Jk@%|@(=9?w?a4N(b7oyLe($J0SD#H(T8ke700 zPHilp9UOD=16REfyY&Xcp(xR2dL zkeN5BbERMs-Sepo2{J?VCj63Tkd9h9U6}ONvq3fShzmq%CK96El^CA?uLifJSf}YEh4AQ(T^op+gt&#Va z2-!zdDPI}!_1YKwg8c?gP8$Ii%w&MHXK(Gx!=<{&voC_N+$6C&WauvoxlBuo$0LfX z%L)5@Zw^yCydHu&#`kd*-M;62VV43cJm5Oz^fvkoskgdZ^g?&I9D@{ZQz+vVTc>-U!FoT1HOz)rfG% znFnuzN-+v6*`u3pHna$TfR+=h7v=gQ!46`v+78@7MA!Y_{jxWW+9(bmMmw z{}lSayC{EBf>xdR7)0J5=pk^~^Uw)lhCYX1CT>FJF$Sh6kC^(a{--YE^Z2j`z5FPu z@oXoXJL=dHt8_DqJrtxW5np(1F#NwtJpTR#gs6U_&it}anNfY)>PxUg#ffCem&4g= z`miqbAH0JM&4~CPAu>cSlU^V9>P0eAKv2hL(Ya$N^Qe1jy|Rw7cSY}8u^WcszWmkY z1TFY%F9-2=M8t1D0|RG3rHBc5Nv#H4PaMD?%NOk^V0~9gY?HhocTqdZ&dQ&096$|B z7rrLr7jGYk;>*%-y~?D^ZgoL}*cyDpeNIPPB+geXCx%}BH#g3d6_l%a|5!-!U+mJQY1;{&oZ3=AP9Un`0& z`6!BF9X{p%_ErJj|3aF-I7D;xe?dvO(`lE@WMiUufv2ypiUc}|Se;3g7xMKvVkM**4-t9kqu!{~N?~9OA(H)Advw;?8=W>9Px8@-M+|?dO6{^zVn%Bj)m6&vH%o5jQoe9d8p5JD7CUoh^i6EqN~38{fPU)4Pe0xA@(*SvvZ89 z7Zc34nyT_+YcxK=b`puQB%&M2e}2lGzcERXbNV}_Tqq$)1};~1@gT@q2!vy0daY~v zzF4#=sCg#;XABXd3sd~*Uu78igW&JqQBDmze01pCcVj~?F+f{(9np8;{d5hJdL0=F zog9ROBtt-w=2%<3!*<0ypv9kw;qi`&Y(jtvjI`Zft9|cw5AN}2lCUO5L~=@^9WA@2 zggkG1l0S1BW=VxdVkO+v-fKerx8)X^Cj|3KNb~=oCiI%NlDS|kbvoMgj>~&Eqca3t zarpSG$7xH10*|r_(GSlOD33Ku`fPDcxR$;|J&Run$;N3V_rQ^7aha6W^jr_tmdHlM zIiJL%uA-FvMw+j9C;oh78gsi?SIb%scb>MEle2wTRTPrb{k@N1?Y&%ewU76)GDKpn z#3ISz5!?zDM=sKdoorPMi{N<|;)mo#!Sh5M&bmKa&cTzU?A1XM7IiC=!*00|J~cr?(HRshs`wgy zhaiJewC6CL|H~d{VwL22-`4)QzOh0&HCTr6e(M-&e-t|L{O&Ifr4m;T&Y6865)!|p zH&-frp){Q@qQqaDbwD022+mX+b_iU!mEGeYJy6kr00D@IM7R6D080hS>cl_7J5~wJ z&>8=46&=y-mNj5J??jFb8kUV+aW!vvF;Z*U-}}&Ojo~*T1uG@*U4x$$$dpddv-Ud z(Tq~NyQWkEOsab0^rmbOtf*P@#eV&YlsRMO>0l@iJD~_|pnbW4xa#ub+DOpTyM|2yCYT?>*KHGTls z`Q&EOnF^>p2?2=COaht!V7(YVJc?%oiz+JGE0B0E( z6y1#@xZ_+T%+l@+pyKI$rk59(9`BAZ$-raQ=7eqrFx0{&4kowoqgWWTh0iIf@$mK+ zIaFIaW`4-rITi9hA4Crzns2rLyn;XjCVusT5fL1}65zGHNBg~FtdQPsi7r6+Q|Vx~^Fj?CUe$Lm4#s;ITpTA=xht-I?6^xZj_khg z7Vrz))+alPW#prt-%paEg+g#2hIwRKgh@cszCqDQf=W_*GUL{su`y><2`Jeq7t?H^| z;di|R??7<1OdkBe`A(?Y&#&Xzvz+G>XVbKElX}_ir_Pm)Zg}s=n zZZH!K`m;L$yK0n+4=J45perH)d9x<|fLUI^HF!IrS3v#?5skA*`(vbgRA@iFu~Y94 zk7mgI?R=GB=R03T~jk^JJf*rI`<&{%{TZe%=c+gFBue5`bo^QC(p zt_Pk_r!yR|w$13_^7s=GFEuo9R{F`Y{@+UA9QGCWs;6pQ5a)Ou3Zl$Nvwa C=*iUp From e9406db4dc68fc2a196963d420725f38af2b0f32 Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Fri, 10 Jan 2025 09:26:21 -0800 Subject: [PATCH 02/18] Adds a water tank. Removes a doubled grille. --- _maps/shuttles/roumain/srm_vagrant.dmm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm index e3f61c2d2041..6d3937b4bac2 100644 --- a/_maps/shuttles/roumain/srm_vagrant.dmm +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -613,19 +613,6 @@ "jM" = ( /turf/open/floor/engine/hull, /area/ship/external/dark) -"jZ" = ( -/obj/structure/window/reinforced/fulltile, -/obj/structure/grille, -/obj/structure/grille, -/obj/machinery/door/poddoor/shutters{ - id = "vagrantatriumshuts"; - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ship/roumain) "kl" = ( /obj/structure/cable{ icon_state = "2-4" @@ -2035,6 +2022,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/wood/walnut, /area/ship/cargo) "KD" = ( @@ -2947,7 +2935,7 @@ bF Ut qN qN -jZ +qN dt bF bF From 72f6d6fb84a55148ce7af850aab0f28ab5494d8e Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Fri, 10 Jan 2025 15:15:56 -0800 Subject: [PATCH 03/18] Added Frederick to entertainment as asked, hopefully fixed a turf. Added a pipe to engine room shutters, named airlocks, changed wooden boards, put fax machine on top layer, add corner decals, dir'd the AAC, made the shitbucket and the shower seperate, anchored the PACMAN, put a torch in the airlock, fixed docking static, and moved armory plant and tables. --- _maps/shuttles/roumain/srm_vagrant.dmm | 204 +++++++++--------- .../effects/spawners/random/entertainment.dm | 1 + .../turfs/open/floor/plating/misc_plating.dm | 2 +- 3 files changed, 110 insertions(+), 97 deletions(-) diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm index 6d3937b4bac2..f37ba26de0f2 100644 --- a/_maps/shuttles/roumain/srm_vagrant.dmm +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -46,7 +46,7 @@ pixel_x = 0 }, /obj/effect/turf_decal/siding/brown/corner, -/turf/open/floor/wood/birch, +/turf/open/floor/wood/walnut, /area/ship/bridge) "aG" = ( /obj/structure/cable{ @@ -83,8 +83,10 @@ pixel_x = 10; pixel_y = 3 }, -/obj/effect/turf_decal/siding/brown, -/turf/open/floor/wood/birch, +/obj/effect/turf_decal/siding/brown{ + dir = 6 + }, +/turf/open/floor/wood/walnut, /area/ship/security) "bF" = ( /turf/template_noop, @@ -121,7 +123,7 @@ dir = 4 }, /obj/machinery/door/poddoor/shutters{ - id = "vagrantengineshuts"; + id = "vagrantstarboardengineshuts"; dir = 8 }, /turf/open/floor/plating, @@ -145,6 +147,9 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/effect/turf_decal/siding/brown{ + dir = 10 + }, /turf/open/floor/wood/walnut, /area/ship/security) "cf" = ( @@ -341,6 +346,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, /turf/open/floor/plating, /area/ship/engineering/electrical) "fm" = ( @@ -349,15 +357,13 @@ /turf/open/floor/plating/asteroid/rockplanet/wet/ship, /area/ship/roumain) "fT" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_x = -25 - }, /obj/effect/turf_decal/industrial/warning{ dir = 1 }, /obj/effect/turf_decal/trimline/opaque/red/arrow_cw{ dir = 4 }, +/obj/machinery/advanced_airlock_controller/directional/west, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) "fY" = ( @@ -367,9 +373,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/effect/turf_decal/siding/brown{ - dir = 6 - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -415,7 +418,7 @@ /obj/item/clothing/suit/armor/roumain/flamebearer, /obj/item/clothing/under/suit/roumain, /obj/effect/turf_decal/siding/brown/corner, -/turf/open/floor/wood/birch, +/turf/open/floor/wood/walnut, /area/ship/security) "gJ" = ( /turf/open/floor/plating/asteroid/rockplanet/wet/ship, @@ -429,7 +432,7 @@ /area/ship/medical) "gV" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Medical Bay" + name = "Herbalist Shed" }, /obj/structure/cable{ icon_state = "1-2" @@ -454,7 +457,7 @@ dir = 4 }, /obj/machinery/door/poddoor/shutters{ - id = "vagrantengineshuts"; + id = "vagrantstarboardengineshuts"; dir = 8 }, /obj/structure/cable{ @@ -551,7 +554,7 @@ /obj/effect/turf_decal/siding/brown/corner{ dir = 4 }, -/turf/open/floor/wood/birch, +/turf/open/floor/wood/walnut, /area/ship/bridge) "ja" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -654,6 +657,9 @@ dir = 8; icon_state = "computer-left" }, +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, /turf/open/floor/wood/walnut, /area/ship/bridge) "kJ" = ( @@ -661,7 +667,7 @@ dir = 4 }, /obj/machinery/door/poddoor/shutters{ - id = "vagrantengineshuts"; + id = "vagrantportengineshuts"; dir = 8 }, /obj/structure/cable{ @@ -772,7 +778,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/wood/walnut, +/turf/open/floor/wood/birch, /area/ship/bridge) "lW" = ( /obj/item/reagent_containers/glass/mortar/bone, @@ -862,11 +868,10 @@ /obj/effect/turf_decal/siding/brown{ dir = 4 }, -/turf/open/floor/wood/birch, +/turf/open/floor/wood/walnut, /area/ship/bridge) "ni" = ( /obj/machinery/atmospherics/components/unary/tank/air{ - dir = 1; piping_layer = 2 }, /turf/open/floor/plasteel/dark, @@ -959,7 +964,7 @@ /obj/effect/turf_decal/siding/brown{ dir = 4 }, -/turf/open/floor/wood/birch, +/turf/open/floor/wood/walnut, /area/ship/security) "pp" = ( /obj/structure/cable{ @@ -982,6 +987,10 @@ /obj/effect/turf_decal/trimline/opaque/red/arrow_cw{ dir = 4 }, +/obj/structure/destructible/tribal_torch{ + pixel_x = -10; + pixel_y = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) "pD" = ( @@ -1081,7 +1090,7 @@ /obj/effect/turf_decal/siding/brown/corner{ dir = 4 }, -/turf/open/floor/wood/birch, +/turf/open/floor/wood/walnut, /area/ship/security) "qR" = ( /obj/structure/cable{ @@ -1133,7 +1142,7 @@ dir = 4 }, /obj/machinery/door/poddoor/shutters{ - id = "vagrantengineshuts"; + id = "vagrantportengineshuts"; dir = 8 }, /turf/open/floor/plating, @@ -1150,7 +1159,7 @@ "sH" = ( /obj/machinery/door/airlock/glass{ dir = 4; - name = "Atrium" + name = "Cargo Bay" }, /obj/structure/cable{ icon_state = "4-8" @@ -1171,7 +1180,6 @@ /area/ship/cargo) "sI" = ( /obj/item/clothing/head/hardhat/solgov, -/obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/welding, /obj/item/clothing/head/welding, /obj/item/clothing/suit/hazardvest/roumain, @@ -1183,8 +1191,9 @@ anchored = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/item/storage/toolbox/electrical, /obj/item/clothing/gloves/color/yellow, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) "sP" = ( @@ -1196,7 +1205,7 @@ /obj/item/tank/internals/emergency_oxygen/double, /obj/item/clothing/mask/breath, /obj/effect/turf_decal/siding/brown, -/turf/open/floor/wood/birch, +/turf/open/floor/wood/walnut, /area/ship/bridge) "sV" = ( /obj/structure/platform/wood{ @@ -1236,9 +1245,9 @@ pixel_y = 0 }, /obj/effect/turf_decal/siding/brown{ - dir = 1 + dir = 5 }, -/turf/open/floor/wood/birch, +/turf/open/floor/wood/walnut, /area/ship/bridge) "un" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1297,6 +1306,9 @@ pixel_y = -8; layer = 2.8 }, +/obj/effect/turf_decal/siding/brown{ + dir = 9 + }, /turf/open/floor/wood/walnut, /area/ship/bridge) "vq" = ( @@ -1394,7 +1406,7 @@ /obj/structure/chair/wood/wings{ dir = 4 }, -/turf/open/floor/wood/walnut, +/turf/open/floor/wood/birch, /area/ship/bridge) "yb" = ( /obj/structure/railing/corner/wood, @@ -1578,7 +1590,7 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/button/door{ - id = "vagrantengineshuts"; + id = "vagrantportengineshuts"; name = "Engine Shutters"; dir = 1; pixel_x = -7; @@ -1715,6 +1727,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/button/door{ + id = "vagrantstarboardengineshuts"; + name = "Engine Shutters"; + pixel_x = 0; + pixel_y = 21 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "DJ" = ( @@ -1762,10 +1780,12 @@ /obj/effect/turf_decal/siding/brown{ dir = 4 }, -/turf/open/floor/wood/birch, +/turf/open/floor/wood/walnut, /area/ship/bridge) "FA" = ( -/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/airlock/maintenance{ + name = "Starboard Engine Room" + }, /obj/structure/cable{ icon_state = "1-2" }, @@ -1866,7 +1886,7 @@ /obj/effect/turf_decal/siding/brown{ dir = 4 }, -/turf/open/floor/wood/birch, +/turf/open/floor/wood/walnut, /area/ship/security) "Hn" = ( /turf/closed/wall/r_wall/yesdiag, @@ -1987,7 +2007,7 @@ dir = 8 }, /obj/effect/turf_decal/siding/brown, -/turf/open/floor/wood/birch, +/turf/open/floor/wood/walnut, /area/ship/bridge) "Jp" = ( /obj/structure/chair/wood{ @@ -2007,7 +2027,9 @@ dir = 1 }, /obj/effect/turf_decal/stoneborder, -/obj/structure/window/reinforced/tinted/frosted, +/obj/structure/window/reinforced/tinted/frosted{ + dir = 8 + }, /obj/item/reagent_containers/glass/bucket/wooden{ pixel_x = 2; pixel_y = 3 @@ -2285,7 +2307,9 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/airlock/maintenance{ + name = "Port Engine Room" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -2298,6 +2322,9 @@ dir = 8; icon_state = "computer-right" }, +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, /turf/open/floor/wood/walnut, /area/ship/bridge) "NN" = ( @@ -2356,7 +2383,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/turf/open/floor/wood/walnut, +/turf/open/floor/wood/birch, /area/ship/security) "Pj" = ( /obj/structure/platform/wood{ @@ -2394,7 +2421,7 @@ /turf/open/floor/plating/sandy_dirt/ship, /area/ship/roumain) "PS" = ( -/turf/open/floor/wood/walnut, +/turf/open/floor/wood/birch, /area/ship/security) "Qa" = ( /obj/structure/platform/wood{ @@ -2421,7 +2448,9 @@ /turf/open/floor/plating, /area/ship/engineering/electrical) "Qs" = ( -/obj/machinery/door/airlock/security/glass, +/obj/machinery/door/airlock/security/glass{ + name = "Armory" + }, /obj/structure/cable{ icon_state = "1-2" }, @@ -2450,9 +2479,11 @@ dir = 6 }, /obj/structure/table/wood/fancy, -/obj/machinery/fax/roumain, +/obj/machinery/fax/roumain{ + layer = 3.22 + }, /obj/effect/turf_decal/siding/brown, -/turf/open/floor/wood/birch, +/turf/open/floor/wood/walnut, /area/ship/bridge) "Rk" = ( /turf/open/floor/plating/sandy_dirt/ship, @@ -2492,6 +2523,9 @@ /obj/item/storage/box/ammo/a12g_buckshot, /obj/item/storage/box/ammo/a12g_buckshot, /obj/item/storage/toolbox/ammo/a850r, +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, /turf/open/floor/wood/walnut, /area/ship/security) "Ss" = ( @@ -2568,7 +2602,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/wood/walnut, +/turf/open/floor/wood/birch, /area/ship/bridge) "TU" = ( /obj/machinery/power/ship_gravity, @@ -2611,6 +2645,12 @@ /obj/effect/turf_decal/siding/brown{ dir = 4 }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 1 + }, /turf/open/floor/wood/birch, /area/ship/cargo) "UH" = ( @@ -2631,22 +2671,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/table/wood, -/obj/item/storage/toolbox/fishing{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/storage/toolbox/fishing{ - pixel_x = 1; - pixel_y = 0 - }, /obj/effect/turf_decal/siding/brown{ dir = 1 }, -/turf/open/floor/wood/birch, +/obj/item/kirbyplants/random, +/turf/open/floor/wood/walnut, /area/ship/security) "Ve" = ( -/turf/open/floor/wood/walnut, +/turf/open/floor/wood/birch, /area/ship/bridge) "Vy" = ( /obj/structure/window/reinforced/fulltile, @@ -2675,7 +2707,9 @@ /turf/open/floor/plating/asteroid/rockplanet/cracked/ship, /area/ship/roumain) "VB" = ( -/obj/machinery/door/airlock/command, +/obj/machinery/door/airlock/command{ + name = "Bridge" + }, /obj/structure/cable{ icon_state = "1-2" }, @@ -2728,7 +2762,7 @@ /obj/structure/cable{ icon_state = "6-8" }, -/turf/open/floor/wood/walnut, +/turf/open/floor/wood/birch, /area/ship/bridge) "VL" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -2751,10 +2785,15 @@ pixel_x = -4; pixel_y = -5 }, +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, /turf/open/floor/wood/walnut, /area/ship/security) "Wg" = ( -/obj/machinery/power/port_gen/pacman, +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, /obj/item/stack/sheet/mineral/plasma/twenty, /obj/structure/cable{ icon_state = "0-2" @@ -2796,7 +2835,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/structure/table/wood, /obj/effect/turf_decal/siding/brown{ dir = 1 }, @@ -2816,7 +2854,8 @@ pixel_y = 5; pixel_x = -3 }, -/turf/open/floor/wood/birch, +/obj/structure/table/wood, +/turf/open/floor/wood/walnut, /area/ship/security) "WU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -2826,8 +2865,17 @@ dir = 1 }, /obj/machinery/airalarm/directional/east, -/obj/item/kirbyplants/random, -/turf/open/floor/wood/birch, +/obj/structure/table/wood, +/obj/structure/table/wood, +/obj/item/storage/toolbox/fishing{ + pixel_x = 1; + pixel_y = 0 + }, +/obj/item/storage/toolbox/fishing{ + pixel_x = -1; + pixel_y = 5 + }, +/turf/open/floor/wood/walnut, /area/ship/security) "XB" = ( /obj/structure/window/reinforced/fulltile, @@ -2905,7 +2953,7 @@ dir = 4 }, /obj/item/toy/plush/frederick, -/turf/open/floor/wood/walnut, +/turf/open/floor/wood/birch, /area/ship/bridge) "ZO" = ( /obj/structure/cable{ @@ -2917,9 +2965,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/effect/turf_decal/siding/brown{ - dir = 5 - }, /turf/open/floor/wood/birch, /area/ship/bridge) @@ -2931,7 +2976,6 @@ bF bF bF bF -bF Ut qN qN @@ -2953,7 +2997,6 @@ bF bF bF bF -bF BD Io Lb @@ -2974,7 +3017,6 @@ bF bF bF bF -bF Ut dj Op @@ -2996,7 +3038,6 @@ bF bF bF bF -bF BD Op Op @@ -3017,7 +3058,6 @@ bF bF bF bF -bF Ut dj xS @@ -3039,7 +3079,6 @@ bF bF bF bF -bF My za nk @@ -3058,7 +3097,6 @@ bF (7,1,1) = {" bF bF -bF lw XO XO @@ -3079,7 +3117,6 @@ bF "} (8,1,1) = {" bF -bF Hn rH kJ @@ -3101,7 +3138,6 @@ bF "} (9,1,1) = {" bF -bF xc cZ bZ @@ -3123,7 +3159,6 @@ bF "} (10,1,1) = {" bF -bF xc HZ rz @@ -3145,7 +3180,6 @@ bF "} (11,1,1) = {" bF -bF xc ni pp @@ -3166,7 +3200,6 @@ zP bF "} (12,1,1) = {" -bF oO xc sI @@ -3188,7 +3221,6 @@ zP KN "} (13,1,1) = {" -bF GV fd Wg @@ -3211,7 +3243,6 @@ jM "} (14,1,1) = {" bF -bF Hn xc Hy @@ -3233,7 +3264,6 @@ bF "} (15,1,1) = {" bF -bF jM xc xc @@ -3255,7 +3285,6 @@ bF "} (16,1,1) = {" bF -bF jM EM fT @@ -3277,7 +3306,6 @@ bF "} (17,1,1) = {" bF -bF jM EM km @@ -3299,7 +3327,6 @@ bF "} (18,1,1) = {" ie -bF jM Hn xc @@ -3323,7 +3350,6 @@ bF bF bF bF -bF xc cL ja @@ -3345,7 +3371,6 @@ bF bF bF bF -bF xc JR pN @@ -3366,7 +3391,6 @@ bF (21,1,1) = {" bF bF -bF JE ia ia @@ -3388,7 +3412,6 @@ bF (22,1,1) = {" bF bF -bF Vy aE nc @@ -3410,7 +3433,6 @@ bF (23,1,1) = {" bF bF -bF Vy sP Ve @@ -3432,7 +3454,6 @@ bF (24,1,1) = {" bF bF -bF Vy QA lQ @@ -3454,7 +3475,6 @@ bF (25,1,1) = {" bF bF -bF Vy Jh xU @@ -3476,7 +3496,6 @@ bF (26,1,1) = {" bF bF -bF YL Cp kD @@ -3499,7 +3518,6 @@ bF bF bF bF -bF Ab GZ ia @@ -3523,7 +3541,6 @@ bF bF bF bF -bF SV IZ hr @@ -3545,7 +3562,6 @@ bF bF bF bF -bF SV VG lA @@ -3567,7 +3583,6 @@ bF bF bF bF -bF SV iq pD @@ -3589,7 +3604,6 @@ bF bF bF bF -bF SV Fa kZ @@ -3611,7 +3625,6 @@ bF bF bF bF -bF mi SV SV @@ -3634,7 +3647,6 @@ bF bF bF bF -bF jM jM jM diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm index 8e51ddf384c0..06abe3052b02 100644 --- a/code/game/objects/effects/spawners/random/entertainment.dm +++ b/code/game/objects/effects/spawners/random/entertainment.dm @@ -249,6 +249,7 @@ /obj/item/toy/plush/spider, /obj/item/toy/plush/tali, /obj/item/toy/plush/xader, + /obj/item/toy/plush/frederick /obj/effect/spawner/random/entertainment/plushie/moth // fair chances ) diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm index 1a6c4e867dad..f1cf31218b42 100644 --- a/code/game/turfs/open/floor/plating/misc_plating.dm +++ b/code/game/turfs/open/floor/plating/misc_plating.dm @@ -276,7 +276,7 @@ heavyfootstep = FOOTSTEP_GENERIC_HEAVY tiled_dirt = FALSE - /turf/open/floor/plating/sandy_dirt/ship +/turf/open/floor/plating/sandy_dirt/ship initial_gas_mix = OPENTURF_DEFAULT_ATMOS planetary_atmos = FALSE From ed5d3800049e88f88106482402e565b89b7e18b2 Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Fri, 10 Jan 2025 15:20:59 -0800 Subject: [PATCH 04/18] i forgot a comma im so cool --- code/game/objects/effects/spawners/random/entertainment.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm index 06abe3052b02..75028ca12e11 100644 --- a/code/game/objects/effects/spawners/random/entertainment.dm +++ b/code/game/objects/effects/spawners/random/entertainment.dm @@ -249,7 +249,7 @@ /obj/item/toy/plush/spider, /obj/item/toy/plush/tali, /obj/item/toy/plush/xader, - /obj/item/toy/plush/frederick + /obj/item/toy/plush/frederick, /obj/effect/spawner/random/entertainment/plushie/moth // fair chances ) From 9049ecb106ea57d7e2d5854a8a24a2301719928e Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Fri, 10 Jan 2025 15:27:13 -0800 Subject: [PATCH 05/18] duped table oops --- _maps/shuttles/roumain/srm_vagrant.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm index f37ba26de0f2..f89a283a1883 100644 --- a/_maps/shuttles/roumain/srm_vagrant.dmm +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -2866,7 +2866,6 @@ }, /obj/machinery/airalarm/directional/east, /obj/structure/table/wood, -/obj/structure/table/wood, /obj/item/storage/toolbox/fishing{ pixel_x = 1; pixel_y = 0 From 8ce810a09edc4fab6ee4d01c08306dfdce3ee8e9 Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Sat, 11 Jan 2025 13:37:26 -0800 Subject: [PATCH 06/18] Added a filing cabinet. Changed some floor tiles. Fixed some miscellaneous issues with alignment. --- _maps/shuttles/roumain/srm_vagrant.dmm | 128 ++++++++++++------------- 1 file changed, 62 insertions(+), 66 deletions(-) diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm index f89a283a1883..a29ee4e558be 100644 --- a/_maps/shuttles/roumain/srm_vagrant.dmm +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -9,12 +9,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, -/obj/effect/turf_decal/siding/brown{ - dir = 8 - }, +/obj/effect/turf_decal/siding/brown/end, /turf/open/floor/wood/birch, /area/ship/cargo) "ah" = ( @@ -83,9 +78,7 @@ pixel_x = 10; pixel_y = 3 }, -/obj/effect/turf_decal/siding/brown{ - dir = 6 - }, +/obj/effect/turf_decal/siding/brown, /turf/open/floor/wood/walnut, /area/ship/security) "bF" = ( @@ -147,9 +140,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/effect/turf_decal/siding/brown{ - dir = 10 - }, +/obj/effect/turf_decal/siding/brown, /turf/open/floor/wood/walnut, /area/ship/security) "cf" = ( @@ -226,10 +217,6 @@ /area/ship/roumain) "dE" = ( /obj/structure/table/wood/fancy, -/obj/item/disk/holodisk/roumain{ - pixel_x = -2; - pixel_y = 4 - }, /obj/item/book/manual/srmlore{ pixel_y = 4; pixel_x = 2 @@ -341,7 +328,7 @@ /obj/structure/window/reinforced/fulltile, /obj/structure/grille, /obj/machinery/door/poddoor/shutters{ - id = "vagrantengineshuts" + id = "vagrantportengineshuts" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -376,6 +363,19 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/turf_decal/siding/brown/end{ + dir = 1 + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 1; + pixel_x = 0; + pixel_y = -27 + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 4; + pixel_x = 0; + pixel_y = -27 + }, /turf/open/floor/wood/birch, /area/ship/security) "fZ" = ( @@ -593,21 +593,10 @@ /area/ship/medical) "jy" = ( /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/eva{ - pixel_x = -8 - }, -/obj/item/clothing/head/helmet/space/eva{ - pixel_y = 8; - pixel_x = 8 - }, -/obj/item/clothing/mask/breath{ - pixel_y = 9; - pixel_x = -6 - }, -/obj/item/tank/internals/emergency_oxygen/double{ - pixel_x = 4; - pixel_y = -6 - }, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/mask/breath, +/obj/item/tank/internals/emergency_oxygen/double, /turf/open/floor/wood/walnut, /area/ship/cargo) "jB" = ( @@ -647,6 +636,12 @@ }, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) +"kq" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "ky" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/bonfire, @@ -868,6 +863,10 @@ /obj/effect/turf_decal/siding/brown{ dir = 4 }, +/obj/item/disk/holodisk/roumain{ + pixel_x = -2; + pixel_y = 4 + }, /turf/open/floor/wood/walnut, /area/ship/bridge) "ni" = ( @@ -916,7 +915,9 @@ /turf/open/floor/grass/ship, /area/ship/roumain) "oC" = ( -/obj/structure/flora/tree/srm, +/obj/structure/flora/tree/srm{ + bound_height = 32 + }, /obj/item/candle{ layer = 5.1; pixel_x = -10; @@ -1119,11 +1120,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, -/obj/effect/turf_decal/siding/brown{ - dir = 8 +/obj/effect/turf_decal/siding/brown/end{ + dir = 1 }, /turf/open/floor/wood/birch, /area/ship/cargo) @@ -1176,6 +1174,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/turf_decal/siding/brown/end{ + dir = 8 + }, /turf/open/floor/wood/birch, /area/ship/cargo) "sI" = ( @@ -1245,7 +1246,7 @@ pixel_y = 0 }, /obj/effect/turf_decal/siding/brown{ - dir = 5 + dir = 1 }, /turf/open/floor/wood/walnut, /area/ship/bridge) @@ -1306,8 +1307,9 @@ pixel_y = -8; layer = 2.8 }, +/obj/item/radio/intercom/wideband/directional/south, /obj/effect/turf_decal/siding/brown{ - dir = 9 + dir = 1 }, /turf/open/floor/wood/walnut, /area/ship/bridge) @@ -1446,12 +1448,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/siding/brown/corner{ +/obj/effect/turf_decal/siding/brown{ dir = 8 }, -/obj/effect/turf_decal/siding/brown/corner{ - dir = 1 - }, /turf/open/floor/wood/birch, /area/ship/cargo) "yF" = ( @@ -1562,17 +1561,9 @@ dir = 1 }, /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/eva{ - pixel_x = -8 - }, -/obj/item/clothing/head/helmet/space/eva{ - pixel_y = 8; - pixel_x = 8 - }, -/obj/item/clothing/mask/breath{ - pixel_y = 9; - pixel_x = -6 - }, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/mask/breath, /obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 4; pixel_y = -6 @@ -1997,16 +1988,11 @@ /turf/open/floor/plating/asteroid/rockplanet/wet/ship, /area/ship/roumain) "Jh" = ( -/obj/structure/table/wood/fancy, -/obj/item/radio/intercom/wideband/table{ - dir = 1; - pixel_y = 2; - pixel_x = 1 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /obj/effect/turf_decal/siding/brown, +/obj/structure/filingcabinet, /turf/open/floor/wood/walnut, /area/ship/bridge) "Jp" = ( @@ -2964,6 +2950,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/turf_decal/siding/brown/end, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 8; + pixel_x = 0; + pixel_y = 27 + }, +/obj/effect/turf_decal/siding/brown/corner{ + pixel_x = 0; + pixel_y = 27 + }, /turf/open/floor/wood/birch, /area/ship/bridge) @@ -3647,11 +3643,11 @@ bF bF bF jM -jM -jM -jM -jM -jM +kq +kq +kq +kq +kq Go bF bF From 8043b71c9984333bf2a028cd0c17568d548001d2 Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Sat, 11 Jan 2025 19:25:27 -0800 Subject: [PATCH 07/18] Changed from Generalist to Specialist. Equipment is still kind of up in the air on my end. --- _maps/configs/srm_vagrant.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/srm_vagrant.json b/_maps/configs/srm_vagrant.json index 5ef25137a67e..9965899be49d 100644 --- a/_maps/configs/srm_vagrant.json +++ b/_maps/configs/srm_vagrant.json @@ -13,7 +13,7 @@ "tags": [ "Botany", "Combat", - "Generalist" + "Specialist" ], "map_id": "srm_vagrant", "limit": 1, From 1245497d1521c89725713a71cacb96e1ef02fd33 Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Sun, 12 Jan 2025 14:53:59 -0800 Subject: [PATCH 08/18] buffed medical slightly, added a roumain medkit and a seperatory funnel. --- _maps/shuttles/roumain/srm_vagrant.dmm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm index a29ee4e558be..dec6832c3713 100644 --- a/_maps/shuttles/roumain/srm_vagrant.dmm +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -636,12 +636,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) -"kq" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) "ky" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/bonfire, @@ -794,6 +788,8 @@ /obj/item/reagent_containers/glass/bottle/formaldehyde, /obj/item/reagent_containers/glass/bottle/formaldehyde, /obj/structure/closet/cabinet, +/obj/item/reagent_containers/glass/filter, +/obj/item/storage/firstaid/roumain, /turf/open/floor/wood/walnut, /area/ship/medical) "lX" = ( @@ -1377,6 +1373,12 @@ "xc" = ( /turf/closed/wall/r_wall, /area/ship/engineering/electrical) +"xk" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "xt" = ( /obj/machinery/computer/cryopod/retro/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -3643,11 +3645,11 @@ bF bF bF jM -kq -kq -kq -kq -kq +xk +xk +xk +xk +xk Go bF bF From fbdb39c49e904b38c22c571c4da7f34f941456fd Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Mon, 20 Jan 2025 15:57:35 -0800 Subject: [PATCH 09/18] merging rockplant dm with rockstation's code (hopefully), applied more of a focus on weapons and trickwines and removed some medicine options --- _maps/configs/srm_vagrant.json | 4 +- _maps/shuttles/roumain/srm_vagrant.dmm | 139 ++++++------------ .../turfs/open/floor/plating/rockplanet.dm | 55 +++++-- 3 files changed, 89 insertions(+), 109 deletions(-) diff --git a/_maps/configs/srm_vagrant.json b/_maps/configs/srm_vagrant.json index 9965899be49d..f4e64028bfd9 100644 --- a/_maps/configs/srm_vagrant.json +++ b/_maps/configs/srm_vagrant.json @@ -34,11 +34,11 @@ }, "Hunter": { "outfit": "/datum/outfit/job/roumain/security", - "slots": 1 + "slots": 2 }, "Shadow": { "outfit": "/datum/outfit/job/roumain/assistant", - "slots": 2 + "slots": 1 } }, "enabled": true diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm index dec6832c3713..4026720e072a 100644 --- a/_maps/shuttles/roumain/srm_vagrant.dmm +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -70,7 +70,9 @@ /obj/item/reagent_containers/food/snacks/grown/apple, /obj/item/reagent_containers/food/drinks/beer, /obj/item/reagent_containers/food/drinks/beer, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine, +/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine, +/obj/item/reagent_containers/condiment/enzyme, /turf/open/floor/plating/asteroid/rockplanet/wet/ship, /area/ship/roumain) "bz" = ( @@ -774,22 +776,12 @@ /obj/item/pestle{ pixel_y = 6 }, -/obj/item/reagent_containers/hypospray/medipen/survival{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/reagent_containers/hypospray/medipen/survival{ - pixel_x = 7 - }, -/obj/item/reagent_containers/syringe/antiviral{ - pixel_y = 1; - pixel_x = 8 - }, -/obj/item/reagent_containers/glass/bottle/formaldehyde, -/obj/item/reagent_containers/glass/bottle/formaldehyde, /obj/structure/closet/cabinet, +/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/filter, +/obj/item/reagent_containers/glass/beaker, /obj/item/storage/firstaid/roumain, +/obj/item/stack/sheet/mineral/plasma/five, /turf/open/floor/wood/walnut, /area/ship/medical) "lX" = ( @@ -942,27 +934,6 @@ }, /turf/open/floor/engine/hull, /area/ship/external/dark) -"ph" = ( -/obj/structure/closet/secure_closet/shadow, -/obj/item/clothing/head/cowboy/sec/roumain/shadow, -/obj/item/clothing/suit/armor/roumain/shadow, -/obj/item/melee/knife/hunting, -/obj/item/clothing/accessory/waistcoat/roumain, -/obj/item/storage/backpack/satchel/leather, -/obj/item/gps{ - pixel_x = -7 - }, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/shoes/cowboy/black, -/obj/item/lighter, -/obj/item/flashlight/lantern, -/obj/item/clothing/under/suit/roumain, -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, -/turf/open/floor/wood/walnut, -/area/ship/security) "pp" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1373,12 +1344,6 @@ "xc" = ( /turf/closed/wall/r_wall, /area/ship/engineering/electrical) -"xk" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) "xt" = ( /obj/machinery/computer/cryopod/retro/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -1514,19 +1479,23 @@ /area/ship/roumain) "zd" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/puce{ - pixel_y = 6; - pixel_x = -6 +/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine{ + pixel_x = -6; + pixel_y = 14 }, -/obj/item/reagent_containers/food/snacks/meat/slab/bear{ - pixel_y = 4; - pixel_x = 2 +/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine{ + pixel_x = 7; + pixel_y = 15 }, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf{ - pixel_x = 7 +/obj/item/stack/sheet/animalhide/goliath_hide/polar_bear_hide{ + amount = 3; + pixel_x = 4; + pixel_y = -6 }, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit{ - pixel_y = -2 +/obj/item/stack/sheet/bone{ + amount = 6; + pixel_x = -4; + pixel_y = 1 }, /turf/open/floor/wood/walnut, /area/ship/medical) @@ -1944,30 +1913,22 @@ /area/ship/roumain) "Io" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/seeds/coffee, -/obj/item/seeds/coffee, -/obj/item/seeds/tea, -/obj/item/seeds/tea, -/obj/item/seeds/tobacco, -/obj/item/seeds/tobacco, -/obj/item/seeds/carrot, -/obj/item/seeds/lavaland/puce, -/obj/item/seeds/lavaland/puce, -/obj/item/seeds/carrot, -/obj/item/seeds/wheat, -/obj/item/seeds/wheat, /obj/item/seeds/lavaland/cactus, /obj/item/seeds/lavaland/cactus, -/obj/item/seeds/lavaland/porcini, -/obj/item/seeds/lavaland/porcini, -/obj/item/seeds/lavaland/polypore, -/obj/item/seeds/lavaland/polypore, -/obj/item/seeds/lavaland/inocybe, -/obj/item/seeds/lavaland/inocybe, -/obj/item/seeds/lavaland/ember, -/obj/item/seeds/lavaland/ember, /obj/item/seeds/cotton, /obj/item/seeds/cotton, +/obj/item/seeds/sunflower/moonflower, +/obj/item/seeds/sunflower/moonflower, +/obj/item/seeds/lavaland/inocybe, +/obj/item/seeds/lavaland/inocybe, +/obj/item/seeds/chili/ice, +/obj/item/seeds/chili/ice, +/obj/item/seeds/wheat/rice, +/obj/item/seeds/wheat/rice, +/obj/item/seeds/potato, +/obj/item/seeds/potato, +/obj/item/seeds/lemon, +/obj/item/seeds/lemon, /turf/open/floor/plating/sandy_dirt/ship, /area/ship/roumain) "IZ" = ( @@ -2373,6 +2334,12 @@ }, /turf/open/floor/wood/birch, /area/ship/security) +"OJ" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "Pj" = ( /obj/structure/platform/wood{ dir = 9 @@ -2496,24 +2463,15 @@ pixel_x = -2; pixel_y = -8 }, -/obj/item/ammo_box/magazine/illestren_a850r{ - pixel_x = -2; - pixel_y = -5 - }, -/obj/item/ammo_box/magazine/illestren_a850r{ - pixel_x = 7; - pixel_y = -7 - }, /obj/item/ammo_box/magazine/illestren_a850r{ pixel_x = 5; pixel_y = -3 }, -/obj/item/storage/box/ammo/a12g_buckshot, -/obj/item/storage/box/ammo/a12g_buckshot, -/obj/item/storage/toolbox/ammo/a850r, /obj/effect/turf_decal/siding/brown{ dir = 8 }, +/obj/item/storage/toolbox/ammo/shotgun, +/obj/item/storage/box/ammo/a8_50r, /turf/open/floor/wood/walnut, /area/ship/security) "Ss" = ( @@ -2764,10 +2722,6 @@ /obj/structure/guncloset{ anchored = 1 }, -/obj/item/gun/ballistic/rifle/illestren/factory{ - pixel_x = -4; - pixel_y = -5 - }, /obj/item/gun/ballistic/shotgun/flamingarrow/conflagration, /obj/item/gun/ballistic/rifle/illestren/factory{ pixel_x = -4; @@ -2776,6 +2730,7 @@ /obj/effect/turf_decal/siding/brown{ dir = 8 }, +/obj/item/gun/ballistic/shotgun/flamingarrow/conflagration, /turf/open/floor/wood/walnut, /area/ship/security) "Wg" = ( @@ -3421,7 +3376,7 @@ SV HU gz Hg -ph +Hg qQ HU bF @@ -3645,11 +3600,11 @@ bF bF bF jM -xk -xk -xk -xk -xk +OJ +OJ +OJ +OJ +OJ Go bF bF diff --git a/code/game/turfs/open/floor/plating/rockplanet.dm b/code/game/turfs/open/floor/plating/rockplanet.dm index 2367bf0e2228..f3c53f70d692 100644 --- a/code/game/turfs/open/floor/plating/rockplanet.dm +++ b/code/game/turfs/open/floor/plating/rockplanet.dm @@ -11,10 +11,6 @@ digResult = /obj/item/stack/ore/glass/rockplanet light_color = COLOR_ROCKPLANET_LIGHT -/turf/open/floor/plating/asteroid/rockplanet/ship - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = FALSE - /turf/open/floor/plating/asteroid/rockplanet/lit light_range = 2 light_power = 0.6 @@ -32,18 +28,10 @@ baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit turf_type = /turf/open/floor/plating/asteroid/rockplanet/lit -/turf/open/floor/plating/asteroid/rockplanet/cracked/ship - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = FALSE - /turf/open/floor/plating/asteroid/rockplanet/wet icon_state = "wet_soft0" base_icon_state = "wet_soft" -/turf/open/floor/plating/asteroid/rockplanet/wet/ship - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = FALSE - /turf/open/floor/plating/asteroid/rockplanet/wet/lit light_range = 2 light_power = 0.6 @@ -53,11 +41,48 @@ icon_state = "wet_cracked0" base_icon_state = "wet_cracked" -/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/ship +/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/lit + light_range = 2 + light_power = 0.6 + +//safe tiles and whatever., i hate subtypinhg + +/turf/open/floor/plating/asteroid/rockplanet/safe initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = FALSE -/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/lit +/turf/open/floor/plating/asteroid/rockplanet/safe/lit + light_range = 2 + light_power = 0.6 + +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe + name = "iron cracked sand" + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + icon_state = "dry_cracked0" + base_icon_state = "dry_cracked" + baseturfs = /turf/open/floor/plating/asteroid/rockplanet + turf_type = /turf/open/floor/plating/asteroid/rockplanet + +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe/lit + light_range = 2 + light_power = 0.6 + baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit + turf_type = /turf/open/floor/plating/asteroid/rockplanet/lit + +/turf/open/floor/plating/asteroid/rockplanet/wet/safe + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + icon_state = "wet_soft0" + base_icon_state = "wet_soft" + +/turf/open/floor/plating/asteroid/rockplanet/wet/safe/lit + light_range = 2 + light_power = 0.6 + +/turf/open/floor/plating/asteroid/rockplanet/wet/safe/cracked + name = "iron cracked sand" + icon_state = "wet_cracked0" + base_icon_state = "wet_cracked" + +/turf/open/floor/plating/asteroid/rockplanet/wet/safe/cracked/lit light_range = 2 light_power = 0.6 From 619366deacb445f0242ccf4a8d97ee6258a49bd3 Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Mon, 20 Jan 2025 16:16:55 -0800 Subject: [PATCH 10/18] didnt work please give me my floors back --- .../turfs/open/floor/plating/rockplanet.dm | 55 +++++-------------- 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/code/game/turfs/open/floor/plating/rockplanet.dm b/code/game/turfs/open/floor/plating/rockplanet.dm index f3c53f70d692..86a2d745ff45 100644 --- a/code/game/turfs/open/floor/plating/rockplanet.dm +++ b/code/game/turfs/open/floor/plating/rockplanet.dm @@ -11,6 +11,10 @@ digResult = /obj/item/stack/ore/glass/rockplanet light_color = COLOR_ROCKPLANET_LIGHT +/turf/open/floor/plating/asteroid/rockplanet/safe + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE + /turf/open/floor/plating/asteroid/rockplanet/lit light_range = 2 light_power = 0.6 @@ -28,10 +32,18 @@ baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit turf_type = /turf/open/floor/plating/asteroid/rockplanet/lit +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE + /turf/open/floor/plating/asteroid/rockplanet/wet icon_state = "wet_soft0" base_icon_state = "wet_soft" +/turf/open/floor/plating/asteroid/rockplanet/wet/safe + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE + /turf/open/floor/plating/asteroid/rockplanet/wet/lit light_range = 2 light_power = 0.6 @@ -41,48 +53,11 @@ icon_state = "wet_cracked0" base_icon_state = "wet_cracked" -/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/lit - light_range = 2 - light_power = 0.6 - -//safe tiles and whatever., i hate subtypinhg - -/turf/open/floor/plating/asteroid/rockplanet/safe - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - -/turf/open/floor/plating/asteroid/rockplanet/safe/lit - light_range = 2 - light_power = 0.6 - -/turf/open/floor/plating/asteroid/rockplanet/cracked/safe - name = "iron cracked sand" - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - icon_state = "dry_cracked0" - base_icon_state = "dry_cracked" - baseturfs = /turf/open/floor/plating/asteroid/rockplanet - turf_type = /turf/open/floor/plating/asteroid/rockplanet - -/turf/open/floor/plating/asteroid/rockplanet/cracked/safe/lit - light_range = 2 - light_power = 0.6 - baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit - turf_type = /turf/open/floor/plating/asteroid/rockplanet/lit - -/turf/open/floor/plating/asteroid/rockplanet/wet/safe +/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/safe initial_gas_mix = OPENTURF_DEFAULT_ATMOS - icon_state = "wet_soft0" - base_icon_state = "wet_soft" - -/turf/open/floor/plating/asteroid/rockplanet/wet/safe/lit - light_range = 2 - light_power = 0.6 + planetary_atmos = FALSE -/turf/open/floor/plating/asteroid/rockplanet/wet/safe/cracked - name = "iron cracked sand" - icon_state = "wet_cracked0" - base_icon_state = "wet_cracked" - -/turf/open/floor/plating/asteroid/rockplanet/wet/safe/cracked/lit +/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/lit light_range = 2 light_power = 0.6 From da0d96aeff2e8ffc1cbd78e6570bb9c4008fac80 Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Mon, 20 Jan 2025 16:31:05 -0800 Subject: [PATCH 11/18] fixed(???) rockplanet tiles, did some small decorating. should be in a good state now. --- _maps/shuttles/roumain/srm_vagrant.dmm | 179 ++++++++++++++----------- 1 file changed, 97 insertions(+), 82 deletions(-) diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm index 4026720e072a..7fe573cb678d 100644 --- a/_maps/shuttles/roumain/srm_vagrant.dmm +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -17,19 +17,19 @@ /obj/structure/railing{ dir = 8 }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "ai" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/jukebox/boombox, /obj/structure/table/wood, -/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/safe, /area/ship/roumain) "ap" = ( /obj/structure/flora/rock/rockplanet{ icon_state = "redrock2" }, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "aE" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -73,7 +73,7 @@ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine, /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine, /obj/item/reagent_containers/condiment/enzyme, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "bz" = ( /obj/structure/destructible/tribal_torch{ @@ -98,7 +98,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "bH" = ( /obj/structure/cable{ @@ -111,7 +111,7 @@ dir = 4 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "bT" = ( /obj/machinery/atmospherics/components/unary/shuttle/heater{ @@ -147,7 +147,7 @@ /area/ship/security) "cf" = ( /mob/living/simple_animal/chicken, -/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "cn" = ( /obj/structure/platform/wood{ @@ -194,7 +194,7 @@ /turf/open/floor/plating, /area/ship/engineering/electrical) "df" = ( -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "dj" = ( /obj/structure/window/reinforced/fulltile, @@ -343,7 +343,7 @@ "fm" = ( /obj/structure/chair/pew/right, /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "fT" = ( /obj/effect/turf_decal/industrial/warning{ @@ -401,7 +401,7 @@ dir = 1 }, /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "gz" = ( /obj/structure/closet/secure_closet/flamebearer, @@ -423,7 +423,7 @@ /turf/open/floor/wood/walnut, /area/ship/security) "gJ" = ( -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "gP" = ( /obj/effect/turf_decal/siding/brown, @@ -471,7 +471,7 @@ /obj/structure/chair/wood{ dir = 4 }, -/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/safe, /area/ship/roumain) "hr" = ( /obj/structure/closet/crate/trashcart, @@ -524,7 +524,7 @@ light_range = 0; name = "dead grass" }, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "iW" = ( /obj/structure/closet/secure_closet/montagnes{ @@ -569,7 +569,7 @@ /obj/structure/platform/wood{ dir = 8 }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "jo" = ( /obj/effect/turf_decal/trimline/opaque/orange/filled/line{ @@ -618,7 +618,7 @@ dir = 6 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "km" = ( /obj/structure/closet/emcloset/wall/directional/east, @@ -641,7 +641,7 @@ "ky" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/bonfire, -/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/safe, /area/ship/roumain) "kD" = ( /obj/machinery/computer/helm{ @@ -815,7 +815,7 @@ /obj/structure/flora/rock/rockplanet{ icon_state = "redrock3" }, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "mZ" = ( /obj/structure/railing/wood, @@ -1005,14 +1005,14 @@ dir = 5 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "qK" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/railing/corner{ dir = 1 }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "qM" = ( /obj/structure/flora/ausbushes/sparsegrass/hell{ @@ -1022,7 +1022,7 @@ name = "dead grass" }, /mob/living/simple_animal/chicken, -/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "qN" = ( /obj/structure/window/reinforced/fulltile, @@ -1069,7 +1069,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "re" = ( /obj/effect/turf_decal/siding/brown{ @@ -1184,13 +1184,13 @@ dir = 8; icon_state = "dirty_mattress" }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "sW" = ( /obj/structure/railing{ dir = 4 }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "ti" = ( /obj/machinery/power/apc/auto_name/directional/east, @@ -1230,7 +1230,7 @@ "uV" = ( /obj/structure/chair/pew/left, /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "vk" = ( /obj/machinery/button/door{ @@ -1306,7 +1306,7 @@ dir = 4 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "wP" = ( /obj/structure/tank_dispenser/oxygen, @@ -1400,7 +1400,7 @@ dir = 8; icon_state = "dirty_mattress" }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "yD" = ( /obj/structure/cable{ @@ -1422,7 +1422,7 @@ /area/ship/cargo) "yF" = ( /obj/structure/kitchenspike, -/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "yI" = ( /obj/effect/turf_decal/sand/plating, @@ -1436,7 +1436,7 @@ dir = 8 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "yU" = ( /obj/structure/cable{ @@ -1449,7 +1449,7 @@ dir = 4 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "yX" = ( /obj/structure/table/wood, @@ -1465,7 +1465,7 @@ pixel_x = 9; pixel_y = -3 }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "za" = ( /obj/structure/destructible/tribal_torch, @@ -1558,6 +1558,9 @@ pixel_x = -7; pixel_y = -20 }, +/obj/structure/chair/wood/wings{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/engineering/electrical) "Bq" = ( @@ -1598,21 +1601,11 @@ dir = 5 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "Cb" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/destructible/tribal_torch, -/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "Cp" = ( /obj/structure/window/reinforced/fulltile, @@ -1637,7 +1630,7 @@ dir = 4 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "Dc" = ( /obj/structure/cable{ @@ -1679,7 +1672,7 @@ dir = 9 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "Dl" = ( /obj/structure/catwalk/over/plated_catwalk/dark, @@ -1720,7 +1713,7 @@ dir = 1 }, /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "Fs" = ( /obj/structure/cable{ @@ -1772,7 +1765,7 @@ dir = 6 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "FK" = ( /obj/structure/cable{ @@ -1789,7 +1782,7 @@ /obj/structure/railing/corner{ dir = 8 }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "Go" = ( /obj/docking_port/mobile{ @@ -1803,7 +1796,7 @@ /obj/effect/turf_decal/sand/plating, /obj/structure/flora/grass/rockplanet/dead, /obj/structure/railing/corner, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "GT" = ( /turf/open/floor/plasteel/stairs/wood/walnut{ @@ -1893,7 +1886,7 @@ /obj/structure/railing{ dir = 1 }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "Ik" = ( /obj/structure/flora/rock/rockplanet{ @@ -1902,14 +1895,14 @@ /obj/structure/platform/wood{ dir = 8 }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "Il" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/chair/wood{ dir = 4 }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "Io" = ( /obj/structure/closet/crate/hydroponics, @@ -1941,14 +1934,14 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "Jb" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/railing/corner{ dir = 4 }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "Jh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -1963,7 +1956,7 @@ dir = 8 }, /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "Jx" = ( /turf/closed/wall/r_wall/yesdiag, @@ -1997,7 +1990,7 @@ /turf/open/floor/wood/walnut, /area/ship/cargo) "KD" = ( -/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/safe, /area/ship/roumain) "KN" = ( /obj/item/toy/plush/landmine, @@ -2021,7 +2014,7 @@ dir = 8 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "KR" = ( /obj/structure/cable{ @@ -2106,7 +2099,7 @@ dir = 4 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "LP" = ( /obj/structure/cable{ @@ -2119,6 +2112,8 @@ /obj/effect/turf_decal/trimline/opaque/orange/filled/line{ dir = 4 }, +/obj/structure/table/wood, +/obj/machinery/cell_charger, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) "LW" = ( @@ -2129,7 +2124,7 @@ name = "dead grass" }, /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "Me" = ( /obj/structure/table/wood, @@ -2233,7 +2228,7 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/destructible/tribal_torch, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "MO" = ( /obj/machinery/door/airlock/glass{ @@ -2305,12 +2300,12 @@ dir = 8 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "Ob" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/flora/grass/rockplanet/dead, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "On" = ( /obj/effect/turf_decal/industrial/warning{ @@ -2348,7 +2343,7 @@ dir = 8; icon_state = "dirty_mattress" }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "Pt" = ( /obj/structure/platform/wood{ @@ -2358,7 +2353,7 @@ dir = 8; icon_state = "dirty_mattress" }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "PC" = ( /obj/machinery/power/terminal{ @@ -2399,7 +2394,25 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/table/wood, -/obj/machinery/cell_charger, +/obj/item/paper_bin/bundlenatural{ + pixel_y = 4; + pixel_x = 4 + }, +/obj/item/pen/charcoal{ + pixel_x = -7; + pixel_y = 3; + layer = 3.1 + }, +/obj/item/clipboard{ + pixel_x = -4; + pixel_y = 2; + layer = 2.9 + }, +/obj/item/flashlight/lamp/green{ + pixel_y = 16; + pixel_x = -16; + layer = 2.8 + }, /turf/open/floor/plating, /area/ship/engineering/electrical) "Qs" = ( @@ -2480,7 +2493,7 @@ }, /obj/effect/turf_decal/sand/plating, /obj/structure/railing, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "Sx" = ( /obj/structure/cable{ @@ -2493,7 +2506,7 @@ dir = 9 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "SR" = ( /obj/structure/table/wood, @@ -2509,7 +2522,7 @@ pixel_y = 10; pixel_x = -4 }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "SV" = ( /turf/closed/wall/r_wall, @@ -2525,7 +2538,7 @@ dir = 10 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "Te" = ( /obj/structure/cable{ @@ -2539,7 +2552,7 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/destructible/tribal_torch, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "TE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -2561,11 +2574,11 @@ /obj/structure/chair/wood{ dir = 8 }, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "Uj" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/plating/asteroid/rockplanet/wet/ship, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "Ut" = ( /obj/structure/window/reinforced/fulltile, @@ -2611,7 +2624,7 @@ pixel_x = -3; pixel_y = -8 }, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "UV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -2650,7 +2663,7 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/airalarm/directional/north, /obj/structure/destructible/tribal_torch, -/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "VB" = ( /obj/machinery/door/airlock/command{ @@ -2830,7 +2843,7 @@ /area/ship/roumain) "XG" = ( /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "XO" = ( /obj/machinery/power/shuttle/engine/electric, @@ -2851,7 +2864,7 @@ dir = 4 }, /obj/structure/catwalk/over/plated_catwalk/dark, -/turf/open/floor/plating/asteroid/rockplanet/ship, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "YL" = ( /obj/structure/window/reinforced/fulltile, @@ -2873,7 +2886,7 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "ZA" = ( -/turf/open/floor/plating/asteroid/rockplanet/cracked/ship, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "ZF" = ( /obj/structure/cable{ @@ -2894,7 +2907,9 @@ /obj/structure/chair/wood/wings{ dir = 4 }, -/obj/item/toy/plush/frederick, +/obj/item/toy/plush/frederick{ + layer = 3.1 + }, /turf/open/floor/wood/birch, /area/ship/bridge) "ZO" = ( @@ -3201,7 +3216,7 @@ Hy WM xc LO -df +gJ Jp aJ Uh @@ -3221,7 +3236,7 @@ xc xc xc xc -Cb +Te cf Uj KD @@ -3288,7 +3303,7 @@ xc yU df iU -XG +Cb NS Wu Wu @@ -3308,7 +3323,7 @@ ja no bG BY -XG +Cb FJ CG MO From d084c05b1a41567935f89dca78c0f55c8bff5a06 Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Mon, 20 Jan 2025 16:42:53 -0800 Subject: [PATCH 12/18] removed a conflicting torch, added a seclock to the bridge and made it glass, should be good this time (for real) --- _maps/shuttles/roumain/srm_vagrant.dmm | 32 ++++++++++++-------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm index 7fe573cb678d..426860ec601e 100644 --- a/_maps/shuttles/roumain/srm_vagrant.dmm +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -434,7 +434,7 @@ /area/ship/medical) "gV" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Herbalist Shed" + name = "Brewing Shed" }, /obj/structure/cable{ icon_state = "1-2" @@ -586,11 +586,11 @@ }, /obj/structure/curtain/cloth, /obj/item/bedsheet/brown, -/obj/effect/decal/cleanable/blood/old, /obj/structure/bed{ dir = 8; icon_state = "dirty_mattress" }, +/obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/wood/walnut, /area/ship/medical) "jy" = ( @@ -1339,6 +1339,7 @@ pixel_x = -8; pixel_y = 1 }, +/obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/wood/walnut, /area/ship/medical) "xc" = ( @@ -1546,10 +1547,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/structure/destructible/tribal_torch{ - pixel_x = 9; - pixel_y = 0 - }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/button/door{ id = "vagrantportengineshuts"; @@ -1605,7 +1602,7 @@ /area/ship/roumain) "Cb" = ( /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/safe, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "Cp" = ( /obj/structure/window/reinforced/fulltile, @@ -1853,9 +1850,6 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/trimline/opaque/orange/filled/line{ - layer = 3 - }, /turf/open/floor/plating, /area/ship/engineering/electrical) "HC" = ( @@ -2666,9 +2660,6 @@ /turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "VB" = ( -/obj/machinery/door/airlock/command{ - name = "Bridge" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -2685,6 +2676,9 @@ /obj/effect/turf_decal/siding/brown{ dir = 8 }, +/obj/machinery/door/airlock/command/glass/seclock{ + name = "Bridge" + }, /turf/open/floor/wood/birch, /area/ship/bridge) "VE" = ( @@ -2843,7 +2837,7 @@ /area/ship/roumain) "XG" = ( /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "XO" = ( /obj/machinery/power/shuttle/engine/electric, @@ -2901,6 +2895,10 @@ /obj/effect/decal/cleanable/blood/drip{ pixel_y = -4 }, +/obj/effect/decal/cleanable/blood/squirt, +/obj/effect/decal/cleanable/blood/footprints{ + layer = 3 + }, /turf/open/floor/wood/walnut, /area/ship/medical) "ZI" = ( @@ -3258,7 +3256,7 @@ fT ps EM Yr -XG +Cb uV yX gg @@ -3303,7 +3301,7 @@ xc yU df iU -Cb +XG NS Wu Wu @@ -3323,7 +3321,7 @@ ja no bG BY -Cb +XG FJ CG MO From 8b6e6f2a2377b32446ed2c110b1a1730f9da69ba Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Mon, 20 Jan 2025 17:27:28 -0800 Subject: [PATCH 13/18] removed machinist, 2 shadow slots now, added airlock shutters. --- _maps/configs/srm_vagrant.json | 8 +- _maps/shuttles/roumain/srm_vagrant.dmm | 206 +++++++++++++++---------- 2 files changed, 129 insertions(+), 85 deletions(-) diff --git a/_maps/configs/srm_vagrant.json b/_maps/configs/srm_vagrant.json index f4e64028bfd9..1c53d989d92f 100644 --- a/_maps/configs/srm_vagrant.json +++ b/_maps/configs/srm_vagrant.json @@ -28,17 +28,13 @@ "officer": true, "slots": 1 }, - "Machinist": { - "outfit": "/datum/outfit/job/roumain/engineer", - "slots": 1 - }, "Hunter": { "outfit": "/datum/outfit/job/roumain/security", - "slots": 2 + "slots": 1 }, "Shadow": { "outfit": "/datum/outfit/job/roumain/assistant", - "slots": 1 + "slots": 2 } }, "enabled": true diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm index 426860ec601e..10e9ee5847f9 100644 --- a/_maps/shuttles/roumain/srm_vagrant.dmm +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -340,11 +340,24 @@ }, /turf/open/floor/plating, /area/ship/engineering/electrical) +"fh" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, +/area/ship/roumain) "fm" = ( /obj/structure/chair/pew/right, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) +"fJ" = ( +/obj/machinery/button/door{ + pixel_x = 0; + pixel_y = -10; + name = "Airlock Shutters"; + id = "airlockshutters" + }, +/turf/closed/wall/r_wall, +/area/ship/engineering/electrical) "fT" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -864,7 +877,6 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) "nk" = ( -/obj/structure/flora/grass/rockplanet/dead, /obj/machinery/hydroponics/soil, /obj/structure/platform/wood{ dir = 4 @@ -970,6 +982,10 @@ }, /turf/open/floor/wood/birch, /area/ship/cargo) +"pM" = ( +/obj/structure/flora/grass/rockplanet/dead, +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) "pN" = ( /obj/structure/sink{ dir = 8; @@ -1041,23 +1057,23 @@ dir = 4 }, /obj/structure/closet/secure_closet/shadow, -/obj/item/clothing/head/cowboy/sec/roumain/shadow, -/obj/item/clothing/suit/armor/roumain/shadow, -/obj/item/melee/knife/hunting, -/obj/item/clothing/accessory/waistcoat/roumain, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 4 + }, +/obj/item/clothing/under/suit/roumain, +/obj/item/flashlight/lantern, +/obj/item/lighter, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/combat, /obj/item/storage/backpack/satchel/leather, /obj/item/gps{ pixel_x = -7 }, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/shoes/cowboy/black, -/obj/item/lighter, -/obj/item/flashlight/lantern, -/obj/item/clothing/under/suit/roumain, -/obj/effect/turf_decal/siding/brown/corner{ - dir = 4 - }, +/obj/item/clothing/accessory/waistcoat/roumain, +/obj/item/melee/knife/hunting, +/obj/item/clothing/suit/armor/roumain/shadow, +/obj/item/clothing/head/cowboy/sec/roumain/shadow, /turf/open/floor/wood/walnut, /area/ship/security) "qR" = ( @@ -1147,21 +1163,25 @@ /turf/open/floor/wood/birch, /area/ship/cargo) "sI" = ( -/obj/item/clothing/head/hardhat/solgov, -/obj/item/clothing/glasses/welding, -/obj/item/clothing/head/welding, -/obj/item/clothing/suit/hazardvest/roumain, -/obj/item/clothing/head/cowboy/sec/roumain/machinist, -/obj/item/clothing/under/suit/roumain, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/storage/belt, -/obj/structure/closet/secure_closet/machinist{ - anchored = 1 +/obj/item/clothing/glasses/welding{ + pixel_x = 1; + pixel_y = 6; + layer = 3.1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/item/clothing/gloves/color/yellow, -/obj/item/storage/toolbox/mechanical, -/obj/item/storage/toolbox/electrical, +/obj/structure/table/wood, +/obj/item/storage/toolbox/electrical{ + pixel_x = 0; + pixel_y = 5 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 0; + pixel_y = -1 + }, +/obj/item/clothing/gloves/color/yellow{ + pixel_x = 0; + pixel_y = 5 + }, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) "sP" = ( @@ -1555,9 +1575,7 @@ pixel_x = -7; pixel_y = -20 }, -/obj/structure/chair/wood/wings{ - dir = 8 - }, +/obj/structure/destructible/tribal_torch, /turf/open/floor/plating, /area/ship/engineering/electrical) "Bq" = ( @@ -1585,6 +1603,9 @@ /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/poddoor/shutters{ + id = "airlockshutters" + }, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) "BY" = ( @@ -1601,8 +1622,18 @@ /turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "Cb" = ( -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/destructible/tribal_torch, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "Cp" = ( /obj/structure/window/reinforced/fulltile, @@ -1698,7 +1729,11 @@ }, /area/ship/roumain) "EM" = ( -/obj/machinery/door/airlock/external, +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "airlockshutters" + }, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) "Fa" = ( @@ -1937,12 +1972,26 @@ }, /turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) +"Je" = ( +/obj/machinery/button/door{ + pixel_x = 0; + pixel_y = 13; + name = "Airlock Shutters"; + id = "airlockshutters"; + dir = 1 + }, +/turf/closed/wall/r_wall, +/area/ship/engineering/electrical) "Jh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /obj/effect/turf_decal/siding/brown, /obj/structure/filingcabinet, +/obj/item/computer_hardware/card_slot, +/obj/item/folder, +/obj/item/folder/blue, +/obj/item/folder/yellow, /turf/open/floor/wood/walnut, /area/ship/bridge) "Jp" = ( @@ -2106,8 +2155,6 @@ /obj/effect/turf_decal/trimline/opaque/orange/filled/line{ dir = 4 }, -/obj/structure/table/wood, -/obj/machinery/cell_charger, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) "LW" = ( @@ -2362,6 +2409,7 @@ /area/ship/engineering/electrical) "PE" = ( /obj/structure/railing/corner/wood, +/obj/structure/flora/grass/rockplanet/dead, /turf/open/floor/plating/sandy_dirt/ship, /area/ship/roumain) "PS" = ( @@ -2388,25 +2436,7 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/table/wood, -/obj/item/paper_bin/bundlenatural{ - pixel_y = 4; - pixel_x = 4 - }, -/obj/item/pen/charcoal{ - pixel_x = -7; - pixel_y = 3; - layer = 3.1 - }, -/obj/item/clipboard{ - pixel_x = -4; - pixel_y = 2; - layer = 2.9 - }, -/obj/item/flashlight/lamp/green{ - pixel_y = 16; - pixel_x = -16; - layer = 2.8 - }, +/obj/machinery/cell_charger, /turf/open/floor/plating, /area/ship/engineering/electrical) "Qs" = ( @@ -2433,6 +2463,27 @@ }, /turf/open/floor/wood/birch, /area/ship/security) +"Qu" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/structure/closet/secure_closet/shadow, +/obj/item/clothing/under/suit/roumain, +/obj/item/flashlight/lantern, +/obj/item/lighter, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/combat, +/obj/item/storage/backpack/satchel/leather, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/clothing/accessory/waistcoat/roumain, +/obj/item/melee/knife/hunting, +/obj/item/clothing/suit/armor/roumain/shadow, +/obj/item/clothing/head/cowboy/sec/roumain/shadow, +/turf/open/floor/wood/walnut, +/area/ship/security) "QA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -2535,19 +2586,9 @@ /turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "Te" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/destructible/tribal_torch, -/turf/open/floor/plating/asteroid/rockplanet/safe, -/area/ship/roumain) +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "TE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -2910,6 +2951,13 @@ }, /turf/open/floor/wood/birch, /area/ship/bridge) +"ZL" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/door/poddoor/shutters{ + id = "airlockshutters" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) "ZO" = ( /obj/structure/cable{ icon_state = "2-9" @@ -3068,7 +3116,7 @@ XO My Ik sV -Rk +pM Rk rY Pj @@ -3229,12 +3277,12 @@ bF "} (15,1,1) = {" bF -jM -xc -xc +Te +Je xc xc -Te +fJ +Cb cf Uj KD @@ -3250,13 +3298,13 @@ bF "} (16,1,1) = {" bF -jM +Te EM fT ps EM Yr -Cb +fh uV yX gg @@ -3271,8 +3319,8 @@ bF "} (17,1,1) = {" bF -jM -EM +Te +ZL km NN BO @@ -3292,7 +3340,7 @@ bF "} (18,1,1) = {" ie -jM +Te Hn xc xc @@ -3343,7 +3391,7 @@ xc My Vz ZA -Te +Cb My Wu Me @@ -3389,7 +3437,7 @@ SV HU gz Hg -Hg +Qu qQ HU bF From 8682d4ff6b7d4161a22ecf6f3aa7566f8c91eaf1 Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Mon, 20 Jan 2025 17:48:48 -0800 Subject: [PATCH 14/18] going to be honest i think i just touched a pipe this time --- _maps/shuttles/roumain/srm_vagrant.dmm | 194 ++++++++++++------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm index 10e9ee5847f9..4a419ed3ba38 100644 --- a/_maps/shuttles/roumain/srm_vagrant.dmm +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -75,6 +75,27 @@ /obj/item/reagent_containers/condiment/enzyme, /turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) +"bk" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/structure/closet/secure_closet/shadow, +/obj/item/clothing/under/suit/roumain, +/obj/item/flashlight/lantern, +/obj/item/lighter, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/combat, +/obj/item/storage/backpack/satchel/leather, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/clothing/accessory/waistcoat/roumain, +/obj/item/melee/knife/hunting, +/obj/item/clothing/suit/armor/roumain/shadow, +/obj/item/clothing/head/cowboy/sec/roumain/shadow, +/turf/open/floor/wood/walnut, +/area/ship/security) "bz" = ( /obj/structure/destructible/tribal_torch{ pixel_x = 10; @@ -194,7 +215,7 @@ /turf/open/floor/plating, /area/ship/engineering/electrical) "df" = ( -/turf/open/floor/plating/asteroid/rockplanet/safe, +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) "dj" = ( /obj/structure/window/reinforced/fulltile, @@ -340,24 +361,11 @@ }, /turf/open/floor/plating, /area/ship/engineering/electrical) -"fh" = ( -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, -/area/ship/roumain) "fm" = ( /obj/structure/chair/pew/right, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) -"fJ" = ( -/obj/machinery/button/door{ - pixel_x = 0; - pixel_y = -10; - name = "Airlock Shutters"; - id = "airlockshutters" - }, -/turf/closed/wall/r_wall, -/area/ship/engineering/electrical) "fT" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -436,8 +444,14 @@ /turf/open/floor/wood/walnut, /area/ship/security) "gJ" = ( -/turf/open/floor/plating/asteroid/rockplanet/wet/safe, -/area/ship/roumain) +/obj/machinery/button/door{ + pixel_x = 0; + pixel_y = -10; + name = "Airlock Shutters"; + id = "airlockshutters" + }, +/turf/closed/wall/r_wall, +/area/ship/engineering/electrical) "gP" = ( /obj/effect/turf_decal/siding/brown, /turf/open/floor/wood/birch, @@ -982,10 +996,6 @@ }, /turf/open/floor/wood/birch, /area/ship/cargo) -"pM" = ( -/obj/structure/flora/grass/rockplanet/dead, -/turf/open/floor/plating/sandy_dirt/ship, -/area/ship/roumain) "pN" = ( /obj/structure/sink{ dir = 8; @@ -1321,6 +1331,10 @@ /obj/effect/turf_decal/siding/brown, /turf/open/floor/wood/birch, /area/ship/cargo) +"vK" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, +/area/ship/roumain) "wJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -1622,19 +1636,9 @@ /turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "Cb" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/structure/destructible/tribal_torch, -/turf/open/floor/plating/asteroid/rockplanet/safe, -/area/ship/roumain) +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "Cp" = ( /obj/structure/window/reinforced/fulltile, /obj/structure/grille, @@ -1972,16 +1976,6 @@ }, /turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) -"Je" = ( -/obj/machinery/button/door{ - pixel_x = 0; - pixel_y = 13; - name = "Airlock Shutters"; - id = "airlockshutters"; - dir = 1 - }, -/turf/closed/wall/r_wall, -/area/ship/engineering/electrical) "Jh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -2288,6 +2282,9 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/wood/walnut, /area/ship/crew/cryo) +"MW" = ( +/turf/open/floor/plating/asteroid/rockplanet/safe, +/area/ship/roumain) "Ni" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2386,6 +2383,13 @@ }, /turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) +"Pl" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/door/poddoor/shutters{ + id = "airlockshutters" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) "Pt" = ( /obj/structure/platform/wood{ dir = 1 @@ -2463,27 +2467,6 @@ }, /turf/open/floor/wood/birch, /area/ship/security) -"Qu" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, -/obj/structure/closet/secure_closet/shadow, -/obj/item/clothing/under/suit/roumain, -/obj/item/flashlight/lantern, -/obj/item/lighter, -/obj/item/clothing/shoes/cowboy/black, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/shoes/combat, -/obj/item/storage/backpack/satchel/leather, -/obj/item/gps{ - pixel_x = -7 - }, -/obj/item/clothing/accessory/waistcoat/roumain, -/obj/item/melee/knife/hunting, -/obj/item/clothing/suit/armor/roumain/shadow, -/obj/item/clothing/head/cowboy/sec/roumain/shadow, -/turf/open/floor/wood/walnut, -/area/ship/security) "QA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -2572,6 +2555,10 @@ "SV" = ( /turf/closed/wall/r_wall, /area/ship/cargo) +"Tc" = ( +/obj/structure/flora/grass/rockplanet/dead, +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) "Td" = ( /obj/structure/cable{ icon_state = "2-8" @@ -2586,9 +2573,19 @@ /turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "Te" = ( -/obj/effect/turf_decal/industrial/warning, -/turf/open/floor/engine/hull, -/area/ship/external/dark) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/destructible/tribal_torch, +/turf/open/floor/plating/asteroid/rockplanet/safe, +/area/ship/roumain) "TE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -2654,6 +2651,16 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"UJ" = ( +/obj/machinery/button/door{ + pixel_x = 0; + pixel_y = 13; + name = "Airlock Shutters"; + id = "airlockshutters"; + dir = 1 + }, +/turf/closed/wall/r_wall, +/area/ship/engineering/electrical) "UT" = ( /obj/structure/bedsheetbin{ pixel_x = -3; @@ -2951,13 +2958,6 @@ }, /turf/open/floor/wood/birch, /area/ship/bridge) -"ZL" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/door/poddoor/shutters{ - id = "airlockshutters" - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/electrical) "ZO" = ( /obj/structure/cable{ icon_state = "2-9" @@ -3116,7 +3116,7 @@ XO My Ik sV -pM +Tc Rk rY Pj @@ -3159,8 +3159,8 @@ xc ZA ZA iU -gJ -gJ +df +df qM Ja zP @@ -3182,7 +3182,7 @@ Uj hq ai Il -gJ +df kl FA lM @@ -3199,11 +3199,11 @@ pp Qo xc mz -gJ +df Gu sW Jb -gJ +df yI zP Dl @@ -3241,7 +3241,7 @@ lX fZ Ni qR -gJ +df Gg ah qK @@ -3262,11 +3262,11 @@ Hy WM xc LO -gJ +df Jp aJ Uh -df +MW MC gQ wY @@ -3277,16 +3277,16 @@ bF "} (15,1,1) = {" bF -Te -Je +Cb +UJ xc xc -fJ -Cb +gJ +Te cf Uj KD -gJ +df ZA NS gV @@ -3298,17 +3298,17 @@ bF "} (16,1,1) = {" bF -Te +Cb EM fT ps EM Yr -fh +vK uV yX gg -df +MW yI gQ aG @@ -3319,8 +3319,8 @@ bF "} (17,1,1) = {" bF -Te -ZL +Cb +Pl km NN BO @@ -3340,14 +3340,14 @@ bF "} (18,1,1) = {" ie -Te +Cb Hn xc xc xc xc yU -df +MW iU XG NS @@ -3391,7 +3391,7 @@ xc My Vz ZA -Cb +Te My Wu Me @@ -3437,7 +3437,7 @@ SV HU gz Hg -Qu +bk qQ HU bF From b7dc98c3d69cc238d7d849ff578bf1b0a21ba3d4 Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Mon, 20 Jan 2025 18:20:35 -0800 Subject: [PATCH 15/18] description changes --- _maps/configs/srm_vagrant.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/srm_vagrant.json b/_maps/configs/srm_vagrant.json index 1c53d989d92f..d544b8b8e216 100644 --- a/_maps/configs/srm_vagrant.json +++ b/_maps/configs/srm_vagrant.json @@ -9,7 +9,7 @@ ], "map_short_name": "Vagrant-class", "map_path": "_maps/shuttles/roumain/srm_vagrant.dmm", - "description": "A lighter hunting vessel of the Saint-Roumian-Militia, issued to modest Montagnes seeking either to prove themselves or who have a fondness for simplicity. While smaller than other vessels among the Militia, the Vagrant is considerably cheaper than other options and features a rocky terrarium which has yet to be populated with a fresh abundance of life. The poor soil provides a challenge that encourages its' crew to collect herbs one finds along their path, while still posessing a vital tree from the owning Montagnes’ home planet. To build a healthy ecosystem between this oak and wild, foreign plants is seen as a great accomplishment. As a highly religious ascetic order, the SRM supplies the Vagrant with supplies to achieve this goal and expects the crew aboard to learn how to perform medicine in more “natural” ways, using herbs and plants found in the wilderness, and then grown in house. The ship is captained by a Montagne, who oversees a team of Hunters, and Shadows apprenticing them.", + "description": "One of the smallest vessels available to Montagnes of the Saint-Roumaine-Militia, the Vagrant-Class provides hunters with an affordable, swift journey to their hunting grounds. This vessel features a rocky terrarium prepared with a seed bank perfectly fit for producing trickwines. Hunters and apprenticing shadows alike can find comfort around a campfire, utilizing a strong armory and potent brews to push them through their trials in service to the huntsman.", "tags": [ "Botany", "Combat", From 56bb0a29081ac5206aa1f57e1c39368431f8aeb5 Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Mon, 20 Jan 2025 18:33:46 -0800 Subject: [PATCH 16/18] fixed atrium apc --- _maps/shuttles/roumain/srm_vagrant.dmm | 172 +++++++++++++------------ 1 file changed, 89 insertions(+), 83 deletions(-) diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm index 4a419ed3ba38..f79b03e24aca 100644 --- a/_maps/shuttles/roumain/srm_vagrant.dmm +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -75,27 +75,6 @@ /obj/item/reagent_containers/condiment/enzyme, /turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) -"bk" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, -/obj/structure/closet/secure_closet/shadow, -/obj/item/clothing/under/suit/roumain, -/obj/item/flashlight/lantern, -/obj/item/lighter, -/obj/item/clothing/shoes/cowboy/black, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/shoes/combat, -/obj/item/storage/backpack/satchel/leather, -/obj/item/gps{ - pixel_x = -7 - }, -/obj/item/clothing/accessory/waistcoat/roumain, -/obj/item/melee/knife/hunting, -/obj/item/clothing/suit/armor/roumain/shadow, -/obj/item/clothing/head/cowboy/sec/roumain/shadow, -/turf/open/floor/wood/walnut, -/area/ship/security) "bz" = ( /obj/structure/destructible/tribal_torch{ pixel_x = 10; @@ -207,6 +186,10 @@ /obj/item/soap/deluxe, /turf/open/floor/plasteel/mono, /area/ship/engineering/electrical) +"cQ" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/rockplanet/safe, +/area/ship/roumain) "cZ" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8 @@ -215,7 +198,7 @@ /turf/open/floor/plating, /area/ship/engineering/electrical) "df" = ( -/turf/open/floor/plating/asteroid/rockplanet/wet/safe, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "dj" = ( /obj/structure/window/reinforced/fulltile, @@ -444,14 +427,8 @@ /turf/open/floor/wood/walnut, /area/ship/security) "gJ" = ( -/obj/machinery/button/door{ - pixel_x = 0; - pixel_y = -10; - name = "Airlock Shutters"; - id = "airlockshutters" - }, -/turf/closed/wall/r_wall, -/area/ship/engineering/electrical) +/turf/open/floor/plating/asteroid/rockplanet/wet/safe, +/area/ship/roumain) "gP" = ( /obj/effect/turf_decal/siding/brown, /turf/open/floor/wood/birch, @@ -1095,6 +1072,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "re" = ( @@ -1205,6 +1185,16 @@ /obj/effect/turf_decal/siding/brown, /turf/open/floor/wood/walnut, /area/ship/bridge) +"sQ" = ( +/obj/machinery/button/door{ + pixel_x = 0; + pixel_y = 13; + name = "Airlock Shutters"; + id = "airlockshutters"; + dir = 1 + }, +/turf/closed/wall/r_wall, +/area/ship/engineering/electrical) "sV" = ( /obj/structure/platform/wood{ dir = 10 @@ -1331,15 +1321,36 @@ /obj/effect/turf_decal/siding/brown, /turf/open/floor/wood/birch, /area/ship/cargo) -"vK" = ( -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, -/area/ship/roumain) +"vs" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/structure/closet/secure_closet/shadow, +/obj/item/clothing/under/suit/roumain, +/obj/item/flashlight/lantern, +/obj/item/lighter, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/combat, +/obj/item/storage/backpack/satchel/leather, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/clothing/accessory/waistcoat/roumain, +/obj/item/melee/knife/hunting, +/obj/item/clothing/suit/armor/roumain/shadow, +/obj/item/clothing/head/cowboy/sec/roumain/shadow, +/turf/open/floor/wood/walnut, +/area/ship/security) "wJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "wP" = ( @@ -1534,6 +1545,14 @@ }, /turf/open/floor/wood/walnut, /area/ship/medical) +"zp" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "airlockshutters" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) "zP" = ( /turf/closed/wall/r_wall, /area/ship/engineering/engine) @@ -1733,8 +1752,7 @@ }, /area/ship/roumain) "EM" = ( -/obj/structure/window/reinforced/fulltile, -/obj/structure/grille, +/obj/machinery/door/airlock/external, /obj/machinery/door/poddoor/shutters{ id = "airlockshutters" }, @@ -2128,7 +2146,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -2282,9 +2299,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/wood/walnut, /area/ship/crew/cryo) -"MW" = ( -/turf/open/floor/plating/asteroid/rockplanet/safe, -/area/ship/roumain) "Ni" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2358,6 +2372,15 @@ /obj/structure/flora/grass/rockplanet/dead, /turf/open/floor/grass/ship, /area/ship/roumain) +"OF" = ( +/obj/machinery/button/door{ + pixel_x = 0; + pixel_y = -10; + name = "Airlock Shutters"; + id = "airlockshutters" + }, +/turf/closed/wall/r_wall, +/area/ship/engineering/electrical) "OH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -2383,13 +2406,6 @@ }, /turf/open/floor/plating/asteroid/rockplanet/wet/safe, /area/ship/roumain) -"Pl" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/door/poddoor/shutters{ - id = "airlockshutters" - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/electrical) "Pt" = ( /obj/structure/platform/wood{ dir = 1 @@ -2555,10 +2571,6 @@ "SV" = ( /turf/closed/wall/r_wall, /area/ship/cargo) -"Tc" = ( -/obj/structure/flora/grass/rockplanet/dead, -/turf/open/floor/plating/sandy_dirt/ship, -/area/ship/roumain) "Td" = ( /obj/structure/cable{ icon_state = "2-8" @@ -2651,16 +2663,6 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) -"UJ" = ( -/obj/machinery/button/door{ - pixel_x = 0; - pixel_y = 13; - name = "Airlock Shutters"; - id = "airlockshutters"; - dir = 1 - }, -/turf/closed/wall/r_wall, -/area/ship/engineering/electrical) "UT" = ( /obj/structure/bedsheetbin{ pixel_x = -3; @@ -2885,7 +2887,7 @@ /area/ship/roumain) "XG" = ( /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/safe, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "XO" = ( /obj/machinery/power/shuttle/engine/electric, @@ -2980,6 +2982,10 @@ }, /turf/open/floor/wood/birch, /area/ship/bridge) +"ZT" = ( +/obj/structure/flora/grass/rockplanet/dead, +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) (1,1,1) = {" bF @@ -3116,7 +3122,7 @@ XO My Ik sV -Tc +ZT Rk rY Pj @@ -3159,8 +3165,8 @@ xc ZA ZA iU -df -df +gJ +gJ qM Ja zP @@ -3182,7 +3188,7 @@ Uj hq ai Il -df +gJ kl FA lM @@ -3199,11 +3205,11 @@ pp Qo xc mz -df +gJ Gu sW Jb -df +gJ yI zP Dl @@ -3241,7 +3247,7 @@ lX fZ Ni qR -df +gJ Gg ah qK @@ -3262,11 +3268,11 @@ Hy WM xc LO -df +gJ Jp aJ Uh -MW +df MC gQ wY @@ -3278,15 +3284,15 @@ bF (15,1,1) = {" bF Cb -UJ +sQ xc xc -gJ +OF Te cf Uj KD -df +gJ ZA NS gV @@ -3299,16 +3305,16 @@ bF (16,1,1) = {" bF Cb -EM +zp fT ps -EM +zp Yr -vK +XG uV yX gg -MW +df yI gQ aG @@ -3320,7 +3326,7 @@ bF (17,1,1) = {" bF Cb -Pl +EM km NN BO @@ -3347,9 +3353,9 @@ xc xc xc yU -MW +df iU -XG +cQ NS Wu Wu @@ -3369,7 +3375,7 @@ ja no bG BY -XG +cQ FJ CG MO @@ -3437,7 +3443,7 @@ SV HU gz Hg -bk +vs qQ HU bF From 1e409b26c3e0772d13253ea18a8f64b5f26116e0 Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Thu, 23 Jan 2025 15:15:18 -0800 Subject: [PATCH 17/18] Job slots change no. 16,000, removed a shadow, added a hunter colligne. Added a loom, but more importantly, a stash of trickwines in the armory to encourage use and further crafting. --- _maps/configs/srm_vagrant.json | 8 +- _maps/shuttles/roumain/srm_vagrant.dmm | 187 ++++++++++++++----------- 2 files changed, 108 insertions(+), 87 deletions(-) diff --git a/_maps/configs/srm_vagrant.json b/_maps/configs/srm_vagrant.json index d544b8b8e216..feacdc29bb9c 100644 --- a/_maps/configs/srm_vagrant.json +++ b/_maps/configs/srm_vagrant.json @@ -23,9 +23,13 @@ "officer": true, "slots": 1 }, + "Hunter Colligne": { + "outfit": "/datum/outfit/job/roumain/hop", + "officer": true, + "slots": 1 + }, "Flamebearer": { "outfit": "/datum/outfit/job/roumain/flamebearer", - "officer": true, "slots": 1 }, "Hunter": { @@ -34,7 +38,7 @@ }, "Shadow": { "outfit": "/datum/outfit/job/roumain/assistant", - "slots": 2 + "slots": 1 } }, "enabled": true diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm index f79b03e24aca..a439d7ab7040 100644 --- a/_maps/shuttles/roumain/srm_vagrant.dmm +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -186,10 +186,6 @@ /obj/item/soap/deluxe, /turf/open/floor/plasteel/mono, /area/ship/engineering/electrical) -"cQ" = ( -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/safe, -/area/ship/roumain) "cZ" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8 @@ -344,6 +340,31 @@ }, /turf/open/floor/plating, /area/ship/engineering/electrical) +"fj" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/structure/closet/secure_closet/flamebearer, +/obj/item/clothing/suit/armor/roumain/flamebearer, +/obj/item/clothing/head/cowboy/sec/roumain/flamebearer, +/obj/item/lighter, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/melee/knife/hunting, +/obj/item/storage/backpack/satchel/leather, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/clothing/accessory/waistcoat/roumain, +/obj/item/flashlight/lantern, +/obj/item/clothing/under/suit/roumain, +/obj/item/clothing/shoes/combat, +/obj/item/storage/fancy/candle_box{ + pixel_y = 3; + pixel_x = 8 + }, +/turf/open/floor/wood/walnut, +/area/ship/security) "fm" = ( /obj/structure/chair/pew/right, /obj/effect/turf_decal/sand/plating, @@ -359,6 +380,15 @@ /obj/machinery/advanced_airlock_controller/directional/west, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) +"fV" = ( +/obj/machinery/button/door{ + pixel_x = 0; + pixel_y = -10; + name = "Airlock Shutters"; + id = "airlockshutters" + }, +/turf/closed/wall/r_wall, +/area/ship/engineering/electrical) "fY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -408,22 +438,27 @@ /turf/open/floor/plating/asteroid/rockplanet/cracked/safe, /area/ship/roumain) "gz" = ( -/obj/structure/closet/secure_closet/flamebearer, -/obj/item/clothing/accessory/waistcoat/roumain, +/obj/effect/turf_decal/siding/brown/corner, +/obj/structure/closet/secure_closet/collignes, +/obj/item/clothing/suit/armor/roumain/colligne, +/obj/item/clothing/head/cowboy/sec/roumain/colligne, +/obj/item/ammo_box/c38, +/obj/item/ammo_box/c38, +/obj/item/storage/box/ammo/c38, +/obj/item/gun/ballistic/revolver/detective, /obj/item/storage/backpack/satchel/leather, -/obj/item/melee/knife/hunting, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/cowboy/black, -/obj/item/clothing/shoes/cowboy, -/obj/item/flashlight/lantern, /obj/item/gps{ pixel_x = -7 }, -/obj/item/lighter, -/obj/item/clothing/head/cowboy/sec/roumain/flamebearer, -/obj/item/clothing/suit/armor/roumain/flamebearer, +/obj/item/lighter{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/clothing/shoes/combat, /obj/item/clothing/under/suit/roumain, -/obj/effect/turf_decal/siding/brown/corner, +/obj/item/flashlight/lantern, +/obj/item/melee/knife/combat, +/obj/item/clothing/accessory/waistcoat/roumain, /turf/open/floor/wood/walnut, /area/ship/security) "gJ" = ( @@ -471,6 +506,16 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"hh" = ( +/obj/machinery/button/door{ + pixel_x = 0; + pixel_y = 13; + name = "Airlock Shutters"; + id = "airlockshutters"; + dir = 1 + }, +/turf/closed/wall/r_wall, +/area/ship/engineering/electrical) "hq" = ( /obj/structure/chair/wood{ dir = 4 @@ -508,6 +553,10 @@ }, /turf/template_noop, /area/template_noop) +"il" = ( +/obj/structure/loom, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, +/area/ship/roumain) "iq" = ( /obj/structure/rack, /obj/item/stack/sheet/metal/twenty{ @@ -887,6 +936,10 @@ }, /turf/open/floor/wood/walnut, /area/ship/engineering/electrical) +"nr" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, +/area/ship/roumain) "os" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1185,16 +1238,6 @@ /obj/effect/turf_decal/siding/brown, /turf/open/floor/wood/walnut, /area/ship/bridge) -"sQ" = ( -/obj/machinery/button/door{ - pixel_x = 0; - pixel_y = 13; - name = "Airlock Shutters"; - id = "airlockshutters"; - dir = 1 - }, -/turf/closed/wall/r_wall, -/area/ship/engineering/electrical) "sV" = ( /obj/structure/platform/wood{ dir = 10 @@ -1321,27 +1364,6 @@ /obj/effect/turf_decal/siding/brown, /turf/open/floor/wood/birch, /area/ship/cargo) -"vs" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, -/obj/structure/closet/secure_closet/shadow, -/obj/item/clothing/under/suit/roumain, -/obj/item/flashlight/lantern, -/obj/item/lighter, -/obj/item/clothing/shoes/cowboy/black, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/shoes/combat, -/obj/item/storage/backpack/satchel/leather, -/obj/item/gps{ - pixel_x = -7 - }, -/obj/item/clothing/accessory/waistcoat/roumain, -/obj/item/melee/knife/hunting, -/obj/item/clothing/suit/armor/roumain/shadow, -/obj/item/clothing/head/cowboy/sec/roumain/shadow, -/turf/open/floor/wood/walnut, -/area/ship/security) "wJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -1545,14 +1567,6 @@ }, /turf/open/floor/wood/walnut, /area/ship/medical) -"zp" = ( -/obj/structure/window/reinforced/fulltile, -/obj/structure/grille, -/obj/machinery/door/poddoor/shutters{ - id = "airlockshutters" - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/electrical) "zP" = ( /turf/closed/wall/r_wall, /area/ship/engineering/engine) @@ -1752,7 +1766,8 @@ }, /area/ship/roumain) "EM" = ( -/obj/machinery/door/airlock/external, +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, /obj/machinery/door/poddoor/shutters{ id = "airlockshutters" }, @@ -2323,6 +2338,10 @@ }, /turf/open/floor/wood/walnut, /area/ship/bridge) +"NF" = ( +/obj/structure/flora/grass/rockplanet/dead, +/turf/open/floor/plating/sandy_dirt/ship, +/area/ship/roumain) "NN" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ dir = 1 @@ -2354,6 +2373,13 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) +"NW" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/door/poddoor/shutters{ + id = "airlockshutters" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) "Ob" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/flora/grass/rockplanet/dead, @@ -2372,15 +2398,6 @@ /obj/structure/flora/grass/rockplanet/dead, /turf/open/floor/grass/ship, /area/ship/roumain) -"OF" = ( -/obj/machinery/button/door{ - pixel_x = 0; - pixel_y = -10; - name = "Airlock Shutters"; - id = "airlockshutters" - }, -/turf/closed/wall/r_wall, -/area/ship/engineering/electrical) "OH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -2854,7 +2871,11 @@ pixel_y = 5; pixel_x = -3 }, -/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine, +/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine, +/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine, +/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine, +/obj/structure/rack, /turf/open/floor/wood/walnut, /area/ship/security) "WU" = ( @@ -2866,14 +2887,14 @@ }, /obj/machinery/airalarm/directional/east, /obj/structure/table/wood, -/obj/item/storage/toolbox/fishing{ - pixel_x = 1; - pixel_y = 0 - }, /obj/item/storage/toolbox/fishing{ pixel_x = -1; pixel_y = 5 }, +/obj/item/storage/toolbox/fishing{ + pixel_x = 1; + pixel_y = 0 + }, /turf/open/floor/wood/walnut, /area/ship/security) "XB" = ( @@ -2887,7 +2908,7 @@ /area/ship/roumain) "XG" = ( /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/asteroid/rockplanet/cracked/safe, +/turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) "XO" = ( /obj/machinery/power/shuttle/engine/electric, @@ -2982,10 +3003,6 @@ }, /turf/open/floor/wood/birch, /area/ship/bridge) -"ZT" = ( -/obj/structure/flora/grass/rockplanet/dead, -/turf/open/floor/plating/sandy_dirt/ship, -/area/ship/roumain) (1,1,1) = {" bF @@ -3122,7 +3139,7 @@ XO My Ik sV -ZT +NF Rk rY Pj @@ -3162,7 +3179,7 @@ cZ bZ PC xc -ZA +il ZA iU gJ @@ -3284,10 +3301,10 @@ bF (15,1,1) = {" bF Cb -sQ +hh xc xc -OF +fV Te cf Uj @@ -3305,12 +3322,12 @@ bF (16,1,1) = {" bF Cb -zp +EM fT ps -zp +EM Yr -XG +nr uV yX gg @@ -3326,7 +3343,7 @@ bF (17,1,1) = {" bF Cb -EM +NW km NN BO @@ -3355,7 +3372,7 @@ xc yU df iU -cQ +XG NS Wu Wu @@ -3375,7 +3392,7 @@ ja no bG BY -cQ +XG FJ CG MO @@ -3442,8 +3459,8 @@ sH SV HU gz +fj Hg -vs qQ HU bF From 70d98fd5ee8172224bd73b46b1b06c10cfcb325f Mon Sep 17 00:00:00 2001 From: stiel0248 Date: Sat, 25 Jan 2025 14:21:20 -0800 Subject: [PATCH 18/18] added some extra ammo varieties, fixed a railing, made airlock faster. --- _maps/shuttles/roumain/srm_vagrant.dmm | 34 +++++++++++++++++++++----- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/_maps/shuttles/roumain/srm_vagrant.dmm b/_maps/shuttles/roumain/srm_vagrant.dmm index a439d7ab7040..db0d4f4db5c6 100644 --- a/_maps/shuttles/roumain/srm_vagrant.dmm +++ b/_maps/shuttles/roumain/srm_vagrant.dmm @@ -378,6 +378,7 @@ dir = 4 }, /obj/machinery/advanced_airlock_controller/directional/west, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) "fV" = ( @@ -1015,6 +1016,10 @@ pixel_x = -10; pixel_y = 1 }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) "pD" = ( @@ -1063,6 +1068,20 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating/asteroid/rockplanet/safe, /area/ship/roumain) +"qI" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "airlockshutters" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/electrical) "qK" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/railing/corner{ @@ -1648,11 +1667,15 @@ /area/ship/roumain) "BO" = ( /obj/machinery/door/airlock/external, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/poddoor/shutters{ id = "airlockshutters" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/engineering/electrical) "BY" = ( @@ -2546,12 +2569,11 @@ }, /obj/item/storage/toolbox/ammo/shotgun, /obj/item/storage/box/ammo/a8_50r, +/obj/item/storage/box/ammo/a12g_slug, +/obj/item/storage/box/ammo/a8_50r/match, /turf/open/floor/wood/walnut, /area/ship/security) "Ss" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/sand/plating, /obj/structure/railing, /turf/open/floor/plating/asteroid/rockplanet/wet/safe, @@ -3325,7 +3347,7 @@ Cb EM fT ps -EM +qI Yr nr uV