From f66413b1d2410bf8d47e54f720b7d8d1a39f52a0 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Sat, 13 Apr 2024 14:19:15 -0400 Subject: [PATCH 01/17] so cool --- _maps/configs/minutemen_atlas.json | 48 + _maps/shuttles/minutemen/minutemen_atlas.dmm | 4859 +++++++++++++++++ .../machinery/porta_turret/portable_turret.dm | 5 +- 3 files changed, 4911 insertions(+), 1 deletion(-) create mode 100644 _maps/configs/minutemen_atlas.json create mode 100644 _maps/shuttles/minutemen/minutemen_atlas.dmm diff --git a/_maps/configs/minutemen_atlas.json b/_maps/configs/minutemen_atlas.json new file mode 100644 index 000000000000..c6f2f5014a74 --- /dev/null +++ b/_maps/configs/minutemen_atlas.json @@ -0,0 +1,48 @@ + { + "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "map_name": "Atlas-class Light Armored Crusier", + "prefix": "CMSV", + "namelists": ["GENERAL", "CLIP MINUTEMEN", "NATURAL_AGGRESSIVE"], + "description": "The Atlas-Class follows the designation of some of the oldest serving vessels in the Confederated League's military fleet. Originally intended as a supply barge, the Atlas was taken by C-MM shipwrights and repurposed to carry a decently-sized team of Minutemen while not putting a major strain on the League's resources.", + "tags": [ + "Combat" + ], + "map_short_name": "Atlas-class", + "starting_funds": 1000, + "map_path": "_maps/shuttles/minutemen/minutemen_atlas.dmm", + "limit": 1, + "job_slots": { + "Captain": { + "outfit": "/datum/outfit/job/clip/minutemen/captain", + "officer": true, + "slots": 1 + }, + "First Officer": { + "outfit": "/datum/outfit/job/clip/first_officer", + "officer": true, + "slots": 1 + }, + "Staff Sergeant": { + "outfit": "/datum/outfit/job/clip/minutemen/grunt/lead", + "officer": true, + "slots": 1 + }, + "Minuteman": { + "outfit": "/datum/outfit/job/clip/minutemen/grunt", + "slots": 4 + }, + "Corpsman": { + "outfit": "/datum/outfit/job/clip/minutemen/doctor", + "slots": 1 + }, + "Engineer": { + "outfit": "/datum/outfit/job/clip/minutemen/engineer", + "slots": 2 + }, + "Deckhand": { + "outfit": "/datum/outfit/job/clip/minutemen/grunt/reserve", + "slots": 1 + } + }, + "enabled": true +} diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm new file mode 100644 index 000000000000..847c28bb1bee --- /dev/null +++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm @@ -0,0 +1,4859 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"af" = ( +/obj/machinery/power/smes/shuttle/precharged{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"am" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"aw" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewtwo) +"aC" = ( +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/effect/turf_decal/spline/fancy/opaque/white/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/airalarm/directional/west, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"aI" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/carpet/blue, +/area/ship/crew) +"aS" = ( +/obj/machinery/firealarm/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"aX" = ( +/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"bF" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4, +/turf/open/floor/plating/airless, +/area/ship/engineering) +"bK" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"bQ" = ( +/obj/structure/rack, +/obj/item/clothing/head/clip{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/clothing/head/clip{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/head/clip{ + pixel_x = -3 + }, +/obj/item/clothing/head/clip{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"bS" = ( +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"cc" = ( +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewthree) +"cm" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"ct" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/transparent/blue/line{ + dir = 1 + }, +/obj/structure/railing, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"cV" = ( +/obj/structure/sign/poster/clip/random{ + pixel_y = -32 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/open/floor/carpet/nanoweave/blue, +/area/ship/crew/crewtwo) +"cY" = ( +/obj/effect/turf_decal/corner/transparent/blue/border{ + dir = 4 + }, +/obj/structure/curtain, +/obj/effect/turf_decal/corner/transparent/blue/mono, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/medical) +"da" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/crewtwo) +"di" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/ship/crew) +"dw" = ( +/obj/effect/turf_decal/minutemen/corner{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"dM" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"dV" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"ec" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/central) +"em" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/tech, +/area/ship/crew/canteen) +"ev" = ( +/obj/effect/decal/fakelattice, +/obj/structure/railing, +/turf/open/floor/plasteel/elevatorshaft, +/area/ship/hallway/central) +"eB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/grunge, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"eH" = ( +/obj/structure/closet/secure_closet{ + icon_state = "cap"; + name = "captain's locker"; + req_access_txt = "20" + }, +/turf/open/floor/carpet/blue, +/area/ship/crew/crewthree) +"eJ" = ( +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 5 + }, +/obj/structure/sign/poster/clip/maxin{ + pixel_y = 32 + }, +/obj/item/kirbyplants{ + icon_state = "plant-02"; + pixel_y = 6; + pixel_x = 3 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"eK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/crew/canteen) +"eW" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/decal/cleanable/confetti, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"fd" = ( +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 8 + }, +/obj/structure/railing{ + layer = 3.31 + }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 5 + }, +/obj/effect/turf_decal/box/corners{ + color = "#75A2BB" + }, +/obj/effect/turf_decal/box/corners{ + dir = 8; + color = "#75A2BB" + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"fg" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/light_switch{ + pixel_y = 23; + pixel_x = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"fi" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"fp" = ( +/obj/structure/table, +/obj/machinery/jukebox/boombox, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"fs" = ( +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) +"fF" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/corner/transparent/blue/mono, +/obj/item/book/manual/wiki/surgery{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plasteel/mono/white, +/area/ship/medical) +"fL" = ( +/obj/structure/table, +/obj/structure/bedsheetbin, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 5 + }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 10 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/canteen) +"fM" = ( +/obj/structure/cable{ + icon_state = "6-8" + }, +/obj/structure/cable{ + icon_state = "1-6" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"fR" = ( +/turf/open/floor/carpet/blue, +/area/ship/crew) +"gk" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/tech, +/area/ship/crew/canteen) +"gu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"gw" = ( +/obj/machinery/door/airlock/medical, +/obj/effect/turf_decal/corner/transparent/blue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"gy" = ( +/obj/structure/closet/crate/freezer/blood, +/obj/effect/turf_decal/corner/transparent/blue/mono, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plasteel/mono/white, +/area/ship/medical) +"gA" = ( +/obj/machinery/holopad/emergency/command, +/obj/effect/turf_decal/minutemen/middle, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) +"gE" = ( +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black/corner, +/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"gF" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/effect/turf_decal/minutemen/edge{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"gH" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"gR" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "atlas_fo" + }, +/turf/open/floor/plating, +/area/ship/crew/crewtwo) +"gT" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/security) +"gU" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"hg" = ( +/obj/effect/turf_decal/trimline/transparent/blue/line, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -23 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"hq" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewthree) +"hL" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"hQ" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/structure/chair, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"hR" = ( +/obj/structure/table/wood, +/obj/structure/sign/poster/official/moth/smokey{ + pixel_x = -32 + }, +/obj/item/modular_computer/laptop/preset/civilian/rilena{ + pixel_y = 4 + }, +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewthree) +"ia" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"is" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"iw" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewtwo) +"ix" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"iN" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "2-9" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"iO" = ( +/obj/structure/table/reinforced, +/obj/machinery/fax/clip{ + pixel_y = 7 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"iS" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"iW" = ( +/obj/structure/closet/secure_closet{ + icon_state = "cap"; + name = "first officer's locker"; + req_access_txt = "19" + }, +/turf/open/floor/carpet/nanoweave/blue, +/area/ship/crew/crewtwo) +"jc" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"jp" = ( +/obj/structure/table, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -28 + }, +/obj/item/clipboard, +/obj/item/pen, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/security) +"js" = ( +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"jG" = ( +/obj/effect/turf_decal/trimline/transparent/blue/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/structure/railing/corner, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"jI" = ( +/obj/structure/chair, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"jL" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"jQ" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_y = 4 + }, +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewthree) +"jR" = ( +/obj/effect/landmark/start/station_engineer, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"jZ" = ( +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"kd" = ( +/obj/structure/table, +/obj/item/storage/box/evidence{ + pixel_y = 18; + pixel_x = -6 + }, +/obj/item/storage/box/flares{ + pixel_y = 11; + pixel_x = 2 + }, +/obj/item/storage/box/zipties{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/machinery/recharger, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) +"kt" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4; + pixel_y = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"kv" = ( +/obj/effect/turf_decal/trimline/transparent/blue/line, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"kE" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"kG" = ( +/obj/structure/table, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"kL" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"kS" = ( +/obj/machinery/door/poddoor{ + id = "atlas_cargo" + }, +/turf/open/floor/plating, +/area/ship/cargo) +"kX" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"lc" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"le" = ( +/obj/effect/turf_decal/industrial/loading{ + icon_state = "loadingarea_stripes" + }, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"lw" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/landmark/start/head_of_personnel, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"lA" = ( +/obj/machinery/porta_turret/ship/ballistic/clip, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"lJ" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/crew) +"lY" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"mf" = ( +/obj/effect/turf_decal/techfloor/orange{ + dir = 4 + }, +/obj/structure/table, +/obj/item/radio/off{ + pixel_x = 9; + pixel_y = 11 + }, +/obj/item/radio/off{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/radio/off{ + pixel_x = -1; + pixel_y = 9 + }, +/obj/item/radio/off{ + pixel_x = 4; + pixel_y = 7 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew) +"mh" = ( +/obj/structure/dresser, +/turf/open/floor/carpet/nanoweave/blue, +/area/ship/crew/crewtwo) +"ms" = ( +/obj/machinery/porta_turret/ship/ballistic/clip, +/obj/docking_port/mobile{ + dir = 2; + launch_status = 0; + port_direction = 8; + preferred_direction = 4; + name = "atlas dock" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"mK" = ( +/obj/structure/cable/yellow{ + icon_state = "4-10" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"mN" = ( +/obj/structure/sign/clip, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/engineering) +"mS" = ( +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"nl" = ( +/obj/effect/landmark/start/security_officer, +/obj/structure/chair, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"nm" = ( +/obj/effect/turf_decal/box/corners{ + dir = 1; + color = "#75A2BB" + }, +/obj/effect/turf_decal/box/corners{ + dir = 8; + color = "#75A2BB" + }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 6 + }, +/turf/open/floor/pod/dark, +/area/ship/cargo) +"ny" = ( +/obj/item/gun/ballistic/automatic/assault/p16/minutemen{ + spawnwithmagazine = 0; + pixel_y = 7; + pixel_x = -5 + }, +/obj/item/gun/ballistic/automatic/assault/p16/minutemen{ + spawnwithmagazine = 0; + pixel_y = 7; + pixel_x = -5 + }, +/obj/item/gun/ballistic/automatic/smg/cm5/no_mag{ + pixel_y = -4; + pixel_x = 6 + }, +/obj/item/gun/ballistic/automatic/smg/cm5/no_mag{ + pixel_y = -4; + pixel_x = 6 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/structure/guncase, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) +"nO" = ( +/obj/machinery/cryopod{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 6 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew) +"nP" = ( +/obj/machinery/door/airlock/mining, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"nQ" = ( +/obj/effect/turf_decal/trimline/transparent/blue/corner, +/obj/machinery/light/directional/south, +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"nS" = ( +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black/corner, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"nU" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 9 + }, +/obj/effect/turf_decal/box/corners{ + dir = 4; + color = "#75A2BB" + }, +/obj/effect/turf_decal/box/corners{ + color = "#75A2BB" + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/turf/open/floor/pod/dark, +/area/ship/crew/canteen) +"nW" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/security_officer, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"nX" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"nY" = ( +/obj/effect/turf_decal/trimline/transparent/blue/line, +/obj/structure/table, +/obj/item/storage/bag/tray/cafeteria{ + pixel_y = 2 + }, +/obj/item/storage/bag/tray/cafeteria{ + pixel_y = 4 + }, +/obj/item/storage/bag/tray/cafeteria{ + pixel_y = 6 + }, +/obj/item/storage/bag/tray/cafeteria{ + pixel_y = 8 + }, +/obj/item/storage/bag/tray/cafeteria{ + pixel_y = 10 + }, +/obj/item/storage/bag/tray/cafeteria{ + pixel_y = 12 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"oa" = ( +/obj/structure/table, +/obj/item/trash/plate{ + pixel_x = 4; + pixel_y = 1 + }, +/obj/item/trash/plate{ + pixel_x = -2; + pixel_y = 4 + }, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"of" = ( +/obj/structure/closet/crate/bin, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewtwo) +"ov" = ( +/obj/effect/turf_decal/box/corners{ + dir = 1; + color = "#75A2BB" + }, +/obj/effect/turf_decal/box/corners{ + dir = 8; + color = "#75A2BB" + }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 6 + }, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/pod/dark, +/area/ship/cargo) +"oJ" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning{ + dir = 5; + pixel_y = -1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"oX" = ( +/obj/machinery/door/airlock/grunge{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewthree) +"oY" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/arrow_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"pn" = ( +/obj/machinery/blackbox_recorder, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"pp" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/ship/engineering) +"pq" = ( +/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/hallway/central) +"ps" = ( +/turf/template_noop, +/area/template_noop) +"qb" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"qc" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "atlas_bridge" + }, +/turf/open/floor/plating, +/area/ship/bridge) +"qn" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"qr" = ( +/obj/effect/turf_decal/minutemen/corner{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"qA" = ( +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"qG" = ( +/obj/machinery/power/terminal, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/structure/sign/warning/nosmoking{ + pixel_x = 32 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"qP" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/obj/effect/turf_decal/minutemen/edge{ + dir = 8 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/landmark/start/captain, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"qR" = ( +/obj/structure/chair/office, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/security) +"qS" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 5 + }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 10 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"rk" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"ry" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewthree) +"rz" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_y = 5 + }, +/obj/item/pen{ + pixel_y = 5 + }, +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewthree) +"rO" = ( +/obj/structure/rack, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewtwo) +"rR" = ( +/obj/structure/closet/emcloset/wall{ + dir = 8; + pixel_x = 28 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"sh" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 23 + }, +/turf/open/floor/plasteel/stairs, +/area/ship/engineering) +"si" = ( +/obj/structure/closet/emcloset/anchored, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"sl" = ( +/obj/machinery/computer/helm/viewscreen/directional/south, +/obj/structure/table, +/obj/item/storage/fancy/cigarettes{ + pixel_x = -1; + pixel_y = 3 + }, +/obj/item/storage/fancy/cigarettes{ + pixel_x = -5 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/item/storage/fancy/cigarettes{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = 1 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/security) +"sB" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"sD" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) +"sF" = ( +/obj/structure/rack, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewthree) +"sI" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"sL" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/obj/structure/closet/crate/bin{ + pixel_y = 11 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"sP" = ( +/obj/machinery/computer/cryopod/directional/west, +/turf/open/floor/plasteel/tech, +/area/ship/crew) +"tc" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "atlas_cap" + }, +/turf/open/floor/plating, +/area/ship/crew/crewthree) +"tq" = ( +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23; + pixel_y = -11 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"tF" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"tP" = ( +/obj/structure/table, +/obj/item/stamp{ + pixel_x = 9; + pixel_y = 13 + }, +/obj/item/clipboard, +/obj/item/stamp/denied{ + pixel_x = 10; + pixel_y = 4 + }, +/obj/item/binoculars{ + pixel_y = 6; + pixel_x = -4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"tW" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/canteen) +"us" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/carpet/blue, +/area/ship/crew) +"ux" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4; + pixel_y = 1 + }, +/obj/effect/turf_decal/minutemen/edge{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"uC" = ( +/obj/structure/table/reinforced, +/obj/item/radio/weather_monitor{ + pixel_y = 6; + pixel_x = -4 + }, +/obj/machinery/button/door{ + id = "atlas_bridge"; + dir = 1; + pixel_x = 14; + pixel_y = 4 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"uG" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewthree) +"uL" = ( +/obj/structure/mirror{ + pixel_y = 28 + }, +/obj/structure/sink{ + pixel_y = 12; + pixel_x = 1 + }, +/obj/effect/turf_decal/corner/transparent/blue/border{ + dir = 8 + }, +/obj/structure/curtain, +/obj/effect/turf_decal/corner/transparent/blue/mono, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/medical) +"uO" = ( +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"uQ" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"uU" = ( +/obj/structure/table, +/obj/item/storage/cans/sixsoda, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"uX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewthree) +"uY" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/central) +"vd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/catwalk/over, +/obj/machinery/airalarm/directional/east, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/engineering) +"vo" = ( +/obj/structure/railing, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 9; + pixel_x = 2 + }, +/obj/item/storage/toolbox/electrical{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"vw" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/catwalk/over, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "2-9" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/ship/engineering) +"vy" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_y = 5 + }, +/obj/item/pen{ + pixel_y = 5 + }, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"vS" = ( +/obj/structure/table/glass, +/obj/item/folder/white{ + pixel_x = -13; + pixel_y = 6 + }, +/obj/item/folder/white{ + pixel_x = -10; + pixel_y = 2 + }, +/obj/item/paper_bin{ + pixel_y = 5; + pixel_x = 6 + }, +/obj/item/pen{ + pixel_y = 5; + pixel_x = 6 + }, +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/effect/turf_decal/spline/fancy/opaque/white, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"vT" = ( +/obj/structure/dresser{ + dir = 1 + }, +/turf/open/floor/carpet/blue, +/area/ship/crew) +"vW" = ( +/obj/structure/sign/poster/clip/random{ + pixel_y = 32 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/carpet/blue, +/area/ship/crew/crewthree) +"vZ" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/ship/engineering) +"wc" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-6" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"wd" = ( +/obj/structure/sign/warning/nosmoking/circle{ + pixel_x = -28 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"we" = ( +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/machinery/iv_drip, +/obj/effect/turf_decal/spline/fancy/opaque/white{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"wi" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/techfloor/orange, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew) +"wk" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"wl" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"wu" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"wy" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"wJ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"wU" = ( +/obj/machinery/power/smes/engineering, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"wW" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/structure/chair, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"xi" = ( +/obj/effect/decal/fakelattice{ + icon_state = "lattice-203" + }, +/obj/structure/lattice/catwalk, +/turf/open/floor/plating, +/area/ship/external/dark) +"xz" = ( +/obj/effect/turf_decal/box/corners{ + dir = 4; + color = "#75A2BB" + }, +/obj/effect/turf_decal/box/corners{ + color = "#75A2BB" + }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 9 + }, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/pod/dark, +/area/ship/cargo) +"xU" = ( +/obj/structure/closet/wall/white{ + dir = 1; + pixel_y = -28 + }, +/obj/item/defibrillator/loaded, +/obj/item/clothing/gloves/color/latex/nitrile/clip{ + pixel_x = -11; + pixel_y = 5 + }, +/obj/item/clothing/under/clip/medic{ + pixel_x = 9; + pixel_y = -4 + }, +/obj/item/storage/belt/medical/webbing/clip/prefilled{ + pixel_x = -6; + pixel_y = -7 + }, +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/item/clothing/head/clip/corpsman{ + pixel_y = 8; + pixel_x = 9 + }, +/obj/effect/turf_decal/spline/fancy/opaque/white, +/obj/structure/table/glass, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"yi" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"yn" = ( +/obj/structure/salvageable/computer{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"yo" = ( +/obj/item/clothing/under/clip/minutemen{ + pixel_y = 8; + pixel_x = -9 + }, +/obj/item/clothing/under/clip/minutemen{ + pixel_x = -2; + pixel_y = 7 + }, +/obj/item/clothing/under/clip/minutemen{ + pixel_x = 11; + pixel_y = 10 + }, +/obj/item/clothing/under/clip/minutemen{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/clothing/under/clip/minutemen{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/clothing/shoes/combat{ + pixel_x = -9; + pixel_y = -6 + }, +/obj/item/clothing/shoes/combat{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/clothing/shoes/combat{ + pixel_x = 1; + pixel_y = -6 + }, +/obj/item/clothing/shoes/combat{ + pixel_x = 11; + pixel_y = -6 + }, +/obj/item/clothing/shoes/combat{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/structure/closet, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) +"yx" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/double/grey, +/turf/open/floor/carpet/nanoweave/blue, +/area/ship/crew/crewtwo) +"yB" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"yC" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewthree) +"yI" = ( +/obj/effect/turf_decal/box/corners{ + dir = 1; + color = "#75A2BB" + }, +/obj/effect/turf_decal/box/corners{ + dir = 8; + color = "#75A2BB" + }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 6 + }, +/obj/structure/punching_bag, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -23 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/pod/dark, +/area/ship/cargo) +"yO" = ( +/obj/machinery/computer/helm/viewscreen/directional/north, +/turf/open/floor/carpet/blue, +/area/ship/crew/crewthree) +"yR" = ( +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/structure/table/glass, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"yT" = ( +/obj/machinery/door/firedoor, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/central) +"yZ" = ( +/obj/structure/sign/poster/clip/bard{ + pixel_y = 32 + }, +/obj/structure/filingcabinet/double, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) +"zc" = ( +/obj/structure/closet/crate/freezer, +/obj/item/tank/internals/anesthetic{ + pixel_x = 12 + }, +/obj/item/tank/internals/anesthetic{ + pixel_x = 12 + }, +/obj/item/clothing/mask/breath/medical{ + pixel_y = -12 + }, +/obj/item/clothing/mask/breath/medical{ + pixel_y = -12 + }, +/obj/effect/turf_decal/corner/transparent/blue/mono, +/obj/item/storage/firstaid/regular{ + pixel_y = 12 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/medical) +"zf" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) +"zl" = ( +/obj/structure/closet/crate/trashcart/laundry, +/turf/open/floor/plasteel/tech, +/area/ship/crew/canteen) +"zq" = ( +/obj/machinery/turretid, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"zt" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"zx" = ( +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/effect/turf_decal/spline/fancy/opaque/white/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"zE" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"zQ" = ( +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"Aa" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/effect/turf_decal/trimline/transparent/blue/filled/arrow_ccw{ + dir = 1 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"An" = ( +/obj/structure/bed{ + dir = 1 + }, +/obj/item/bedsheet/blue{ + dir = 1 + }, +/obj/structure/curtain/cloth, +/obj/machinery/light/directional/west, +/turf/open/floor/carpet/blue, +/area/ship/crew) +"Av" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp{ + pixel_y = 6; + pixel_x = 1 + }, +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewtwo) +"Ay" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewtwo) +"AH" = ( +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"AP" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"Bm" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/ship/external/dark) +"Bx" = ( +/obj/machinery/photocopier, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4; + pixel_y = 1 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"BH" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"BI" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"BL" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/railing{ + dir = 1; + layer = 2.89 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"BW" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"Cc" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 10 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + color = "#75A2BB" + }, +/obj/effect/turf_decal/box/corners{ + dir = 4; + color = "#75A2BB" + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"Cm" = ( +/obj/structure/sign/clip, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/crewthree) +"Cn" = ( +/obj/item/cigbutt{ + anchored = 1; + color = "#808080"; + layer = 2; + pixel_x = -4; + pixel_y = 8 + }, +/obj/effect/decal/fakelattice, +/obj/structure/railing, +/turf/open/floor/plasteel/elevatorshaft, +/area/ship/hallway/central) +"Cq" = ( +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black/corner, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"Cr" = ( +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, +/obj/item/stack/sheet/mineral/plasma/twenty, +/obj/effect/turf_decal/techfloor, +/obj/structure/cable/yellow{ + icon_state = "0-9" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"CM" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_y = 3 + }, +/obj/item/pen{ + pixel_y = 3 + }, +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewtwo) +"CO" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/medical) +"CX" = ( +/obj/structure/sign/poster/clip/serene{ + pixel_y = -32 + }, +/obj/structure/table/glass, +/obj/item/storage/box/masks{ + pixel_y = 13; + pixel_x = -4 + }, +/obj/item/clothing/suit/apron/surgical{ + pixel_x = -5; + pixel_y = -3 + }, +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/effect/turf_decal/spline/fancy/opaque/white, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"CZ" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ + dir = 8 + }, +/obj/structure/railing, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"Da" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"Do" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"Dq" = ( +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/structure/bed, +/obj/item/bedsheet, +/obj/effect/turf_decal/spline/fancy/opaque/white{ + dir = 1 + }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"DL" = ( +/obj/machinery/photocopier, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"Ej" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"Eo" = ( +/obj/structure/railing{ + dir = 1; + layer = 2.89 + }, +/obj/machinery/autolathe/hacked, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"Es" = ( +/obj/structure/curtain/cloth/grey, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"Ey" = ( +/obj/effect/decal/fakelattice{ + icon_state = "lattice-23" + }, +/obj/structure/lattice/catwalk, +/turf/open/floor/plating, +/area/ship/external/dark) +"EB" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/carpet/nanoweave/blue, +/area/ship/crew/crewtwo) +"ED" = ( +/obj/item/kirbyplants{ + icon_state = "plant-02" + }, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"EH" = ( +/obj/structure/filingcabinet/double/grey{ + dir = 8; + pixel_x = 8 + }, +/obj/item/folder, +/obj/item/folder/blue, +/obj/item/folder/red, +/obj/item/folder/white, +/obj/item/folder/yellow, +/obj/machinery/button/door{ + pixel_y = -23; + id = "atlas_fo"; + dir = 1 + }, +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewtwo) +"EJ" = ( +/obj/item/kirbyplants{ + icon_state = "plant-02" + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"EP" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/obj/machinery/light_switch{ + pixel_y = -20; + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"ES" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"EZ" = ( +/obj/effect/turf_decal/techfloor/corner{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"Fu" = ( +/obj/effect/decal/fakelattice{ + icon_state = "lattice-21" + }, +/obj/structure/lattice/catwalk, +/turf/open/floor/plating, +/area/ship/external/dark) +"Fv" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"FF" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"FI" = ( +/obj/structure/table, +/obj/item/desk_flag/trans{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/toy/cards/deck{ + pixel_x = 6; + pixel_y = 9 + }, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"FN" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/crewthree) +"FO" = ( +/obj/effect/turf_decal/techfloor/corner{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"FQ" = ( +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"Gj" = ( +/obj/effect/turf_decal/corner_steel_grid{ + dir = 5 + }, +/obj/effect/turf_decal/box/corners{ + dir = 8; + color = "#75A2BB" + }, +/obj/effect/turf_decal/box/corners{ + color = "#75A2BB" + }, +/obj/item/mop{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/structure/janitorialcart{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/canteen) +"Gt" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/double/blue, +/turf/open/floor/carpet/blue, +/area/ship/crew/crewthree) +"Hf" = ( +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewtwo) +"Hg" = ( +/obj/machinery/airalarm/directional/west, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"Hh" = ( +/obj/item/radio/intercom/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"Hl" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/techfloor, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"Hu" = ( +/obj/machinery/door/poddoor, +/turf/open/floor/plating, +/area/ship/cargo) +"HW" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew) +"HX" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/hallway/central) +"Ig" = ( +/obj/machinery/door/window/westright{ + req_access = list(3) + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/mono/dark, +/area/ship/security) +"Ir" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/effect/turf_decal/minutemen/edge, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"IK" = ( +/obj/effect/turf_decal/box/corners{ + dir = 4; + color = "#75A2BB" + }, +/obj/effect/turf_decal/box/corners{ + color = "#75A2BB" + }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 9 + }, +/obj/structure/closet/crate, +/obj/item/storage/box/emptysandbags, +/obj/item/storage/box/emptysandbags, +/obj/item/shovel, +/obj/item/shovel, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/machinery/light/directional/east, +/turf/open/floor/pod/dark, +/area/ship/cargo) +"IP" = ( +/obj/structure/table/wood, +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewtwo) +"IY" = ( +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"Jb" = ( +/obj/machinery/door/airlock/command{ + dir = 4 + }, +/obj/effect/turf_decal/corner_techfloor_gray{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"Je" = ( +/turf/open/floor/engine/hull/reinforced, +/area/ship/external/dark) +"JR" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-5" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"JU" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"JV" = ( +/obj/item/kirbyplants{ + icon_state = "plant-02" + }, +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"Kf" = ( +/obj/structure/chair/plastic{ + dir = 8; + pixel_y = 9; + pixel_x = 7 + }, +/obj/effect/decal/cleanable/confetti, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"Km" = ( +/obj/machinery/computer/helm/viewscreen/directional/south, +/turf/open/floor/carpet/nanoweave/blue, +/area/ship/crew/crewtwo) +"KB" = ( +/obj/effect/turf_decal/trimline/transparent/blue/line, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"Ld" = ( +/obj/item/caution{ + pixel_x = 6 + }, +/obj/effect/decal/cleanable/oil/slippery{ + icon_state = "floor5"; + pixel_x = -12; + pixel_y = 1 + }, +/obj/item/wirecutters{ + pixel_x = -5; + pixel_y = -15 + }, +/obj/item/crowbar/large{ + pixel_y = 14 + }, +/turf/open/floor/plating, +/area/ship/cargo) +"Ln" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"Lp" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/command{ + pixel_y = 6; + pixel_x = -3 + }, +/obj/item/book/manual/wiki/piloting{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"Lw" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/stand_clear/white, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"LE" = ( +/obj/structure/grille, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external/dark) +"LH" = ( +/obj/structure/filingcabinet/double/grey{ + dir = 8; + pixel_x = 8 + }, +/obj/item/folder, +/obj/item/folder/blue, +/obj/item/folder/red, +/obj/item/folder/white, +/obj/item/folder/yellow, +/obj/machinery/button/door{ + pixel_y = 23; + id = "atlas_cap" + }, +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewthree) +"LM" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) +"Ml" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/stand_clear/white, +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"Mq" = ( +/obj/structure/closet/crate/bin{ + pixel_y = 11; + pixel_x = -10 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"Mu" = ( +/obj/effect/landmark/start/station_engineer, +/obj/structure/cable/yellow{ + icon_state = "2-5" + }, +/obj/structure/cable/yellow{ + icon_state = "5-6" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"MC" = ( +/obj/structure/bed, +/obj/item/bedsheet/head_of_personnel{ + name = "sergeant's bedsheet"; + desc = "Smells like gunpowder and cleaning oil." + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/security) +"MH" = ( +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, +/obj/item/stack/sheet/mineral/plasma/twenty, +/obj/effect/turf_decal/techfloor, +/obj/structure/cable/yellow, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"MO" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"MQ" = ( +/obj/structure/chair/comfy/black, +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewtwo) +"Ni" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewtwo) +"No" = ( +/obj/machinery/mech_bay_recharge_port{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/hatch/blue, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"NE" = ( +/obj/structure/closet/emcloset/anchored, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 6 + }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + color = "#75A2BB" + }, +/obj/effect/turf_decal/box/corners{ + dir = 8; + color = "#75A2BB" + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/turf/open/floor/pod/dark, +/area/ship/crew/canteen) +"NY" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewthree) +"Ob" = ( +/obj/structure/sign/clip, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/crewtwo) +"Oj" = ( +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) +"Ot" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"OA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/catwalk/over, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light/directional/east, +/turf/open/floor/plating, +/area/ship/engineering) +"OQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"OV" = ( +/obj/effect/turf_decal/rechargefloor, +/obj/item/stack/ore/salvage/scraptitanium{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/stack/ore/salvage/scrapsilver{ + pixel_x = 4; + pixel_y = -8 + }, +/obj/structure/mecha_wreckage/ripley/clip, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo) +"OW" = ( +/obj/effect/decal/fakelattice, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plasteel/elevatorshaft, +/area/ship/hallway/central) +"Pd" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4; + pixel_y = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"Pi" = ( +/obj/effect/turf_decal/box{ + color = "#75A2BB" + }, +/obj/structure/closet/secure_closet{ + icon_state = "hop"; + name = "sergeant's locker"; + req_access_txt = "19" + }, +/obj/item/clothing/head/clip/slouch{ + pixel_y = 12 + }, +/obj/item/clothing/suit/armor/vest/alt{ + pixel_x = 7 + }, +/obj/item/clothing/under/clip/minutemen{ + pixel_x = -5 + }, +/obj/item/clothing/shoes/combat{ + pixel_y = -12; + pixel_x = -4 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/security) +"Pk" = ( +/obj/effect/turf_decal/minutemen/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"Pn" = ( +/obj/structure/table, +/obj/item/storage/fancy/donut_box, +/obj/effect/spawner/lootdrop/donut, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"Py" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/decal/cleanable/confetti, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"PD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/toilet{ + dir = 8; + pixel_x = 4 + }, +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 1; + pixel_x = -5 + }, +/obj/effect/turf_decal/floordetail/pryhole, +/obj/machinery/light/small/directional/west, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew) +"PG" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/carpet/blue, +/area/ship/crew/crewthree) +"PK" = ( +/obj/effect/turf_decal/trimline/transparent/blue/line, +/obj/structure/closet/secure_closet/freezer/fridge/open{ + populate = 0 + }, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"PT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"PU" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/engineering) +"PV" = ( +/obj/machinery/door/airlock/grunge{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"PX" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"Qg" = ( +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/engineering) +"Qj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sink{ + dir = 4; + pixel_x = -12; + pixel_y = 6 + }, +/obj/item/lipstick{ + pixel_x = -11 + }, +/obj/item/lipstick/black{ + pixel_x = -11 + }, +/obj/item/lipstick/jade{ + pixel_x = -11 + }, +/obj/item/lipstick/purple{ + pixel_x = -11 + }, +/obj/structure/closet/wall/white{ + dir = 8; + pixel_x = 28; + pixel_y = 6 + }, +/obj/structure/mirror{ + pixel_x = -28; + pixel_y = 7 + }, +/obj/item/dyespray{ + pixel_x = 10 + }, +/obj/item/clothing/head/wig/random{ + pixel_x = 11 + }, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/crew) +"Qt" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"Qw" = ( +/obj/effect/turf_decal/minutemen/corner, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"Qz" = ( +/obj/structure/sign/clip, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/cargo) +"QC" = ( +/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"QG" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/hallway/central) +"QM" = ( +/obj/item/radio/intercom/table{ + dir = 4; + pixel_y = 17 + }, +/obj/item/radio/intercom/wideband/table{ + dir = 4; + pixel_y = -1 + }, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"QS" = ( +/obj/structure/rack, +/obj/item/storage/belt/military/clip{ + pixel_y = 11; + pixel_x = 5 + }, +/obj/item/storage/belt/military/clip{ + pixel_x = -7; + pixel_y = 10 + }, +/obj/item/storage/belt/military/clip{ + pixel_x = -4 + }, +/obj/item/storage/belt/military/clip{ + pixel_y = -1; + pixel_x = 6 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"Rf" = ( +/obj/machinery/door/airlock/grunge, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/dark, +/area/ship/crew) +"Rt" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewtwo) +"Rv" = ( +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"Rz" = ( +/obj/structure/rack, +/obj/item/clothing/head/helmet/bulletproof/x11/clip{ + pixel_x = -7; + pixel_y = 9 + }, +/obj/item/clothing/head/helmet/bulletproof/x11/clip{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/item/clothing/head/helmet/bulletproof/x11/clip{ + pixel_x = -6; + pixel_y = 1 + }, +/obj/item/clothing/head/helmet/bulletproof/x11/clip{ + pixel_y = -2; + pixel_x = 1 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"RL" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/cigarettes/cigars{ + pixel_y = 6; + pixel_x = 2 + }, +/obj/item/storage/fancy/cigarettes/cigars{ + pixel_y = 9; + pixel_x = 1 + }, +/obj/item/clothing/mask/cigarette/cigar{ + pixel_x = -10; + pixel_y = 1 + }, +/obj/item/clothing/mask/cigarette/pipe{ + pixel_x = 10 + }, +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewthree) +"RM" = ( +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"RQ" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"RU" = ( +/obj/machinery/computer/helm{ + dir = 8; + icon_state = "computer-left" + }, +/obj/effect/turf_decal/corner/transparent/blue/full, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"Sb" = ( +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"Sp" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "atlas_cap" + }, +/turf/open/floor/plating, +/area/ship/crew/crewthree) +"Ss" = ( +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"Sw" = ( +/obj/structure/rack, +/obj/item/ammo_box/a762_40{ + pixel_y = 6; + pixel_x = -1 + }, +/obj/item/ammo_box/c9mm{ + pixel_x = 4; + pixel_y = -5 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"SB" = ( +/obj/effect/landmark/start/warden, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/security) +"SI" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"SK" = ( +/obj/structure/sign/clip, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/medical) +"ST" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/southright{ + req_access = list(3) + }, +/obj/item/radio/intercom/table{ + pixel_y = -3; + pixel_x = 5 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"SW" = ( +/obj/structure/table/wood, +/obj/item/modular_computer/laptop/preset/civilian{ + pixel_y = 3 + }, +/turf/open/floor/holofloor/wood, +/area/ship/crew/crewtwo) +"Ti" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"Tx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewtwo) +"Ty" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"TA" = ( +/obj/effect/turf_decal/techfloor, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"TE" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/cargo) +"TK" = ( +/obj/structure/dresser{ + dir = 1 + }, +/turf/open/floor/carpet/blue, +/area/ship/crew/crewthree) +"TT" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/hallway/central) +"Uh" = ( +/obj/structure/rack, +/obj/item/clothing/suit/armor/vest/bulletproof{ + pixel_x = -9; + pixel_y = 11 + }, +/obj/item/clothing/suit/armor/vest/bulletproof{ + pixel_y = 6 + }, +/obj/item/clothing/suit/armor/vest/bulletproof{ + pixel_x = -9; + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/bulletproof{ + pixel_x = 4 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"Um" = ( +/obj/machinery/door/airlock/grunge{ + req_access = list(3) + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"UG" = ( +/obj/structure/table/optable, +/obj/effect/turf_decal/corner/transparent/blue/mono, +/turf/open/floor/plasteel/mono/white, +/area/ship/medical) +"UK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/carpet/blue, +/area/ship/crew) +"UP" = ( +/obj/effect/turf_decal/box/corners{ + dir = 4; + color = "#75A2BB" + }, +/obj/effect/turf_decal/box/corners{ + color = "#75A2BB" + }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 9 + }, +/obj/structure/weightmachine/weightlifter, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/pod/dark, +/area/ship/cargo) +"US" = ( +/obj/machinery/computer/cargo/express{ + dir = 8; + icon_state = "computer-right" + }, +/obj/effect/turf_decal/corner/transparent/blue/full, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"UY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/structure/catwalk/over, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/engineering) +"Vk" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 5; + pixel_x = 16 + }, +/obj/item/pen{ + pixel_y = 5; + pixel_x = 16 + }, +/obj/machinery/door/window/brigdoor/southleft{ + req_access = list(3) + }, +/obj/item/flashlight/lamp{ + pixel_x = -8; + pixel_y = 13 + }, +/obj/item/stamp{ + pixel_x = -9 + }, +/obj/item/stamp/denied, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"Vl" = ( +/obj/effect/turf_decal/corner/transparent/blue/border{ + dir = 8 + }, +/obj/structure/curtain, +/obj/effect/turf_decal/corner/transparent/blue/mono, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel/mono/white, +/area/ship/medical) +"Vo" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/ship/medical) +"Vq" = ( +/obj/structure/rack, +/obj/item/reagent_containers/spray/pepper{ + pixel_y = 11; + pixel_x = 8 + }, +/obj/item/reagent_containers/spray/pepper{ + pixel_y = 11; + pixel_x = -13 + }, +/obj/item/reagent_containers/spray/pepper{ + pixel_y = 9; + pixel_x = -6 + }, +/obj/item/reagent_containers/spray/pepper{ + pixel_y = 12 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/p16, +/obj/item/ammo_box/magazine/p16, +/obj/item/ammo_box/magazine/p16, +/obj/item/ammo_box/magazine/p16, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"Vw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewthree) +"VG" = ( +/obj/machinery/modular_computer/console/preset/command{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"VK" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/structure/table, +/obj/item/chair/plastic{ + pixel_y = 13; + pixel_x = -3 + }, +/obj/item/chair/plastic{ + pixel_y = 9; + pixel_x = 3 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) +"VQ" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/plasteel/stairs{ + dir = 1 + }, +/area/ship/engineering) +"VR" = ( +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) +"VT" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black/corner, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"VW" = ( +/obj/effect/decal/fakelattice{ + icon_state = "lattice-6" + }, +/obj/structure/lattice/catwalk, +/turf/open/floor/plating, +/area/ship/external/dark) +"Wi" = ( +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) +"Wk" = ( +/obj/machinery/door/airlock/medical, +/obj/effect/turf_decal/corner/transparent/blue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/white, +/area/ship/medical) +"Wr" = ( +/obj/machinery/door/airlock/grunge{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewtwo) +"WO" = ( +/obj/machinery/cryopod{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew) +"WQ" = ( +/obj/machinery/door/airlock/grunge{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) +"WR" = ( +/obj/structure/bed{ + dir = 1 + }, +/obj/item/bedsheet/blue{ + dir = 1 + }, +/obj/structure/curtain/cloth, +/turf/open/floor/carpet/blue, +/area/ship/crew) +"WZ" = ( +/obj/structure/catwalk/over, +/obj/machinery/firealarm/directional/east, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/engineering) +"Xc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewthree) +"Xg" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning{ + dir = 6 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"Xl" = ( +/obj/effect/turf_decal/trimline/transparent/blue/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/structure/railing, +/obj/machinery/firealarm/directional/north, +/obj/machinery/light_switch{ + pixel_y = 23; + pixel_x = 10 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"Xp" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"Ya" = ( +/turf/open/floor/plasteel/tech, +/area/ship/crew/canteen) +"Yt" = ( +/obj/docking_port/stationary{ + width = 30; + height = 15; + dwidth = 15 + }, +/turf/template_noop, +/area/template_noop) +"Yu" = ( +/obj/item/reagent_containers/food/snacks/cakeslice/birthday{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) +"Yw" = ( +/obj/machinery/door/airlock/mining, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/cargo) +"YK" = ( +/obj/structure/closet/crate/bin, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewthree) +"YM" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "atlas_fo" + }, +/turf/open/floor/plating, +/area/ship/crew/crewtwo) +"YO" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) +"Zd" = ( +/obj/structure/bed/dogbed{ + anchored = 1; + name = "Mushroom's bed"; + desc = "A comfy-looking dog bed. Despite the name, the owner is a mothroach." + }, +/mob/living/simple_animal/pet/mothroach{ + name = "Mushroom"; + desc = "Master Sergeant Mushroom is assigned to overwatch C-MM armory officers. Don't let him eat the armor." + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/storage/fancy/egg_box{ + pixel_x = 11; + pixel_y = 7 + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/security) +"Ze" = ( +/obj/machinery/washing_machine, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 10 + }, +/obj/effect/turf_decal/box/corners{ + dir = 4; + color = "#75A2BB" + }, +/obj/effect/turf_decal/box/corners{ + dir = 1; + color = "#75A2BB" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/canteen) +"Zo" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 5; + pixel_x = 11 + }, +/obj/item/pen{ + pixel_y = 5; + pixel_x = 11 + }, +/obj/item/papercutter{ + pixel_x = -2; + pixel_y = 5 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"Zs" = ( +/obj/machinery/door/airlock/command{ + dir = 4 + }, +/obj/effect/turf_decal/corner_techfloor_gray{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) +"ZE" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/crewtwo) +"ZG" = ( +/obj/structure/sign/poster/clip/enlist{ + pixel_y = 32 + }, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/carpet/blue, +/area/ship/crew) +"ZU" = ( +/obj/structure/closet/firecloset/wall{ + dir = 8; + pixel_x = 28 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) +"ZZ" = ( +/obj/machinery/computer/communications{ + dir = 8; + icon_state = "computer-middle" + }, +/obj/effect/turf_decal/corner/transparent/blue/full, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) + +(1,1,1) = {" +ps +ps +ms +ps +ps +ps +ps +ps +ps +ps +ps +ps +ps +ps +ps +ps +ps +ps +lA +ps +ps +"} +(2,1,1) = {" +ps +ps +PU +PU +Bm +Bm +PU +ps +ps +PU +sD +PU +ps +ps +PU +Bm +Bm +PU +PU +ps +ps +"} +(3,1,1) = {" +ps +ps +PU +Ti +af +af +PU +Bm +Bm +PU +zf +PU +Bm +Bm +PU +af +af +Hl +PU +ps +ps +"} +(4,1,1) = {" +ps +ps +pp +eW +bK +bK +PU +af +af +PU +sD +PU +af +af +PU +bK +JR +TA +pp +ps +ps +"} +(5,1,1) = {" +ps +ps +pp +Py +Yu +fM +vo +wc +bK +Hh +Qg +wd +zE +zE +Eo +Rv +Mu +MH +pp +ps +ps +"} +(6,1,1) = {" +ps +bF +vZ +VK +Kf +jR +iN +sh +vw +UY +OA +vd +WZ +VQ +PX +mK +Xp +Cr +pp +ps +ps +"} +(7,1,1) = {" +ps +ps +mN +PU +Cc +qS +fd +PU +WQ +PU +PU +PU +PU +PU +BL +qG +wU +PU +mN +ps +ps +"} +(8,1,1) = {" +ps +ps +ps +PU +PU +PU +PU +tW +eK +tW +Ze +fL +Gj +tW +PU +PU +PU +PU +ps +ps +ps +"} +(9,1,1) = {" +ps +ps +ps +ps +LE +LE +LE +tW +em +tW +zl +Ya +gk +tW +LE +LE +LE +ps +ps +ps +ps +"} +(10,1,1) = {" +ps +ps +gT +gT +gT +gT +gT +tW +VT +Pd +kt +kt +gU +tW +HW +HW +HW +HW +HW +ps +ps +"} +(11,1,1) = {" +ps +gT +gT +kd +gE +Bx +gT +kE +nS +jI +fp +Do +Sb +nQ +HW +WR +us +An +HW +HW +ps +"} +(12,1,1) = {" +ps +gT +Vq +Sw +dV +jp +gT +jG +jc +jI +vy +nW +FF +PK +HW +ZG +fR +fR +WR +di +ps +"} +(13,1,1) = {" +ps +gT +ny +VR +aX +qR +Vk +ct +oY +nl +oa +nW +FF +nY +HW +fg +wJ +UK +vT +di +ps +"} +(14,1,1) = {" +ps +gT +Rz +Uh +dV +SB +ST +ct +oY +Wi +am +dM +BI +cm +Rf +Ej +yi +aI +WR +di +ps +"} +(15,1,1) = {" +ps +gT +yo +fs +QC +sl +gT +Xl +oY +Wi +Qt +OQ +iS +hg +HW +HW +Es +HW +HW +HW +ps +"} +(16,1,1) = {" +ps +gT +bQ +QS +sI +EP +gT +CZ +Aa +nl +FI +Do +FF +kv +NE +HW +lJ +sP +wi +HW +ps +"} +(17,1,1) = {" +ps +gT +yZ +Oj +zQ +PT +Um +Cq +wk +jI +Pn +Do +FF +kv +nU +HW +WO +mf +nO +HW +ps +"} +(18,1,1) = {" +ps +lA +gT +gT +Zd +Ig +gT +sL +IY +jI +uU +Do +FF +KB +HW +HW +HW +HW +HW +lA +ps +"} +(19,1,1) = {" +ps +ps +ps +gT +Pi +MC +gT +eJ +RM +gu +ES +bS +Ss +wy +eB +Qj +PD +HW +ps +ps +ps +"} +(20,1,1) = {" +ps +ps +ps +gT +TE +TE +TE +TE +HX +PV +HX +PV +HX +CO +CO +CO +CO +HW +ps +ps +ps +"} +(21,1,1) = {" +ps +ps +ps +ps +TE +OV +No +TE +ev +sB +Ot +ia +OW +CO +gy +zc +CO +ps +ps +ps +ps +"} +(22,1,1) = {" +ps +ps +ps +Qz +TE +Ld +yn +TE +TE +zt +tF +Ty +CO +CO +cY +cY +CO +SK +ps +ps +ps +"} +(23,1,1) = {" +ps +ps +ps +Hu +Lw +le +YO +Hg +Yw +TT +hL +TT +gw +aC +FQ +mS +CX +CO +ps +ps +ps +"} +(24,1,1) = {" +ps +ps +Yt +Hu +nX +jZ +jZ +yI +TE +hQ +rk +Ln +CO +Dq +aa +aa +vS +Vo +ps +ps +ps +"} +(25,1,1) = {" +ps +ps +ps +Hu +nX +jZ +jZ +UP +TE +wW +rk +JU +CO +we +uO +aa +yR +Vo +ps +ps +ps +"} +(26,1,1) = {" +ps +ps +ps +kS +Ml +le +Da +SI +nP +yB +ix +yB +Wk +zx +AH +qA +xU +CO +ps +ps +ps +"} +(27,1,1) = {" +ps +ps +ps +Qz +TE +ov +nm +TE +TE +yT +ec +uY +CO +CO +uL +Vl +CO +SK +ps +ps +ps +"} +(28,1,1) = {" +ps +ps +ps +ps +TE +IK +xz +TE +MO +Fv +lY +uQ +wl +CO +fF +UG +CO +ps +ps +ps +ps +"} +(29,1,1) = {" +da +VW +Ey +Fu +TE +TE +TE +TE +kG +kL +lY +BW +si +CO +CO +CO +CO +VW +Ey +Fu +da +"} +(30,1,1) = {" +FN +FN +xi +HX +HX +EJ +aS +uY +is +Xg +lY +oJ +is +uY +aS +EJ +HX +HX +xi +da +da +"} +(31,1,1) = {" +FN +FN +FN +FN +Cn +lc +gH +QG +gH +fi +jL +AP +gH +QG +gH +RQ +OW +da +da +da +da +"} +(32,1,1) = {" +Sp +jQ +hR +FN +FN +oX +FN +FN +rR +BH +kX +pq +ZU +da +da +Wr +da +da +SW +Av +gR +"} +(33,1,1) = {" +Sp +rz +NY +hq +Xc +uX +sF +LM +LM +Jb +LM +Zs +LM +LM +rO +Ni +Tx +iw +MQ +CM +gR +"} +(34,1,1) = {" +Sp +RL +cc +yC +Vw +YK +LM +LM +JV +FO +tq +EZ +ED +LM +LM +of +Ay +aw +Hf +IP +gR +"} +(35,1,1) = {" +lA +FN +LH +uG +ry +LM +zq +Mq +qn +Qw +ux +Pk +qb +pn +LM +LM +ZE +Rt +EH +da +lA +"} +(36,1,1) = {" +ps +FN +FN +vW +TK +LM +wu +js +js +Ir +gA +gF +js +js +lw +LM +mh +cV +da +da +ps +"} +(37,1,1) = {" +ps +Je +FN +yO +PG +LM +tP +DL +Zo +qr +qP +dw +uC +QM +VG +LM +EB +Km +da +Je +ps +"} +(38,1,1) = {" +ps +Je +FN +Gt +eH +LM +qc +LM +iO +RU +ZZ +US +Lp +LM +qc +LM +iW +yx +da +Je +ps +"} +(39,1,1) = {" +ps +ps +Cm +tc +tc +LM +ps +LM +qc +qc +qc +qc +qc +LM +ps +LM +YM +YM +Ob +ps +ps +"} diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 75498600b007..f1efc958a88e 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -836,8 +836,11 @@ DEFINE_BITFIELD(turret_flags, list( stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg' desc = "A ballistic machine gun auto-turret." +/obj/machinery/porta_turret/ship/ballistic/clip + faction = list(FACTION_PLAYER_MINUTEMAN, "turret") + /obj/machinery/porta_turret/ship/solgov - faction = list("playerSolgov", "turret") + faction = list(FACTION_PLAYER_SOLGOV, "turret") /obj/machinery/porta_turret/ship/syndicate faction = list(FACTION_PLAYER_SYNDICATE, "turret") From d8b8efd21f3f070366d4f293e21be4259600cb5a Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:17:37 -0400 Subject: [PATCH 02/17] Update minutemen_atlas.dmm --- _maps/shuttles/minutemen/minutemen_atlas.dmm | 304 +++++++++++-------- 1 file changed, 174 insertions(+), 130 deletions(-) diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm index 847c28bb1bee..46e0631a117a 100644 --- a/_maps/shuttles/minutemen/minutemen_atlas.dmm +++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm @@ -1,6 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/machinery/iv_drip, +/obj/effect/turf_decal/corner/transparent/blue{ + dir = 9 + }, +/obj/machinery/holopad/emergency/medical, /turf/open/floor/plasteel/white, /area/ship/medical) "af" = ( @@ -22,14 +26,18 @@ /area/ship/crew/crewtwo) "aC" = ( /obj/effect/turf_decal/corner/transparent/blue/diagonal, -/obj/effect/turf_decal/spline/fancy/opaque/white/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/airalarm/directional/west, /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/turf_decal/spline/fancy/opaque/white/corner, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23 + }, +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "aI" = ( @@ -175,7 +183,7 @@ /obj/effect/turf_decal/minutemen/corner{ dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "dM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -441,12 +449,13 @@ /obj/structure/closet/crate/freezer/blood, /obj/effect/turf_decal/corner/transparent/blue/mono, /obj/machinery/light/small/directional/west, +/obj/machinery/airalarm/directional/north, /turf/open/floor/plasteel/mono/white, /area/ship/medical) "gA" = ( /obj/machinery/holopad/emergency/command, /obj/effect/turf_decal/minutemen/middle, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "gE" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner{ @@ -469,7 +478,7 @@ /obj/effect/turf_decal/minutemen/edge{ dir = 1 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "gH" = ( /obj/structure/catwalk/over/plated_catwalk/dark, @@ -681,7 +690,7 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/security) "js" = ( -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "jG" = ( /obj/effect/turf_decal/trimline/transparent/blue/corner{ @@ -824,7 +833,7 @@ dir = 4 }, /obj/effect/landmark/start/head_of_personnel, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "lA" = ( /obj/machinery/porta_turret/ship/ballistic/clip, @@ -855,21 +864,21 @@ dir = 4 }, /obj/structure/table, -/obj/item/radio/off{ - pixel_x = 9; - pixel_y = 11 +/obj/item/radio{ + pixel_y = 13; + pixel_x = -5 }, -/obj/item/radio/off{ - pixel_x = 7; - pixel_y = 9 +/obj/item/radio{ + pixel_y = 15; + pixel_x = 7 }, -/obj/item/radio/off{ - pixel_x = -1; - pixel_y = 9 +/obj/item/radio{ + pixel_y = 8; + pixel_x = 7 }, -/obj/item/radio/off{ - pixel_x = 4; - pixel_y = 7 +/obj/item/radio{ + pixel_y = 6; + pixel_x = -5 }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew) @@ -906,6 +915,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/effect/turf_decal/spline/fancy/opaque/white/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "nl" = ( @@ -1146,6 +1161,9 @@ /area/ship/crew/canteen) "pn" = ( /obj/machinery/blackbox_recorder, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 9 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "pp" = ( @@ -1170,6 +1188,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 8 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "qc" = ( @@ -1183,19 +1204,28 @@ /area/ship/bridge) "qn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 1 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "qr" = ( /obj/effect/turf_decal/minutemen/corner{ dir = 8 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "qA" = ( /obj/effect/turf_decal/corner/transparent/blue/diagonal, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/effect/turf_decal/spline/fancy/opaque/white/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 6 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "qG" = ( @@ -1225,7 +1255,7 @@ dir = 4 }, /obj/effect/landmark/start/captain, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "qR" = ( /obj/structure/chair/office, @@ -1287,7 +1317,7 @@ /area/ship/crew/crewtwo) "rR" = ( /obj/structure/closet/emcloset/wall{ - dir = 8; + dir = 4; pixel_x = 28 }, /obj/effect/turf_decal/techfloor{ @@ -1401,6 +1431,9 @@ /obj/structure/closet/crate/bin{ pixel_y = 11 }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "sP" = ( @@ -1417,9 +1450,6 @@ /turf/open/floor/plating, /area/ship/crew/crewthree) "tq" = ( -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, /obj/machinery/firealarm/directional/west, /obj/machinery/light_switch{ dir = 4; @@ -1429,7 +1459,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/mineral/plastitanium, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "tF" = ( /obj/structure/catwalk/over/plated_catwalk/dark, @@ -1480,7 +1513,7 @@ /obj/effect/turf_decal/minutemen/edge{ dir = 4 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "uC" = ( /obj/structure/table/reinforced, @@ -1503,27 +1536,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/dark, /area/ship/crew/crewthree) -"uL" = ( -/obj/structure/mirror{ - pixel_y = 28 - }, -/obj/structure/sink{ - pixel_y = 12; - pixel_x = 1 - }, -/obj/effect/turf_decal/corner/transparent/blue/border{ - dir = 8 - }, -/obj/structure/curtain, -/obj/effect/turf_decal/corner/transparent/blue/mono, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plasteel/mono/white, -/area/ship/medical) "uO" = ( -/obj/effect/turf_decal/corner/transparent/blue/diagonal, -/obj/effect/landmark/start/medical_doctor, +/obj/structure/bed/roller, +/obj/effect/turf_decal/corner/transparent/blue{ + dir = 6 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "uQ" = ( @@ -1624,8 +1641,7 @@ pixel_y = 5; pixel_x = 6 }, -/obj/effect/turf_decal/corner/transparent/blue/diagonal, -/obj/effect/turf_decal/spline/fancy/opaque/white, +/obj/effect/turf_decal/corner/transparent/blue/full, /turf/open/floor/plasteel/white, /area/ship/medical) "vT" = ( @@ -1669,14 +1685,13 @@ /area/ship/engineering) "we" = ( /obj/effect/turf_decal/corner/transparent/blue/diagonal, -/obj/machinery/iv_drip, -/obj/effect/turf_decal/spline/fancy/opaque/white{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/light/directional/north, +/obj/effect/turf_decal/spline/fancy/opaque/white, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "wi" = ( @@ -1708,7 +1723,7 @@ dir = 4 }, /obj/machinery/airalarm/directional/north, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "wy" = ( /obj/effect/turf_decal/trimline/transparent/blue/warning, @@ -1779,13 +1794,13 @@ pixel_x = -6; pixel_y = -7 }, -/obj/effect/turf_decal/corner/transparent/blue/diagonal, /obj/item/clothing/head/clip/corpsman{ pixel_y = 8; pixel_x = 9 }, -/obj/effect/turf_decal/spline/fancy/opaque/white, /obj/structure/table/glass, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/corner/transparent/blue/full, /turf/open/floor/plasteel/white, /area/ship/medical) "yi" = ( @@ -1881,6 +1896,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/holopad/emergency/counselor, /turf/open/floor/plasteel/dark, /area/ship/crew/crewthree) "yI" = ( @@ -1910,8 +1926,16 @@ /turf/open/floor/carpet/blue, /area/ship/crew/crewthree) "yR" = ( -/obj/effect/turf_decal/corner/transparent/blue/diagonal, /obj/structure/table/glass, +/obj/item/roller{ + pixel_y = 15; + pixel_x = -6 + }, +/obj/item/roller{ + pixel_y = 6; + pixel_x = -7 + }, +/obj/effect/turf_decal/corner/transparent/blue/full, /turf/open/floor/plasteel/white, /area/ship/medical) "yT" = ( @@ -1951,7 +1975,8 @@ }, /obj/effect/turf_decal/corner/transparent/blue/mono, /obj/item/storage/firstaid/regular{ - pixel_y = 12 + pixel_y = 8; + pixel_x = -4 }, /turf/open/floor/plasteel/mono/white, /area/ship/medical) @@ -1980,15 +2005,18 @@ /area/ship/hallway/central) "zx" = ( /obj/effect/turf_decal/corner/transparent/blue/diagonal, -/obj/effect/turf_decal/spline/fancy/opaque/white/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/turf_decal/spline/fancy/opaque/white/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "zE" = ( @@ -2060,6 +2088,12 @@ "AH" = ( /obj/effect/turf_decal/corner/transparent/blue/diagonal, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/spline/fancy/opaque/white{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "AP" = ( @@ -2199,6 +2233,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/trimline/transparent/blue/filled/warning{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Cr" = ( @@ -2238,8 +2275,8 @@ pixel_x = -5; pixel_y = -3 }, -/obj/effect/turf_decal/corner/transparent/blue/diagonal, -/obj/effect/turf_decal/spline/fancy/opaque/white, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/corner/transparent/blue/full, /turf/open/floor/plasteel/white, /area/ship/medical) "CZ" = ( @@ -2250,6 +2287,9 @@ dir = 8 }, /obj/structure/railing, +/obj/effect/turf_decal/trimline/transparent/blue/filled/corner{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Da" = ( @@ -2264,17 +2304,20 @@ /area/ship/crew/canteen) "Dq" = ( /obj/effect/turf_decal/corner/transparent/blue/diagonal, -/obj/structure/bed, -/obj/item/bedsheet, -/obj/effect/turf_decal/spline/fancy/opaque/white{ - dir = 1 - }, -/obj/machinery/light_switch{ - pixel_y = 23 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/spline/fancy/opaque/white, +/obj/structure/sink{ + pixel_y = 12; + pixel_x = 1 + }, +/obj/structure/mirror{ + pixel_y = 28 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "DL" = ( @@ -2334,10 +2377,8 @@ /obj/item/kirbyplants{ icon_state = "plant-02" }, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, /obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/corner_steel_grid/full, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "EH" = ( @@ -2395,12 +2436,6 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "EZ" = ( -/obj/effect/turf_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -2452,12 +2487,6 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/crewthree) "FO" = ( -/obj/effect/turf_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/turf_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -2472,6 +2501,13 @@ "FQ" = ( /obj/effect/turf_decal/corner/transparent/blue/diagonal, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/spline/fancy/opaque/white{ + dir = 4 + }, +/obj/effect/landmark/start/medical_doctor, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "Gj" = ( @@ -2534,8 +2570,21 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/hallway/central) "Ig" = ( -/obj/machinery/door/window/westright{ - req_access = list(3) +/obj/structure/bed/dogbed{ + anchored = 1; + name = "Mushroom's bed"; + desc = "A comfy-looking dog bed. Despite the name, the owner is a mothroach." + }, +/mob/living/simple_animal/pet/mothroach{ + name = "Mushroom"; + desc = "Master Sergeant Mushroom is assigned to overwatch C-MM armory officers. Don't let him eat the armor." + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/storage/fancy/egg_box{ + pixel_x = 11; + pixel_y = 7 }, /obj/machinery/light/directional/south, /turf/open/floor/plasteel/mono/dark, @@ -2543,7 +2592,7 @@ "Ir" = ( /obj/effect/turf_decal/spline/fancy/opaque/black, /obj/effect/turf_decal/minutemen/edge, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "IK" = ( /obj/effect/turf_decal/box/corners{ @@ -2632,13 +2681,13 @@ /obj/item/kirbyplants{ icon_state = "plant-02" }, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ icon_state = "0-2" }, +/obj/effect/turf_decal/corner_steel_grid/full{ + dir = 8 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "Kf" = ( @@ -2746,6 +2795,9 @@ pixel_y = 11; pixel_x = -10 }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 9 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "Mu" = ( @@ -2782,7 +2834,7 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "MQ" = ( -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/beige, /turf/open/floor/holofloor/wood, /area/ship/crew/crewtwo) "Ni" = ( @@ -2823,8 +2875,8 @@ /turf/open/floor/pod/dark, /area/ship/crew/canteen) "NY" = ( -/obj/structure/chair/comfy/black{ - dir = 8 +/obj/structure/chair/comfy/blue{ + dir = 1 }, /turf/open/floor/holofloor/wood, /area/ship/crew/crewthree) @@ -2945,7 +2997,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "Pn" = ( /obj/structure/table, @@ -2974,7 +3026,7 @@ }, /obj/effect/turf_decal/floordetail/pryhole, /obj/machinery/light/small/directional/west, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/plastic, /area/ship/crew) "PG" = ( /obj/machinery/light/directional/south, @@ -3090,7 +3142,7 @@ /obj/item/clothing/head/wig/random{ pixel_x = 11 }, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/plastic, /area/ship/crew) "Qt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -3101,7 +3153,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/turf/open/floor/mineral/plastitanium, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "Qz" = ( /obj/structure/sign/clip, @@ -3227,10 +3279,6 @@ pixel_y = 9; pixel_x = 1 }, -/obj/item/clothing/mask/cigarette/cigar{ - pixel_x = -10; - pixel_y = 1 - }, /obj/item/clothing/mask/cigarette/pipe{ pixel_x = 10 }, @@ -3275,7 +3323,7 @@ dir = 8; icon_state = "computer-left" }, -/obj/effect/turf_decal/corner/transparent/blue/full, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "Sb" = ( @@ -3460,6 +3508,14 @@ }, /turf/open/floor/plasteel/dark, /area/ship/security) +"UC" = ( +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/effect/turf_decal/spline/fancy/opaque/white{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/plasteel/white, +/area/ship/medical) "UG" = ( /obj/structure/table/optable, /obj/effect/turf_decal/corner/transparent/blue/mono, @@ -3494,7 +3550,7 @@ dir = 8; icon_state = "computer-right" }, -/obj/effect/turf_decal/corner/transparent/blue/full, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "UY" = ( @@ -3595,6 +3651,7 @@ dir = 8 }, /obj/machinery/light/directional/south, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "VK" = ( @@ -3853,21 +3910,8 @@ /turf/open/floor/plasteel/tech, /area/ship/cargo) "Zd" = ( -/obj/structure/bed/dogbed{ - anchored = 1; - name = "Mushroom's bed"; - desc = "A comfy-looking dog bed. Despite the name, the owner is a mothroach." - }, -/mob/living/simple_animal/pet/mothroach{ - name = "Mushroom"; - desc = "Master Sergeant Mushroom is assigned to overwatch C-MM armory officers. Don't let him eat the armor." - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/storage/fancy/egg_box{ - pixel_x = 11; - pixel_y = 7 +/obj/machinery/door/window/westright{ + req_access = list(3) }, /turf/open/floor/plasteel/mono/dark, /area/ship/security) @@ -3943,7 +3987,7 @@ /area/ship/crew) "ZU" = ( /obj/structure/closet/firecloset/wall{ - dir = 8; + dir = 4; pixel_x = 28 }, /obj/effect/turf_decal/techfloor{ @@ -3956,7 +4000,7 @@ dir = 8; icon_state = "computer-middle" }, -/obj/effect/turf_decal/corner/transparent/blue/full, +/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) @@ -4379,8 +4423,8 @@ ps ps ps gT -Pi MC +Pi gT eJ RM @@ -4505,7 +4549,7 @@ Ln CO Dq aa -aa +UC vS Vo ps @@ -4528,7 +4572,7 @@ JU CO we uO -aa +UC yR Vo ps @@ -4573,7 +4617,7 @@ ec uY CO CO -uL +Vl Vl CO SK From 1108db868611aa72cb1ae101ed7faacf1d447b45 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Wed, 24 Jul 2024 22:11:02 -0400 Subject: [PATCH 03/17] i must eat goblins --- _maps/configs/minutemen_atlas.json | 17 +- _maps/shuttles/minutemen/minutemen_atlas.dmm | 883 +++++++++++++----- .../clothing/outfits/factions/minutemen.dm | 2 +- 3 files changed, 681 insertions(+), 221 deletions(-) diff --git a/_maps/configs/minutemen_atlas.json b/_maps/configs/minutemen_atlas.json index c6f2f5014a74..0976d1a0c4c5 100644 --- a/_maps/configs/minutemen_atlas.json +++ b/_maps/configs/minutemen_atlas.json @@ -3,9 +3,10 @@ "map_name": "Atlas-class Light Armored Crusier", "prefix": "CMSV", "namelists": ["GENERAL", "CLIP MINUTEMEN", "NATURAL_AGGRESSIVE"], - "description": "The Atlas-Class follows the designation of some of the oldest serving vessels in the Confederated League's military fleet. Originally intended as a supply barge, the Atlas was taken by C-MM shipwrights and repurposed to carry a decently-sized team of Minutemen while not putting a major strain on the League's resources.", + "description": "The Atlas-Class is the designation for some of the oldest serving vessels in the Confederated League's military fleet. Originally the Atlantas-class, the design of the Atlantas was taken by the Colonial Militia just before the beginning of the war with the Old Frontiersmen, playing a pivotal role in multiple skirmishes. It is small in size and crew, well-suited and well-rounded as an unexpensive hit-and-run vessel, and despite its age, the Atlas continues to serve the Confederated League for peacekeeping missions and driving off small crews of pirates from colonies.", "tags": [ - "Combat" + "Combat", + "Generalist" ], "map_short_name": "Atlas-class", "starting_funds": 1000, @@ -22,22 +23,22 @@ "officer": true, "slots": 1 }, - "Staff Sergeant": { + "Sergeant": { "outfit": "/datum/outfit/job/clip/minutemen/grunt/lead", "officer": true, "slots": 1 }, - "Minuteman": { - "outfit": "/datum/outfit/job/clip/minutemen/grunt", - "slots": 4 - }, "Corpsman": { "outfit": "/datum/outfit/job/clip/minutemen/doctor", "slots": 1 }, "Engineer": { "outfit": "/datum/outfit/job/clip/minutemen/engineer", - "slots": 2 + "slots": 1 + }, + "Minuteman": { + "outfit": "/datum/outfit/job/clip/minutemen/grunt", + "slots": 4 }, "Deckhand": { "outfit": "/datum/outfit/job/clip/minutemen/grunt/reserve", diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm index 46e0631a117a..ebd49d8669c7 100644 --- a/_maps/shuttles/minutemen/minutemen_atlas.dmm +++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm @@ -1,16 +1,29 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/machinery/iv_drip, /obj/effect/turf_decal/corner/transparent/blue{ dir = 9 }, -/obj/machinery/holopad/emergency/medical, +/obj/structure/table/chem, +/obj/item/paper_bin{ + pixel_y = 5; + pixel_x = 6 + }, +/obj/item/pen{ + pixel_y = 5; + pixel_x = 6 + }, +/obj/item/folder/white{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/folder/white{ + pixel_x = -8; + pixel_y = 2 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "af" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, +/obj/machinery/power/smes/shuttle/precharged, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -18,10 +31,12 @@ /area/ship/engineering) "am" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/grimy, /area/ship/crew/canteen) "aw" = ( /obj/effect/turf_decal/siding/wood, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/crew/crewtwo) "aC" = ( @@ -151,6 +166,17 @@ /obj/structure/railing, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) +"cN" = ( +/obj/item/cigbutt{ + pixel_x = 5 + }, +/obj/item/cigbutt{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) "cV" = ( /obj/structure/sign/poster/clip/random{ pixel_y = -32 @@ -164,11 +190,11 @@ /obj/effect/turf_decal/corner/transparent/blue/border{ dir = 4 }, -/obj/structure/curtain, /obj/effect/turf_decal/corner/transparent/blue/mono, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/structure/curtain/cloth, /turf/open/floor/plasteel/mono/white, /area/ship/medical) "da" = ( @@ -187,6 +213,7 @@ /area/ship/bridge) "dM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/grimy, /area/ship/crew/canteen) "dV" = ( @@ -248,6 +275,27 @@ name = "captain's locker"; req_access_txt = "20" }, +/obj/item/clothing/suit/armor/clip_capcoat{ + pixel_x = -14 + }, +/obj/item/clothing/under/clip/officer{ + pixel_x = 13 + }, +/obj/item/clothing/under/clip/officer/alt{ + pixel_x = 13 + }, +/obj/item/radio/headset/clip/captain{ + pixel_x = 7 + }, +/obj/item/clothing/head/clip/slouch/officer{ + pixel_y = 13 + }, +/obj/item/storage/pistolcase/candor{ + pixel_y = -16 + }, +/obj/item/ammo_box/c45{ + pixel_y = -10 + }, /turf/open/floor/carpet/blue, /area/ship/crew/crewthree) "eJ" = ( @@ -279,13 +327,15 @@ }, /turf/open/floor/plasteel/tech, /area/ship/crew/canteen) +"eU" = ( +/obj/effect/landmark/start/security_officer, +/obj/structure/chair, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) "eW" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/structure/closet/secure_closet/engineering_personal, /obj/effect/decal/cleanable/confetti, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "fd" = ( /obj/machinery/atmospherics/components/unary/tank/air{ @@ -294,9 +344,6 @@ /obj/structure/railing{ layer = 3.31 }, -/obj/effect/turf_decal/corner_steel_grid{ - dir = 5 - }, /obj/effect/turf_decal/box/corners{ color = "#75A2BB" }, @@ -307,7 +354,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "fg" = ( /obj/effect/turf_decal/siding/wood{ @@ -364,17 +411,12 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/security) "fF" = ( -/obj/structure/table/glass, /obj/effect/turf_decal/corner/transparent/blue/mono, -/obj/item/book/manual/wiki/surgery{ - pixel_x = 6; - pixel_y = 1 - }, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_x = -2; - pixel_y = 8 - }, /obj/machinery/light/small/directional/east, +/obj/structure/sink{ + pixel_y = 19; + pixel_x = 7 + }, /turf/open/floor/plasteel/mono/white, /area/ship/medical) "fL" = ( @@ -402,7 +444,10 @@ /area/ship/crew) "gk" = ( /obj/machinery/light/directional/south, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 5 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/crew/canteen) "gu" = ( /obj/effect/decal/cleanable/dirt, @@ -565,8 +610,9 @@ /obj/structure/sign/poster/official/moth/smokey{ pixel_x = -32 }, -/obj/item/modular_computer/laptop/preset/civilian/rilena{ - pixel_y = 4 +/obj/item/modular_computer/laptop/preset/civilian{ + pixel_y = 5; + pixel_x = 2 }, /turf/open/floor/holofloor/wood, /area/ship/crew/crewthree) @@ -659,6 +705,27 @@ name = "first officer's locker"; req_access_txt = "19" }, +/obj/item/storage/pistolcase/candor{ + pixel_y = -16 + }, +/obj/item/ammo_box/c45{ + pixel_y = -10 + }, +/obj/item/clothing/head/clip/slouch/officer{ + pixel_y = 13 + }, +/obj/item/radio/headset/clip/captain{ + pixel_x = 7 + }, +/obj/item/clothing/under/clip/officer/alt{ + pixel_x = 13 + }, +/obj/item/clothing/under/clip/officer{ + pixel_x = 13 + }, +/obj/item/clothing/suit/toggle/lawyer/clip/fo{ + pixel_x = -13 + }, /turf/open/floor/carpet/nanoweave/blue, /area/ship/crew/crewtwo) "jc" = ( @@ -721,8 +788,14 @@ "jQ" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ - pixel_y = 4 + pixel_y = 7; + pixel_x = 12 }, +/obj/item/melee/chainofcommand{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/radio/intercom/directional/west, /turf/open/floor/holofloor/wood, /area/ship/crew/crewthree) "jR" = ( @@ -790,6 +863,7 @@ /area/ship/crew/canteen) "kG" = ( /obj/structure/table, +/obj/item/storage/cans/sixsoda, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "kL" = ( @@ -807,6 +881,7 @@ /obj/effect/turf_decal/techfloor{ dir = 4 }, +/obj/structure/closet/crate/bin, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "lc" = ( @@ -864,26 +939,54 @@ dir = 4 }, /obj/structure/table, -/obj/item/radio{ - pixel_y = 13; - pixel_x = -5 - }, +/obj/structure/closet/wall/directional/east, /obj/item/radio{ pixel_y = 15; pixel_x = 7 }, /obj/item/radio{ - pixel_y = 8; + pixel_y = 9; pixel_x = 7 }, /obj/item/radio{ - pixel_y = 6; - pixel_x = -5 + pixel_y = 9; + pixel_x = 4 + }, +/obj/item/radio{ + pixel_y = 9 + }, +/obj/item/radio{ + pixel_y = 9; + pixel_x = -4 + }, +/obj/item/radio{ + pixel_y = 9; + pixel_x = -9 + }, +/obj/item/radio{ + pixel_y = 15; + pixel_x = 4 + }, +/obj/item/radio{ + pixel_y = 15 + }, +/obj/item/radio{ + pixel_y = 15; + pixel_x = -4 + }, +/obj/item/radio{ + pixel_y = 15; + pixel_x = -9 }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew) "mh" = ( /obj/structure/dresser, +/obj/machinery/button/door{ + pixel_y = 23; + id = "atlas_fo"; + name = "private windows button" + }, /turf/open/floor/carpet/nanoweave/blue, /area/ship/crew/crewtwo) "ms" = ( @@ -904,6 +1007,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "mN" = ( @@ -973,11 +1079,11 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/structure/guncase, /obj/effect/turf_decal/techfloor{ dir = 1 }, /obj/machinery/airalarm/directional/north, +/obj/structure/guncloset, /turf/open/floor/plasteel/tech/grid, /area/ship/security) "nO" = ( @@ -1002,9 +1108,33 @@ /turf/open/floor/plasteel/dark, /area/ship/cargo) "nQ" = ( -/obj/effect/turf_decal/trimline/transparent/blue/corner, +/obj/structure/table, +/obj/item/kitchen/fork/plastic{ + pixel_x = -10 + }, +/obj/item/kitchen/fork/plastic{ + pixel_x = -8 + }, +/obj/item/kitchen/fork/plastic{ + pixel_x = -6 + }, +/obj/item/kitchen/fork/plastic{ + pixel_x = -4 + }, +/obj/item/kitchen/knife/plastic{ + pixel_x = 12 + }, +/obj/item/kitchen/knife/plastic{ + pixel_x = 10 + }, +/obj/item/kitchen/knife/plastic{ + pixel_x = 8 + }, +/obj/item/kitchen/knife/plastic{ + pixel_x = 6 + }, /obj/machinery/light/directional/south, -/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/trimline/transparent/blue/corner, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "nS" = ( @@ -1093,8 +1223,29 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew/canteen) "of" = ( -/obj/structure/closet/crate/bin, /obj/machinery/firealarm/directional/north, +/obj/item/paperplane{ + pixel_y = 5 + }, +/obj/structure/fluff/paper/stack{ + name = "stack of papers"; + desc = "Seems like someone needs to work on their aim."; + pixel_x = 4; + pixel_y = -4; + dir = 4 + }, +/obj/structure/closet/crate/bin{ + pixel_y = 12; + pixel_x = 5 + }, +/obj/item/paperplane{ + pixel_x = 9; + pixel_y = 10 + }, +/obj/item/paperplane{ + pixel_x = 2; + pixel_y = 10 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/crewtwo) "ov" = ( @@ -1117,6 +1268,7 @@ dir = 5; pixel_y = -1 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "oX" = ( @@ -1169,6 +1321,9 @@ "pp" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "atlas_engi_lockdown" + }, /turf/open/floor/plating, /area/ship/engineering) "pq" = ( @@ -1191,6 +1346,9 @@ /obj/effect/turf_decal/corner_steel_grid{ dir = 8 }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "qc" = ( @@ -1198,7 +1356,7 @@ /obj/structure/window/reinforced/fulltile, /obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - id = "atlas_bridge" + id = "atlas_bridge_lockdown" }, /turf/open/floor/plating, /area/ship/bridge) @@ -1207,6 +1365,7 @@ /obj/effect/turf_decal/corner_steel_grid{ dir = 1 }, +/obj/structure/railing, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "qr" = ( @@ -1233,16 +1392,14 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, +/obj/effect/turf_decal/industrial, /obj/structure/sign/warning/nosmoking{ pixel_x = 32 }, /obj/structure/cable/yellow{ icon_state = "0-8" }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "qP" = ( /obj/effect/turf_decal/spline/fancy/opaque/black{ @@ -1262,20 +1419,15 @@ /obj/effect/turf_decal/trimline/transparent/blue/filled/line{ dir = 1 }, +/obj/effect/landmark/start/warden, /turf/open/floor/plasteel/mono/dark, /area/ship/security) "qS" = ( /obj/machinery/portable_atmospherics/canister/air, -/obj/effect/turf_decal/corner_steel_grid{ - dir = 5 - }, -/obj/effect/turf_decal/corner_steel_grid{ - dir = 10 - }, /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "rk" = ( /obj/structure/catwalk/over/plated_catwalk/dark, @@ -1290,6 +1442,13 @@ }, /turf/open/floor/plating, /area/ship/hallway/central) +"rr" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) "ry" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1308,11 +1467,76 @@ /turf/open/floor/holofloor/wood, /area/ship/crew/crewthree) "rO" = ( -/obj/structure/rack, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ icon_state = "0-2" }, +/obj/structure/closet/cabinet{ + name = "formal uniform cabinet" + }, +/obj/item/clothing/under/clip/formal/with_shirt{ + pixel_x = 8; + pixel_y = 10 + }, +/obj/item/clothing/under/clip/formal/with_shirt{ + pixel_y = 10 + }, +/obj/item/clothing/under/clip/formal/with_shirt{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/clothing/under/clip/formal/with_shirt{ + pixel_x = -10; + pixel_y = 9 + }, +/obj/item/clothing/under/clip/formal/with_shirt/alt{ + pixel_x = 8; + pixel_y = -3 + }, +/obj/item/clothing/under/clip/formal/with_shirt/alt{ + pixel_x = 2; + pixel_y = -4 + }, +/obj/item/clothing/under/clip/formal/with_shirt/alt{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/under/clip/formal/with_shirt/alt{ + pixel_x = -10; + pixel_y = -4 + }, +/obj/item/clothing/shoes/laceup{ + pixel_x = 6; + pixel_y = -14 + }, +/obj/item/clothing/shoes/laceup{ + pixel_x = 6; + pixel_y = -14 + }, +/obj/item/clothing/shoes/laceup{ + pixel_x = 6; + pixel_y = -14 + }, +/obj/item/clothing/shoes/laceup{ + pixel_x = 6; + pixel_y = -14 + }, +/obj/item/clothing/shoes/laceup{ + pixel_x = 6; + pixel_y = -14 + }, +/obj/item/clothing/shoes/laceup{ + pixel_x = 6; + pixel_y = -14 + }, +/obj/item/clothing/shoes/laceup{ + pixel_x = 6; + pixel_y = -14 + }, +/obj/item/clothing/shoes/laceup{ + pixel_x = 6; + pixel_y = -14 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/crewtwo) "rR" = ( @@ -1323,6 +1547,9 @@ /obj/effect/turf_decal/techfloor{ dir = 4 }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "sh" = ( @@ -1373,6 +1600,15 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/security) +"sA" = ( +/obj/item/chair{ + dir = 8; + pixel_y = -10; + pixel_x = 5 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) "sB" = ( /obj/effect/turf_decal/trimline/transparent/blue/warning, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -1403,6 +1639,14 @@ /obj/structure/rack, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, +/obj/item/storage/lockbox/medal{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/item/storage/lockbox/medal/sec{ + pixel_x = -4; + pixel_y = -1 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/crewthree) "sI" = ( @@ -1450,20 +1694,22 @@ /turf/open/floor/plating, /area/ship/crew/crewthree) "tq" = ( -/obj/machinery/firealarm/directional/west, /obj/machinery/light_switch{ dir = 4; - pixel_x = -23; - pixel_y = -11 + pixel_x = -23 }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/corner_steel_grid{ - dir = 9 +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) +"tA" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/cargo) "tF" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1513,19 +1759,26 @@ /obj/effect/turf_decal/minutemen/edge{ dir = 4 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "uC" = ( /obj/structure/table/reinforced, -/obj/item/radio/weather_monitor{ - pixel_y = 6; - pixel_x = -4 +/obj/machinery/button/door{ + id = "atlas_bridge_lockdown"; + dir = 1; + pixel_y = 4; + name = "bridge lockdown"; + pixel_x = -6 }, /obj/machinery/button/door{ id = "atlas_bridge"; dir = 1; - pixel_x = 14; - pixel_y = 4 + pixel_x = 7; + pixel_y = 4; + name = "bridge shutters" }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) @@ -1537,21 +1790,42 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/crewthree) "uO" = ( -/obj/structure/bed/roller, /obj/effect/turf_decal/corner/transparent/blue{ dir = 6 }, +/obj/structure/table/chem, +/obj/structure/sink/chem, +/obj/item/roller{ + pixel_y = 15; + pixel_x = -12 + }, +/obj/item/roller{ + pixel_y = 6; + pixel_x = -14 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "uQ" = ( /obj/effect/turf_decal/trimline/transparent/blue/warning{ dir = 1 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "uU" = ( /obj/structure/table, -/obj/item/storage/cans/sixsoda, +/obj/item/reagent_containers/food/drinks/soda_cans/cola{ + pixel_y = 9; + pixel_x = -5 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/cola{ + pixel_y = 4; + pixel_x = 1 + }, +/obj/item/trash/can{ + pixel_x = 11; + pixel_y = 9 + }, /turf/open/floor/plasteel/grimy, /area/ship/crew/canteen) "uX" = ( @@ -1592,6 +1866,7 @@ pixel_y = 2 }, /obj/machinery/light/directional/west, +/obj/structure/rack, /turf/open/floor/plasteel/tech, /area/ship/engineering) "vw" = ( @@ -1624,24 +1899,8 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew/canteen) "vS" = ( -/obj/structure/table/glass, -/obj/item/folder/white{ - pixel_x = -13; - pixel_y = 6 - }, -/obj/item/folder/white{ - pixel_x = -10; - pixel_y = 2 - }, -/obj/item/paper_bin{ - pixel_y = 5; - pixel_x = 6 - }, -/obj/item/pen{ - pixel_y = 5; - pixel_x = 6 - }, /obj/effect/turf_decal/corner/transparent/blue/full, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/white, /area/ship/medical) "vT" = ( @@ -1663,6 +1922,9 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "atlas_engi_lockdown" + }, /turf/open/floor/plating, /area/ship/engineering) "wc" = ( @@ -1692,8 +1954,33 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, +/obj/structure/closet/secure_closet/wall/directional/north{ + icon_door = "med_wall"; + req_access = list(5) + }, +/obj/item/storage/belt/medical/webbing/clip/prefilled{ + pixel_x = -6; + pixel_y = -7 + }, +/obj/item/clothing/gloves/color/latex/nitrile/clip{ + pixel_x = -11; + pixel_y = 5 + }, +/obj/item/clothing/under/clip/medic{ + pixel_x = 9; + pixel_y = -4 + }, +/obj/item/clothing/head/clip/corpsman{ + pixel_y = 8; + pixel_x = 9 + }, +/obj/item/defibrillator/loaded, /turf/open/floor/plasteel/white, /area/ship/medical) +"wh" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/grimy, +/area/ship/crew/canteen) "wi" = ( /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/techfloor/orange, @@ -1738,13 +2025,11 @@ /area/ship/crew) "wU" = ( /obj/machinery/power/smes/engineering, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, +/obj/effect/turf_decal/industrial, /obj/structure/cable{ icon_state = "0-8" }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "wW" = ( /obj/effect/turf_decal/trimline/transparent/blue/warning, @@ -1777,30 +2062,10 @@ /turf/open/floor/pod/dark, /area/ship/cargo) "xU" = ( -/obj/structure/closet/wall/white{ - dir = 1; - pixel_y = -28 - }, -/obj/item/defibrillator/loaded, -/obj/item/clothing/gloves/color/latex/nitrile/clip{ - pixel_x = -11; - pixel_y = 5 - }, -/obj/item/clothing/under/clip/medic{ - pixel_x = 9; - pixel_y = -4 - }, -/obj/item/storage/belt/medical/webbing/clip/prefilled{ - pixel_x = -6; - pixel_y = -7 - }, -/obj/item/clothing/head/clip/corpsman{ - pixel_y = 8; - pixel_x = 9 - }, -/obj/structure/table/glass, /obj/machinery/light/directional/east, /obj/effect/turf_decal/corner/transparent/blue/full, +/obj/machinery/iv_drip, +/obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/white, /area/ship/medical) "yi" = ( @@ -1921,21 +2186,23 @@ }, /turf/open/floor/pod/dark, /area/ship/cargo) +"yL" = ( +/obj/machinery/power/smes/shuttle/precharged, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) "yO" = ( /obj/machinery/computer/helm/viewscreen/directional/north, /turf/open/floor/carpet/blue, /area/ship/crew/crewthree) "yR" = ( -/obj/structure/table/glass, -/obj/item/roller{ - pixel_y = 15; - pixel_x = -6 - }, -/obj/item/roller{ - pixel_y = 6; - pixel_x = -7 - }, /obj/effect/turf_decal/corner/transparent/blue/full, +/obj/structure/bed/roller, /turf/open/floor/plasteel/white, /area/ship/medical) "yT" = ( @@ -1947,7 +2214,6 @@ /obj/structure/sign/poster/clip/bard{ pixel_y = 32 }, -/obj/structure/filingcabinet/double, /obj/effect/turf_decal/trimline/transparent/blue/filled/line{ dir = 8 }, @@ -1957,6 +2223,9 @@ /obj/effect/turf_decal/techfloor{ dir = 1 }, +/obj/structure/filingcabinet/double/grey{ + pixel_y = 5 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/security) "zc" = ( @@ -1968,15 +2237,25 @@ pixel_x = 12 }, /obj/item/clothing/mask/breath/medical{ - pixel_y = -12 + pixel_y = -12; + pixel_x = 5 }, /obj/item/clothing/mask/breath/medical{ - pixel_y = -12 + pixel_y = -12; + pixel_x = 6 + }, +/obj/effect/turf_decal/corner/transparent/blue/mono, +/obj/item/storage/firstaid/regular{ + pixel_y = 8; + pixel_x = -8 + }, +/obj/item/storage/box/gloves{ + pixel_x = -10; + pixel_y = 2 }, -/obj/effect/turf_decal/corner/transparent/blue/mono, -/obj/item/storage/firstaid/regular{ - pixel_y = 8; - pixel_x = -4 +/obj/item/storage/box/masks{ + pixel_y = -5; + pixel_x = -12 }, /turf/open/floor/plasteel/mono/white, /area/ship/medical) @@ -1989,7 +2268,10 @@ /area/ship/engineering) "zl" = ( /obj/structure/closet/crate/trashcart/laundry, -/turf/open/floor/plasteel/tech, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 10 + }, +/turf/open/floor/plasteel/tech/grid, /area/ship/crew/canteen) "zq" = ( /obj/machinery/turretid, @@ -2077,12 +2359,17 @@ pixel_y = 6; pixel_x = 1 }, +/obj/item/radio/intercom/directional/west, /turf/open/floor/holofloor/wood, /area/ship/crew/crewtwo) "Ay" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/item/paperplane{ + pixel_x = 11; + pixel_y = 9 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/crewtwo) "AH" = ( @@ -2111,15 +2398,17 @@ /turf/open/floor/plating, /area/ship/hallway/central) "Bm" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/electric, /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "atlas_engi_lockdown" + }, /turf/open/floor/plating, /area/ship/external/dark) "Bx" = ( @@ -2164,13 +2453,11 @@ dir = 1; layer = 2.89 }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, +/obj/effect/turf_decal/industrial, /obj/structure/cable{ icon_state = "0-8" }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "BW" = ( /obj/effect/turf_decal/trimline/transparent/blue/warning{ @@ -2179,13 +2466,11 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "Cc" = ( /obj/machinery/portable_atmospherics/canister/air, -/obj/effect/turf_decal/corner_steel_grid{ - dir = 10 - }, /obj/effect/turf_decal/box/corners{ dir = 1; color = "#75A2BB" @@ -2197,7 +2482,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "Cm" = ( /obj/structure/sign/clip, @@ -2243,11 +2528,10 @@ anchored = 1 }, /obj/item/stack/sheet/mineral/plasma/twenty, -/obj/effect/turf_decal/techfloor, /obj/structure/cable/yellow{ icon_state = "0-9" }, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "CM" = ( /obj/structure/table/wood, @@ -2257,6 +2541,10 @@ /obj/item/pen{ pixel_y = 3 }, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = 16; + pixel_y = 11 + }, /turf/open/floor/holofloor/wood, /area/ship/crew/crewtwo) "CO" = ( @@ -2266,17 +2554,9 @@ /obj/structure/sign/poster/clip/serene{ pixel_y = -32 }, -/obj/structure/table/glass, -/obj/item/storage/box/masks{ - pixel_y = 13; - pixel_x = -4 - }, -/obj/item/clothing/suit/apron/surgical{ - pixel_x = -5; - pixel_y = -3 - }, /obj/machinery/light/directional/west, /obj/effect/turf_decal/corner/transparent/blue/full, +/obj/structure/bed/roller, /turf/open/floor/plasteel/white, /area/ship/medical) "CZ" = ( @@ -2294,6 +2574,7 @@ /area/ship/crew/canteen) "Da" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Do" = ( @@ -2308,10 +2589,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/spline/fancy/opaque/white, -/obj/structure/sink{ - pixel_y = 12; - pixel_x = 1 - }, /obj/structure/mirror{ pixel_y = 28 }, @@ -2324,6 +2601,10 @@ /obj/machinery/photocopier, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) +"Ea" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) "Ej" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -2342,7 +2623,7 @@ dir = 1; layer = 2.89 }, -/obj/machinery/autolathe/hacked, +/obj/machinery/autolathe, /obj/machinery/light/directional/west, /turf/open/floor/plasteel/tech, /area/ship/engineering) @@ -2375,27 +2656,26 @@ /area/ship/crew/crewtwo) "ED" = ( /obj/item/kirbyplants{ - icon_state = "plant-02" + icon_state = "plant-02"; + pixel_x = -7 }, /obj/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/corner_steel_grid/full, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "EH" = ( /obj/structure/filingcabinet/double/grey{ - dir = 8; - pixel_x = 8 + dir = 1; + pixel_y = -3 }, /obj/item/folder, /obj/item/folder/blue, /obj/item/folder/red, /obj/item/folder/white, /obj/item/folder/yellow, -/obj/machinery/button/door{ - pixel_y = -23; - id = "atlas_fo"; - dir = 1 - }, /turf/open/floor/holofloor/wood, /area/ship/crew/crewtwo) "EJ" = ( @@ -2442,7 +2722,13 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel/telecomms_floor, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/plasteel/stairs{ + icon = 'icons/obj/stairs.dmi'; + dir = 4 + }, /area/ship/bridge) "Fu" = ( /obj/effect/decal/fakelattice{ @@ -2496,7 +2782,13 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plasteel/telecomms_floor, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4 + }, +/turf/open/floor/plasteel/stairs{ + icon = 'icons/obj/stairs.dmi'; + dir = 4 + }, /area/ship/bridge) "FQ" = ( /obj/effect/turf_decal/corner/transparent/blue/diagonal, @@ -2547,17 +2839,22 @@ /turf/open/floor/plasteel/tech, /area/ship/cargo) "Hh" = ( -/obj/item/radio/intercom/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, +/obj/machinery/button/door{ + id = "atlas_engi_lockdown"; + dir = 4; + pixel_y = 2; + name = "engineering shutters"; + pixel_x = -24 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "Hl" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/techfloor, /obj/machinery/light/directional/west, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "Hu" = ( /obj/machinery/door/poddoor, @@ -2571,13 +2868,13 @@ /area/ship/hallway/central) "Ig" = ( /obj/structure/bed/dogbed{ - anchored = 1; name = "Mushroom's bed"; desc = "A comfy-looking dog bed. Despite the name, the owner is a mothroach." }, /mob/living/simple_animal/pet/mothroach{ name = "Mushroom"; - desc = "Master Sergeant Mushroom is assigned to overwatch C-MM armory officers. Don't let him eat the armor." + desc = "Master Sergeant Mushroom is assigned to overwatch C-MM armory officers. Don't let her eat the armor."; + gender = "female" }, /obj/structure/window/reinforced{ dir = 8 @@ -2619,6 +2916,17 @@ /area/ship/cargo) "IP" = ( /obj/structure/table/wood, +/obj/item/kitchen/knife/letter_opener{ + pixel_x = 9; + pixel_y = -6 + }, +/obj/item/folder/biscuit/unsealed{ + pixel_x = -4 + }, +/obj/item/papercutter{ + pixel_x = 5; + pixel_y = 5 + }, /turf/open/floor/holofloor/wood, /area/ship/crew/crewtwo) "IY" = ( @@ -2653,11 +2961,24 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "atlas_engi_lockdown" + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "Je" = ( /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) +"JL" = ( +/obj/effect/turf_decal/corner/transparent/blue/diagonal, +/obj/effect/turf_decal/spline/fancy/opaque/white{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white, +/obj/machinery/holopad/emergency/medical, +/turf/open/floor/plasteel/white, +/area/ship/medical) "JR" = ( /obj/machinery/power/terminal{ dir = 8 @@ -2679,7 +3000,9 @@ /area/ship/hallway/central) "JV" = ( /obj/item/kirbyplants{ - icon_state = "plant-02" + icon_state = "plant-02"; + pixel_y = 16; + pixel_x = -6 }, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ @@ -2688,8 +3011,31 @@ /obj/effect/turf_decal/corner_steel_grid/full{ dir = 8 }, +/obj/machinery/firealarm/directional/west, +/obj/structure/railing, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) +"Kc" = ( +/obj/effect/decal/fakelattice{ + icon_state = "lattice-203" + }, +/obj/structure/lattice/catwalk, +/obj/item/toy/plush/moth/royal{ + pixel_x = 9; + pixel_y = 8; + name = "Specialist Aloe"; + desc = "An adorable mothperson plushy. Judging by a tag attached just beneath its leg, it is part of the Colonial League's armed forces." + }, +/obj/item/clothing/head/clip{ + pixel_x = 9; + pixel_y = 18 + }, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = 5; + list_reagents = list(/datum/reagent/consumable/ice = 30) + }, +/turf/open/floor/plating, +/area/ship/external/dark) "Kf" = ( /obj/structure/chair/plastic{ dir = 8; @@ -2698,6 +3044,9 @@ }, /obj/effect/decal/cleanable/confetti, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "Km" = ( @@ -2757,6 +3106,7 @@ }, /obj/effect/turf_decal/industrial/stand_clear/white, /obj/machinery/light/directional/west, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/cargo) "LE" = ( @@ -2765,17 +3115,24 @@ /area/ship/external/dark) "LH" = ( /obj/structure/filingcabinet/double/grey{ - dir = 8; - pixel_x = 8 + pixel_y = 14 }, /obj/item/folder, /obj/item/folder/blue, /obj/item/folder/red, /obj/item/folder/white, /obj/item/folder/yellow, -/obj/machinery/button/door{ - pixel_y = 23; - id = "atlas_cap" +/obj/item/reagent_containers/food/snacks/grown/tobacco{ + dry = 1 + }, +/obj/item/reagent_containers/food/snacks/grown/tobacco{ + dry = 1 + }, +/obj/item/reagent_containers/food/snacks/grown/tobacco{ + dry = 1 + }, +/obj/item/reagent_containers/food/snacks/grown/tobacco{ + dry = 1 }, /turf/open/floor/holofloor/wood, /area/ship/crew/crewthree) @@ -2810,6 +3167,18 @@ }, /turf/open/floor/plasteel/tech, /area/ship/engineering) +"My" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering) "MC" = ( /obj/structure/bed, /obj/item/bedsheet/head_of_personnel{ @@ -2823,9 +3192,8 @@ anchored = 1 }, /obj/item/stack/sheet/mineral/plasma/twenty, -/obj/effect/turf_decal/techfloor, /obj/structure/cable/yellow, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "MO" = ( /obj/structure/chair{ @@ -3002,16 +3370,30 @@ "Pn" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, -/obj/effect/spawner/lootdrop/donut, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/grimy, /area/ship/crew/canteen) "Py" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/turf_decal/techfloor{ - dir = 1 +/obj/structure/closet/secure_closet/engineering_personal{ + populate = 0 }, /obj/effect/decal/cleanable/confetti, -/turf/open/floor/plasteel/tech/grid, +/obj/item/clothing/glasses/meson{ + pixel_x = -1; + pixel_y = -8 + }, +/obj/item/storage/belt/utility/full, +/obj/item/storage/backpack/satchel/eng{ + pixel_y = 10 + }, +/obj/item/clothing/under/clip{ + pixel_x = 7 + }, +/obj/item/clothing/suit/hazardvest{ + pixel_x = -8; + pixel_y = 3 + }, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "PD" = ( /obj/effect/decal/cleanable/dirt, @@ -3104,7 +3486,16 @@ }, /turf/open/floor/plasteel/tech, /area/ship/engineering) +"Qb" = ( +/obj/structure/curtain/cloth, +/obj/machinery/recharge_station, +/turf/open/floor/carpet/blue, +/area/ship/crew) "Qg" = ( +/obj/item/cigbutt{ + pixel_x = -8; + pixel_y = 11 + }, /obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/engineering) @@ -3146,6 +3537,7 @@ /area/ship/crew) "Qt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/grimy, /area/ship/crew/canteen) "Qw" = ( @@ -3191,15 +3583,19 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "QM" = ( +/obj/structure/table/reinforced, /obj/item/radio/intercom/table{ dir = 4; pixel_y = 17 }, +/obj/item/radio/weather_monitor{ + pixel_x = -1; + pixel_y = 10 + }, /obj/item/radio/intercom/wideband/table{ dir = 4; pixel_y = -1 }, -/obj/structure/table/reinforced, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "QS" = ( @@ -3246,6 +3642,9 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/crewtwo) "Rv" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "Rz" = ( @@ -3282,6 +3681,9 @@ /obj/item/clothing/mask/cigarette/pipe{ pixel_x = 10 }, +/obj/item/lighter{ + pixel_x = -9 + }, /turf/open/floor/holofloor/wood, /area/ship/crew/crewthree) "RM" = ( @@ -3387,8 +3789,14 @@ /obj/effect/turf_decal/trimline/transparent/blue/filled, /turf/open/floor/plasteel/dark, /area/ship/security) +"Sz" = ( +/obj/effect/turf_decal/trimline/transparent/blue/warning{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/ship/hallway/central) "SB" = ( -/obj/effect/landmark/start/warden, /obj/effect/turf_decal/trimline/transparent/blue/filled/line{ dir = 1 }, @@ -3429,11 +3837,9 @@ /turf/open/floor/holofloor/wood, /area/ship/crew/crewtwo) "Ti" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, /obj/machinery/light/directional/west, -/turf/open/floor/plasteel/tech/grid, +/obj/structure/closet/secure_closet/engineering_welding, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "Tx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -3456,8 +3862,42 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "TA" = ( -/obj/effect/turf_decal/techfloor, -/turf/open/floor/plasteel/tech/grid, +/obj/item/emptysandbag{ + pixel_x = -10; + pixel_y = -8 + }, +/obj/item/emptysandbag{ + pixel_x = 4; + pixel_y = -8 + }, +/obj/item/emptysandbag{ + pixel_x = -3; + pixel_y = -6 + }, +/obj/item/emptysandbag{ + pixel_x = -3; + pixel_y = -6 + }, +/obj/item/emptysandbag{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/emptysandbag{ + pixel_x = -10; + pixel_y = -5 + }, +/obj/item/emptysandbag{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/emptysandbag{ + pixel_x = -10 + }, +/obj/item/shovel{ + pixel_x = -18; + pixel_y = -3 + }, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "TE" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -3466,6 +3906,12 @@ /obj/structure/dresser{ dir = 1 }, +/obj/machinery/button/door{ + pixel_y = -23; + id = "atlas_cap"; + dir = 1; + name = "private windows button" + }, /turf/open/floor/carpet/blue, /area/ship/crew/crewthree) "TT" = ( @@ -3519,6 +3965,14 @@ "UG" = ( /obj/structure/table/optable, /obj/effect/turf_decal/corner/transparent/blue/mono, +/obj/item/clothing/suit/apron/surgical{ + pixel_x = -5; + pixel_y = -3 + }, +/obj/item/book/manual/wiki/surgery{ + pixel_x = 6; + pixel_y = 1 + }, /turf/open/floor/plasteel/mono/white, /area/ship/medical) "UK" = ( @@ -3546,11 +4000,11 @@ /turf/open/floor/pod/dark, /area/ship/cargo) "US" = ( -/obj/machinery/computer/cargo/express{ +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/computer/cargo{ dir = 8; icon_state = "computer-right" }, -/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "UY" = ( @@ -3625,9 +4079,6 @@ /obj/item/reagent_containers/spray/pepper{ pixel_y = 12 }, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/effect/turf_decal/trimline/transparent/blue/filled, /obj/item/ammo_box/magazine/smgm9mm, /obj/item/ammo_box/magazine/smgm9mm, @@ -3638,6 +4089,9 @@ /obj/item/ammo_box/magazine/p16, /obj/item/ammo_box/magazine/p16, /obj/machinery/light/directional/north, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/security) "Vw" = ( @@ -3655,9 +4109,6 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "VK" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, /obj/structure/table, /obj/item/chair/plastic{ pixel_y = 13; @@ -3668,7 +4119,7 @@ pixel_x = 3 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/engine/hull/interior, /area/ship/engineering) "VQ" = ( /obj/structure/railing{ @@ -3877,6 +4328,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "Yw" = ( @@ -3894,6 +4348,7 @@ "YK" = ( /obj/structure/closet/crate/bin, /obj/machinery/firealarm/directional/south, +/obj/item/broken_bottle, /turf/open/floor/plasteel/dark, /area/ship/crew/crewthree) "YM" = ( @@ -3965,6 +4420,10 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "atlas_bridge_lockdown" + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "ZE" = ( @@ -4055,7 +4514,7 @@ ps ps PU Ti -af +yL af PU Bm @@ -4078,7 +4537,7 @@ ps ps pp eW -bK +My bK PU af @@ -4322,7 +4781,7 @@ Rf Ej yi aI -WR +Qb di ps "} @@ -4336,7 +4795,7 @@ sl gT Xl oY -Wi +wh Qt OQ iS @@ -4359,7 +4818,7 @@ EP gT CZ Aa -nl +eU FI Do FF @@ -4384,7 +4843,7 @@ Cq wk jI Pn -Do +rr FF kv nU @@ -4407,7 +4866,7 @@ sL IY jI uU -Do +rr FF KB HW @@ -4539,7 +4998,7 @@ ps Yt Hu nX -jZ +cN jZ yI TE @@ -4549,7 +5008,7 @@ Ln CO Dq aa -UC +JL vS Vo ps @@ -4562,8 +5021,8 @@ ps ps Hu nX -jZ -jZ +sA +tA UP TE wW @@ -4684,13 +5143,13 @@ is Xg lY oJ -is +Sz uY aS EJ HX HX -xi +Kc da da "} @@ -4822,8 +5281,8 @@ js Ir gA gF -js -js +Ea +Ea lw LM mh diff --git a/code/modules/clothing/outfits/factions/minutemen.dm b/code/modules/clothing/outfits/factions/minutemen.dm index 5c038b05f181..e1fb8d8ca8f9 100644 --- a/code/modules/clothing/outfits/factions/minutemen.dm +++ b/code/modules/clothing/outfits/factions/minutemen.dm @@ -512,7 +512,7 @@ job_icon = "clip_cmm2" ears = /obj/item/radio/headset/alt box = /obj/item/storage/box/survival/clip/balaclava - shoes = null + shoes = /obj/item/clothing/shoes/combat // shoos backpack = /obj/item/storage/backpack/security/clip satchel = /obj/item/storage/backpack/satchel/sec/clip From dad71a2fe42b4cf4bf3e2658a8a8b8c1726a1585 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Wed, 24 Jul 2024 22:28:01 -0400 Subject: [PATCH 04/17] kill goblins --- _maps/configs/minutemen_atlas.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/minutemen_atlas.json b/_maps/configs/minutemen_atlas.json index 0976d1a0c4c5..0f45e5ec4082 100644 --- a/_maps/configs/minutemen_atlas.json +++ b/_maps/configs/minutemen_atlas.json @@ -3,7 +3,7 @@ "map_name": "Atlas-class Light Armored Crusier", "prefix": "CMSV", "namelists": ["GENERAL", "CLIP MINUTEMEN", "NATURAL_AGGRESSIVE"], - "description": "The Atlas-Class is the designation for some of the oldest serving vessels in the Confederated League's military fleet. Originally the Atlantas-class, the design of the Atlantas was taken by the Colonial Militia just before the beginning of the war with the Old Frontiersmen, playing a pivotal role in multiple skirmishes. It is small in size and crew, well-suited and well-rounded as an unexpensive hit-and-run vessel, and despite its age, the Atlas continues to serve the Confederated League for peacekeeping missions and driving off small crews of pirates from colonies.", + "description": "The Atlas-Class is the designation for some of the oldest serving vessels in the Confederated League's military fleet. Originally the Atlantas-class, the design of the Atlantas was taken by the Colonial Militia just before the beginning of the war with the Old Frontiersmen, playing a pivotal role in multiple skirmishes. It is small in size and crew, well-rounded, and well-suited as an unexpensive hit-and-run vessel. Despite its age, the Atlas continues to serve the Confederated League for peacekeeping missions and driving off small crews of pirates from colonies.", "tags": [ "Combat", "Generalist" From 311e0543f97ccc8ba8964609d3355fa0361039c4 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Thu, 25 Jul 2024 18:31:06 -0400 Subject: [PATCH 05/17] competent maptainer --- _maps/shuttles/minutemen/minutemen_atlas.dmm | 252 +++++++++++++++---- 1 file changed, 206 insertions(+), 46 deletions(-) diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm index ebd49d8669c7..79e83967bfaa 100644 --- a/_maps/shuttles/minutemen/minutemen_atlas.dmm +++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm @@ -203,6 +203,9 @@ "di" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "atlas_dorms" + }, /turf/open/floor/plating, /area/ship/crew) "dw" = ( @@ -335,6 +338,10 @@ /area/ship/crew/canteen) "eW" = ( /obj/effect/decal/cleanable/confetti, +/obj/machinery/power/ship_gravity, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/engine/hull/interior, /area/ship/engineering) "fd" = ( @@ -361,7 +368,7 @@ dir = 8 }, /obj/machinery/light_switch{ - pixel_y = 23; + pixel_y = 20; pixel_x = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -538,7 +545,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/door/poddoor/shutters/preopen{ - id = "atlas_fo" + id = "atlas_dorms" }, /turf/open/floor/plating, /area/ship/crew/crewtwo) @@ -859,6 +866,9 @@ dir = 4 }, /obj/machinery/light/directional/north, +/obj/structure/closet/crate/bin{ + pixel_y = 11 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "kG" = ( @@ -875,6 +885,14 @@ /obj/machinery/door/poddoor{ id = "atlas_cargo" }, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "atlas_holo" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/industrial/warning, /turf/open/floor/plating, /area/ship/cargo) "kX" = ( @@ -901,6 +919,9 @@ /obj/effect/turf_decal/industrial/loading{ icon_state = "loadingarea_stripes" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "lw" = ( @@ -1249,20 +1270,18 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/crewtwo) "ov" = ( -/obj/effect/turf_decal/box/corners{ - dir = 1; - color = "#75A2BB" +/obj/machinery/door/airlock/external{ + dir = 4 }, -/obj/effect/turf_decal/box/corners{ - dir = 8; - color = "#75A2BB" +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, -/obj/effect/turf_decal/corner_steel_grid{ - dir = 6 +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/pod/dark, -/area/ship/cargo) +/turf/open/floor/plasteel/dark, +/area/ship/engineering) "oJ" = ( /obj/effect/turf_decal/trimline/transparent/blue/warning{ dir = 5; @@ -1356,7 +1375,7 @@ /obj/structure/window/reinforced/fulltile, /obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - id = "atlas_bridge_lockdown" + id = "atlas_bridge" }, /turf/open/floor/plating, /area/ship/bridge) @@ -1368,6 +1387,22 @@ /obj/structure/railing, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) +"qq" = ( +/obj/structure/bed{ + dir = 1 + }, +/obj/item/bedsheet/blue{ + dir = 1 + }, +/obj/structure/curtain/cloth, +/obj/machinery/button/door{ + id = "atlas_dorms"; + name = "private windows button"; + pixel_x = -23; + dir = 4 + }, +/turf/open/floor/carpet/blue, +/area/ship/crew) "qr" = ( /obj/effect/turf_decal/minutemen/corner{ dir = 8 @@ -1566,7 +1601,7 @@ }, /obj/machinery/light_switch{ dir = 8; - pixel_x = 23 + pixel_x = 20 }, /turf/open/floor/plasteel/stairs, /area/ship/engineering) @@ -1633,6 +1668,9 @@ dir = 1 }, /obj/effect/turf_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/engineering) "sF" = ( @@ -1672,9 +1710,6 @@ dir = 1 }, /obj/machinery/light/directional/north, -/obj/structure/closet/crate/bin{ - pixel_y = 11 - }, /obj/effect/turf_decal/trimline/transparent/blue/filled/corner{ dir = 1 }, @@ -1780,6 +1815,10 @@ pixel_y = 4; name = "bridge shutters" }, +/obj/item/radio/intercom/table{ + dir = 4; + pixel_y = -10 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "uG" = ( @@ -1886,6 +1925,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/ship/engineering) "vy" = ( @@ -1943,6 +1985,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/plasteel/tech, /area/ship/engineering) "we" = ( @@ -1974,7 +2017,13 @@ pixel_y = 8; pixel_x = 9 }, -/obj/item/defibrillator/loaded, +/obj/item/defibrillator/loaded{ + pixel_y = 26 + }, +/obj/item/storage/belt/medical/surgery{ + pixel_x = -7; + pixel_y = -8 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "wh" = ( @@ -2010,6 +2059,9 @@ dir = 4 }, /obj/machinery/airalarm/directional/north, +/obj/machinery/turretid{ + pixel_x = -28 + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "wy" = ( @@ -2179,7 +2231,7 @@ /obj/structure/punching_bag, /obj/machinery/light_switch{ dir = 1; - pixel_y = -23 + pixel_y = -20 }, /obj/structure/cable{ icon_state = "4-8" @@ -2223,9 +2275,42 @@ /obj/effect/turf_decal/techfloor{ dir = 1 }, -/obj/structure/filingcabinet/double/grey{ +/obj/structure/closet/crate, +/obj/item/clothing/suit/space/hardsuit/clip_patroller{ + pixel_x = -1; pixel_y = 5 }, +/obj/item/clothing/suit/space/hardsuit/clip_patroller{ + pixel_x = -13; + pixel_y = 8 + }, +/obj/item/clothing/suit/space/hardsuit/clip_patroller{ + pixel_x = -11; + pixel_y = -2 + }, +/obj/item/clothing/suit/space/hardsuit/clip_patroller{ + pixel_x = 9 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = -1; + pixel_y = -10 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = -1; + pixel_y = -10 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = -1; + pixel_y = -10 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = -1; + pixel_y = -10 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = -1; + pixel_y = -10 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/security) "zc" = ( @@ -2264,6 +2349,12 @@ dir = 1 }, /obj/effect/turf_decal/industrial/warning, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ + dir = 8 + }, +/obj/machinery/advanced_airlock_controller{ + pixel_y = 26 + }, /turf/open/floor/plasteel/dark, /area/ship/engineering) "zl" = ( @@ -2274,9 +2365,10 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew/canteen) "zq" = ( -/obj/machinery/turretid, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) +/obj/machinery/door/poddoor, +/obj/effect/turf_decal/industrial/warning, +/turf/open/floor/plating, +/area/ship/cargo) "zt" = ( /obj/effect/turf_decal/trimline/transparent/blue/warning, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -2302,11 +2394,20 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "zE" = ( -/obj/machinery/power/terminal{ - dir = 8 +/obj/effect/turf_decal/box/corners{ + dir = 1; + color = "#75A2BB" }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering) +/obj/effect/turf_decal/box/corners{ + dir = 8; + color = "#75A2BB" + }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 6 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/pod/dark, +/area/ship/cargo) "zQ" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 1 @@ -2575,6 +2676,9 @@ "Da" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Do" = ( @@ -2625,6 +2729,8 @@ }, /obj/machinery/autolathe, /obj/machinery/light/directional/west, +/obj/item/stack/sheet/glass/twenty, +/obj/item/stack/sheet/metal/twenty, /turf/open/floor/plasteel/tech, /area/ship/engineering) "Es" = ( @@ -2836,6 +2942,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Hh" = ( @@ -2858,6 +2967,14 @@ /area/ship/engineering) "Hu" = ( /obj/machinery/door/poddoor, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "atlas_holo" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/industrial/warning, /turf/open/floor/plating, /area/ship/cargo) "HW" = ( @@ -2963,7 +3080,7 @@ }, /obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - id = "atlas_engi_lockdown" + id = "atlas_bridge_lockdown" }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) @@ -3105,8 +3222,23 @@ dir = 1 }, /obj/effect/turf_decal/industrial/stand_clear/white, -/obj/machinery/light/directional/west, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/button/door{ + id = "atlas_cargo"; + dir = 4; + pixel_x = -23; + pixel_y = 6; + name = "cargo bay control" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/button/shieldwallgen{ + dir = 4; + pixel_y = -4; + pixel_x = -20; + id = "atlas_holo" + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "LE" = ( @@ -3145,6 +3277,9 @@ }, /obj/effect/turf_decal/industrial/stand_clear/white, /obj/machinery/light/directional/east, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Mq" = ( @@ -3266,7 +3401,7 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/light_switch{ dir = 4; - pixel_x = -23 + pixel_x = -20 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 @@ -3283,12 +3418,14 @@ /turf/open/floor/plating, /area/ship/hallway/central) "OA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/catwalk/over, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/engineering) "OQ" = ( @@ -3356,6 +3493,10 @@ pixel_y = -12; pixel_x = -4 }, +/obj/item/clothing/suit/space/hardsuit/clip_patroller{ + pixel_x = 8; + pixel_y = -13 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/security) "Pk" = ( @@ -3393,6 +3534,9 @@ pixel_x = -8; pixel_y = 3 }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/engine/hull/interior, /area/ship/engineering) "PD" = ( @@ -3497,6 +3641,9 @@ pixel_y = 11 }, /obj/structure/catwalk/over, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/engineering) "Qj" = ( @@ -3519,7 +3666,7 @@ pixel_x = -11 }, /obj/structure/closet/wall/white{ - dir = 8; + dir = 4; pixel_x = 28; pixel_y = 6 }, @@ -3584,10 +3731,6 @@ /area/ship/hallway/central) "QM" = ( /obj/structure/table/reinforced, -/obj/item/radio/intercom/table{ - dir = 4; - pixel_y = 17 - }, /obj/item/radio/weather_monitor{ pixel_x = -1; pixel_y = 10 @@ -3645,6 +3788,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "4-10" + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "Rz" = ( @@ -3811,6 +3957,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "SK" = ( @@ -3996,7 +4145,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/firealarm/directional/south, /turf/open/floor/pod/dark, /area/ship/cargo) "US" = ( @@ -4269,6 +4417,12 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/cable{ + icon_state = "1-10" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plating, /area/ship/engineering) "Xc" = ( @@ -4331,6 +4485,9 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "Yw" = ( @@ -4362,6 +4519,9 @@ /area/ship/crew/crewtwo) "YO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Zd" = ( @@ -4543,7 +4703,7 @@ PU af af PU -sD +ov PU af af @@ -4568,8 +4728,8 @@ bK Hh Qg wd -zE -zE +bK +JR Eo Rv Mu @@ -4735,7 +4895,7 @@ HW ZG fR fR -WR +qq di ps "} @@ -4996,7 +5156,7 @@ ps ps ps Yt -Hu +zq nX cN jZ @@ -5019,7 +5179,7 @@ ps ps ps ps -Hu +zq nX sA tA @@ -5067,8 +5227,8 @@ ps ps Qz TE -ov nm +zE TE TE yT @@ -5252,7 +5412,7 @@ LH uG ry LM -zq +LM Mq qn Qw From 2df99d1922af430a6530423db53abecbedec83af Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Thu, 25 Jul 2024 18:38:39 -0400 Subject: [PATCH 06/17] I want to kill the Prime Minister of the Zohil Explorat --- .../syndicate/syndicate_gorlex_komodo.dmm | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm index bfbdc4e43e04..1de65caa3c4c 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -1645,9 +1645,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "pJ" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, +/obj/machinery/power/smes/shuttle/precharged, /obj/structure/cable{ icon_state = "0-8" }, @@ -1747,9 +1745,7 @@ /turf/open/floor/mineral/plastitanium, /area/ship/crew/canteen) "qF" = ( -/obj/machinery/power/smes/shuttle/precharged{ - dir = 4 - }, +/obj/machinery/power/smes/shuttle/precharged, /obj/structure/cable{ icon_state = "0-8" }, @@ -3323,7 +3319,6 @@ icon_state = "0-8" }, /obj/docking_port/mobile{ - can_move_docking_ports = 1; dir = 8; launch_status = 0; preferred_direction = 4 @@ -4020,9 +4015,7 @@ /obj/machinery/door/window/eastleft{ name = "Engine Access" }, -/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/shuttle/fire_heater, /turf/open/floor/plating, /area/ship/engineering) "MV" = ( @@ -4262,9 +4255,7 @@ id = "warship_engines"; name = "Thruster Blast Door" }, -/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/shuttle/fire_heater, /turf/open/floor/plating, /area/ship/engineering) "PA" = ( @@ -5222,9 +5213,7 @@ /turf/open/floor/holofloor/wood, /area/ship/bridge) "Yb" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/electric, /obj/structure/cable{ icon_state = "0-4" }, @@ -5237,9 +5226,7 @@ /turf/open/floor/engine/hull, /area/ship/external/dark) "Yn" = ( -/obj/machinery/power/shuttle/engine/fire{ - dir = 4 - }, +/obj/machinery/power/shuttle/engine/fire, /turf/open/floor/plating, /area/ship/engineering) "Yp" = ( From ed4eceec9baf91884219b14bf529004c7fa456fb Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Thu, 25 Jul 2024 18:41:23 -0400 Subject: [PATCH 07/17] ougjjjjhhh --- _maps/shuttles/minutemen/minutemen_atlas.dmm | 132 +++++++++++-------- 1 file changed, 75 insertions(+), 57 deletions(-) diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm index 79e83967bfaa..b9360b2941c3 100644 --- a/_maps/shuttles/minutemen/minutemen_atlas.dmm +++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm @@ -345,9 +345,6 @@ /turf/open/floor/engine/hull/interior, /area/ship/engineering) "fd" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8 - }, /obj/structure/railing{ layer = 3.31 }, @@ -361,6 +358,10 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 8 + }, /turf/open/floor/engine/hull/interior, /area/ship/engineering) "fg" = ( @@ -444,6 +445,9 @@ /obj/structure/cable{ icon_state = "1-6" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "fR" = ( @@ -675,13 +679,13 @@ dir = 8 }, /obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "2-9" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "iO" = ( @@ -808,6 +812,9 @@ "jR" = ( /obj/effect/landmark/start/station_engineer, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "jZ" = ( @@ -1270,18 +1277,20 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/crewtwo) "ov" = ( -/obj/machinery/door/airlock/external{ - dir = 4 +/obj/effect/turf_decal/box/corners{ + dir = 1; + color = "#75A2BB" }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 +/obj/effect/turf_decal/box/corners{ + dir = 8; + color = "#75A2BB" }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/corner_steel_grid{ + dir = 6 }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) +/obj/machinery/firealarm/directional/south, +/turf/open/floor/pod/dark, +/area/ship/cargo) "oJ" = ( /obj/effect/turf_decal/trimline/transparent/blue/warning{ dir = 5; @@ -1387,22 +1396,6 @@ /obj/structure/railing, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) -"qq" = ( -/obj/structure/bed{ - dir = 1 - }, -/obj/item/bedsheet/blue{ - dir = 1 - }, -/obj/structure/curtain/cloth, -/obj/machinery/button/door{ - id = "atlas_dorms"; - name = "private windows button"; - pixel_x = -23; - dir = 4 - }, -/turf/open/floor/carpet/blue, -/area/ship/crew) "qr" = ( /obj/effect/turf_decal/minutemen/corner{ dir = 8 @@ -1458,10 +1451,13 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/security) "qS" = ( -/obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 8 + }, /turf/open/floor/engine/hull/interior, /area/ship/engineering) "rk" = ( @@ -2366,6 +2362,13 @@ /area/ship/crew/canteen) "zq" = ( /obj/machinery/door/poddoor, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 4; + id = "atlas_holo" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, /obj/effect/turf_decal/industrial/warning, /turf/open/floor/plating, /area/ship/cargo) @@ -2394,20 +2397,21 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "zE" = ( -/obj/effect/turf_decal/box/corners{ - dir = 1; - color = "#75A2BB" +/obj/structure/bed{ + dir = 1 }, -/obj/effect/turf_decal/box/corners{ - dir = 8; - color = "#75A2BB" +/obj/item/bedsheet/blue{ + dir = 1 }, -/obj/effect/turf_decal/corner_steel_grid{ - dir = 6 +/obj/structure/curtain/cloth, +/obj/machinery/button/door{ + id = "atlas_dorms"; + name = "private windows button"; + pixel_x = -23; + dir = 4 }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/pod/dark, -/area/ship/cargo) +/turf/open/floor/carpet/blue, +/area/ship/crew) "zQ" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 1 @@ -2571,7 +2575,6 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "Cc" = ( -/obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/box/corners{ dir = 1; color = "#75A2BB" @@ -2583,6 +2586,9 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 8 + }, /turf/open/floor/engine/hull/interior, /area/ship/engineering) "Cm" = ( @@ -2967,13 +2973,6 @@ /area/ship/engineering) "Hu" = ( /obj/machinery/door/poddoor, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 4; - id = "atlas_holo" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, /obj/effect/turf_decal/industrial/warning, /turf/open/floor/plating, /area/ship/cargo) @@ -3164,6 +3163,9 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "Km" = ( @@ -3687,6 +3689,19 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/grimy, /area/ship/crew/canteen) +"Qu" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) "Qw" = ( /obj/effect/turf_decal/minutemen/corner, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -4488,6 +4503,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "Yw" = ( @@ -4703,7 +4721,7 @@ PU af af PU -ov +Qu PU af af @@ -4895,7 +4913,7 @@ HW ZG fR fR -qq +zE di ps "} @@ -5133,7 +5151,7 @@ ps ps ps ps -Hu +zq Lw le YO @@ -5156,7 +5174,7 @@ ps ps ps Yt -zq +Hu nX cN jZ @@ -5179,7 +5197,7 @@ ps ps ps ps -zq +Hu nX sA tA @@ -5228,7 +5246,7 @@ ps Qz TE nm -zE +ov TE TE yT From f40b6965c788d981208e3703cf8f27cc2e5b2949 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Fri, 26 Jul 2024 01:21:01 -0400 Subject: [PATCH 08/17] checks --- _maps/shuttles/minutemen/minutemen_atlas.dmm | 75 ++++++++++++++++---- 1 file changed, 62 insertions(+), 13 deletions(-) diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm index b9360b2941c3..efdee670d861 100644 --- a/_maps/shuttles/minutemen/minutemen_atlas.dmm +++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm @@ -1339,6 +1339,17 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) +"pi" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/plating, +/area/ship/hallway/central) "pn" = ( /obj/machinery/blackbox_recorder, /obj/effect/turf_decal/corner_steel_grid{ @@ -1400,6 +1411,9 @@ /obj/effect/turf_decal/minutemen/corner{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "qA" = ( @@ -1901,7 +1915,8 @@ pixel_y = 2 }, /obj/machinery/light/directional/west, -/obj/structure/rack, +/obj/machinery/cell_charger, +/obj/structure/table, /turf/open/floor/plasteel/tech, /area/ship/engineering) "vw" = ( @@ -2361,7 +2376,9 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew/canteen) "zq" = ( -/obj/machinery/door/poddoor, +/obj/machinery/door/poddoor{ + id = "atlas_cargo" + }, /obj/machinery/power/shieldwallgen/atmos/roundstart{ dir = 4; id = "atlas_holo" @@ -2587,7 +2604,8 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8 + dir = 8; + piping_layer = 2 }, /turf/open/floor/engine/hull/interior, /area/ship/engineering) @@ -2658,12 +2676,15 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/medical) "CX" = ( -/obj/structure/sign/poster/clip/serene{ - pixel_y = -32 - }, /obj/machinery/light/directional/west, /obj/effect/turf_decal/corner/transparent/blue/full, /obj/structure/bed/roller, +/obj/machinery/button/door{ + pixel_y = -23; + id = "atlas_med"; + dir = 1; + name = "medbay shutters" + }, /turf/open/floor/plasteel/white, /area/ship/medical) "CZ" = ( @@ -2897,6 +2918,9 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/stairs{ icon = 'icons/obj/stairs.dmi'; dir = 4 @@ -2972,7 +2996,9 @@ /turf/open/floor/engine/hull/interior, /area/ship/engineering) "Hu" = ( -/obj/machinery/door/poddoor, +/obj/machinery/door/poddoor{ + id = "atlas_cargo" + }, /obj/effect/turf_decal/industrial/warning, /turf/open/floor/plating, /area/ship/cargo) @@ -3005,6 +3031,9 @@ "Ir" = ( /obj/effect/turf_decal/spline/fancy/opaque/black, /obj/effect/turf_decal/minutemen/edge, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "IK" = ( @@ -3707,8 +3736,19 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"Qx" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "atlas_med" + }, +/turf/open/floor/plating, +/area/ship/crew/crewtwo) "Qz" = ( /obj/structure/sign/clip, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -3882,11 +3922,14 @@ /turf/open/floor/plating, /area/ship/hallway/central) "RU" = ( -/obj/machinery/computer/helm{ +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/computer/monitor{ dir = 8; icon_state = "computer-left" }, -/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "Sb" = ( @@ -4137,6 +4180,9 @@ pixel_x = 6; pixel_y = 1 }, +/obj/structure/sign/poster/clip/serene{ + pixel_x = 32 + }, /turf/open/floor/plasteel/mono/white, /area/ship/medical) "UK" = ( @@ -4223,6 +4269,9 @@ "Vo" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "atlas_med" + }, /turf/open/floor/plating, /area/ship/medical) "Vq" = ( @@ -4633,11 +4682,11 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "ZZ" = ( -/obj/machinery/computer/communications{ +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/computer/helm{ dir = 8; icon_state = "computer-middle" }, -/obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) @@ -5296,7 +5345,7 @@ TE TE kG kL -lY +pi BW si CO @@ -5375,7 +5424,7 @@ da da SW Av -gR +Qx "} (33,1,1) = {" Sp From 73731c39edcef84c7b5f545c85f10c2b7982515c Mon Sep 17 00:00:00 2001 From: rye-rice <58402542+rye-rice@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:35:14 -0700 Subject: [PATCH 09/17] im sorry meem i need to control who plays it during the uptime at least for now Signed-off-by: rye-rice <58402542+rye-rice@users.noreply.github.com> --- _maps/configs/minutemen_atlas.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/configs/minutemen_atlas.json b/_maps/configs/minutemen_atlas.json index 0f45e5ec4082..ac8582185036 100644 --- a/_maps/configs/minutemen_atlas.json +++ b/_maps/configs/minutemen_atlas.json @@ -45,5 +45,5 @@ "slots": 1 } }, - "enabled": true + "enabled": false } From c8d13e1e94a202022c32794318c360696c9920c7 Mon Sep 17 00:00:00 2001 From: rye-rice <58402542+rye-rice@users.noreply.github.com> Date: Fri, 26 Jul 2024 14:13:33 -0700 Subject: [PATCH 10/17] REVERT WHEN DONE: path changes for clip guns, canwebedit work miracles? Signed-off-by: rye-rice <58402542+rye-rice@users.noreply.github.com> --- _maps/shuttles/minutemen/minutemen_atlas.dmm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm index efdee670d861..7aa1f9bdc3bd 100644 --- a/_maps/shuttles/minutemen/minutemen_atlas.dmm +++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm @@ -1077,12 +1077,12 @@ /turf/open/floor/pod/dark, /area/ship/cargo) "ny" = ( -/obj/item/gun/ballistic/automatic/assault/p16/minutemen{ +/obj/item/gun/ballistic/automatic/assault/cm82{ spawnwithmagazine = 0; pixel_y = 7; pixel_x = -5 }, -/obj/item/gun/ballistic/automatic/assault/p16/minutemen{ +/obj/item/gun/ballistic/automatic/assault/cm82{ spawnwithmagazine = 0; pixel_y = 7; pixel_x = -5 @@ -3979,7 +3979,7 @@ /area/ship/crew/canteen) "Sw" = ( /obj/structure/rack, -/obj/item/ammo_box/a762_40{ +/obj/item/ammo_box/a556_39{ pixel_y = 6; pixel_x = -1 }, @@ -4292,10 +4292,10 @@ pixel_y = 12 }, /obj/effect/turf_decal/trimline/transparent/blue/filled, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/cm5_9mm, +/obj/item/ammo_box/magazine/cm5_9mm, +/obj/item/ammo_box/magazine/cm5_9mm, +/obj/item/ammo_box/magazine/cm5_9mm, /obj/item/ammo_box/magazine/p16, /obj/item/ammo_box/magazine/p16, /obj/item/ammo_box/magazine/p16, From 69b68cb3160730862e3685433806b936f6bef800 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Tue, 30 Jul 2024 00:11:09 -0400 Subject: [PATCH 11/17] sarge db --- _maps/shuttles/minutemen/minutemen_atlas.dmm | 39 ++++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm index 7aa1f9bdc3bd..2173a627f158 100644 --- a/_maps/shuttles/minutemen/minutemen_atlas.dmm +++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm @@ -1077,16 +1077,6 @@ /turf/open/floor/pod/dark, /area/ship/cargo) "ny" = ( -/obj/item/gun/ballistic/automatic/assault/cm82{ - spawnwithmagazine = 0; - pixel_y = 7; - pixel_x = -5 - }, -/obj/item/gun/ballistic/automatic/assault/cm82{ - spawnwithmagazine = 0; - pixel_y = 7; - pixel_x = -5 - }, /obj/item/gun/ballistic/automatic/smg/cm5/no_mag{ pixel_y = -4; pixel_x = 6 @@ -1112,6 +1102,16 @@ }, /obj/machinery/airalarm/directional/north, /obj/structure/guncloset, +/obj/item/gun/ballistic/automatic/assault/cm82{ + spawnwithmagazine = 0; + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/gun/ballistic/automatic/assault/cm82{ + spawnwithmagazine = 0; + pixel_x = -4; + pixel_y = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/security) "nO" = ( @@ -3528,6 +3528,14 @@ pixel_x = 8; pixel_y = -13 }, +/obj/item/storage/box/lethalshot{ + pixel_x = 17; + pixel_y = -12 + }, +/obj/item/gun/ballistic/shotgun/doublebarrel{ + pixel_y = -16; + pixel_x = -3 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/security) "Pk" = ( @@ -3979,18 +3987,17 @@ /area/ship/crew/canteen) "Sw" = ( /obj/structure/rack, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/transparent/blue/filled, /obj/item/ammo_box/a556_39{ - pixel_y = 6; - pixel_x = -1 + pixel_y = 3 }, /obj/item/ammo_box/c9mm{ pixel_x = 4; pixel_y = -5 }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/transparent/blue/filled, /turf/open/floor/plasteel/dark, /area/ship/security) "Sz" = ( From f6db2ef808409a6c696fb523f87475758b73b261 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Sat, 10 Aug 2024 23:02:15 -0400 Subject: [PATCH 12/17] I FUCKING HATE CAKE --- _maps/shuttles/minutemen/minutemen_atlas.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm index 2173a627f158..9843b42b2d2e 100644 --- a/_maps/shuttles/minutemen/minutemen_atlas.dmm +++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm @@ -4546,7 +4546,7 @@ /turf/template_noop, /area/template_noop) "Yu" = ( -/obj/item/reagent_containers/food/snacks/cakeslice/birthday{ +/obj/item/food/cakeslice/birthday{ pixel_x = 6; pixel_y = 3 }, From d8f49e212305d03e5daf27b263f437ff96d9e751 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Thu, 22 Aug 2024 22:08:24 -0400 Subject: [PATCH 13/17] brig --- _maps/shuttles/minutemen/minutemen_atlas.dmm | 244 ++++++++++++++----- 1 file changed, 180 insertions(+), 64 deletions(-) diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm index 9843b42b2d2e..1cda2d476609 100644 --- a/_maps/shuttles/minutemen/minutemen_atlas.dmm +++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm @@ -338,10 +338,10 @@ /area/ship/crew/canteen) "eW" = ( /obj/effect/decal/cleanable/confetti, -/obj/machinery/power/ship_gravity, /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/power/ship_gravity, /turf/open/floor/engine/hull/interior, /area/ship/engineering) "fd" = ( @@ -820,6 +820,10 @@ "jZ" = ( /turf/open/floor/plasteel/tech, /area/ship/cargo) +"kb" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) "kd" = ( /obj/structure/table, /obj/item/storage/box/evidence{ @@ -880,7 +884,12 @@ /area/ship/crew/canteen) "kG" = ( /obj/structure/table, -/obj/item/storage/cans/sixsoda, +/obj/structure/showcase/machinery/microwave{ + name = "\improper broken microwave"; + desc = "Nobody exactly knows why every microwave in Atlas-class vessels are broken, but there have certainly been rumors."; + pixel_x = -1; + pixel_y = 6 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "kL" = ( @@ -1082,8 +1091,8 @@ pixel_x = 6 }, /obj/item/gun/ballistic/automatic/smg/cm5/no_mag{ - pixel_y = -4; - pixel_x = 6 + pixel_y = -7; + pixel_x = 1 }, /obj/effect/turf_decal/trimline/transparent/blue/filled/line{ dir = 8 @@ -1109,8 +1118,8 @@ }, /obj/item/gun/ballistic/automatic/assault/cm82{ spawnwithmagazine = 0; - pixel_x = -4; - pixel_y = 8 + pixel_x = -6; + pixel_y = 4 }, /turf/open/floor/plasteel/tech/grid, /area/ship/security) @@ -1378,6 +1387,14 @@ "ps" = ( /turf/template_noop, /area/template_noop) +"pE" = ( +/obj/structure/toilet{ + dir = 4; + pixel_x = -6; + pixel_y = 3 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) "qb" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -1987,6 +2004,7 @@ /obj/structure/cable{ icon_state = "0-6" }, +/obj/structure/table, /turf/open/floor/plasteel/tech, /area/ship/engineering) "wd" = ( @@ -2070,9 +2088,6 @@ dir = 4 }, /obj/machinery/airalarm/directional/north, -/obj/machinery/turretid{ - pixel_x = -28 - }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "wy" = ( @@ -2274,9 +2289,6 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) "yZ" = ( -/obj/structure/sign/poster/clip/bard{ - pixel_y = 32 - }, /obj/effect/turf_decal/trimline/transparent/blue/filled/line{ dir = 8 }, @@ -2286,41 +2298,11 @@ /obj/effect/turf_decal/techfloor{ dir = 1 }, -/obj/structure/closet/crate, -/obj/item/clothing/suit/space/hardsuit/clip_patroller{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/clothing/suit/space/hardsuit/clip_patroller{ - pixel_x = -13; - pixel_y = 8 - }, -/obj/item/clothing/suit/space/hardsuit/clip_patroller{ - pixel_x = -11; - pixel_y = -2 - }, -/obj/item/clothing/suit/space/hardsuit/clip_patroller{ - pixel_x = 9 - }, -/obj/item/tank/internals/oxygen{ - pixel_x = -1; - pixel_y = -10 - }, -/obj/item/tank/internals/oxygen{ - pixel_x = -1; - pixel_y = -10 - }, -/obj/item/tank/internals/oxygen{ - pixel_x = -1; - pixel_y = -10 - }, -/obj/item/tank/internals/oxygen{ - pixel_x = -1; - pixel_y = -10 +/obj/effect/turf_decal/techfloor/hole{ + dir = 1 }, -/obj/item/tank/internals/oxygen{ - pixel_x = -1; - pixel_y = -10 +/obj/effect/turf_decal/techfloor/hole/right{ + dir = 1 }, /turf/open/floor/plasteel/tech/grid, /area/ship/security) @@ -2534,12 +2516,47 @@ /turf/open/floor/plating, /area/ship/external/dark) "Bx" = ( -/obj/machinery/photocopier, /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 4; pixel_y = 1 }, /obj/machinery/light/directional/south, +/obj/item/tank/internals/oxygen{ + pixel_x = -1; + pixel_y = -10 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = -1; + pixel_y = -10 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = -1; + pixel_y = -10 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = -1; + pixel_y = -10 + }, +/obj/item/tank/internals/oxygen{ + pixel_x = -1; + pixel_y = -10 + }, +/obj/item/clothing/suit/space/hardsuit/clip_patroller{ + pixel_x = -13; + pixel_y = 8 + }, +/obj/item/clothing/suit/space/hardsuit/clip_patroller{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/item/clothing/suit/space/hardsuit/clip_patroller{ + pixel_x = -11; + pixel_y = -2 + }, +/obj/item/clothing/suit/space/hardsuit/clip_patroller{ + pixel_x = 9 + }, +/obj/structure/closet/crate, /turf/open/floor/plasteel/dark, /area/ship/security) "BH" = ( @@ -2826,6 +2843,7 @@ pixel_y = -20; dir = 1 }, +/obj/machinery/photocopier, /turf/open/floor/plasteel/dark, /area/ship/security) "ES" = ( @@ -2938,6 +2956,15 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) +"Gi" = ( +/obj/structure/bed/pod{ + dir = 1 + }, +/obj/item/bedsheet/red{ + dir = 1 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) "Gj" = ( /obj/effect/turf_decal/corner_steel_grid{ dir = 5 @@ -3008,6 +3035,10 @@ "HX" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/hallway/central) +"Ic" = ( +/obj/machinery/turretid, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) "Ig" = ( /obj/structure/bed/dogbed{ name = "Mushroom's bed"; @@ -4052,7 +4083,6 @@ /area/ship/crew/crewtwo) "Ti" = ( /obj/machinery/light/directional/west, -/obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/engine/hull/interior, /area/ship/engineering) "Tx" = ( @@ -4111,6 +4141,7 @@ pixel_x = -18; pixel_y = -3 }, +/obj/structure/table, /turf/open/floor/engine/hull/interior, /area/ship/engineering) "TE" = ( @@ -4215,6 +4246,11 @@ }, /turf/open/floor/pod/dark, /area/ship/cargo) +"UR" = ( +/obj/structure/bed/pod, +/obj/item/bedsheet/red, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) "US" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/computer/cargo{ @@ -4328,16 +4364,8 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "VK" = ( -/obj/structure/table, -/obj/item/chair/plastic{ - pixel_y = 13; - pixel_x = -3 - }, -/obj/item/chair/plastic{ - pixel_y = 9; - pixel_x = 3 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/engine/hull/interior, /area/ship/engineering) "VQ" = ( @@ -4576,6 +4604,13 @@ }, /turf/open/floor/plasteel/dark, /area/ship/cargo) +"YG" = ( +/obj/machinery/door/window/brigdoor/southright{ + req_access = list(3) + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) "YK" = ( /obj/structure/closet/crate/bin, /obj/machinery/firealarm/directional/south, @@ -4602,6 +4637,9 @@ /obj/machinery/door/window/westright{ req_access = list(3) }, +/obj/structure/sign/poster/clip/bard{ + pixel_y = 32 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/security) "Ze" = ( @@ -4700,6 +4738,8 @@ (1,1,1) = {" ps ps +ps +ps ms ps ps @@ -4723,6 +4763,8 @@ ps (2,1,1) = {" ps ps +ps +ps PU PU Bm @@ -4746,6 +4788,8 @@ ps (3,1,1) = {" ps ps +ps +ps PU Ti yL @@ -4769,6 +4813,8 @@ ps (4,1,1) = {" ps ps +ps +ps pp eW My @@ -4792,6 +4838,8 @@ ps (5,1,1) = {" ps ps +ps +ps pp Py Yu @@ -4814,6 +4862,8 @@ ps "} (6,1,1) = {" ps +ps +ps bF vZ VK @@ -4838,6 +4888,8 @@ ps (7,1,1) = {" ps ps +ps +ps mN PU Cc @@ -4862,6 +4914,8 @@ ps ps ps ps +ps +ps PU PU PU @@ -4886,6 +4940,8 @@ ps ps ps ps +ps +ps LE LE LE @@ -4907,6 +4963,8 @@ ps (10,1,1) = {" ps ps +ps +ps gT gT gT @@ -4929,6 +4987,8 @@ ps "} (11,1,1) = {" ps +ps +ps gT gT kd @@ -4952,6 +5012,8 @@ ps "} (12,1,1) = {" ps +ps +ps gT Vq Sw @@ -4975,6 +5037,8 @@ ps "} (13,1,1) = {" ps +ps +ps gT ny VR @@ -4998,6 +5062,8 @@ ps "} (14,1,1) = {" ps +ps +ps gT Rz Uh @@ -5020,7 +5086,9 @@ di ps "} (15,1,1) = {" -ps +gT +gT +gT gT yo fs @@ -5043,7 +5111,9 @@ HW ps "} (16,1,1) = {" -ps +gT +UR +pE gT bQ QS @@ -5066,8 +5136,10 @@ HW ps "} (17,1,1) = {" -ps gT +Gi +kb +YG yZ Oj zQ @@ -5089,8 +5161,10 @@ HW ps "} (18,1,1) = {" -ps -lA +gT +gT +gT +gT gT gT Zd @@ -5115,6 +5189,8 @@ ps ps ps ps +ps +ps gT MC Pi @@ -5138,7 +5214,9 @@ ps ps ps ps -gT +ps +ps +lA TE TE TE @@ -5162,6 +5240,8 @@ ps ps ps ps +ps +ps TE OV No @@ -5184,6 +5264,8 @@ ps ps ps ps +ps +ps Qz TE Ld @@ -5207,6 +5289,8 @@ ps ps ps ps +ps +ps zq Lw le @@ -5229,6 +5313,8 @@ ps (24,1,1) = {" ps ps +ps +ps Yt Hu nX @@ -5253,6 +5339,8 @@ ps ps ps ps +ps +ps Hu nX sA @@ -5276,6 +5364,8 @@ ps ps ps ps +ps +ps kS Ml le @@ -5299,6 +5389,8 @@ ps ps ps ps +ps +ps Qz TE nm @@ -5323,6 +5415,8 @@ ps ps ps ps +ps +ps TE IK xz @@ -5342,6 +5436,8 @@ ps ps "} (29,1,1) = {" +ps +ps da VW Ey @@ -5365,6 +5461,8 @@ Fu da "} (30,1,1) = {" +ps +ps FN FN xi @@ -5388,6 +5486,8 @@ da da "} (31,1,1) = {" +ps +ps FN FN FN @@ -5411,6 +5511,8 @@ da da "} (32,1,1) = {" +ps +ps Sp jQ hR @@ -5434,6 +5536,8 @@ Av Qx "} (33,1,1) = {" +ps +ps Sp rz NY @@ -5457,6 +5561,8 @@ CM gR "} (34,1,1) = {" +ps +ps Sp RL cc @@ -5480,13 +5586,15 @@ IP gR "} (35,1,1) = {" +ps +ps lA FN LH uG ry LM -LM +Ic Mq qn Qw @@ -5504,6 +5612,8 @@ lA "} (36,1,1) = {" ps +ps +ps FN FN vW @@ -5527,6 +5637,8 @@ ps "} (37,1,1) = {" ps +ps +ps Je FN yO @@ -5550,6 +5662,8 @@ ps "} (38,1,1) = {" ps +ps +ps Je FN Gt @@ -5574,6 +5688,8 @@ ps (39,1,1) = {" ps ps +ps +ps Cm tc tc From ac86bee40cf4c807779ecaac89f6acadf9b374cb Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Sat, 24 Aug 2024 15:03:13 -0400 Subject: [PATCH 14/17] Update minutemen_atlas.dmm --- _maps/shuttles/minutemen/minutemen_atlas.dmm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm index 1cda2d476609..b28b98e57e43 100644 --- a/_maps/shuttles/minutemen/minutemen_atlas.dmm +++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm @@ -1393,6 +1393,8 @@ pixel_x = -6; pixel_y = 3 }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/effect/turf_decal/steeldecal/steel_decals_central3, /turf/open/floor/plasteel/tech/grid, /area/ship/security) "qb" = ( From 9da7feaa289333e5f3ecfd7d751c91185ef48aec Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Sun, 1 Sep 2024 15:01:12 -0400 Subject: [PATCH 15/17] jeorg review jeorg shiptest maptainers with 30 reviews is an outlier and should not be counted --- _maps/shuttles/minutemen/minutemen_atlas.dmm | 310 ++++++++++--------- 1 file changed, 165 insertions(+), 145 deletions(-) diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm index b28b98e57e43..d55c0fe99437 100644 --- a/_maps/shuttles/minutemen/minutemen_atlas.dmm +++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm @@ -154,6 +154,10 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "ct" = ( @@ -164,7 +168,7 @@ dir = 1 }, /obj/structure/railing, -/turf/open/floor/plasteel/dark, +/turf/open/floor/pod/dark, /area/ship/crew/canteen) "cN" = ( /obj/item/cigbutt{ @@ -270,6 +274,9 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/crew) "eH" = ( @@ -293,11 +300,19 @@ /obj/item/clothing/head/clip/slouch/officer{ pixel_y = 13 }, -/obj/item/storage/pistolcase/candor{ - pixel_y = -16 +/obj/item/gun/ballistic/automatic/pistol/cm23{ + pixel_x = -2; + pixel_y = -10; + spawnwithmagazine = 0 }, -/obj/item/ammo_box/c45{ - pixel_y = -10 +/obj/item/ammo_box/magazine/cm23{ + pixel_y = -11 + }, +/obj/item/ammo_box/magazine/cm23{ + pixel_y = -12 + }, +/obj/item/ammo_box/magazine/cm23{ + pixel_y = -12 }, /turf/open/floor/carpet/blue, /area/ship/crew/crewthree) @@ -458,6 +473,7 @@ /obj/effect/turf_decal/corner_steel_grid{ dir = 5 }, +/obj/effect/turf_decal/siding/thinplating/dark/corner, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/canteen) "gu" = ( @@ -521,7 +537,6 @@ dir = 4 }, /obj/effect/turf_decal/spline/fancy/opaque/black/corner, -/obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, @@ -549,7 +564,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/door/poddoor/shutters/preopen{ - id = "atlas_dorms" + id = "atlas_fo" }, /turf/open/floor/plating, /area/ship/crew/crewtwo) @@ -557,9 +572,6 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/security) "gU" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 - }, /obj/effect/turf_decal/spline/fancy/opaque/black/corner{ dir = 4 }, @@ -572,6 +584,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "hg" = ( @@ -580,6 +593,7 @@ dir = 1; pixel_y = -23 }, +/obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "hq" = ( @@ -672,6 +686,10 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/turf_decal/industrial/warning{ + dir = 4; + layer = 2.456 + }, /turf/open/floor/plating, /area/ship/hallway/central) "iN" = ( @@ -686,7 +704,8 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/plasteel/tech, +/obj/structure/catwalk/over, +/turf/open/floor/plating, /area/ship/engineering) "iO" = ( /obj/structure/table/reinforced, @@ -700,7 +719,6 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/obj/effect/turf_decal/siding/thinplating/dark, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -740,21 +758,12 @@ /turf/open/floor/carpet/nanoweave/blue, /area/ship/crew/crewtwo) "jc" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/door/window/brigdoor/southright{ + req_access = list(3); dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/plasteel/dark, -/area/ship/crew/canteen) +/area/ship/security) "jp" = ( /obj/structure/table, /obj/structure/reagent_dispensers/peppertank{ @@ -778,7 +787,7 @@ dir = 1 }, /obj/structure/railing/corner, -/turf/open/floor/plasteel/dark, +/turf/open/floor/pod/dark, /area/ship/crew/canteen) "jI" = ( /obj/structure/chair, @@ -815,15 +824,12 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/plasteel/tech, +/obj/structure/catwalk/over, +/turf/open/floor/plating, /area/ship/engineering) "jZ" = ( /turf/open/floor/plasteel/tech, /area/ship/cargo) -"kb" = ( -/obj/machinery/light/small/directional/east, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security) "kd" = ( /obj/structure/table, /obj/item/storage/box/evidence{ @@ -849,9 +855,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/security) "kt" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 4; pixel_y = 1 @@ -863,10 +866,14 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "kv" = ( /obj/effect/turf_decal/trimline/transparent/blue/line, +/obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "kE" = ( @@ -956,6 +963,10 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/light_switch{ + pixel_y = 22; + pixel_x = 11 + }, /turf/open/floor/plasteel/tech, /area/ship/crew) "lY" = ( @@ -1047,7 +1058,8 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel/tech, +/obj/structure/catwalk/over, +/turf/open/floor/plating, /area/ship/engineering) "mN" = ( /obj/structure/sign/clip, @@ -1172,6 +1184,9 @@ }, /obj/machinery/light/directional/south, /obj/effect/turf_decal/trimline/transparent/blue/corner, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "nS" = ( @@ -1245,6 +1260,7 @@ /obj/item/storage/bag/tray/cafeteria{ pixel_y = 12 }, +/obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "oa" = ( @@ -1330,24 +1346,15 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/crewthree) "oY" = ( -/obj/effect/turf_decal/spline/fancy/opaque/black, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/transparent/blue/filled/arrow_ccw{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/toilet{ + dir = 4; + pixel_x = -6; + pixel_y = 3 }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/canteen) +/obj/machinery/light/small/directional/south, +/obj/structure/catwalk/over/plated_catwalk/dark, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) "pi" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/cable{ @@ -1388,15 +1395,22 @@ /turf/template_noop, /area/template_noop) "pE" = ( -/obj/structure/toilet{ - dir = 4; - pixel_x = -6; - pixel_y = 3 - }, /obj/structure/catwalk/over/plated_catwalk/dark, -/obj/effect/turf_decal/steeldecal/steel_decals_central3, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + layer = 2.456 + }, +/turf/open/floor/plating, +/area/ship/hallway/central) "qb" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -1878,6 +1892,9 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "uU" = ( @@ -1886,14 +1903,14 @@ pixel_y = 9; pixel_x = -5 }, +/obj/item/trash/can{ + pixel_x = 7; + pixel_y = 9 + }, /obj/item/reagent_containers/food/drinks/soda_cans/cola{ pixel_y = 4; pixel_x = 1 }, -/obj/item/trash/can{ - pixel_x = 11; - pixel_y = 9 - }, /turf/open/floor/plasteel/grimy, /area/ship/crew/canteen) "uX" = ( @@ -2068,9 +2085,6 @@ /area/ship/crew) "wk" = ( /obj/effect/turf_decal/spline/fancy/opaque/black, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable{ @@ -2093,7 +2107,15 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "wy" = ( -/obj/effect/turf_decal/trimline/transparent/blue/warning, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/transparent/blue/warning{ + dir = 6 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "wJ" = ( @@ -2235,6 +2257,10 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/industrial/warning{ + dir = 4; + layer = 2.456 + }, /turf/open/floor/plating, /area/ship/hallway/central) "yC" = ( @@ -2297,15 +2323,6 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor/hole{ - dir = 1 - }, -/obj/effect/turf_decal/techfloor/hole/right{ - dir = 1 - }, /turf/open/floor/plasteel/tech/grid, /area/ship/security) "zc" = ( @@ -2434,9 +2451,6 @@ /obj/effect/turf_decal/trimline/transparent/blue/filled/arrow_ccw{ dir = 1 }, -/obj/structure/railing{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -2575,7 +2589,6 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/obj/effect/turf_decal/siding/thinplating/dark, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, @@ -2665,7 +2678,7 @@ /obj/effect/turf_decal/trimline/transparent/blue/filled/warning{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/pod/dark, /area/ship/crew/canteen) "Cr" = ( /obj/machinery/power/port_gen/pacman{ @@ -2717,7 +2730,7 @@ /obj/effect/turf_decal/trimline/transparent/blue/filled/corner{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/pod/dark, /area/ship/crew/canteen) "Da" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -2892,13 +2905,15 @@ /area/ship/external/dark) "Fv" = ( /obj/effect/turf_decal/trimline/transparent/blue/warning, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "FF" = ( /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/obj/effect/turf_decal/siding/thinplating/dark, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -2959,13 +2974,9 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "Gi" = ( -/obj/structure/bed/pod{ - dir = 1 - }, -/obj/item/bedsheet/red{ - dir = 1 - }, -/turf/open/floor/plasteel/tech/grid, +/obj/structure/bed/pod, +/obj/item/bedsheet/red, +/turf/open/floor/plasteel/dark, /area/ship/security) "Gj" = ( /obj/effect/turf_decal/corner_steel_grid{ @@ -3090,6 +3101,7 @@ /obj/item/storage/bag/ore, /obj/item/storage/bag/ore, /obj/machinery/light/directional/east, +/obj/structure/crate_shelf, /turf/open/floor/pod/dark, /area/ship/cargo) "IP" = ( @@ -3228,7 +3240,8 @@ /obj/machinery/atmospherics/components/binary/pump/layer2{ dir = 8 }, -/turf/open/floor/plasteel/tech, +/obj/structure/catwalk/over, +/turf/open/floor/plating, /area/ship/engineering) "Km" = ( /obj/machinery/computer/helm/viewscreen/directional/south, @@ -3237,6 +3250,7 @@ "KB" = ( /obj/effect/turf_decal/trimline/transparent/blue/line, /obj/machinery/light/directional/south, +/obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Ld" = ( @@ -3364,7 +3378,8 @@ /obj/structure/cable/yellow{ icon_state = "5-6" }, -/turf/open/floor/plasteel/tech, +/obj/structure/catwalk/over, +/turf/open/floor/plating, /area/ship/engineering) "My" = ( /obj/machinery/power/terminal{ @@ -3645,6 +3660,7 @@ /obj/item/reagent_containers/food/drinks/waterbottle/large, /obj/item/reagent_containers/food/drinks/waterbottle/large, /obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "PT" = ( @@ -3700,10 +3716,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/tech, +/obj/structure/catwalk/over, +/turf/open/floor/plating, /area/ship/engineering) "Qb" = ( -/obj/structure/curtain/cloth, /obj/machinery/recharge_station, /turf/open/floor/carpet/blue, /area/ship/crew) @@ -3783,13 +3799,8 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Qx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "atlas_med" - }, -/turf/open/floor/plating, -/area/ship/crew/crewtwo) +/turf/open/floor/plasteel/dark, +/area/ship/security) "Qz" = ( /obj/structure/sign/clip, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -3974,7 +3985,6 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "Sb" = ( -/obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, @@ -3987,6 +3997,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Sp" = ( @@ -4004,9 +4017,6 @@ /obj/effect/turf_decal/spline/fancy/opaque/black/corner{ dir = 1 }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, @@ -4016,6 +4026,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Sw" = ( @@ -4248,11 +4261,6 @@ }, /turf/open/floor/pod/dark, /area/ship/cargo) -"UR" = ( -/obj/structure/bed/pod, -/obj/item/bedsheet/red, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security) "US" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/computer/cargo{ @@ -4401,9 +4409,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/security) "VT" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 9 - }, /obj/effect/turf_decal/spline/fancy/opaque/black/corner, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 @@ -4418,6 +4423,12 @@ icon_state = "2-4" }, /obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "VW" = ( @@ -4556,13 +4567,14 @@ pixel_y = 23; pixel_x = 10 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/pod/dark, /area/ship/crew/canteen) "Xp" = ( /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/plasteel/tech, +/obj/structure/catwalk/over, +/turf/open/floor/plating, /area/ship/engineering) "Ya" = ( /turf/open/floor/plasteel/tech, @@ -4592,7 +4604,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/turf/open/floor/plasteel/tech, +/obj/structure/catwalk/over, +/turf/open/floor/plating, /area/ship/engineering) "Yw" = ( /obj/machinery/door/airlock/mining, @@ -4607,12 +4620,19 @@ /turf/open/floor/plasteel/dark, /area/ship/cargo) "YG" = ( -/obj/machinery/door/window/brigdoor/southright{ - req_access = list(3) +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 4; + pixel_y = 1 }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) "YK" = ( /obj/structure/closet/crate/bin, /obj/machinery/firealarm/directional/south, @@ -4943,10 +4963,10 @@ ps ps ps ps -ps -LE -LE -LE +gT +Qx +Gi +oY tW em tW @@ -4969,14 +4989,14 @@ ps ps gT gT -gT +jc gT gT tW VT Pd kt -kt +YG gU tW HW @@ -5023,7 +5043,7 @@ dV jp gT jG -jc +IY jI vy nW @@ -5048,7 +5068,7 @@ aX qR Vk ct -oY +Aa nl oa nW @@ -5073,7 +5093,7 @@ dV SB ST ct -oY +Aa Wi am dM @@ -5088,9 +5108,9 @@ di ps "} (15,1,1) = {" -gT -gT -gT +ps +ps +ps gT yo fs @@ -5098,7 +5118,7 @@ QC sl gT Xl -oY +Aa wh Qt OQ @@ -5113,9 +5133,9 @@ HW ps "} (16,1,1) = {" -gT -UR -pE +ps +ps +ps gT bQ QS @@ -5138,10 +5158,10 @@ HW ps "} (17,1,1) = {" +ps +ps +ps gT -Gi -kb -YG yZ Oj zQ @@ -5163,9 +5183,9 @@ HW ps "} (18,1,1) = {" -gT -gT -gT +ps +ps +ps gT gT gT @@ -5425,7 +5445,7 @@ xz TE MO Fv -lY +pE uQ wl CO @@ -5535,7 +5555,7 @@ da da SW Av -Qx +gR "} (33,1,1) = {" ps From f9e87546661c31d5fbdedfcdccdd8fdb412efd71 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Sat, 14 Sep 2024 16:40:46 -0300 Subject: [PATCH 16/17] RYE STOP REPATHING THINGS --- _maps/shuttles/minutemen/minutemen_atlas.dmm | 89 +++++++++++++++----- 1 file changed, 67 insertions(+), 22 deletions(-) diff --git a/_maps/shuttles/minutemen/minutemen_atlas.dmm b/_maps/shuttles/minutemen/minutemen_atlas.dmm index d55c0fe99437..ee9959882c5c 100644 --- a/_maps/shuttles/minutemen/minutemen_atlas.dmm +++ b/_maps/shuttles/minutemen/minutemen_atlas.dmm @@ -734,12 +734,6 @@ name = "first officer's locker"; req_access_txt = "19" }, -/obj/item/storage/pistolcase/candor{ - pixel_y = -16 - }, -/obj/item/ammo_box/c45{ - pixel_y = -10 - }, /obj/item/clothing/head/clip/slouch/officer{ pixel_y = 13 }, @@ -755,6 +749,20 @@ /obj/item/clothing/suit/toggle/lawyer/clip/fo{ pixel_x = -13 }, +/obj/item/gun/ballistic/automatic/pistol/cm23{ + pixel_x = -2; + pixel_y = -10; + spawnwithmagazine = 0 + }, +/obj/item/ammo_box/magazine/cm23{ + pixel_y = -12 + }, +/obj/item/ammo_box/magazine/cm23{ + pixel_y = -12 + }, +/obj/item/ammo_box/magazine/cm23{ + pixel_y = -12 + }, /turf/open/floor/carpet/nanoweave/blue, /area/ship/crew/crewtwo) "jc" = ( @@ -2367,6 +2375,23 @@ /obj/machinery/advanced_airlock_controller{ pixel_y = 26 }, +/obj/structure/closet/emcloset/wall/directional/south, +/obj/item/clothing/suit/space/fragile{ + pixel_x = 6; + pixel_y = -14 + }, +/obj/item/clothing/suit/space/fragile{ + pixel_x = 11; + pixel_y = -17 + }, +/obj/item/clothing/head/helmet/space/fragile{ + pixel_x = -8; + pixel_y = -9 + }, +/obj/item/clothing/head/helmet/space/fragile{ + pixel_x = -2; + pixel_y = -14 + }, /turf/open/floor/plasteel/dark, /area/ship/engineering) "zl" = ( @@ -3624,6 +3649,8 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/item/clothing/suit/space/syndicate/blue, +/obj/item/clothing/head/helmet/space/syndicate/blue, /turf/open/floor/engine/hull/interior, /area/ship/engineering) "PD" = ( @@ -4037,8 +4064,9 @@ dir = 8 }, /obj/effect/turf_decal/trimline/transparent/blue/filled, -/obj/item/ammo_box/a556_39{ - pixel_y = 3 +/obj/item/ammo_box/a556_42{ + pixel_x = -3; + pixel_y = 4 }, /obj/item/ammo_box/c9mm{ pixel_x = 4; @@ -4185,18 +4213,19 @@ "Uh" = ( /obj/structure/rack, /obj/item/clothing/suit/armor/vest/bulletproof{ - pixel_x = -9; - pixel_y = 11 + pixel_x = -5; + pixel_y = 7 }, /obj/item/clothing/suit/armor/vest/bulletproof{ - pixel_y = 6 + pixel_y = 5; + pixel_x = 6 }, /obj/item/clothing/suit/armor/vest/bulletproof{ - pixel_x = -9; - pixel_y = 3 + pixel_x = -6 }, /obj/item/clothing/suit/armor/vest/bulletproof{ - pixel_x = 4 + pixel_x = 5; + pixel_y = -1 }, /obj/effect/turf_decal/trimline/transparent/blue/filled, /turf/open/floor/plasteel/dark, @@ -4345,14 +4374,30 @@ pixel_y = 12 }, /obj/effect/turf_decal/trimline/transparent/blue/filled, -/obj/item/ammo_box/magazine/cm5_9mm, -/obj/item/ammo_box/magazine/cm5_9mm, -/obj/item/ammo_box/magazine/cm5_9mm, -/obj/item/ammo_box/magazine/cm5_9mm, -/obj/item/ammo_box/magazine/p16, -/obj/item/ammo_box/magazine/p16, -/obj/item/ammo_box/magazine/p16, -/obj/item/ammo_box/magazine/p16, +/obj/item/ammo_box/magazine/cm5_9mm{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/cm5_9mm{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/cm5_9mm{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/cm5_9mm{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/p16{ + pixel_x = -9 + }, +/obj/item/ammo_box/magazine/p16{ + pixel_x = -9 + }, +/obj/item/ammo_box/magazine/p16{ + pixel_x = -9 + }, +/obj/item/ammo_box/magazine/p16{ + pixel_x = -9 + }, /obj/machinery/light/directional/north, /obj/structure/window/reinforced{ dir = 8 From def75e4cd0c8391cca1117014cba169f94fa8b80 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Sun, 22 Sep 2024 20:19:10 -0300 Subject: [PATCH 17/17] checks --- code/game/machinery/porta_turret/portable_turret.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 12307d02b5d3..ed7177fcb92f 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -846,7 +846,7 @@ DEFINE_BITFIELD(turret_flags, list( faction = list(FACTION_PLAYER_MINUTEMAN, "turret") /obj/machinery/porta_turret/ship/solgov - faction = list(FACTION_PLAYER_SOLGOV, "turret") + faction = list(FACTION_PLAYER_SOLCON, "turret") /* Syndicate Turrets */