From d3be64cb7a47ce10624fefe8d617628ee7fc76e6 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Thu, 22 Aug 2024 03:57:29 -0700 Subject: [PATCH 01/26] Create independent_daniel.dmm --- .../independent/independent_daniel.dmm | 925 ++++++++++++++++++ 1 file changed, 925 insertions(+) create mode 100644 _maps/shuttles/independent/independent_daniel.dmm diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm new file mode 100644 index 000000000000..59d69a7181a9 --- /dev/null +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -0,0 +1,925 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"c" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"d" = ( +/obj/machinery/button/door{ + name = "Engine Shutters"; + dir = 4; + pixel_y = -7; + pixel_x = -23; + id = "kiloengine" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"e" = ( +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"g" = ( +/obj/machinery/power/ship_gravity, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"h" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"j" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"k" = ( +/turf/closed/wall/r_wall, +/area/ship/engineering/engine) +"m" = ( +/obj/machinery/power/smes/shuttle{ + dir = 4 + }, +/obj/machinery/door/window/westright{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/window/reinforced/spawner/north, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + id = "kiloengine"; + name = "Engine Shutters"; + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"n" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"p" = ( +/obj/machinery/power/port_gen/pacman/super, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"q" = ( +/obj/machinery/power/terminal, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/closet/wall/orange/directional/east, +/obj/item/stack/sheet/mineral/uranium/twenty, +/obj/item/stack/sheet/mineral/plasma/ten, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"u" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/closet/wall/orange/directional/north, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/syndicate, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical, +/obj/item/construction/rcd, +/obj/item/storage/belt/utility, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"w" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"x" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"z" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/closet/wall/orange/directional/south, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"A" = ( +/turf/open/floor/plating, +/area/ship/engineering/engine) +"D" = ( +/obj/machinery/power/smes/shuttle{ + dir = 4 + }, +/obj/machinery/door/window/westright{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/window/reinforced/spawner, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + id = "kiloengine"; + name = "Engine Shutters"; + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"F" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + id = "kiloengine"; + name = "Engine Shutters"; + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/external) +"H" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"I" = ( +/obj/machinery/button/door{ + name = "Garage Control"; + dir = 4; + pixel_y = -7; + pixel_x = -23; + id = "DanielGarage" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"J" = ( +/obj/machinery/power/smes, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"L" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"M" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/closet/wall/orange/directional/east, +/obj/item/stack/sheet/mineral/uranium/twenty, +/obj/item/stack/sheet/mineral/plasma/ten, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"N" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"O" = ( +/obj/machinery/door/poddoor/shutters{ + id = "DanielGarage" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Q" = ( +/obj/machinery/power/terminal, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"S" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"T" = ( +/obj/machinery/power/port_gen/pacman/super, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"V" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"W" = ( +/obj/machinery/atmospherics/components/unary/tank/air{ + piping_layer = 2 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"X" = ( +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Z" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +k +F +F +F +F +k +F +F +F +F +k +a +"} +(3,1,1) = {" +a +k +m +D +m +D +k +m +D +m +D +k +a +"} +(4,1,1) = {" +a +k +n +n +n +n +d +n +n +n +n +k +a +"} +(5,1,1) = {" +a +k +u +S +j +j +h +c +c +V +z +k +a +"} +(6,1,1) = {" +a +k +J +Z +A +A +H +A +A +Q +J +k +a +"} +(7,1,1) = {" +a +k +J +M +p +L +H +N +T +q +J +k +a +"} +(8,1,1) = {" +a +k +k +k +k +k +H +k +k +k +k +k +a +"} +(9,1,1) = {" +a +O +I +A +A +k +H +k +W +W +X +k +a +"} +(10,1,1) = {" +a +O +A +A +A +w +H +w +A +A +A +k +a +"} +(11,1,1) = {" +a +O +A +A +A +k +x +k +A +e +g +k +a +"} +(12,1,1) = {" +a +k +k +k +k +a +a +a +k +k +k +k +a +"} +(13,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(21,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(22,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(23,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(24,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(25,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(26,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(27,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(28,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(29,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(30,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(31,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(32,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(33,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(34,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(35,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(36,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(37,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(38,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(39,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(40,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} From 8bb557e173466ee7c3e7c099ed0f4b5737612fd1 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Thu, 22 Aug 2024 04:37:04 -0700 Subject: [PATCH 02/26] Update independent_daniel.dmm --- .../independent/independent_daniel.dmm | 1497 +++++++++-------- 1 file changed, 832 insertions(+), 665 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 59d69a7181a9..a1fba93b20ba 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -1,113 +1,225 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, +"aJ" = ( +/obj/machinery/power/terminal, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"aK" = ( +/obj/machinery/door/airlock/vault, +/turf/open/floor/plating, /area/template_noop) -"c" = ( +"aL" = ( +/obj/machinery/door/poddoor/shutters{ + id = "DanielGarage" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"bS" = ( /obj/structure/cable{ icon_state = "2-8" }, /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"ei" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/r_wall, +/area/ship/engineering/engine) +"en" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"eU" = ( +/obj/structure/closet/crate/secure/science, +/obj/item/circuitboard/machine/protolathe, +/obj/item/circuitboard/machine/circuit_imprinter, /turf/open/floor/plating, /area/ship/engineering/engine) -"d" = ( +"fc" = ( +/turf/open/floor/plating, +/area/template_noop) +"fK" = ( +/obj/machinery/power/smes, +/obj/structure/cable{ + icon_state = "0-1" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"gM" = ( +/obj/machinery/computer/crew/retro, +/turf/open/floor/circuit, +/area/template_noop) +"he" = ( +/obj/structure/AIcore, +/obj/item/circuitboard/aicore, +/obj/item/stack/sheet/rglass, +/obj/item/stack/sheet/rglass, +/obj/item/stack/sheet/rglass, +/obj/item/stack/sheet/rglass, +/obj/item/stack/sheet/rglass, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"mn" = ( /obj/machinery/button/door{ - name = "Engine Shutters"; + name = "Garage Control"; dir = 4; pixel_y = -7; pixel_x = -23; - id = "kiloengine" + id = "DanielGarage" }, /turf/open/floor/plating, /area/ship/engineering/engine) -"e" = ( -/obj/machinery/portable_atmospherics/pump, +"qQ" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/open/floor/plating, /area/ship/engineering/engine) -"g" = ( -/obj/machinery/power/ship_gravity, +"si" = ( +/obj/structure/mecha_wreckage/marauder, /turf/open/floor/plating, /area/ship/engineering/engine) -"h" = ( +"tK" = ( +/turf/closed/wall/r_wall, +/area/ship/engineering/engine) +"ui" = ( /obj/structure/cable{ - icon_state = "1-4" + icon_state = "1-8" }, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/plating, /area/ship/engineering/engine) -"j" = ( +"uV" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, /obj/structure/cable{ icon_state = "1-8" }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"vj" = ( +/obj/machinery/power/port_gen/pacman/super, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "0-2" }, /turf/open/floor/plating, /area/ship/engineering/engine) -"k" = ( +"wy" = ( +/turf/template_noop, +/area/template_noop) +"wB" = ( /turf/closed/wall/r_wall, -/area/ship/engineering/engine) -"m" = ( -/obj/machinery/power/smes/shuttle{ - dir = 4 +/area/template_noop) +"xV" = ( +/obj/structure/closet/wall/blue/directional/north, +/obj/item/aicard{ + pixel_x = -5 }, -/obj/machinery/door/window/westright{ - dir = 4 +/obj/item/aiModule/toyAI, +/obj/item/borg/upgrade/ai, +/obj/item/mmi/posibrain{ + pixel_x = 7; + pixel_y = 11; + name = "Saga Bootup Procedure" }, +/turf/open/floor/circuit, +/area/template_noop) +"yD" = ( /obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/window/reinforced/spawner/north, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - id = "kiloengine"; - name = "Engine Shutters"; - dir = 8 + icon_state = "0-1" }, +/obj/machinery/power/terminal, /turf/open/floor/plating, /area/ship/engineering/engine) -"n" = ( -/obj/machinery/power/terminal{ - dir = 8 +"yR" = ( +/obj/machinery/atmospherics/components/unary/tank/air{ + piping_layer = 2 }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"zw" = ( /obj/structure/cable{ - icon_state = "0-4" + icon_state = "1-4" }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 +/obj/structure/cable{ + icon_state = "2-4" }, /turf/open/floor/plating, /area/ship/engineering/engine) -"p" = ( -/obj/machinery/power/port_gen/pacman/super, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "1-2" - }, +"BX" = ( +/obj/structure/closet/crate/eva, +/obj/effect/spawner/lootdrop/maintenance/four, +/obj/effect/spawner/lootdrop/maintenance/six, +/obj/effect/spawner/lootdrop/maintenance/six, /turf/open/floor/plating, /area/ship/engineering/engine) -"q" = ( -/obj/machinery/power/terminal, +"BZ" = ( +/obj/machinery/airalarm/all_access, +/turf/closed/wall/r_wall, +/area/ship/engineering/engine) +"Ch" = ( /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-8" }, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Dn" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Dr" = ( +/obj/machinery/power/terminal{ + dir = 8 }, /obj/structure/cable{ - icon_state = "1-8" + icon_state = "0-4" }, -/obj/structure/closet/wall/orange/directional/east, -/obj/item/stack/sheet/mineral/uranium/twenty, -/obj/item/stack/sheet/mineral/plasma/ten, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/plating, /area/ship/engineering/engine) -"u" = ( +"Dx" = ( /obj/structure/cable{ icon_state = "2-8" }, @@ -123,16 +235,53 @@ /obj/item/rcd_ammo/large, /turf/open/floor/plating, /area/ship/engineering/engine) -"w" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +"EO" = ( +/obj/structure/AIcore, +/obj/item/circuitboard/aicore, +/obj/item/stack/sheet/rglass, +/obj/item/stack/sheet/rglass, +/obj/item/stack/sheet/rglass, +/obj/item/stack/sheet/rglass, +/obj/item/stack/sheet/rglass, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/circuit, +/area/template_noop) +"FR" = ( +/obj/machinery/blackbox_recorder{ + name = "SAGA remote data saving center"; + desc = "Where are the other three?!" }, +/turf/open/floor/circuit, +/area/template_noop) +"Gc" = ( +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating, /area/ship/engineering/engine) -"x" = ( +"Gl" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/template_noop, +/area/template_noop) +"Hd" = ( +/obj/machinery/announcement_system, +/turf/open/floor/circuit, +/area/template_noop) +"Hg" = ( +/obj/machinery/computer/rdconsole/core, +/turf/open/floor/circuit, +/area/template_noop) +"Hr" = ( +/mob/living/carbon/human/species/ipc, +/obj/structure/bed/pod, +/obj/item/bedsheet/black, +/obj/structure/curtain/cloth/fancy, +/obj/item/clothing/under/suit/charcoal, +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/gloves/color/black, +/obj/item/radio/headset/heads/captain/alt, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/circuit, +/area/template_noop) +"HI" = ( /obj/structure/cable{ icon_state = "4-8" }, @@ -146,17 +295,14 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) -"z" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/closet/wall/orange/directional/south, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"A" = ( +"HK" = ( +/obj/machinery/power/ship_gravity, /turf/open/floor/plating, /area/ship/engineering/engine) -"D" = ( +"Ig" = ( +/turf/open/floor/circuit, +/area/template_noop) +"JC" = ( /obj/machinery/power/smes/shuttle{ dir = 4 }, @@ -166,7 +312,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/structure/window/reinforced/spawner, +/obj/structure/window/reinforced/spawner/north, /obj/effect/turf_decal/industrial/warning{ dir = 4 }, @@ -177,9 +323,13 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) -"F" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 +"Kd" = ( +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"KY" = ( +/obj/machinery/power/terminal{ + dir = 8 }, /obj/structure/cable{ icon_state = "0-4" @@ -187,42 +337,59 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - id = "kiloengine"; - name = "Engine Shutters"; - dir = 4 +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Lg" = ( +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/plating, -/area/ship/external) -"H" = ( +/area/ship/engineering/engine) +"NI" = ( +/turf/open/floor/plating, +/area/ship/engineering/engine) +"OL" = ( /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"ON" = ( +/obj/machinery/power/port_gen/pacman/super, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"OP" = ( +/obj/machinery/power/apc, +/turf/closed/wall/r_wall, +/area/ship/engineering/engine) +"PF" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/closet/wall/orange/directional/south, /turf/open/floor/plating, /area/ship/engineering/engine) -"I" = ( +"Ri" = ( /obj/machinery/button/door{ - name = "Garage Control"; + name = "Engine Shutters"; dir = 4; pixel_y = -7; pixel_x = -23; - id = "DanielGarage" + id = "kiloengine" }, /turf/open/floor/plating, /area/ship/engineering/engine) -"J" = ( -/obj/machinery/power/smes, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"L" = ( +"RW" = ( /obj/machinery/power/port_gen/pacman, /obj/structure/cable, /turf/open/floor/plating, /area/ship/engineering/engine) -"M" = ( +"So" = ( /obj/machinery/power/terminal{ dir = 1 }, @@ -240,686 +407,686 @@ /obj/item/stack/sheet/mineral/plasma/ten, /turf/open/floor/plating, /area/ship/engineering/engine) -"N" = ( -/obj/machinery/power/port_gen/pacman, +"Ss" = ( +/obj/machinery/power/smes/shuttle{ + dir = 4 + }, +/obj/machinery/door/window/westright{ + dir = 4 + }, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "0-8" + }, +/obj/structure/window/reinforced/spawner, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"O" = ( /obj/machinery/door/poddoor/shutters{ - id = "DanielGarage" + id = "kiloengine"; + name = "Engine Shutters"; + dir = 8 }, /turf/open/floor/plating, /area/ship/engineering/engine) -"Q" = ( -/obj/machinery/power/terminal, +"St" = ( +/obj/machinery/rnd/server, +/obj/item/radio/intercom/wideband/directional/west, +/turf/open/floor/circuit, +/area/template_noop) +"Tm" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/r_wall, +/area/template_noop) +"Ut" = ( +/obj/machinery/airalarm/all_access, +/turf/closed/wall/r_wall, +/area/template_noop) +"VM" = ( /obj/structure/cable{ icon_state = "2-8" }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-8" }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"S" = ( /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/structure/closet/wall/orange/directional/east, +/obj/item/stack/sheet/mineral/uranium/twenty, +/obj/item/stack/sheet/mineral/plasma/ten, /turf/open/floor/plating, /area/ship/engineering/engine) -"T" = ( -/obj/machinery/power/port_gen/pacman/super, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, +"Wn" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/plating, /area/ship/engineering/engine) -"V" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" +"WM" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 }, /obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"W" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - piping_layer = 2 + icon_state = "0-4" }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"X" = ( -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"Z" = ( -/obj/machinery/power/terminal{ - dir = 1 +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/door/poddoor/shutters{ + id = "kiloengine"; + name = "Engine Shutters"; + dir = 4 }, +/turf/open/floor/plating, +/area/ship/external) +"XO" = ( +/obj/machinery/power/smes, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "0-2" }, /turf/open/floor/plating, /area/ship/engineering/engine) (1,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (2,1,1) = {" -a -k -F -F -F -F -k -F -F -F -F -k -a +wy +tK +WM +WM +WM +WM +tK +WM +WM +WM +WM +tK +wy "} (3,1,1) = {" -a -k -m -D -m -D -k -m -D -m -D -k -a +wy +ei +JC +Ss +JC +Ss +tK +JC +Ss +JC +Ss +ei +wy "} (4,1,1) = {" -a -k -n -n -n -n -d -n -n -n -n -k -a +wy +tK +Dr +KY +KY +KY +Ri +KY +KY +KY +KY +BZ +wy "} (5,1,1) = {" -a -k -u -S -j -j -h -c -c -V -z -k -a +wy +tK +Dx +ui +Ch +Ch +zw +uV +uV +bS +PF +tK +wy "} (6,1,1) = {" -a -k -J -Z -A -A -H -A -A -Q -J -k -a +wy +tK +XO +en +NI +NI +Lg +NI +NI +aJ +fK +tK +wy "} (7,1,1) = {" -a -k -J -M -p -L -H -N -T -q -J -k -a +wy +tK +XO +So +ON +RW +Lg +qQ +vj +VM +yD +OP +wy "} (8,1,1) = {" -a -k -k -k -k -k -H -k -k -k -k -k -a +wy +ei +tK +tK +tK +tK +Lg +tK +tK +tK +tK +ei +wy "} (9,1,1) = {" -a -O -I -A -A -k -H -k -W -W -X -k -a +wy +aL +mn +Wn +BX +tK +OL +tK +yR +yR +Gc +tK +wy "} (10,1,1) = {" -a -O -A -A -A -w -H -w -A -A -A -k -a +wy +aL +NI +NI +NI +Dn +Lg +Dn +NI +NI +NI +tK +wy "} (11,1,1) = {" -a -O -A -A -A -k -x -k -A -e -g -k -a +wy +aL +NI +eU +si +tK +HI +tK +he +Kd +HK +tK +wy "} (12,1,1) = {" -a -k -k -k -k -a -a -a -k -k -k -k -a +wy +ei +tK +tK +tK +fc +fc +wB +tK +tK +tK +ei +wy "} (13,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +fc +fc +fc +fc +fc +fc +wB +St +EO +Hr +wB +wy "} (14,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +fc +fc +fc +fc +fc +fc +wB +gM +Ig +Ig +Ut +wy "} (15,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +fc +fc +fc +fc +fc +fc +wB +xV +Ig +Hd +wB +wy "} (16,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +fc +fc +fc +fc +fc +fc +wB +Hg +Ig +FR +wB +wy "} (17,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +fc +fc +fc +fc +fc +fc +aK +Ig +Ig +FR +wB +wy "} (18,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +Gl +wy +wy +wy +wy +wy +wB +wB +wB +wB +Tm +wy "} (19,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (20,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (21,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (22,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (23,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (24,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (25,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (26,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (27,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (28,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (29,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (30,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (31,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (32,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (33,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (34,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (35,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (36,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (37,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (38,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (39,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} (40,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy +wy "} From 0ef1de5a6893b3a94fcb293059053213347c4b8d Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Thu, 22 Aug 2024 14:15:34 -0700 Subject: [PATCH 03/26] Update independent_daniel.dmm --- .../independent/independent_daniel.dmm | 2576 ++++++++++++----- 1 file changed, 1774 insertions(+), 802 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index a1fba93b20ba..86aa962e82af 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -1,4 +1,16 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ap" = ( +/mob/living/simple_animal/pet/mothroach{ + name = "Bugger" + }, +/obj/structure/bed/dogbed, +/obj/machinery/light/dim/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"aC" = ( +/obj/structure/salvageable/server, +/turf/open/floor/plating, +/area/ship/maintenance/central) "aJ" = ( /obj/machinery/power/terminal, /obj/structure/cable{ @@ -10,15 +22,49 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "aK" = ( -/obj/machinery/door/airlock/vault, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/plating, -/area/template_noop) +/area/ship/engineering/engine) "aL" = ( /obj/machinery/door/poddoor/shutters{ id = "DanielGarage" }, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"ba" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/ship/engineering/engine) +"bj" = ( +/obj/structure/closet/cardboard, +/obj/effect/spawner/lootdrop/donut, +/obj/effect/spawner/lootdrop/donut, +/obj/item/circuitboard/machine/ltsrbt, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/salvage/gold, +/obj/effect/spawner/lootdrop/stockparts, +/obj/item/a_gift/anything, +/turf/open/floor/plating, +/area/ship/maintenance/central) +"bk" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/mineral/gold, +/area/ship/maintenance/central) "bS" = ( /obj/structure/cable{ icon_state = "2-8" @@ -31,6 +77,68 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"ca" = ( +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/light/dim/directional/east, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) +"ch" = ( +/obj/structure/salvageable/computer, +/turf/open/floor/plating, +/area/ship/maintenance/central) +"cJ" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"cW" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"cZ" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/window/plasma/spawner/north, +/obj/structure/window/plasma/spawner, +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"da" = ( +/obj/machinery/computer/communications{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"dE" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 2 + }, +/turf/open/floor/wood/birch, +/area/ship/crew) "ei" = ( /obj/machinery/porta_turret/ship/ballistic, /turf/closed/wall/r_wall, @@ -50,15 +158,66 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) -"eU" = ( -/obj/structure/closet/crate/secure/science, -/obj/item/circuitboard/machine/protolathe, -/obj/item/circuitboard/machine/circuit_imprinter, +"eJ" = ( +/obj/structure/closet/crate/eva, +/obj/effect/spawner/lootdrop/maintenance/four, +/obj/effect/spawner/lootdrop/maintenance/six, +/obj/effect/spawner/lootdrop/maintenance/six, +/obj/machinery/light/dim/directional/south, /turf/open/floor/plating, /area/ship/engineering/engine) +"eN" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/maintenance/central) +"eU" = ( +/obj/structure/guncase, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "fc" = ( +/turf/open/floor/wood/birch, +/area/ship/crew) +"fn" = ( +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/pump/on/layer2{ + dir = 1; + name = "Air to Distro" + }, +/obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, -/area/template_noop) +/area/ship/engineering/engine) +"fp" = ( +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/ert/engi, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"fA" = ( +/obj/machinery/camera/xray, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/wood/birch, +/area/ship/crew) "fK" = ( /obj/machinery/power/smes, /obj/structure/cable{ @@ -66,10 +225,77 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"fT" = ( +/obj/machinery/computer/security, +/obj/machinery/light/floor, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"fU" = ( +/obj/structure/dresser, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/carpet/lone, +/area/ship/crew) +"gd" = ( +/obj/machinery/door/airlock/medical/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) +"ge" = ( +/obj/machinery/airalarm/all_access, +/turf/closed/wall/r_wall, +/area/ship/science/ai_chamber) "gM" = ( -/obj/machinery/computer/crew/retro, +/obj/structure/closet/wall/blue/directional/north, +/obj/item/aicard{ + pixel_x = -5 + }, +/obj/item/aiModule/toyAI, +/obj/item/borg/upgrade/ai, +/obj/item/mmi/posibrain{ + pixel_x = 7; + pixel_y = 11; + name = "Saga Bootup Procedure" + }, +/obj/item/mmi/posibrain, /turf/open/floor/circuit, -/area/template_noop) +/area/ship/science/ai_chamber) +"gR" = ( +/obj/structure/closet/emcloset/wall/directional/north, +/turf/open/floor/wood/birch, +/area/ship/crew) +"gY" = ( +/obj/structure/closet/secure_closet/captains, +/obj/item/pinpointer/crew, +/obj/item/borg/upgrade/pinpointer, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/implanter, +/obj/item/implantcase/mindshield, +/obj/item/implantcase/mindshield, +/obj/item/storage/backpack/duffelbag/captain, +/obj/machinery/light/dim/directional/north, +/obj/item/storage/box/ids, +/obj/item/storage/wallet, +/obj/item/storage/wallet, +/obj/item/storage/wallet, +/obj/item/storage/wallet, +/obj/item/storage/wallet, +/obj/item/card/bank, +/obj/item/card/bank, +/obj/item/card/bank, +/obj/item/card/bank, +/obj/item/card/bank, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) "he" = ( /obj/structure/AIcore, /obj/item/circuitboard/aicore, @@ -80,133 +306,169 @@ /obj/item/stack/sheet/rglass, /turf/open/floor/plating, /area/ship/engineering/engine) -"mn" = ( -/obj/machinery/button/door{ - name = "Garage Control"; - dir = 4; - pixel_y = -7; - pixel_x = -23; - id = "DanielGarage" +"iy" = ( +/obj/machinery/door/airlock/command/glass{ + req_access_txt = "19"; + name = "Bridge"; + dir = 4 }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"qQ" = ( -/obj/machinery/power/port_gen/pacman, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "4-8" }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"si" = ( -/obj/structure/mecha_wreckage/marauder, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"tK" = ( -/turf/closed/wall/r_wall, -/area/ship/engineering/engine) -"ui" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/wood/birch, +/area/ship/bridge) +"iM" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"uV" = ( /obj/structure/cable{ icon_state = "2-8" }, /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"vj" = ( -/obj/machinery/power/port_gen/pacman/super, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "0-2" +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"wy" = ( -/turf/template_noop, -/area/template_noop) -"wB" = ( -/turf/closed/wall/r_wall, -/area/template_noop) -"xV" = ( -/obj/structure/closet/wall/blue/directional/north, -/obj/item/aicard{ - pixel_x = -5 +/turf/open/floor/wood/birch, +/area/ship/crew) +"iX" = ( +/obj/machinery/light/dim/directional/north, +/obj/machinery/camera/xray, +/turf/open/floor/wood/birch, +/area/ship/crew) +"ja" = ( +/obj/structure/destructible/cult/tome, +/obj/item/book/codex_gigas, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/item/aiModule/toyAI, -/obj/item/borg/upgrade/ai, -/obj/item/mmi/posibrain{ - pixel_x = 7; - pixel_y = 11; - name = "Saga Bootup Procedure" +/turf/open/floor/mineral/gold, +/area/ship/maintenance/central) +"jD" = ( +/obj/machinery/button/door{ + name = "Engine Shutters"; + dir = 4; + pixel_y = -7; + pixel_x = -23; + id = "kiloengine" }, -/turf/open/floor/circuit, -/area/template_noop) -"yD" = ( -/obj/structure/cable{ - icon_state = "0-1" +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/power/terminal, /turf/open/floor/plating, /area/ship/engineering/engine) -"yR" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - piping_layer = 2 +"jE" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/plating, /area/ship/engineering/engine) -"zw" = ( +"jV" = ( /obj/structure/cable{ - icon_state = "1-4" + icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, /turf/open/floor/plating, /area/ship/engineering/engine) -"BX" = ( -/obj/structure/closet/crate/eva, -/obj/effect/spawner/lootdrop/maintenance/four, -/obj/effect/spawner/lootdrop/maintenance/six, -/obj/effect/spawner/lootdrop/maintenance/six, +"kc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/plating, /area/ship/engineering/engine) -"BZ" = ( -/obj/machinery/airalarm/all_access, -/turf/closed/wall/r_wall, -/area/ship/engineering/engine) -"Ch" = ( +"kC" = ( /obj/structure/cable{ icon_state = "1-8" }, /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, /area/ship/engineering/engine) -"Dn" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/firedoor/border_only, +"kO" = ( +/obj/machinery/computer/operating{ + dir = 1 + }, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) +"la" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/r_wall, +/area/ship/maintenance/central) +"li" = ( +/obj/machinery/camera{ + dir = 5 + }, +/turf/template_noop, +/area/ship/external) +"lp" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"lz" = ( +/obj/machinery/door/airlock/security, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"mk" = ( +/obj/effect/decal/cleanable/vomit/old, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/maintenance/central) +"mn" = ( +/turf/closed/wall/r_wall, +/area/ship/maintenance/central) +"mo" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/light/dim/directional/east, /turf/open/floor/plating, /area/ship/engineering/engine) -"Dr" = ( +"ms" = ( /obj/machinery/power/terminal{ dir = 8 }, @@ -216,876 +478,1586 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/light/dim/directional/south, /turf/open/floor/plating, /area/ship/engineering/engine) -"Dx" = ( +"mw" = ( /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-2" }, -/obj/structure/closet/wall/orange/directional/north, -/obj/item/storage/toolbox/mechanical, -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/electrical, -/obj/item/storage/toolbox/electrical, -/obj/item/storage/toolbox/mechanical, -/obj/item/construction/rcd, -/obj/item/storage/belt/utility, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"EO" = ( -/obj/structure/AIcore, -/obj/item/circuitboard/aicore, -/obj/item/stack/sheet/rglass, -/obj/item/stack/sheet/rglass, -/obj/item/stack/sheet/rglass, -/obj/item/stack/sheet/rglass, -/obj/item/stack/sheet/rglass, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/circuit, -/area/template_noop) -"FR" = ( -/obj/machinery/blackbox_recorder{ - name = "SAGA remote data saving center"; - desc = "Where are the other three?!" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/wood/birch, +/area/ship/crew) +"nD" = ( +/obj/item/reagent_containers/glass/bowl{ + name = "Buggers Bowl" + }, +/obj/item/clothing/suit/ianshirt, +/obj/item/clothing/suit/vapeshirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"nJ" = ( +/obj/machinery/computer/cargo{ + dir = 8 }, -/turf/open/floor/circuit, -/area/template_noop) -"Gc" = ( -/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"nZ" = ( +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) +"og" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/turf/open/floor/wood/birch, +/area/ship/crew) +"ok" = ( +/obj/structure/sign/departments/medbay/alt, +/turf/closed/wall/r_wall, +/area/ship/medical) +"om" = ( +/obj/structure/closet/crate, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/mining_scanner, +/obj/item/mining_scanner, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, /turf/open/floor/plating, /area/ship/engineering/engine) -"Gl" = ( -/obj/machinery/porta_turret/ship/ballistic, -/turf/template_noop, -/area/template_noop) -"Hd" = ( -/obj/machinery/announcement_system, -/turf/open/floor/circuit, -/area/template_noop) -"Hg" = ( -/obj/machinery/computer/rdconsole/core, +"oG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/circuit, -/area/template_noop) -"Hr" = ( -/mob/living/carbon/human/species/ipc, -/obj/structure/bed/pod, -/obj/item/bedsheet/black, -/obj/structure/curtain/cloth/fancy, -/obj/item/clothing/under/suit/charcoal, -/obj/item/clothing/shoes/laceup, +/area/ship/science/ai_chamber) +"oW" = ( +/obj/item/multitool, +/obj/item/clothing/glasses/meson/engine/tray, +/obj/item/radio, +/obj/item/storage/belt/utility/atmostech, +/obj/item/holosign_creator/atmos, +/obj/item/analyzer, +/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos, +/obj/item/extinguisher/advanced, /obj/item/clothing/gloves/color/black, -/obj/item/radio/headset/heads/captain/alt, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/circuit, -/area/template_noop) -"HI" = ( +/obj/item/clothing/suit/fire/atmos, +/obj/item/clothing/mask/gas/atmos, +/obj/item/clothing/head/hardhat/atmos, +/obj/structure/closet/wall/directional/east{ + name = "Atmospheric locker" + }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-8" + }, +/obj/structure/closet/wall/orange/directional/south, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"pq" = ( +/obj/machinery/door/airlock{ + name = "Bathroom"; + dir = 4 }, -/obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/door/firedoor/heavy, /obj/machinery/door/firedoor/border_only{ dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/turf/open/floor/carpet/lone, +/area/ship/crew) +"pB" = ( +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/swat, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"qD" = ( +/turf/open/floor/mineral/titanium/white, +/area/ship/crew) +"qG" = ( +/obj/structure/closet/secure_closet/lp/medical, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/item/bodybag/bluespace, +/obj/machinery/light/dim/directional/east, +/obj/item/storage/firstaid/tactical, +/obj/item/storage/firstaid/ancient, +/obj/item/storage/firstaid/advanced, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/radiation, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/brute, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) +"qQ" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/open/floor/plating, /area/ship/engineering/engine) -"HK" = ( -/obj/machinery/power/ship_gravity, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"Ig" = ( -/turf/open/floor/circuit, -/area/template_noop) -"JC" = ( -/obj/machinery/power/smes/shuttle{ - dir = 4 - }, -/obj/machinery/door/window/westright{ - dir = 4 - }, +"rh" = ( +/obj/machinery/computer/bookmanagement, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/mineral/gold, +/area/ship/maintenance/central) +"rS" = ( +/obj/structure/closet/firecloset/wall/directional/south, /obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/window/reinforced/spawner/north, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 + icon_state = "4-8" }, -/obj/machinery/door/poddoor/shutters{ - id = "kiloengine"; - name = "Engine Shutters"; +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"Kd" = ( -/obj/machinery/portable_atmospherics/pump, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"KY" = ( -/obj/machinery/power/terminal{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/turf/open/floor/wood/birch, +/area/ship/crew) +"rW" = ( /obj/structure/cable{ - icon_state = "0-4" + icon_state = "0-2" }, -/obj/effect/turf_decal/industrial/warning{ +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/power/terminal{ dir = 8 }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"Lg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/mineral/gold, +/area/ship/maintenance/central) +"se" = ( /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/wood/birch, +/area/ship/crew) +"si" = ( +/obj/structure/mecha_wreckage/marauder, /turf/open/floor/plating, /area/ship/engineering/engine) -"NI" = ( -/turf/open/floor/plating, -/area/ship/engineering/engine) -"OL" = ( +"sx" = ( +/obj/machinery/light/dim/directional/south, /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/wood/birch, +/area/ship/crew) +"th" = ( +/obj/machinery/announcement_system, +/obj/machinery/light/dim/directional/south, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"tj" = ( +/obj/item/antag_spawner/syndi_borer{ + name = "Brain-slug container"; + desc = "Releases a cortical borer." + }, +/obj/structure/safe/floor, +/obj/structure/grille, +/obj/item/documents{ + desc = "\"Top Secret\" Blueprints, these seem to be some kind of design, actually a few designs for a few different weapon and they look absolutely ancient."; + name = "secret blueprints" + }, +/obj/item/aicard, +/obj/item/organ/zombie_infection, +/obj/item/stock_parts/cell/high/slime/hypercharged{ + icon_state = "sheet-gold"; + icon = 'icons/obj/stack_objects.dmi'; + name = "Weird Looking Battery"; + desc = "A weird looking cylindrical cell with a black topping that seems as if you could wire it into something...? on the side there is a red marking on it with a radiation symbol with red text that says boldly CAUTION RADIATION HAZARD" + }, +/obj/item/gun/ballistic/automatic/pistol/candor{ + name = "M1911"; + desc = "An immensely old but still widely popular design which has since been ripped off many times by a few cheap individuals, there is markings on the side showing it was made by John Browning."; + projectile_damage_multiplier = 1.5 + }, +/obj/item/slimepotion/lovepotion, /turf/open/floor/plating, +/area/ship/maintenance/central) +"tK" = ( +/turf/closed/wall/r_wall, /area/ship/engineering/engine) -"ON" = ( -/obj/machinery/power/port_gen/pacman/super, -/obj/structure/cable, +"tX" = ( +/obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, -/area/ship/engineering/engine) -"OP" = ( -/obj/machinery/power/apc, -/turf/closed/wall/r_wall, -/area/ship/engineering/engine) -"PF" = ( +/area/ship/maintenance/central) +"ui" = ( /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/closet/wall/orange/directional/south, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"Ri" = ( -/obj/machinery/button/door{ - name = "Engine Shutters"; - dir = 4; - pixel_y = -7; - pixel_x = -23; - id = "kiloengine" - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"RW" = ( -/obj/machinery/power/port_gen/pacman, -/obj/structure/cable, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"So" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, /obj/structure/cable{ - icon_state = "1-8" + icon_state = "2-8" }, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "4-8" }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"uV" = ( /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/closet/wall/orange/directional/east, -/obj/item/stack/sheet/mineral/uranium/twenty, -/obj/item/stack/sheet/mineral/plasma/ten, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plating, /area/ship/engineering/engine) -"Ss" = ( -/obj/machinery/power/smes/shuttle{ - dir = 4 +"vg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/machinery/door/window/westright{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, +/turf/open/floor/carpet/lone, +/area/ship/crew) +"vj" = ( +/obj/machinery/power/port_gen/pacman/super, /obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/window/reinforced/spawner, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 + icon_state = "1-2" }, -/obj/machinery/door/poddoor/shutters{ - id = "kiloengine"; - name = "Engine Shutters"; - dir = 8 +/obj/structure/cable{ + icon_state = "0-2" }, /turf/open/floor/plating, /area/ship/engineering/engine) -"St" = ( -/obj/machinery/rnd/server, -/obj/item/radio/intercom/wideband/directional/west, -/turf/open/floor/circuit, -/area/template_noop) -"Tm" = ( -/obj/machinery/porta_turret/ship/ballistic, -/turf/closed/wall/r_wall, +"vL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) +"wy" = ( +/turf/template_noop, /area/template_noop) -"Ut" = ( -/obj/machinery/airalarm/all_access, +"wB" = ( /turf/closed/wall/r_wall, -/area/template_noop) -"VM" = ( +/area/ship/security/armory) +"xo" = ( +/turf/open/floor/carpet/lone, +/area/ship/crew) +"xx" = ( /obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "0-8" + icon_state = "1-8" }, +/obj/machinery/holopad/emergency, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"xM" = ( +/obj/structure/closet/wall/red/directional/west, +/obj/item/stock_parts/cell/gun/empty, +/obj/item/stock_parts/cell/gun/empty, +/obj/item/stock_parts/cell/gun/empty, +/obj/item/gun/energy, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"xV" = ( +/obj/machinery/computer/rdconsole/core, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"yx" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/r_wall, +/area/ship/medical) +"yD" = ( /obj/structure/cable{ - icon_state = "1-8" + icon_state = "0-1" }, -/obj/structure/closet/wall/orange/directional/east, -/obj/item/stack/sheet/mineral/uranium/twenty, -/obj/item/stack/sheet/mineral/plasma/ten, +/obj/machinery/power/terminal, /turf/open/floor/plating, /area/ship/engineering/engine) -"Wn" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/eight, -/obj/effect/spawner/lootdrop/maintenance/four, +"yR" = ( +/obj/machinery/atmospherics/components/unary/tank/air{ + piping_layer = 2 + }, /turf/open/floor/plating, /area/ship/engineering/engine) -"WM" = ( -/obj/machinery/power/shuttle/engine/electric{ - dir = 4 - }, +"zw" = ( /obj/structure/cable{ - icon_state = "0-4" + icon_state = "4-8" }, -/obj/effect/turf_decal/industrial/warning{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 4 +/turf/open/floor/plating, +/area/ship/engineering/engine) +"zG" = ( +/obj/machinery/computer/crew{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"zW" = ( +/obj/machinery/button/door{ + name = "Garage Control"; + dir = 4; + pixel_y = -7; + pixel_x = -23; + id = "DanielGarage" + }, +/obj/machinery/mineral/ore_redemption{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"AL" = ( +/mob/living/carbon/human/species/ipc, +/obj/structure/bed/pod, +/obj/item/bedsheet/black, +/obj/structure/curtain/cloth/fancy, +/obj/item/clothing/under/suit/charcoal, +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/gloves/color/black, +/obj/item/radio/headset/heads/captain/alt, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"Bz" = ( +/obj/structure/fluff/broken_flooring, +/turf/open/floor/plating, +/area/ship/maintenance/central) +"BX" = ( +/obj/machinery/rnd/server, +/obj/item/radio/intercom/wideband/directional/west, +/obj/machinery/camera, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"BZ" = ( +/obj/machinery/airalarm/all_access, +/turf/closed/wall/r_wall, +/area/ship/engineering/engine) +"Cg" = ( +/obj/structure/closet/wall/red/directional/east, +/obj/item/ammo_box/magazine/sniper_rounds, +/obj/item/ammo_box/magazine/sniper_rounds, +/obj/item/ammo_box/magazine/sniper_rounds, +/obj/item/ammo_box/magazine/sniper_rounds, +/obj/item/ammo_box/magazine/sniper_rounds, +/obj/item/gun_voucher/syndicate, +/obj/item/gun_voucher/syndicate, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"Ch" = ( +/obj/machinery/computer/cryopod/retro/directional/north{ + pixel_y = 25 + }, +/obj/structure/closet/secure_closet/personal, +/obj/item/implant/radio, +/obj/item/implant/radio, +/obj/item/implant/radio, +/obj/item/implant/radio, +/obj/item/implant/radio, +/obj/item/implant/radio, +/obj/item/implant/radio, +/obj/item/implant/radio, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) +"CS" = ( +/obj/machinery/vending/medical, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) +"Dn" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Dr" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/closet/wall/orange/directional/north, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/syndicate, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical, +/obj/item/construction/rcd, +/obj/item/storage/belt/utility, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/machinery/camera, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Dx" = ( +/obj/machinery/camera/xray, +/turf/template_noop, +/area/ship/external) +"DT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/closed/wall/r_wall, +/area/ship/engineering/engine) +"Ep" = ( +/obj/structure/AIcore, +/obj/item/circuitboard/aicore, +/obj/item/stack/sheet/rglass, +/obj/item/stack/sheet/rglass, +/obj/item/stack/sheet/rglass, +/obj/item/stack/sheet/rglass, +/obj/item/stack/sheet/rglass, +/obj/item/radio/intercom/directional/west, +/obj/machinery/holopad/emergency, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"EO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"Fu" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/r_wall, +/area/ship/crew) +"FC" = ( +/obj/structure/closet/crate/secure/science, +/obj/item/circuitboard/machine/protolathe, +/obj/item/circuitboard/machine/circuit_imprinter, +/obj/machinery/light/dim/directional/east, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"FR" = ( +/obj/machinery/ore_silo, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"Gc" = ( +/obj/machinery/light/dim/directional/south, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Gl" = ( +/turf/closed/wall/r_wall, +/area/ship/crew) +"GU" = ( +/obj/structure/dresser, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) +"Hb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Hd" = ( +/obj/machinery/blackbox_recorder{ + name = "SAGA remote data saving center"; + desc = "Where are the other three?!" + }, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"Hg" = ( +/obj/structure/cable{ + icon_state = "0-1" + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"Hr" = ( +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"HI" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/wood/birch, +/area/ship/crew) +"HK" = ( +/obj/machinery/power/ship_gravity, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"HP" = ( +/obj/structure/closet/cabinet, +/obj/item/storage/box/syndimaid, +/obj/item/clothing/shoes/combat/coldres, +/obj/item/toy/plush/moth/firewatch, +/obj/item/toy/plush/moth, +/obj/item/clothing/under/rank/command/captain/suit/skirt, +/obj/item/clothing/head/wig/natural, +/obj/item/storage/backpack/duffelbag/syndie, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/turf/open/floor/carpet/lone, +/area/ship/crew) +"Ig" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"IA" = ( +/obj/machinery/light/dim/directional/south, +/obj/structure/closet/emcloset/wall/directional/south, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 2 + }, +/turf/open/floor/wood/birch, +/area/ship/crew) +"Jp" = ( +/obj/structure/closet/firecloset/wall/directional/north, +/turf/open/floor/wood/birch, +/area/ship/crew) +"JA" = ( +/obj/structure/cable{ + icon_state = "0-1" + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) +"JC" = ( +/obj/machinery/power/smes/shuttle{ + dir = 4 + }, +/obj/machinery/door/window/westright{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/window/reinforced/spawner/north, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 }, /obj/machinery/door/poddoor/shutters{ id = "kiloengine"; name = "Engine Shutters"; + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Kd" = ( +/obj/machinery/light/dim/directional/north, +/obj/machinery/vending/clothing, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/carpet/lone, +/area/ship/crew) +"Kj" = ( +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/carpet/lone, +/area/ship/crew) +"Kt" = ( +/obj/machinery/stasis, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) +"KF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) +"KT" = ( +/obj/structure/closet/cabinet, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) +"KY" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/plating, -/area/ship/external) -"XO" = ( -/obj/machinery/power/smes, +/area/ship/engineering/engine) +"Lg" = ( /obj/structure/cable{ - icon_state = "0-2" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, /turf/open/floor/plating, /area/ship/engineering/engine) - -(1,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(2,1,1) = {" -wy -tK -WM -WM -WM -WM -tK -WM -WM -WM -WM -tK -wy -"} -(3,1,1) = {" -wy -ei -JC -Ss -JC -Ss -tK -JC -Ss -JC -Ss -ei -wy -"} -(4,1,1) = {" -wy -tK -Dr -KY -KY -KY -Ri -KY -KY -KY -KY -BZ -wy -"} -(5,1,1) = {" -wy -tK -Dx -ui -Ch -Ch -zw -uV -uV -bS -PF -tK -wy -"} -(6,1,1) = {" +"LL" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light/dim/directional/south, +/obj/machinery/camera/xray, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Mf" = ( +/turf/closed/wall/r_wall, +/area/ship/bridge) +"MG" = ( +/obj/structure/window/reinforced/fulltile, +/obj/structure/grille, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"MT" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"Nk" = ( +/obj/docking_port/stationary{ + dwidth = 15; + width = 30; + height = 15 + }, +/turf/template_noop, +/area/template_noop) +"NI" = ( +/turf/open/floor/plating, +/area/ship/engineering/engine) +"NT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/wood/birch, +/area/ship/crew) +"OL" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"ON" = ( +/obj/machinery/power/port_gen/pacman/super, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"OP" = ( +/obj/machinery/power/apc, +/turf/closed/wall/r_wall, +/area/ship/engineering/engine) +"OT" = ( +/obj/structure/salvageable/circuit_imprinter, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/maintenance/central) +"PF" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) +"PJ" = ( +/obj/item/bedsheet/double/captain{ + dir = 4 + }, +/obj/structure/bed/double{ + dir = 4 + }, +/obj/structure/curtain/bounty, +/turf/open/floor/carpet/lone, +/area/ship/crew) +"Qb" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Qg" = ( +/obj/machinery/door/airlock/vault, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"Ri" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Rz" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/mineral/titanium/white, +/area/ship/crew) +"RC" = ( +/obj/effect/landmark/observer_start, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/wood/birch, +/area/ship/crew) +"RD" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4; + name = "Helm" + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"RK" = ( +/obj/machinery/computer/card{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"RT" = ( +/obj/structure/grille/broken, +/obj/structure/salvageable/autolathe, +/turf/open/floor/plating, +/area/ship/maintenance/central) +"RW" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"So" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/closet/wall/orange/directional/east, +/obj/item/stack/sheet/mineral/uranium/twenty, +/obj/item/stack/sheet/mineral/plasma/ten, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Ss" = ( +/obj/machinery/power/smes/shuttle{ + dir = 4 + }, +/obj/machinery/door/window/westright{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/window/reinforced/spawner, +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + id = "kiloengine"; + name = "Engine Shutters"; + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"St" = ( +/obj/machinery/computer/crew/retro, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"SH" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Tm" = ( +/obj/machinery/bookbinder, +/obj/machinery/light/dim/directional/east, +/turf/open/floor/mineral/gold, +/area/ship/maintenance/central) +"Tp" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/light/dim/directional/east, +/obj/machinery/cryopod{ + dir = 8 + }, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) +"Uc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/birch, +/area/ship/crew) +"Ut" = ( +/turf/closed/wall/r_wall, +/area/ship/science/ai_chamber) +"Ux" = ( +/obj/machinery/computer/helm{ + dir = 8 + }, +/obj/machinery/light/floor, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"UK" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/r_wall, +/area/ship/science/ai_chamber) +"US" = ( +/obj/machinery/vending/security/marine/syndicate{ + icon_deny = "marine-deny"; + icon_state = "marine" + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"Vs" = ( +/obj/structure/crate_shelf, +/obj/structure/closet/crate/secure/weapon, +/obj/structure/closet/crate/secure/weapon, +/obj/structure/closet/crate/secure/gear, +/obj/machinery/light/dim/directional/south, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"Vu" = ( +/obj/machinery/light/dim/directional/north, +/turf/open/floor/wood/birch, +/area/ship/crew) +"VM" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/closet/wall/orange/directional/east, +/obj/item/stack/sheet/mineral/uranium/twenty, +/obj/item/stack/sheet/mineral/plasma/ten, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Wd" = ( +/obj/structure/sink/kitchen{ + pixel_y = 13 + }, +/obj/structure/mirror/magic{ + pixel_y = 31 + }, +/turf/open/floor/mineral/titanium/white, +/area/ship/crew) +"Wn" = ( +/turf/closed/wall/r_wall, +/area/ship/medical) +"Wz" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"WM" = ( +/obj/machinery/power/shuttle/engine/electric{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters{ + id = "kiloengine"; + name = "Engine Shutters"; + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/external) +"Xj" = ( +/obj/machinery/computer/aifixer{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"XO" = ( +/obj/machinery/power/smes, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"XY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/carpet/lone, +/area/ship/crew) +"XZ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/carpet/lone, +/area/ship/crew) +"Yi" = ( +/obj/docking_port/stationary{ + dwidth = 15; + width = 30; + height = 15; + dir = 2 + }, +/turf/template_noop, +/area/template_noop) +"YE" = ( +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 8 + }, +/obj/machinery/door/window{ + dir = 8 + }, +/obj/structure/window/plasma/reinforced/spawner/north, +/turf/open/floor/mineral/titanium/white, +/area/ship/crew) +"YG" = ( +/obj/machinery/vending/mining_equipment, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"YT" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"Zq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/ship/bridge) +"Zz" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/birch, +/area/ship/crew) + +(1,1,1) = {" wy tK -XO -en -NI -NI -Lg -NI -NI -aJ -fK -tK -wy -"} -(7,1,1) = {" -wy -tK -XO -So -ON -RW -Lg -qQ -vj -VM -yD -OP -wy -"} -(8,1,1) = {" -wy -ei -tK -tK -tK -tK -Lg -tK -tK -tK -tK -ei -wy -"} -(9,1,1) = {" -wy -aL -mn -Wn -BX -tK -OL -tK -yR -yR -Gc -tK -wy -"} -(10,1,1) = {" -wy -aL -NI -NI -NI -Dn -Lg -Dn -NI -NI -NI -tK -wy -"} -(11,1,1) = {" -wy -aL -NI -eU -si -tK -HI -tK -he -Kd -HK -tK -wy -"} -(12,1,1) = {" -wy -ei -tK -tK -tK -fc -fc -wB -tK -tK -tK -ei -wy -"} -(13,1,1) = {" -wy -fc -fc -fc -fc -fc -fc -wB -St -EO -Hr -wB -wy -"} -(14,1,1) = {" -wy -fc -fc -fc -fc -fc -fc -wB -gM -Ig -Ig -Ut -wy -"} -(15,1,1) = {" -wy -fc -fc -fc -fc -fc -fc -wB -xV -Ig -Hd -wB -wy -"} -(16,1,1) = {" -wy -fc -fc -fc -fc -fc -fc -wB -Hg -Ig -FR -wB -wy -"} -(17,1,1) = {" -wy -fc -fc -fc -fc -fc -fc -aK -Ig -Ig -FR -wB -wy -"} -(18,1,1) = {" -wy -Gl -wy -wy -wy -wy -wy -wB -wB -wB -wB -Tm -wy -"} -(19,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(20,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(21,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(22,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(23,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(24,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(25,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(26,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(27,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(28,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(29,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(30,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(31,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(32,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(33,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(34,1,1) = {" -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -wy -"} -(35,1,1) = {" -wy -wy +WM +WM +WM +WM +cZ +WM +WM +WM +WM +tK wy +"} +(2,1,1) = {" wy +ei +JC +Ss +JC +Ss +DT +JC +Ss +JC +Ss +ei wy +"} +(3,1,1) = {" wy +tK +cW +KY +KY +KY +jD +KY +KY +KY +ms +BZ wy +"} +(4,1,1) = {" wy +tK +Dr +ui +kC +cJ +Ri +uV +uV +bS +oW +tK wy +"} +(5,1,1) = {" wy +tK +XO +en +NI +NI +zw +Qb +Hb +aJ +fK +tK wy +"} +(6,1,1) = {" wy +tK +XO +So +ON +RW +Lg +qQ +vj +VM +yD +OP wy "} -(36,1,1) = {" -wy +(7,1,1) = {" wy +ei +tK +tK +tK +tK +LL +tK +tK +tK +tK +ei wy +"} +(8,1,1) = {" wy +aL +zW +om +eJ +tK +SH +tK +yR +aK +ba +tK wy +"} +(9,1,1) = {" wy +aL +NI +NI +NI +Dn +OL +fn +jE +kc +Gc +tK wy +"} +(10,1,1) = {" wy +aL +YG +FC +si +tK +jV +tK +he +mo +HK +tK wy +"} +(11,1,1) = {" wy +ei +tK +tK +tK +tK +HI +tK +tK +tK +tK +ei wy +"} +(12,1,1) = {" wy +Gl +PJ +HP +Gl +NT +rS +Ut +BX +Ep +AL +Ut wy "} -(37,1,1) = {" -wy +(13,1,1) = {" wy +Gl +xo +XZ +Kj +Uc +IA +Ut +St +EO +Hr +ge wy +"} +(14,1,1) = {" wy +Gl +fU +vg +Gl +fc +HI +Ut +gM +oG +th +Ut wy +"} +(15,1,1) = {" wy +Gl +Kd +XY +Gl +iX +HI +Ut +xV +oG +Hd +Ut wy +"} +(16,1,1) = {" wy +Fu +Gl +pq +Gl +og +iM +Qg +Hg +Ig +FR +Ut wy +"} +(17,1,1) = {" wy +Gl +Wd +qD +Gl +fc +HI +Ut +Ut +Ut +Ut +UK wy +"} +(18,1,1) = {" wy +Gl +Rz +YE +Gl +fc +HI +wB +pB +xM +eU +wB wy "} -(38,1,1) = {" -wy +(19,1,1) = {" wy +Gl +Gl +Gl +Gl +fc +RC +lz +Wz +MT +Vs +wB wy +"} +(20,1,1) = {" wy +Gl +Ch +KF +Gl +fc +sx +wB +fp +Cg +US +wB wy +"} +(21,1,1) = {" wy +Gl +Tp +PF +nZ +Zz +dE +wB +wB +wB +wB +wB wy +"} +(22,1,1) = {" wy +Gl +Gl +Gl +Gl +gR +se +tX +eN +mk +RT +mn wy +"} +(23,1,1) = {" wy +Gl +GU +KT +Gl +Jp +HI +mn +OT +Bz +aC +mn wy +"} +(24,1,1) = {" +Nk +Gl +ca +PF +nZ +Zz +dE +mn +tj +ch +bj +mn +Yi +"} +(25,1,1) = {" wy +la +mn +mn +mn +fA +dE +Wn +Wn +Wn +Wn +yx wy "} -(39,1,1) = {" -wy +(26,1,1) = {" wy +mn +rh +rW +bk +mw +iM +gd +JA +vL +Kt +Wn wy +"} +(27,1,1) = {" wy +mn +Tm +ja +mn +Vu +HI +ok +CS +qG +kO +Wn wy +"} +(28,1,1) = {" wy +mn +mn +mn +mn +Mf +iy +Wn +Wn +Wn +Wn +Wn wy +"} +(29,1,1) = {" wy +li +Mf +gY +lp +YT +xx +nD +Zq +ap +Mf +Dx wy +"} +(30,1,1) = {" wy wy +Mf +fT +RD +RD +RD +RD +RD +Xj +Mf wy wy "} -(40,1,1) = {" -wy -wy -wy +(31,1,1) = {" wy wy +Mf +MG +da +zG +Ux +RK +nJ +MG +Mf wy wy +"} +(32,1,1) = {" wy wy wy +MG +MG +MG +MG +MG +MG +MG wy wy wy From 0824ece7956189a2cc8a2ae3b923011c984b446d Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Sun, 25 Aug 2024 02:44:01 -0700 Subject: [PATCH 04/26] fixes a few runtimes contains horus --- .../independent/independent_daniel.dmm | 59 +++++++------------ .../independent/independent_lagoon.dmm | 2 +- 2 files changed, 22 insertions(+), 39 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 86aa962e82af..0a8483f718fb 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -202,9 +202,6 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/terminal{ - dir = 4 - }, /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) @@ -366,7 +363,7 @@ dir = 4; pixel_y = -7; pixel_x = -23; - id = "kiloengine" + id = "danielengine" }, /obj/effect/turf_decal/industrial/warning{ dir = 8 @@ -523,9 +520,6 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/terminal{ - dir = 1 - }, /turf/open/floor/wood/birch, /area/ship/crew) "ok" = ( @@ -565,9 +559,6 @@ /obj/item/clothing/suit/fire/atmos, /obj/item/clothing/mask/gas/atmos, /obj/item/clothing/head/hardhat/atmos, -/obj/structure/closet/wall/directional/east{ - name = "Atmospheric locker" - }, /obj/structure/cable{ icon_state = "1-8" }, @@ -626,9 +617,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -640,9 +628,6 @@ icon_state = "0-2" }, /obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/power/terminal{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -814,7 +799,7 @@ /obj/structure/cable{ icon_state = "0-1" }, -/obj/machinery/power/terminal, +/obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/plating, /area/ship/engineering/engine) "yR" = ( @@ -1009,9 +994,6 @@ icon_state = "0-1" }, /obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/power/terminal{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/circuit, @@ -1080,9 +1062,6 @@ icon_state = "0-1" }, /obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/power/terminal{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -1104,7 +1083,7 @@ dir = 4 }, /obj/machinery/door/poddoor/shutters{ - id = "kiloengine"; + id = "danielengine"; name = "Engine Shutters"; dir = 8 }, @@ -1233,8 +1212,15 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "OP" = ( -/obj/machinery/power/apc, -/turf/closed/wall/r_wall, +/obj/machinery/door/poddoor/shutters{ + id = "DanielGarage" + }, +/obj/structure/fans/tiny, +/obj/docking_port/mobile{ + dir = 2; + name = "Daniel" + }, +/turf/open/floor/plating, /area/ship/engineering/engine) "OT" = ( /obj/structure/salvageable/circuit_imprinter, @@ -1242,9 +1228,6 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/terminal{ - dir = 1 - }, /turf/open/floor/plating, /area/ship/maintenance/central) "PF" = ( @@ -1373,7 +1356,7 @@ dir = 4 }, /obj/machinery/door/poddoor/shutters{ - id = "kiloengine"; + id = "danielengine"; name = "Engine Shutters"; dir = 8 }, @@ -1500,7 +1483,7 @@ dir = 4 }, /obj/machinery/door/poddoor/shutters{ - id = "kiloengine"; + id = "danielengine"; name = "Engine Shutters"; dir = 4 }, @@ -1564,9 +1547,6 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/terminal{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) @@ -1574,6 +1554,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/structure/railing{ + name = "Railing (my 12 gauge shotgun loaded with slugs) that stops the non stop evercoming horde of pure evil and dasterdlyness (girlscouts) from breaching my defences (my lawn) to stop them from giving me their profane weapons of heathen conversion (cookies)" + }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Zz" = ( @@ -1669,7 +1652,7 @@ qQ vj VM yD -OP +tK wy "} (7,1,1) = {" @@ -1703,8 +1686,8 @@ tK wy "} (9,1,1) = {" -wy -aL +Nk +OP NI NI NI @@ -1928,7 +1911,7 @@ mn wy "} (24,1,1) = {" -Nk +wy Gl ca PF diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm index 7e96d8f93b53..2e7bd2b6f42c 100644 --- a/_maps/shuttles/independent/independent_lagoon.dmm +++ b/_maps/shuttles/independent/independent_lagoon.dmm @@ -4987,7 +4987,7 @@ /turf/open/floor/wood, /area/ship/bridge) "HA" = ( -/obj/structure/table/reinforced, +/obj/docking_port/mobile, /obj/machinery/recharger, /obj/item/paper{ default_raw_text = "Reminder that passengers are NOT permitted to carry weapons on board."; From 7280c147aaa9347fdfa4f52667d721b09c058c38 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Sun, 25 Aug 2024 02:46:15 -0700 Subject: [PATCH 05/26] whoops --- _maps/shuttles/independent/independent_lagoon.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm index 2e7bd2b6f42c..6a7ee8824fd4 100644 --- a/_maps/shuttles/independent/independent_lagoon.dmm +++ b/_maps/shuttles/independent/independent_lagoon.dmm @@ -4987,13 +4987,13 @@ /turf/open/floor/wood, /area/ship/bridge) "HA" = ( -/obj/docking_port/mobile, /obj/machinery/recharger, /obj/item/paper{ default_raw_text = "Reminder that passengers are NOT permitted to carry weapons on board."; pixel_x = 4 }, /obj/machinery/computer/helm/viewscreen/directional/east, +/obj/structure/table/reinforced, /turf/open/floor/plasteel/dark, /area/ship/security) "HE" = ( From 3cd0b2a7df2e2a91538514065d27a110de3d0ad7 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Sun, 25 Aug 2024 03:27:53 -0700 Subject: [PATCH 06/26] fixes a few more things --- .../independent/independent_daniel.dmm | 172 +++++++++++++----- 1 file changed, 123 insertions(+), 49 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 0a8483f718fb..b53a7198a7e5 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -9,22 +9,22 @@ /area/ship/bridge) "aC" = ( /obj/structure/salvageable/server, +/obj/machinery/light_switch{ + pixel_y = -24 + }, /turf/open/floor/plating, /area/ship/maintenance/central) "aJ" = ( -/obj/machinery/power/terminal, /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/plating, /area/ship/engineering/engine) "aK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/plating, /area/ship/engineering/engine) "aL" = ( @@ -50,6 +50,8 @@ /obj/effect/spawner/lootdrop/salvage/gold, /obj/effect/spawner/lootdrop/stockparts, /obj/item/a_gift/anything, +/obj/item/circuitboard/machine/autolathe, +/obj/item/storage/box/stockparts, /turf/open/floor/plating, /area/ship/maintenance/central) "bk" = ( @@ -86,6 +88,7 @@ /area/ship/crew) "ch" = ( /obj/structure/salvageable/computer, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plating, /area/ship/maintenance/central) "cJ" = ( @@ -99,9 +102,6 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "cW" = ( -/obj/machinery/power/terminal{ - dir = 4 - }, /obj/structure/cable{ icon_state = "0-4" }, @@ -110,6 +110,9 @@ }, /obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/light/dim/directional/north, +/obj/machinery/power/terminal{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "cZ" = ( @@ -148,13 +151,7 @@ dir = 1 }, /obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" + icon_state = "0-4" }, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -174,6 +171,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/plating, /area/ship/maintenance/central) "eU" = ( @@ -194,6 +192,9 @@ name = "Air to Distro" }, /obj/machinery/door/airlock/maintenance, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "fp" = ( @@ -203,6 +204,10 @@ icon_state = "0-8" }, /obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "fA" = ( @@ -246,9 +251,15 @@ /turf/open/floor/hangar/plasteel/white, /area/ship/medical) "ge" = ( -/obj/machinery/airalarm/all_access, -/turf/closed/wall/r_wall, -/area/ship/science/ai_chamber) +/obj/machinery/power/smes, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) "gM" = ( /obj/structure/closet/wall/blue/directional/north, /obj/item/aicard{ @@ -278,16 +289,11 @@ /obj/item/implanter, /obj/item/implantcase/mindshield, /obj/item/implantcase/mindshield, -/obj/item/storage/backpack/duffelbag/captain, /obj/machinery/light/dim/directional/north, /obj/item/storage/box/ids, /obj/item/storage/wallet, /obj/item/storage/wallet, /obj/item/storage/wallet, -/obj/item/storage/wallet, -/obj/item/storage/wallet, -/obj/item/card/bank, -/obj/item/card/bank, /obj/item/card/bank, /obj/item/card/bank, /obj/item/card/bank, @@ -303,6 +309,12 @@ /obj/item/stack/sheet/rglass, /turf/open/floor/plating, /area/ship/engineering/engine) +"hW" = ( +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/turf/open/floor/wood/birch, +/area/ship/crew) "iy" = ( /obj/machinery/door/airlock/command/glass{ req_access_txt = "19"; @@ -355,6 +367,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/machinery/airalarm/directional/south, /turf/open/floor/mineral/gold, /area/ship/maintenance/central) "jD" = ( @@ -371,12 +384,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/tank_dispenser/oxygen, /turf/open/floor/plating, /area/ship/engineering/engine) "jE" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "jV" = ( @@ -405,6 +422,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "kC" = ( @@ -435,6 +455,7 @@ /area/ship/external) "lp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/airalarm/directional/west, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "lz" = ( @@ -497,6 +518,7 @@ /obj/item/clothing/suit/ianshirt, /obj/item/clothing/suit/vapeshirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/firealarm/directional/west, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "nJ" = ( @@ -581,6 +603,7 @@ "pB" = ( /obj/machinery/suit_storage_unit/inherit, /obj/item/clothing/suit/space/hardsuit/swat, +/obj/machinery/airalarm/directional/west, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "qD" = ( @@ -632,6 +655,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/machinery/light_switch{ + pixel_x = -29 + }, /turf/open/floor/mineral/gold, /area/ship/maintenance/central) "se" = ( @@ -667,8 +693,10 @@ /turf/open/floor/wood/birch, /area/ship/crew) "th" = ( -/obj/machinery/announcement_system, /obj/machinery/light/dim/directional/south, +/obj/machinery/telecomms/hub{ + name = "Extra Processing Server" + }, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "tj" = ( @@ -718,9 +746,6 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/plating, /area/ship/engineering/engine) "uV" = ( @@ -755,6 +780,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/machinery/light_switch{ + pixel_x = -25 + }, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) "wy" = ( @@ -796,10 +824,14 @@ /turf/closed/wall/r_wall, /area/ship/medical) "yD" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/terminal{ + dir = 8 + }, /obj/structure/cable{ icon_state = "0-1" }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/firealarm/directional/east, /turf/open/floor/plating, /area/ship/engineering/engine) "yR" = ( @@ -851,10 +883,18 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/circuit, /area/ship/science/ai_chamber) +"Bl" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/wood/birch, +/area/ship/crew) "Bz" = ( /obj/structure/fluff/broken_flooring, /turf/open/floor/plating, /area/ship/maintenance/central) +"BA" = ( +/obj/machinery/firealarm/directional/north, +/turf/open/floor/wood/birch, +/area/ship/crew) "BX" = ( /obj/machinery/rnd/server, /obj/item/radio/intercom/wideband/directional/west, @@ -919,6 +959,9 @@ /obj/item/rcd_ammo/large, /obj/item/rcd_ammo/large, /obj/machinery/camera, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "Dx" = ( @@ -967,6 +1010,9 @@ "Gc" = ( /obj/machinery/light/dim/directional/south, /obj/machinery/portable_atmospherics/scrubber, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "Gl" = ( @@ -996,9 +1042,14 @@ /obj/machinery/power/apc/auto_name/directional/east, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/light_switch{ + pixel_x = 29 + }, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "Hr" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/firealarm/directional/south, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "HI" = ( @@ -1015,6 +1066,9 @@ /area/ship/crew) "HK" = ( /obj/machinery/power/ship_gravity, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "HP" = ( @@ -1107,6 +1161,7 @@ /area/ship/crew) "Kt" = ( /obj/machinery/stasis, +/obj/machinery/airalarm/directional/west, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) "KF" = ( @@ -1158,6 +1213,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "Mf" = ( @@ -1166,6 +1224,9 @@ "MG" = ( /obj/structure/window/reinforced/fulltile, /obj/structure/grille, +/obj/machinery/door/poddoor/shutters{ + id = "DanielBridge" + }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "MT" = ( @@ -1201,6 +1262,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "ON" = ( @@ -1247,6 +1311,14 @@ /obj/structure/curtain/bounty, /turf/open/floor/carpet/lone, /area/ship/crew) +"PP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) "Qb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, @@ -1327,18 +1399,15 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, /obj/structure/cable{ icon_state = "2-8" }, /obj/structure/closet/wall/orange/directional/east, /obj/item/stack/sheet/mineral/uranium/twenty, /obj/item/stack/sheet/mineral/plasma/ten, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "Ss" = ( @@ -1377,6 +1446,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "Tm" = ( @@ -1433,18 +1506,12 @@ /turf/open/floor/wood/birch, /area/ship/crew) "VM" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/structure/closet/wall/orange/directional/east, /obj/item/stack/sheet/mineral/uranium/twenty, /obj/item/stack/sheet/mineral/plasma/ten, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "Wd" = ( @@ -1499,7 +1566,7 @@ "XO" = ( /obj/machinery/power/smes, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "0-8" }, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -1548,6 +1615,13 @@ icon_state = "0-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/light_switch{ + pixel_x = -29 + }, +/obj/machinery/button/door{ + pixel_x = -35; + id = "DanielBridge" + }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Zq" = ( @@ -1628,7 +1702,7 @@ wy (5,1,1) = {" wy tK -XO +ge en NI NI @@ -1757,7 +1831,7 @@ Ut St EO Hr -ge +Ut wy "} (14,1,1) = {" @@ -1811,7 +1885,7 @@ Gl Wd qD Gl -fc +Bl HI Ut Ut @@ -1826,7 +1900,7 @@ Gl Rz YE Gl -fc +BA HI wB pB @@ -1856,7 +1930,7 @@ Gl Ch KF Gl -fc +hW sx wB fp @@ -1869,7 +1943,7 @@ wy wy Gl Tp -PF +PP nZ Zz dE From aeb578840227d027d0e0e5c02992c5df7e668a8d Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Sun, 25 Aug 2024 03:29:28 -0700 Subject: [PATCH 07/26] nanotrasen sign for nyan :3c --- _maps/shuttles/independent/independent_daniel.dmm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index b53a7198a7e5..93952edd9f08 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -511,6 +511,10 @@ }, /turf/open/floor/wood/birch, /area/ship/crew) +"mC" = ( +/obj/structure/sign/poster/official/nanotrasen_logo, +/turf/closed/wall/r_wall, +/area/ship/crew) "nD" = ( /obj/item/reagent_containers/glass/bowl{ name = "Buggers Bowl" @@ -1839,7 +1843,7 @@ wy Gl fU vg -Gl +mC fc HI Ut From e3fe6428e3d8a4f02037c585cbeebb7fd009eb20 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Sun, 25 Aug 2024 04:14:07 -0700 Subject: [PATCH 08/26] update --- _maps/shuttles/independent/independent_daniel.dmm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 93952edd9f08..9943e11fc403 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -828,7 +828,6 @@ /turf/closed/wall/r_wall, /area/ship/medical) "yD" = ( -/obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/power/terminal{ dir = 8 }, @@ -1229,7 +1228,8 @@ /obj/structure/window/reinforced/fulltile, /obj/structure/grille, /obj/machinery/door/poddoor/shutters{ - id = "DanielBridge" + id = "DanielBridge"; + dir = 4 }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) @@ -2097,13 +2097,13 @@ wy wy wy Mf -MG +Mf da zG Ux RK nJ -MG +Mf Mf wy wy From 3a2b4ea813f324ddbed29812ffdfccae9ecc727f Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Sun, 25 Aug 2024 04:25:55 -0700 Subject: [PATCH 09/26] nire yodate --- .../independent/independent_daniel.dmm | 175 ++++++++++++++---- 1 file changed, 141 insertions(+), 34 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 9943e11fc403..869077cbb84a 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -52,6 +52,14 @@ /obj/item/a_gift/anything, /obj/item/circuitboard/machine/autolathe, /obj/item/storage/box/stockparts, +/obj/item/stack/tile/carpet/royalblack/fifty, +/obj/item/stack/tile/carpet/royalblue/fifty, +/obj/item/stack/tile/carpet/purple/fifty, +/obj/item/stack/tile/carpet/orange/fifty, +/obj/item/stack/tile/carpet/green/fifty, +/obj/item/stack/tile/carpet/cyan/fifty, +/obj/item/stack/tile/carpet/blue/fifty, +/obj/item/stack/tile/carpet/black/fifty, /turf/open/floor/plating, /area/ship/maintenance/central) "bk" = ( @@ -80,12 +88,22 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "ca" = ( -/obj/structure/bed, -/obj/item/bedsheet/black, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/light/dim/directional/east, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) +/obj/effect/turf_decal/corner/opaque/white/diagonal, +/obj/machinery/processor{ + pixel_y = -1; + pixel_x = -7 + }, +/obj/machinery/chem_dispenser/drinks{ + pixel_y = -3; + pixel_x = 3 + }, +/obj/machinery/chem_dispenser/drinks/beer{ + pixel_y = 12; + pixel_x = 3 + }, +/turf/open/floor/plasteel, +/area/ship/maintenance/central) "ch" = ( /obj/structure/salvageable/computer, /obj/machinery/firealarm/directional/east, @@ -368,6 +386,9 @@ dir = 8 }, /obj/machinery/airalarm/directional/south, +/obj/structure/sign/painting/library{ + pixel_x = 28 + }, /turf/open/floor/mineral/gold, /area/ship/maintenance/central) "jD" = ( @@ -637,6 +658,9 @@ "rh" = ( /obj/machinery/computer/bookmanagement, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/sign/painting/library{ + pixel_y = 34 + }, /turf/open/floor/mineral/gold, /area/ship/maintenance/central) "rS" = ( @@ -651,16 +675,12 @@ /turf/open/floor/wood/birch, /area/ship/crew) "rW" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/directional/west, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/light_switch{ - pixel_x = -29 +/obj/structure/cable{ + icon_state = "2-8" }, /turf/open/floor/mineral/gold, /area/ship/maintenance/central) @@ -855,6 +875,12 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"zF" = ( +/obj/structure/sign/painting/library{ + pixel_y = 34 + }, +/turf/open/floor/wood/birch, +/area/ship/crew) "zG" = ( /obj/machinery/computer/crew{ dir = 8 @@ -1022,9 +1048,28 @@ /turf/closed/wall/r_wall, /area/ship/crew) "GU" = ( -/obj/structure/dresser, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) +/obj/effect/turf_decal/corner/opaque/white/diagonal, +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + pixel_y = 18; + pixel_x = -5 + }, +/obj/machinery/reagentgrinder{ + pixel_y = 11; + pixel_x = 6 + }, +/obj/item/reagent_containers/glass/rag{ + pixel_y = 4; + pixel_x = -5 + }, +/obj/structure/sign/painting/library{ + pixel_y = 34 + }, +/obj/structure/sign/painting/library{ + pixel_x = -28 + }, +/turf/open/floor/plasteel, +/area/ship/maintenance/central) "Hb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -1110,10 +1155,34 @@ }, /turf/open/floor/wood/birch, /area/ship/crew) +"IN" = ( +/obj/item/storage/box/beakers, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/ingredients/fruity, +/obj/item/storage/box/ingredients/carnivore, +/obj/item/storage/box/ingredients/vegetarian, +/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/effect/turf_decal/corner/opaque/white/diagonal, +/obj/machinery/door/window/brigdoor/southleft, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/turf/open/floor/plasteel, +/area/ship/maintenance/central) "Jp" = ( -/obj/structure/closet/firecloset/wall/directional/north, -/turf/open/floor/wood/birch, -/area/ship/crew) +/obj/machinery/light/dim/directional/north, +/obj/structure/bookcase/random, +/turf/open/floor/mineral/gold, +/area/ship/maintenance/central) "JA" = ( /obj/structure/cable{ icon_state = "0-1" @@ -1174,12 +1243,15 @@ /turf/open/floor/carpet/red_gold, /area/ship/crew) "KT" = ( -/obj/structure/closet/cabinet, +/obj/effect/turf_decal/corner/opaque/white/diagonal, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) +/obj/structure/sign/painting/library{ + pixel_x = -28 + }, +/turf/open/floor/plasteel, +/area/ship/maintenance/central) "KY" = ( /obj/machinery/power/terminal{ dir = 8 @@ -1298,13 +1370,25 @@ }, /turf/open/floor/plating, /area/ship/maintenance/central) +"Pq" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 2 + }, +/obj/structure/closet/firecloset/wall/directional/south, +/turf/open/floor/wood/birch, +/area/ship/crew) "PF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) +/obj/effect/turf_decal/corner/opaque/white/diagonal, +/turf/open/floor/plasteel, +/area/ship/maintenance/central) "PJ" = ( /obj/item/bedsheet/double/captain{ dir = 4 @@ -1459,6 +1543,9 @@ "Tm" = ( /obj/machinery/bookbinder, /obj/machinery/light/dim/directional/east, +/obj/structure/sign/painting/library{ + pixel_y = 34 + }, /turf/open/floor/mineral/gold, /area/ship/maintenance/central) "Tp" = ( @@ -1527,6 +1614,14 @@ }, /turf/open/floor/mineral/titanium/white, /area/ship/crew) +"Wf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/corner/opaque/white/diagonal, +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/southright, +/turf/open/floor/plasteel, +/area/ship/maintenance/central) "Wn" = ( /turf/closed/wall/r_wall, /area/ship/medical) @@ -1628,6 +1723,18 @@ }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) +"YW" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -12; + pixel_y = -16 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/mineral/gold, +/area/ship/maintenance/central) "Zq" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -1919,7 +2026,7 @@ Gl Gl Gl Gl -fc +zF RC lz Wz @@ -1960,7 +2067,7 @@ wy "} (22,1,1) = {" wy -Gl +Fu Gl Gl Gl @@ -1975,11 +2082,11 @@ wy "} (23,1,1) = {" wy -Gl +mn GU KT -Gl -Jp +IN +fc HI mn OT @@ -1990,12 +2097,12 @@ wy "} (24,1,1) = {" wy -Gl +mn ca PF -nZ +Wf Zz -dE +Pq mn tj ch @@ -2005,9 +2112,9 @@ Yi "} (25,1,1) = {" wy -la -mn mn +Jp +YW mn fA dE @@ -2050,7 +2157,7 @@ wy "} (28,1,1) = {" wy -mn +la mn mn mn @@ -2060,7 +2167,7 @@ Wn Wn Wn Wn -Wn +yx wy "} (29,1,1) = {" From d4e54eab6b6da1f999bf787fe809c42a85c6043a Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Sun, 25 Aug 2024 04:32:35 -0700 Subject: [PATCH 10/26] fixes a failed linter --- .../independent/independent_daniel.dmm | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 869077cbb84a..1356126e6df4 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -200,7 +200,6 @@ /turf/open/floor/wood/birch, /area/ship/crew) "fn" = ( -/obj/machinery/door/firedoor/heavy, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -562,6 +561,19 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/carpet/red_gold, /area/ship/crew) +"oa" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/closet/crate/secure/gear, +/turf/open/floor/plating, +/area/ship/engineering/engine) "og" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ @@ -631,6 +643,19 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) +"ql" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/closet/crate/secure/weapon, +/turf/open/floor/plating, +/area/ship/engineering/engine) "qD" = ( /turf/open/floor/mineral/titanium/white, /area/ship/crew) @@ -966,7 +991,6 @@ /area/ship/medical) "Dn" = ( /obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor/heavy, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -1586,9 +1610,6 @@ /area/ship/security/armory) "Vs" = ( /obj/structure/crate_shelf, -/obj/structure/closet/crate/secure/weapon, -/obj/structure/closet/crate/secure/weapon, -/obj/structure/closet/crate/secure/gear, /obj/machinery/light/dim/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) @@ -1788,9 +1809,9 @@ KY KY KY jD -KY -KY -KY +oa +ql +ql ms BZ wy From 24ba2fe907e5a246a6b243bc06ca93ea179fe7d1 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Sun, 25 Aug 2024 04:35:50 -0700 Subject: [PATCH 11/26] Create independent_daniel.json --- _maps/configs/independent_daniel.json | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 _maps/configs/independent_daniel.json diff --git a/_maps/configs/independent_daniel.json b/_maps/configs/independent_daniel.json new file mode 100644 index 000000000000..3197ad7bc19d --- /dev/null +++ b/_maps/configs/independent_daniel.json @@ -0,0 +1,30 @@ +{ + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", + "map_name": "Daniel-class Exploration Vessel", + "prefix": "SV", + "namelists": ["NATURAL"], + "map_short_name": "Daniel-class", + "map_path": "_maps/shuttles/independent/independent_daniel.dmm", + "description": "The Daniel-Class is an private exploration vessel for those with a real sense of adventure. Former Nanotrasen employees out exploring the fast frontier.", + "tags": [ + "RP Focus" + ], + "starting_funds": 6000, + "limit": 1, + "job_slots": { + "Captain": { + "outfit": "/datum/outfit/job/independent/captain", + "officer": true, + "slots": 2 + }, + "Mechanic": { + "outfit": "/datum/outfit/job/independent/engineer", + "slots": 1 + }, + "Assistant": { + "outfit": "/datum/outfit/job/independent/assistant", + "slots": 2 + } + }, + "enabled": true +} From 71082ff045d0baa7b94f86bc5d88e22c7299b967 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Sun, 25 Aug 2024 04:54:51 -0700 Subject: [PATCH 12/26] removes energy gun adds e_gun --- _maps/configs/independent_daniel.json | 2 +- _maps/shuttles/independent/independent_daniel.dmm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/configs/independent_daniel.json b/_maps/configs/independent_daniel.json index 3197ad7bc19d..effdcb73847f 100644 --- a/_maps/configs/independent_daniel.json +++ b/_maps/configs/independent_daniel.json @@ -5,7 +5,7 @@ "namelists": ["NATURAL"], "map_short_name": "Daniel-class", "map_path": "_maps/shuttles/independent/independent_daniel.dmm", - "description": "The Daniel-Class is an private exploration vessel for those with a real sense of adventure. Former Nanotrasen employees out exploring the fast frontier.", + "description": "The Daniel-Class is daniels house, yea its just his house (It would be hilarious if you spawned this in while daniel was already in one).", "tags": [ "RP Focus" ], diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 1356126e6df4..07e2138e19bd 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -861,7 +861,7 @@ /obj/item/stock_parts/cell/gun/empty, /obj/item/stock_parts/cell/gun/empty, /obj/item/stock_parts/cell/gun/empty, -/obj/item/gun/energy, +/obj/item/gun/energy/e_gun, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "xV" = ( From 3bdd2eb3f549af962c10931c56e6af729d2340ea Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Mon, 26 Aug 2024 00:32:56 -0700 Subject: [PATCH 13/26] Update independent_daniel.dmm --- _maps/shuttles/independent/independent_daniel.dmm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 07e2138e19bd..a9efc07f6894 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -5,6 +5,11 @@ }, /obj/structure/bed/dogbed, /obj/machinery/light/dim/directional/south, +/obj/structure/railing{ + dir = 5; + layer = 4.1; + name = "Railing (my 12 gauge shotgun loaded with slugs) that stops the non stop evercoming horde of pure evil and dasterdlyness (girlscouts) from breaching my defences (my lawn) to stop them from giving me their profane weapons of heathen conversion (cookies)" + }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "aC" = ( @@ -1381,7 +1386,7 @@ }, /obj/structure/fans/tiny, /obj/docking_port/mobile{ - dir = 2; + dir = 4; name = "Daniel" }, /turf/open/floor/plating, @@ -1760,9 +1765,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/structure/railing{ - name = "Railing (my 12 gauge shotgun loaded with slugs) that stops the non stop evercoming horde of pure evil and dasterdlyness (girlscouts) from breaching my defences (my lawn) to stop them from giving me their profane weapons of heathen conversion (cookies)" - }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Zz" = ( From f8e6b0633c35e450759d29a9a6911de1b335f7e2 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Mon, 26 Aug 2024 00:59:31 -0700 Subject: [PATCH 14/26] outpost comms console --- _maps/shuttles/independent/independent_daniel.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index a9efc07f6894..f0ae03e00bb1 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -551,7 +551,7 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "nJ" = ( -/obj/machinery/computer/cargo{ +/obj/machinery/computer/cargo/express{ dir = 8 }, /turf/open/floor/mineral/plastitanium, @@ -1386,8 +1386,8 @@ }, /obj/structure/fans/tiny, /obj/docking_port/mobile{ - dir = 4; - name = "Daniel" + name = "Daniel"; + dir = 2 }, /turf/open/floor/plating, /area/ship/engineering/engine) From a450a2f6b65934b03c10a2bc8d9c7d83c7d49330 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Mon, 26 Aug 2024 03:28:37 -0700 Subject: [PATCH 15/26] misc changes removed the nuke op 5.56 p90 stupid gun and replaces it with the M-16 --- .../independent/independent_daniel.dmm | 63 ++++++++++++++++--- 1 file changed, 56 insertions(+), 7 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index f0ae03e00bb1..ae82ea9e9f10 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -577,6 +577,17 @@ dir = 8 }, /obj/structure/closet/crate/secure/gear, +/obj/item/target, +/obj/item/target, +/obj/item/target/alien, +/obj/item/target/alien, +/obj/item/target/clown, +/obj/item/target/clown, +/obj/item/target/clown, +/obj/item/target/syndicate, +/obj/item/target/syndicate, +/obj/item/target/syndicate, +/obj/item/target/syndicate, /turf/open/floor/plating, /area/ship/engineering/engine) "og" = ( @@ -659,6 +670,20 @@ dir = 8 }, /obj/structure/closet/crate/secure/weapon, +/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/p16, +/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/p16, +/obj/item/ammo_box/magazine/m12g, +/obj/item/ammo_box/magazine/m12g, +/obj/item/ammo_box/magazine/m12g, +/obj/item/ammo_box/magazine/m12g, /turf/open/floor/plating, /area/ship/engineering/engine) "qD" = ( @@ -676,6 +701,7 @@ /obj/item/storage/firstaid/radiation, /obj/item/storage/firstaid/fire, /obj/item/storage/firstaid/brute, +/obj/item/clothing/neck/stethoscope, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) "qQ" = ( @@ -966,13 +992,14 @@ /area/ship/engineering/engine) "Cg" = ( /obj/structure/closet/wall/red/directional/east, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/item/ammo_box/magazine/sniper_rounds, /obj/item/gun_voucher/syndicate, /obj/item/gun_voucher/syndicate, +/obj/item/clothing/suit/armor/vest/marine, +/obj/item/clothing/suit/armor/vest/marine, +/obj/item/clothing/head/helmet/marine, +/obj/item/clothing/head/helmet/marine, +/obj/item/clothing/suit/armor/vest/marine/heavy, +/obj/item/clothing/head/helmet/marine/security, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Ch" = ( @@ -1453,6 +1480,25 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/circuit, /area/ship/science/ai_chamber) +"Re" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/closet/crate/secure/weapon, +/obj/item/ammo_box/magazine/sniper_rounds, +/obj/item/ammo_box/magazine/sniper_rounds, +/obj/item/ammo_box/magazine/sniper_rounds, +/obj/item/ammo_box/magazine/sniper_rounds, +/obj/item/ammo_box/magazine/sniper_rounds, +/obj/item/ammo_box/magazine/sniper_rounds, +/turf/open/floor/plating, +/area/ship/engineering/engine) "Ri" = ( /obj/structure/cable{ icon_state = "1-4" @@ -1609,7 +1655,10 @@ "US" = ( /obj/machinery/vending/security/marine/syndicate{ icon_deny = "marine-deny"; - icon_state = "marine" + icon_state = "marine"; + icon_vend = "null"; + light_mask = "marine-mask"; + voucher_items = list("P-16" = /obj/item/gun/ballistic/automatic/assault/p16, "sniper rifle" = /obj/item/gun/ballistic/automatic/sniper_rifle, "C-20r SMG" = /obj/item/gun/ballistic/automatic/smg/c20r, "Bulldog Shotgun" = /obj/item/gun/ballistic/shotgun/bulldog) }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) @@ -1812,7 +1861,7 @@ KY KY jD oa -ql +Re ql ms BZ From bea0caf3dacd0fbbc520191602866c846e2105ff Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Mon, 26 Aug 2024 03:48:04 -0700 Subject: [PATCH 16/26] final fixes --- _maps/shuttles/independent/independent_daniel.dmm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index ae82ea9e9f10..d43fb2388904 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -54,7 +54,6 @@ /obj/effect/spawner/lootdrop/ration, /obj/effect/spawner/lootdrop/salvage/gold, /obj/effect/spawner/lootdrop/stockparts, -/obj/item/a_gift/anything, /obj/item/circuitboard/machine/autolathe, /obj/item/storage/box/stockparts, /obj/item/stack/tile/carpet/royalblack/fifty, @@ -791,7 +790,6 @@ name = "secret blueprints" }, /obj/item/aicard, -/obj/item/organ/zombie_infection, /obj/item/stock_parts/cell/high/slime/hypercharged{ icon_state = "sheet-gold"; icon = 'icons/obj/stack_objects.dmi'; @@ -995,8 +993,6 @@ /obj/item/gun_voucher/syndicate, /obj/item/gun_voucher/syndicate, /obj/item/clothing/suit/armor/vest/marine, -/obj/item/clothing/suit/armor/vest/marine, -/obj/item/clothing/head/helmet/marine, /obj/item/clothing/head/helmet/marine, /obj/item/clothing/suit/armor/vest/marine/heavy, /obj/item/clothing/head/helmet/marine/security, From 3b7ea0cb2b3e2550ae64b72a8821fa248f827b4b Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Mon, 26 Aug 2024 12:39:27 -0700 Subject: [PATCH 17/26] more stock parts more stock parts+one more weapon shelf with three more crates, nothing in these new crates theyre just for storage --- .../independent/independent_daniel.dmm | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index d43fb2388904..7fec911f9d1b 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -55,7 +55,6 @@ /obj/effect/spawner/lootdrop/salvage/gold, /obj/effect/spawner/lootdrop/stockparts, /obj/item/circuitboard/machine/autolathe, -/obj/item/storage/box/stockparts, /obj/item/stack/tile/carpet/royalblack/fifty, /obj/item/stack/tile/carpet/royalblue/fifty, /obj/item/stack/tile/carpet/purple/fifty, @@ -64,6 +63,7 @@ /obj/item/stack/tile/carpet/cyan/fifty, /obj/item/stack/tile/carpet/blue/fifty, /obj/item/stack/tile/carpet/black/fifty, +/obj/item/storage/box/stockparts/t2, /turf/open/floor/plating, /area/ship/maintenance/central) "bk" = ( @@ -197,7 +197,7 @@ /turf/open/floor/plating, /area/ship/maintenance/central) "eU" = ( -/obj/structure/guncase, +/obj/structure/crate_shelf, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "fc" = ( @@ -966,6 +966,19 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/circuit, /area/ship/science/ai_chamber) +"AO" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/closet/crate/secure/weapon, +/turf/open/floor/plating, +/area/ship/engineering/engine) "Bl" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/wood/birch, @@ -1314,6 +1327,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, +/obj/structure/closet/crate/secure/gear, /turf/open/floor/plating, /area/ship/engineering/engine) "Lg" = ( @@ -1567,6 +1581,9 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/item/stack/sheet/mineral/plasma/ten, +/obj/item/stack/sheet/mineral/plasma/ten, +/obj/item/stack/sheet/mineral/plasma/ten, /turf/open/floor/plating, /area/ship/engineering/engine) "Ss" = ( @@ -1674,6 +1691,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/item/stack/sheet/mineral/plasma/ten, +/obj/item/stack/sheet/mineral/plasma/ten, +/obj/item/stack/sheet/mineral/plasma/ten, /turf/open/floor/plating, /area/ship/engineering/engine) "Wd" = ( @@ -1852,8 +1872,8 @@ wy wy tK cW -KY -KY +AO +AO KY jD oa From b3e8e1156a9ca52edb6572822f112ed968a80bb1 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Mon, 26 Aug 2024 13:17:50 -0700 Subject: [PATCH 18/26] adds grime and dust --- .../independent/independent_daniel.dmm | 116 ++++++++++++++++-- 1 file changed, 106 insertions(+), 10 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 7fec911f9d1b..2efc5fb5fbd1 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -23,6 +23,7 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/decal/cleanable/robot_debris/down, /turf/open/floor/plating, /area/ship/engineering/engine) "aK" = ( @@ -79,6 +80,13 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/mineral/gold, /area/ship/maintenance/central) +"bR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) "bS" = ( /obj/structure/cable{ icon_state = "2-8" @@ -89,6 +97,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering/engine) "ca" = ( @@ -121,6 +130,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering/engine) "cW" = ( @@ -135,6 +145,7 @@ /obj/machinery/power/terminal{ dir = 8 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering/engine) "cZ" = ( @@ -154,6 +165,19 @@ }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) +"de" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood/birch, +/area/ship/crew) "dE" = ( /obj/structure/cable{ icon_state = "4-8" @@ -175,6 +199,7 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering/engine) "eJ" = ( @@ -194,6 +219,7 @@ dir = 1 }, /obj/machinery/airalarm/directional/west, +/obj/effect/decal/cleanable/oil/slippery, /turf/open/floor/plating, /area/ship/maintenance/central) "eU" = ( @@ -239,6 +265,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/birch, /area/ship/crew) "fK" = ( @@ -298,6 +325,7 @@ /area/ship/science/ai_chamber) "gR" = ( /obj/structure/closet/emcloset/wall/directional/north, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/birch, /area/ship/crew) "gY" = ( @@ -449,6 +477,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/insectguts, /turf/open/floor/plating, /area/ship/engineering/engine) "kC" = ( @@ -459,6 +489,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering/engine) "kO" = ( @@ -521,6 +552,7 @@ dir = 8 }, /obj/machinery/light/dim/directional/south, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering/engine) "mw" = ( @@ -533,12 +565,17 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/birch, /area/ship/crew) "mC" = ( /obj/structure/sign/poster/official/nanotrasen_logo, /turf/closed/wall/r_wall, /area/ship/crew) +"nv" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/ship/engineering/engine) "nD" = ( /obj/item/reagent_containers/glass/bowl{ name = "Buggers Bowl" @@ -737,6 +774,7 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/gold, /area/ship/maintenance/central) "se" = ( @@ -861,6 +899,8 @@ /obj/machinery/light_switch{ pixel_x = -25 }, +/mob/living/simple_animal/bot/cleanbot, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) "wy" = ( @@ -869,7 +909,12 @@ "wB" = ( /turf/closed/wall/r_wall, /area/ship/security/armory) +"xn" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/wood/birch, +/area/ship/crew) "xo" = ( +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/lone, /area/ship/crew) "xx" = ( @@ -891,6 +936,7 @@ /obj/item/stock_parts/cell/gun/empty, /obj/item/stock_parts/cell/gun/empty, /obj/item/gun/energy/e_gun, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "xV" = ( @@ -927,6 +973,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering/engine) "zF" = ( @@ -981,10 +1028,12 @@ /area/ship/engineering/engine) "Bl" = ( /obj/machinery/airalarm/directional/north, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/birch, /area/ship/crew) "Bz" = ( /obj/structure/fluff/broken_flooring, +/obj/effect/decal/cleanable/robot_debris/gib, /turf/open/floor/plating, /area/ship/maintenance/central) "BA" = ( @@ -1139,6 +1188,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering/engine) "Hd" = ( @@ -1158,11 +1208,14 @@ /obj/machinery/light_switch{ pixel_x = 29 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "Hr" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/firealarm/directional/south, +/obj/effect/decal/cleanable/robot_debris/up, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "HI" = ( @@ -1246,8 +1299,15 @@ "Jp" = ( /obj/machinery/light/dim/directional/north, /obj/structure/bookcase/random, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/gold, /area/ship/maintenance/central) +"Jt" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood/birch, +/area/ship/crew) "JA" = ( /obj/structure/cable{ icon_state = "0-1" @@ -1257,6 +1317,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) "JC" = ( @@ -1305,6 +1366,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/red_gold, /area/ship/crew) "KT" = ( @@ -1315,6 +1377,7 @@ /obj/structure/sign/painting/library{ pixel_x = -28 }, +/obj/effect/decal/cleanable/food/pie_smudge, /turf/open/floor/plasteel, /area/ship/maintenance/central) "KY" = ( @@ -1340,6 +1403,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/decal/cleanable/oil/slippery, /turf/open/floor/plating, /area/ship/engineering/engine) "LL" = ( @@ -1394,6 +1458,16 @@ }, /turf/open/floor/wood/birch, /area/ship/crew) +"Ob" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/decal/cleanable/greenglow/filled, +/turf/open/floor/plating, +/area/ship/engineering/engine) "OL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1415,6 +1489,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating, /area/ship/engineering/engine) "OP" = ( @@ -1434,6 +1509,7 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/effect/decal/cleanable/sprayweb, /turf/open/floor/plating, /area/ship/maintenance/central) "Pq" = ( @@ -1445,6 +1521,7 @@ dir = 2 }, /obj/structure/closet/firecloset/wall/directional/south, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/birch, /area/ship/crew) "PF" = ( @@ -1453,6 +1530,8 @@ dir = 10 }, /obj/effect/turf_decal/corner/opaque/white/diagonal, +/obj/effect/decal/cleanable/food/plant_smudge, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/ship/maintenance/central) "PJ" = ( @@ -1471,10 +1550,12 @@ dir = 10 }, /obj/machinery/firealarm/directional/east, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/red_gold, /area/ship/crew) "Qb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering/engine) "Qg" = ( @@ -1520,6 +1601,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/item/kirbyplants/photosynthetic, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering/engine) "Rz" = ( @@ -1561,6 +1644,7 @@ "RT" = ( /obj/structure/grille/broken, /obj/structure/salvageable/autolathe, +/obj/effect/decal/cleanable/sprayweb, /turf/open/floor/plating, /area/ship/maintenance/central) "RW" = ( @@ -1584,6 +1668,7 @@ /obj/item/stack/sheet/mineral/plasma/ten, /obj/item/stack/sheet/mineral/plasma/ten, /obj/item/stack/sheet/mineral/plasma/ten, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering/engine) "Ss" = ( @@ -1626,6 +1711,7 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering/engine) "Tm" = ( @@ -1649,6 +1735,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/birch, /area/ship/crew) "Ut" = ( @@ -1682,6 +1769,7 @@ /area/ship/security/armory) "Vu" = ( /obj/machinery/light/dim/directional/north, +/obj/item/kirbyplants/random, /turf/open/floor/wood/birch, /area/ship/crew) "VM" = ( @@ -1694,6 +1782,7 @@ /obj/item/stack/sheet/mineral/plasma/ten, /obj/item/stack/sheet/mineral/plasma/ten, /obj/item/stack/sheet/mineral/plasma/ten, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/engineering/engine) "Wd" = ( @@ -1724,6 +1813,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "WM" = ( @@ -1753,6 +1843,11 @@ /obj/machinery/light/floor, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) +"Xs" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/ship/engineering/engine) "XO" = ( /obj/machinery/power/smes, /obj/structure/cable{ @@ -1764,6 +1859,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/lone, /area/ship/crew) "XZ" = ( @@ -1892,7 +1988,7 @@ kC cJ Ri uV -uV +Ob bS oW tK @@ -1903,8 +1999,8 @@ wy tK ge en -NI -NI +Xs +nv zw Qb Hb @@ -1994,8 +2090,8 @@ ei tK tK tK -tK -HI +xn +de tK tK tK @@ -2043,7 +2139,7 @@ fc HI Ut gM -oG +bR th Ut wy @@ -2055,7 +2151,7 @@ Kd XY Gl iX -HI +de Ut xV oG @@ -2100,7 +2196,7 @@ Rz YE Gl BA -HI +de wB pB xM @@ -2144,7 +2240,7 @@ Gl Tp PP nZ -Zz +Jt dE wB wB @@ -2235,7 +2331,7 @@ Tm ja mn Vu -HI +de ok CS qG From b56d38caa89e14966807eed7e3f6496445ad4a69 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Mon, 26 Aug 2024 16:21:33 -0700 Subject: [PATCH 19/26] Update independent_daniel.dmm --- .../independent/independent_daniel.dmm | 1576 ++++++++++++----- 1 file changed, 1096 insertions(+), 480 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 2efc5fb5fbd1..83093ef03ba2 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -13,12 +13,9 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "aC" = ( -/obj/structure/salvageable/server, -/obj/machinery/light_switch{ - pixel_y = -24 - }, +/obj/structure/holosign/barrier/cyborg/hacked/infinite, /turf/open/floor/plating, -/area/ship/maintenance/central) +/area/ship/external) "aJ" = ( /obj/structure/cable{ icon_state = "2-8" @@ -27,19 +24,13 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "aK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/plating, -/area/ship/engineering/engine) +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/r_wall, +/area/ship/security/armory) "aL" = ( -/obj/machinery/door/poddoor/shutters{ - id = "DanielGarage" - }, -/obj/structure/fans/tiny, +/obj/structure/closet/crate/hydroponics, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/cargo) "ba" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ dir = 1 @@ -47,39 +38,26 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/ship/engineering/engine) +"bc" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) "bj" = ( -/obj/structure/closet/cardboard, -/obj/effect/spawner/lootdrop/donut, -/obj/effect/spawner/lootdrop/donut, -/obj/item/circuitboard/machine/ltsrbt, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/salvage/gold, -/obj/effect/spawner/lootdrop/stockparts, -/obj/item/circuitboard/machine/autolathe, -/obj/item/stack/tile/carpet/royalblack/fifty, -/obj/item/stack/tile/carpet/royalblue/fifty, -/obj/item/stack/tile/carpet/purple/fifty, -/obj/item/stack/tile/carpet/orange/fifty, -/obj/item/stack/tile/carpet/green/fifty, -/obj/item/stack/tile/carpet/cyan/fifty, -/obj/item/stack/tile/carpet/blue/fifty, -/obj/item/stack/tile/carpet/black/fifty, -/obj/item/storage/box/stockparts/t2, -/turf/open/floor/plating, -/area/ship/maintenance/central) +/turf/closed/wall/r_wall, +/area/ship/crew/library) "bk" = ( -/obj/machinery/door/airlock/hatch, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/light_switch{ + pixel_y = 24 }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/mineral/gold, -/area/ship/maintenance/central) +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "bR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -101,27 +79,20 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "ca" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/machinery/processor{ - pixel_y = -1; - pixel_x = -7 - }, -/obj/machinery/chem_dispenser/drinks{ - pixel_y = -3; - pixel_x = 3 - }, -/obj/machinery/chem_dispenser/drinks/beer{ - pixel_y = 12; - pixel_x = 3 - }, -/turf/open/floor/plasteel, +/obj/structure/fluff/broken_flooring, +/obj/effect/decal/cleanable/robot_debris/gib, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, /area/ship/maintenance/central) "ch" = ( -/obj/structure/salvageable/computer, -/obj/machinery/firealarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) +"cE" = ( +/obj/machinery/light/dim/directional/south, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/ship/maintenance/central) +/area/ship/engineering/engine) "cJ" = ( /obj/structure/cable{ icon_state = "1-8" @@ -188,10 +159,27 @@ }, /turf/open/floor/wood/birch, /area/ship/crew) +"dX" = ( +/obj/machinery/door/poddoor/shutters{ + id = "DanielGarage" + }, +/obj/structure/fans/tiny, +/obj/docking_port/mobile{ + name = "Daniel"; + dir = 2 + }, +/turf/open/floor/plating, +/area/ship/cargo) "ei" = ( /obj/machinery/porta_turret/ship/ballistic, /turf/closed/wall/r_wall, /area/ship/engineering/engine) +"em" = ( +/obj/machinery/light/dim/directional/north, +/obj/structure/bookcase/random, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/gold, +/area/ship/crew/library) "en" = ( /obj/machinery/power/terminal{ dir = 1 @@ -203,25 +191,26 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "eJ" = ( -/obj/structure/closet/crate/eva, -/obj/effect/spawner/lootdrop/maintenance/four, -/obj/effect/spawner/lootdrop/maintenance/six, -/obj/effect/spawner/lootdrop/maintenance/six, -/obj/machinery/light/dim/directional/south, +/obj/structure/closet/crate, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/mining_scanner, +/obj/item/mining_scanner, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/cargo) "eN" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/machinery/door/poddoor/shutters{ + id = "DanielGarage" }, -/obj/machinery/airalarm/directional/west, -/obj/effect/decal/cleanable/oil/slippery, +/obj/structure/fans/tiny, /turf/open/floor/plating, -/area/ship/maintenance/central) +/area/ship/cargo) "eU" = ( /obj/structure/crate_shelf, /turf/open/floor/mineral/plastitanium/red, @@ -245,18 +234,20 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "fp" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/ert/engi, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/light_switch{ - pixel_y = 24 +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/computer/cryopod/retro/directional/north{ + pixel_y = 1; + dir = 8; + pixel_x = -22 }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security/armory) +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) "fA" = ( /obj/machinery/camera/xray, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -387,6 +378,29 @@ }, /turf/open/floor/wood/birch, /area/ship/bridge) +"iA" = ( +/obj/item/storage/box/beakers, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/ingredients/fruity, +/obj/item/storage/box/ingredients/carnivore, +/obj/item/storage/box/ingredients/vegetarian, +/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/effect/turf_decal/corner/opaque/white/diagonal, +/obj/machinery/door/window/brigdoor/southleft, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/turf/open/floor/plasteel, +/area/ship/crew/library) "iM" = ( /obj/structure/cable{ icon_state = "4-8" @@ -411,17 +425,22 @@ /turf/open/floor/wood/birch, /area/ship/crew) "ja" = ( -/obj/structure/destructible/cult/tome, -/obj/item/book/codex_gigas, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/machinery/airalarm/directional/south, -/obj/structure/sign/painting/library{ - pixel_x = 28 +/turf/open/floor/plating, +/area/ship/engineering/engine) +"je" = ( +/obj/structure/falsewall/reinforced, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"js" = ( +/obj/structure/mirror/magic{ + pixel_y = 31 }, -/turf/open/floor/mineral/gold, -/area/ship/maintenance/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/mineral/titanium/white, +/area/ship/crew) "jD" = ( /obj/machinery/button/door{ name = "Engine Shutters"; @@ -448,6 +467,10 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"jI" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plating, +/area/ship/cargo) "jV" = ( /obj/structure/cable{ icon_state = "4-8" @@ -498,6 +521,11 @@ }, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) +"kZ" = ( +/obj/machinery/light/dim/directional/east, +/obj/structure/closet/crate/secure/science, +/turf/open/floor/plating, +/area/ship/cargo) "la" = ( /obj/machinery/porta_turret/ship/ballistic, /turf/closed/wall/r_wall, @@ -527,12 +555,9 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "mk" = ( -/obj/effect/decal/cleanable/vomit/old, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, +/obj/machinery/mineral/ore_redemption, /turf/open/floor/plating, -/area/ship/maintenance/central) +/area/ship/cargo) "mn" = ( /turf/closed/wall/r_wall, /area/ship/maintenance/central) @@ -572,6 +597,14 @@ /obj/structure/sign/poster/official/nanotrasen_logo, /turf/closed/wall/r_wall, /area/ship/crew) +"mN" = ( +/obj/machinery/bookbinder, +/obj/machinery/light/dim/directional/east, +/obj/structure/sign/painting/library{ + pixel_y = 34 + }, +/turf/open/floor/mineral/gold, +/area/ship/crew/library) "nv" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -593,15 +626,9 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "nZ" = ( -/obj/machinery/door/airlock, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) +/obj/structure/safe, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "oa" = ( /obj/machinery/power/terminal{ dir = 8 @@ -638,19 +665,30 @@ /turf/closed/wall/r_wall, /area/ship/medical) "om" = ( -/obj/structure/closet/crate, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/mining_scanner, -/obj/item/mining_scanner, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/engineering/engine) +"op" = ( +/obj/item/stock_parts/cell/gun/empty, +/obj/item/stock_parts/cell/gun/empty, +/obj/item/stock_parts/cell/gun/empty, +/obj/item/gun/energy/e_gun, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/wall/red/directional/north, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "oG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -676,6 +714,16 @@ /obj/structure/closet/wall/orange/directional/south, /turf/open/floor/plating, /area/ship/engineering/engine) +"pp" = ( +/obj/structure/sink/kitchen{ + pixel_y = 27 + }, +/obj/structure/mirror{ + pixel_y = 39 + }, +/obj/item/towel, +/turf/open/floor/mineral/titanium/white, +/area/ship/crew) "pq" = ( /obj/machinery/door/airlock{ name = "Bathroom"; @@ -690,9 +738,25 @@ /turf/open/floor/carpet/lone, /area/ship/crew) "pB" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/swat, -/obj/machinery/airalarm/directional/west, +/turf/closed/wall/r_wall, +/area/ship/cargo) +"qb" = ( +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 8 + }, +/obj/machinery/door/window{ + dir = 8 + }, +/obj/structure/window/plasma/reinforced/spawner/north, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/mineral/titanium/white, +/area/ship/crew) +"qf" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/door/window/brigdoor/security/cell/northleft{ + name = "Cannon Door" + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "ql" = ( @@ -722,9 +786,28 @@ /obj/item/ammo_box/magazine/m12g, /turf/open/floor/plating, /area/ship/engineering/engine) -"qD" = ( +"qw" = ( +/obj/structure/mirror{ + pixel_y = 39 + }, +/obj/structure/sink/kitchen{ + pixel_y = 27 + }, +/obj/item/towel, /turf/open/floor/mineral/titanium/white, /area/ship/crew) +"qD" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 2 + }, +/turf/open/floor/wood/birch, +/area/ship/crew) "qG" = ( /obj/structure/closet/secure_closet/lp/medical, /obj/item/storage/backpack/duffelbag/med/surgery, @@ -748,13 +831,15 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "rh" = ( -/obj/machinery/computer/bookmanagement, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/sign/painting/library{ - pixel_y = 34 - }, -/turf/open/floor/mineral/gold, -/area/ship/maintenance/central) +/obj/structure/curtain/bounty, +/obj/item/bedsheet, +/obj/structure/bed, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) +"rj" = ( +/obj/structure/mecha_wreckage/marauder, +/turf/open/floor/plating, +/area/ship/cargo) "rS" = ( /obj/structure/closet/firecloset/wall/directional/south, /obj/structure/cable{ @@ -767,16 +852,25 @@ /turf/open/floor/wood/birch, /area/ship/crew) "rW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, +/obj/machinery/door/airlock/hatch, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/mineral/gold, -/area/ship/maintenance/central) +/area/ship/crew/library) +"sa" = ( +/obj/machinery/door/airlock{ + name = "Bathroom"; + dir = 4 + }, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) "se" = ( /obj/structure/cable{ icon_state = "4-8" @@ -793,9 +887,20 @@ /turf/open/floor/wood/birch, /area/ship/crew) "si" = ( -/obj/structure/mecha_wreckage/marauder, -/turf/open/floor/plating, -/area/ship/engineering/engine) +/obj/structure/closet/secure_closet/personal, +/obj/item/implant/radio, +/obj/item/implant/radio, +/obj/item/implant/radio, +/obj/item/implant/radio, +/obj/item/implant/radio, +/obj/item/implant/radio, +/obj/item/implant/radio, +/obj/item/implant/radio, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) "sx" = ( /obj/machinery/light/dim/directional/south, /obj/structure/cable{ @@ -809,6 +914,16 @@ }, /turf/open/floor/wood/birch, /area/ship/crew) +"sX" = ( +/obj/machinery/light/dim/directional/south, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/plating, +/area/ship/cargo) "th" = ( /obj/machinery/light/dim/directional/south, /obj/machinery/telecomms/hub{ @@ -817,29 +932,9 @@ /turf/open/floor/circuit, /area/ship/science/ai_chamber) "tj" = ( -/obj/item/antag_spawner/syndi_borer{ - name = "Brain-slug container"; - desc = "Releases a cortical borer." - }, -/obj/structure/safe/floor, -/obj/structure/grille, -/obj/item/documents{ - desc = "\"Top Secret\" Blueprints, these seem to be some kind of design, actually a few designs for a few different weapon and they look absolutely ancient."; - name = "secret blueprints" - }, -/obj/item/aicard, -/obj/item/stock_parts/cell/high/slime/hypercharged{ - icon_state = "sheet-gold"; - icon = 'icons/obj/stack_objects.dmi'; - name = "Weird Looking Battery"; - desc = "A weird looking cylindrical cell with a black topping that seems as if you could wire it into something...? on the side there is a red marking on it with a radiation symbol with red text that says boldly CAUTION RADIATION HAZARD" - }, -/obj/item/gun/ballistic/automatic/pistol/candor{ - name = "M1911"; - desc = "An immensely old but still widely popular design which has since been ripped off many times by a few cheap individuals, there is markings on the side showing it was made by John Browning."; - projectile_damage_multiplier = 1.5 - }, -/obj/item/slimepotion/lovepotion, +/obj/structure/salvageable/computer, +/obj/machinery/firealarm/directional/east, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/maintenance/central) "tK" = ( @@ -873,6 +968,10 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"vf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/closed/wall/r_wall, +/area/ship/crew) "vg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -892,6 +991,18 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"vH" = ( +/obj/structure/destructible/cult/tome, +/obj/item/book/codex_gigas, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/obj/structure/sign/painting/library{ + pixel_x = 28 + }, +/turf/open/floor/mineral/gold, +/area/ship/crew/library) "vL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -909,6 +1020,14 @@ "wB" = ( /turf/closed/wall/r_wall, /area/ship/security/armory) +"xm" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/window/reinforced/spawner/west, +/obj/machinery/door/window/brigdoor/security/cell/northleft{ + name = "Cannon Door" + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "xn" = ( /obj/item/kirbyplants/random, /turf/open/floor/wood/birch, @@ -931,11 +1050,6 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "xM" = ( -/obj/structure/closet/wall/red/directional/west, -/obj/item/stock_parts/cell/gun/empty, -/obj/item/stock_parts/cell/gun/empty, -/obj/item/stock_parts/cell/gun/empty, -/obj/item/gun/energy/e_gun, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) @@ -989,17 +1103,9 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "zW" = ( -/obj/machinery/button/door{ - name = "Garage Control"; - dir = 4; - pixel_y = -7; - pixel_x = -23; - id = "DanielGarage" - }, -/obj/machinery/mineral/ore_redemption{ - dir = 4 - }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/closed/wall/r_wall, /area/ship/engineering/engine) "AL" = ( /mob/living/carbon/human/species/ipc, @@ -1027,17 +1133,58 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "Bl" = ( -/obj/machinery/airalarm/directional/north, +/obj/machinery/porta_turret/ai, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"Bo" = ( +/obj/structure/salvageable/server, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood/birch, -/area/ship/crew) -"Bz" = ( -/obj/structure/fluff/broken_flooring, -/obj/effect/decal/cleanable/robot_debris/gib, +/obj/machinery/light_switch{ + pixel_y = -24 + }, /turf/open/floor/plating, /area/ship/maintenance/central) +"Bp" = ( +/obj/machinery/button/door{ + name = "Garage Control"; + dir = 4; + pixel_y = -7; + pixel_x = -23; + id = "DanielGarage" + }, +/obj/machinery/vending/mining_equipment, +/turf/open/floor/plating, +/area/ship/cargo) +"Bz" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) "BA" = ( -/obj/machinery/firealarm/directional/north, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"BT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/corner/opaque/white/diagonal, +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/southright, +/turf/open/floor/plasteel, +/area/ship/crew/library) +"BV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/wood/birch, /area/ship/crew) "BX" = ( @@ -1051,42 +1198,57 @@ /turf/closed/wall/r_wall, /area/ship/engineering/engine) "Cg" = ( -/obj/structure/closet/wall/red/directional/east, -/obj/item/gun_voucher/syndicate, -/obj/item/gun_voucher/syndicate, -/obj/item/clothing/suit/armor/vest/marine, -/obj/item/clothing/head/helmet/marine, -/obj/item/clothing/suit/armor/vest/marine/heavy, -/obj/item/clothing/head/helmet/marine/security, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/firealarm/directional/north, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Ch" = ( -/obj/machinery/computer/cryopod/retro/directional/north{ - pixel_y = 25 - }, -/obj/structure/closet/secure_closet/personal, -/obj/item/implant/radio, -/obj/item/implant/radio, -/obj/item/implant/radio, -/obj/item/implant/radio, -/obj/item/implant/radio, -/obj/item/implant/radio, -/obj/item/implant/radio, -/obj/item/implant/radio, /turf/open/floor/carpet/red_gold, /area/ship/crew) +"Cq" = ( +/obj/structure/closet/cardboard, +/obj/effect/spawner/lootdrop/donut, +/obj/effect/spawner/lootdrop/donut, +/obj/item/circuitboard/machine/ltsrbt, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/salvage/gold, +/obj/effect/spawner/lootdrop/stockparts, +/obj/item/circuitboard/machine/autolathe, +/obj/item/stack/tile/carpet/royalblack/fifty, +/obj/item/stack/tile/carpet/royalblue/fifty, +/obj/item/stack/tile/carpet/purple/fifty, +/obj/item/stack/tile/carpet/orange/fifty, +/obj/item/stack/tile/carpet/green/fifty, +/obj/item/stack/tile/carpet/cyan/fifty, +/obj/item/stack/tile/carpet/blue/fifty, +/obj/item/stack/tile/carpet/black/fifty, +/obj/item/storage/box/stockparts/t2, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/ship/maintenance/central) +"CO" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/r_wall, +/area/ship/cargo) "CS" = ( /obj/machinery/vending/medical, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) -"Dn" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor/border_only, +"CU" = ( +/obj/machinery/door/airlock, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) +"Dn" = ( +/obj/machinery/door/poddoor/shutters{ + id = "Cannon"; + dir = 4 + }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/security/armory) "Dr" = ( /obj/structure/cable{ icon_state = "2-8" @@ -1117,10 +1279,21 @@ }, /turf/closed/wall/r_wall, /area/ship/engineering/engine) -"Ep" = ( -/obj/structure/AIcore, -/obj/item/circuitboard/aicore, -/obj/item/stack/sheet/rglass, +"Ed" = ( +/obj/machinery/door/airlock, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) +"Ep" = ( +/obj/structure/AIcore, +/obj/item/circuitboard/aicore, +/obj/item/stack/sheet/rglass, /obj/item/stack/sheet/rglass, /obj/item/stack/sheet/rglass, /obj/item/stack/sheet/rglass, @@ -1129,6 +1302,10 @@ /obj/machinery/holopad/emergency, /turf/open/floor/circuit, /area/ship/science/ai_chamber) +"EA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) "EO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -1140,28 +1317,14 @@ /turf/closed/wall/r_wall, /area/ship/crew) "FC" = ( -/obj/structure/closet/crate/secure/science, -/obj/item/circuitboard/machine/protolathe, -/obj/item/circuitboard/machine/circuit_imprinter, -/obj/machinery/light/dim/directional/east, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"FR" = ( -/obj/machinery/ore_silo, -/turf/open/floor/circuit, -/area/ship/science/ai_chamber) -"Gc" = ( -/obj/machinery/light/dim/directional/south, -/obj/machinery/portable_atmospherics/scrubber, -/obj/structure/cable{ - icon_state = "1-4" +/obj/effect/decal/cleanable/vomit/old, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/ship/engineering/engine) -"Gl" = ( -/turf/closed/wall/r_wall, -/area/ship/crew) -"GU" = ( +/area/ship/maintenance/central) +"FF" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal, /obj/structure/table/reinforced, /obj/machinery/microwave{ @@ -1183,7 +1346,23 @@ pixel_x = -28 }, /turf/open/floor/plasteel, -/area/ship/maintenance/central) +/area/ship/crew/library) +"FR" = ( +/obj/machinery/ore_silo, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) +"Gc" = ( +/obj/effect/decal/cleanable/insectguts, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"Gl" = ( +/turf/closed/wall/r_wall, +/area/ship/crew) +"GU" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/closed/wall/r_wall, +/area/ship/crew) "Hb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -1259,6 +1438,38 @@ }, /turf/open/floor/circuit, /area/ship/science/ai_chamber) +"It" = ( +/obj/machinery/light/dim/directional/south, +/obj/machinery/power/emitter/energycannon{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-1" + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"Iv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/effect/turf_decal/corner/opaque/white/diagonal, +/obj/effect/decal/cleanable/food/plant_smudge, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel, +/area/ship/crew/library) +"Iz" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "IA" = ( /obj/machinery/light/dim/directional/south, /obj/structure/closet/emcloset/wall/directional/south, @@ -1274,40 +1485,30 @@ /turf/open/floor/wood/birch, /area/ship/crew) "IN" = ( -/obj/item/storage/box/beakers, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/ingredients/fruity, -/obj/item/storage/box/ingredients/carnivore, -/obj/item/storage/box/ingredients/vegetarian, -/obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/storage/fancy/egg_box, -/obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/item/reagent_containers/food/condiment/sugar, -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/machinery/door/window/brigdoor/southleft, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/turf/open/floor/plasteel, -/area/ship/maintenance/central) -"Jp" = ( -/obj/machinery/light/dim/directional/north, -/obj/structure/bookcase/random, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/mineral/gold, -/area/ship/maintenance/central) -"Jt" = ( +/obj/structure/closet/crate/secure/science, +/obj/item/circuitboard/machine/protolathe, +/obj/item/circuitboard/machine/circuit_imprinter, +/obj/machinery/light/dim/directional/east, +/turf/open/floor/plating, +/area/ship/cargo) +"Jd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plating, +/area/ship/cargo) +"Je" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood/birch, -/area/ship/crew) +/turf/open/floor/plating, +/area/ship/cargo) +"Jp" = ( +/turf/open/floor/plating, +/area/ship/cargo) +"Jt" = ( +/obj/machinery/light/dim/directional/east, +/obj/machinery/porta_turret/ai, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "JA" = ( /obj/structure/cable{ icon_state = "0-1" @@ -1363,23 +1564,31 @@ /turf/open/floor/hangar/plasteel/white, /area/ship/medical) "KF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/red_gold, +/obj/machinery/door/window{ + dir = 8 + }, +/obj/structure/toilet{ + pixel_y = 1 + }, +/obj/item/soap/nanotrasen, +/turf/open/floor/mineral/titanium/white, +/area/ship/crew) +"KL" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/mineral/titanium/white, /area/ship/crew) "KT" = ( -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, +/obj/machinery/computer/bookmanagement, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/sign/painting/library{ - pixel_x = -28 + pixel_y = 34 }, -/obj/effect/decal/cleanable/food/pie_smudge, -/turf/open/floor/plasteel, -/area/ship/maintenance/central) +/turf/open/floor/mineral/gold, +/area/ship/crew/library) "KY" = ( /obj/machinery/power/terminal{ dir = 8 @@ -1423,6 +1632,14 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"Ma" = ( +/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/mineral/plastitanium/red, +/area/ship/security/armory) "Mf" = ( /turf/closed/wall/r_wall, /area/ship/bridge) @@ -1430,15 +1647,19 @@ /obj/structure/window/reinforced/fulltile, /obj/structure/grille, /obj/machinery/door/poddoor/shutters{ - id = "DanielBridge"; + id = "Cannon"; dir = 4 }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "MT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Nk" = ( @@ -1449,7 +1670,27 @@ }, /turf/template_noop, /area/template_noop) +"Nn" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/kirbyplants/photosynthetic, +/turf/open/floor/plating, +/area/ship/engineering/engine) "NI" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "NT" = ( @@ -1469,20 +1710,17 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "OL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, +/obj/machinery/firealarm/directional/east, +/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plating, -/area/ship/engineering/engine) +/turf/open/floor/carpet/red_gold, +/area/ship/crew) "ON" = ( /obj/machinery/power/port_gen/pacman/super, /obj/structure/cable, @@ -1493,25 +1731,15 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "OP" = ( -/obj/machinery/door/poddoor/shutters{ - id = "DanielGarage" - }, -/obj/structure/fans/tiny, -/obj/docking_port/mobile{ - name = "Daniel"; - dir = 2 +/obj/structure/cable{ + icon_state = "2-8" }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/cargo) "OT" = ( -/obj/structure/salvageable/circuit_imprinter, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/decal/cleanable/sprayweb, +/obj/structure/closet/crate/secure/plasma, /turf/open/floor/plating, -/area/ship/maintenance/central) +/area/ship/cargo) "Pq" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1527,13 +1755,14 @@ "PF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 + dir = 6 + }, +/obj/structure/cable{ + icon_state = "2-8" }, -/obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/effect/decal/cleanable/food/plant_smudge, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel, -/area/ship/maintenance/central) +/turf/open/floor/mineral/gold, +/area/ship/crew/library) "PJ" = ( /obj/item/bedsheet/double/captain{ dir = 4 @@ -1545,13 +1774,17 @@ /turf/open/floor/carpet/lone, /area/ship/crew) "PP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/firealarm/directional/east, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/red_gold, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 2 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/wood/birch, /area/ship/crew) "Qb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -1571,9 +1804,18 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/circuit, /area/ship/science/ai_chamber) -"Re" = ( -/obj/machinery/power/terminal{ - dir = 8 +"Qt" = ( +/obj/machinery/button/door{ + pixel_x = -2; + id = "Cannon"; + pixel_y = -25 + }, +/obj/item/holosign_creator/atmos, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"Re" = ( +/obj/machinery/power/terminal{ + dir = 8 }, /obj/structure/cable{ icon_state = "0-4" @@ -1606,11 +1848,9 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "Rz" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/machinery/light/dim/directional/north, -/turf/open/floor/mineral/titanium/white, +/obj/machinery/firealarm/directional/north, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/wood/birch, /area/ship/crew) "RC" = ( /obj/effect/landmark/observer_start, @@ -1642,11 +1882,8 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "RT" = ( -/obj/structure/grille/broken, -/obj/structure/salvageable/autolathe, -/obj/effect/decal/cleanable/sprayweb, /turf/open/floor/plating, -/area/ship/maintenance/central) +/area/ship/external) "RW" = ( /obj/machinery/power/port_gen/pacman, /obj/structure/cable, @@ -1696,32 +1933,32 @@ /obj/machinery/computer/crew/retro, /turf/open/floor/circuit, /area/ship/science/ai_chamber) +"SC" = ( +/obj/machinery/firealarm/directional/east, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "SH" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable{ - icon_state = "0-8" + dir = 6 }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/airalarm/directional/west, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating, /area/ship/engineering/engine) -"Tm" = ( -/obj/machinery/bookbinder, -/obj/machinery/light/dim/directional/east, +"ST" = ( +/obj/effect/turf_decal/corner/opaque/white/diagonal, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /obj/structure/sign/painting/library{ - pixel_y = 34 + pixel_x = -28 }, -/turf/open/floor/mineral/gold, -/area/ship/maintenance/central) +/obj/effect/decal/cleanable/food/pie_smudge, +/turf/open/floor/plasteel, +/area/ship/crew/library) +"Tm" = ( +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "Tp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/light/dim/directional/east, @@ -1730,6 +1967,24 @@ }, /turf/open/floor/carpet/red_gold, /area/ship/crew) +"Tu" = ( +/obj/machinery/firealarm/directional/north, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) +"TE" = ( +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"TX" = ( +/obj/structure/salvageable/circuit_imprinter, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/decal/cleanable/sprayweb, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/ship/maintenance/central) "Uc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -1738,6 +1993,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/birch, /area/ship/crew) +"Uo" = ( +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/ert/engi, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "Ut" = ( /turf/closed/wall/r_wall, /area/ship/science/ai_chamber) @@ -1748,10 +2008,17 @@ /obj/machinery/light/floor, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) +"UD" = ( +/obj/machinery/light/dim/directional/south, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/reagent_containers/food/snacks/breadslice/moldy, +/turf/open/floor/plating, +/area/ship/engineering/engine) "UK" = ( -/obj/machinery/porta_turret/ship/ballistic, -/turf/closed/wall/r_wall, -/area/ship/science/ai_chamber) +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/guncase, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "US" = ( /obj/machinery/vending/security/marine/syndicate{ icon_deny = "marine-deny"; @@ -1762,9 +2029,68 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) +"UX" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/dim/directional/north, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/mineral/titanium/white, +/area/ship/crew) +"UY" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/decal/cleanable/oil/slippery, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/ship/maintenance/central) +"Vc" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -12; + pixel_y = -16 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/mineral/gold, +/area/ship/crew/library) +"Vd" = ( +/obj/item/gun_voucher/syndicate, +/obj/item/gun_voucher/syndicate, +/obj/item/clothing/suit/armor/vest/marine, +/obj/item/clothing/head/helmet/marine, +/obj/item/clothing/suit/armor/vest/marine/heavy, +/obj/item/clothing/head/helmet/marine/security, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/wall/red/directional/west, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"Ve" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) "Vs" = ( -/obj/structure/crate_shelf, -/obj/machinery/light/dim/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/machinery/power/emitter/energycannon{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/north, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "0-1" + }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Vu" = ( @@ -1786,34 +2112,46 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "Wd" = ( -/obj/structure/sink/kitchen{ - pixel_y = 13 - }, -/obj/structure/mirror/magic{ - pixel_y = 31 - }, -/turf/open/floor/mineral/titanium/white, +/obj/machinery/airalarm/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/wood/birch, /area/ship/crew) "Wf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/r_wall, +/area/ship/crew/library) +"Wm" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/corner/opaque/white/diagonal, -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor/southright, +/obj/machinery/processor{ + pixel_y = -1; + pixel_x = -7 + }, +/obj/machinery/chem_dispenser/drinks{ + pixel_y = -3; + pixel_x = 3 + }, +/obj/machinery/chem_dispenser/drinks/beer{ + pixel_y = 12; + pixel_x = 3 + }, /turf/open/floor/plasteel, -/area/ship/maintenance/central) +/area/ship/crew/library) "Wn" = ( /turf/closed/wall/r_wall, /area/ship/medical) "Wz" = ( +/obj/machinery/door/airlock/vault, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "WM" = ( @@ -1836,6 +2174,13 @@ }, /turf/open/floor/plating, /area/ship/external) +"WP" = ( +/obj/structure/grille/broken, +/obj/structure/salvageable/autolathe, +/obj/effect/decal/cleanable/sprayweb, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/ship/maintenance/central) "Xj" = ( /obj/machinery/computer/aifixer{ dir = 1 @@ -1843,11 +2188,52 @@ /obj/machinery/light/floor, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) +"Xm" = ( +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/swat, +/obj/machinery/light/dim/directional/south, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) +"Xr" = ( +/obj/item/antag_spawner/syndi_borer{ + name = "Brain-slug container"; + desc = "Releases a cortical borer." + }, +/obj/structure/safe/floor, +/obj/structure/grille, +/obj/item/documents{ + desc = "\"Top Secret\" Blueprints, these seem to be some kind of design, actually a few designs for a few different weapon and they look absolutely ancient."; + name = "secret blueprints" + }, +/obj/item/aicard, +/obj/item/stock_parts/cell/high/slime/hypercharged{ + icon_state = "sheet-gold"; + icon = 'icons/obj/stack_objects.dmi'; + name = "Weird Looking Battery"; + desc = "A weird looking cylindrical cell with a black topping that seems as if you could wire it into something...? on the side there is a red marking on it with a radiation symbol with red text that says boldly CAUTION RADIATION HAZARD" + }, +/obj/item/gun/ballistic/automatic/pistol/candor{ + name = "M1911"; + desc = "An immensely old but still widely popular design which has since been ripped off many times by a few cheap individuals, there is markings on the side showing it was made by John Browning."; + projectile_damage_multiplier = 1.5 + }, +/obj/item/slimepotion/lovepotion, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/ship/maintenance/central) "Xs" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, /area/ship/engineering/engine) +"Xx" = ( +/obj/structure/closet/crate/eva, +/obj/effect/spawner/lootdrop/maintenance/four, +/obj/effect/spawner/lootdrop/maintenance/six, +/obj/effect/spawner/lootdrop/maintenance/six, +/turf/open/floor/plating, +/area/ship/cargo) "XO" = ( /obj/machinery/power/smes, /obj/structure/cable{ @@ -1872,29 +2258,33 @@ /turf/open/floor/carpet/lone, /area/ship/crew) "Yi" = ( -/obj/docking_port/stationary{ - dwidth = 15; - width = 30; - height = 15; - dir = 2 +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/turf/template_noop, -/area/template_noop) +/obj/machinery/door/firedoor/border_only, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) "YE" = ( -/obj/structure/curtain, -/obj/machinery/shower{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/door/window{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/structure/window/plasma/reinforced/spawner/north, -/turf/open/floor/mineral/titanium/white, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/wood/birch, /area/ship/crew) "YG" = ( -/obj/machinery/vending/mining_equipment, -/turf/open/floor/plating, -/area/ship/engineering/engine) +/obj/structure/guncase, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "YT" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable{ @@ -1911,17 +2301,9 @@ /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "YW" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -12; - pixel_y = -16 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/mineral/gold, -/area/ship/maintenance/central) +/obj/structure/closet/crate/secure/exo, +/turf/open/floor/plating, +/area/ship/cargo) "Zq" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -1933,9 +2315,23 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood/birch, /area/ship/crew) +"ZL" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 4 + }, +/obj/structure/holosign/barrier/atmos/infinite, +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, +/obj/structure/barricade/security, +/turf/open/floor/carpet/red_gold, +/area/ship/crew) (1,1,1) = {" wy +wy +wy +wy +wy tK WM WM @@ -1948,9 +2344,16 @@ WM WM tK wy +wy +wy +wy "} (2,1,1) = {" wy +wy +wy +wy +wy ei JC Ss @@ -1963,9 +2366,16 @@ JC Ss ei wy +wy +wy +wy "} (3,1,1) = {" wy +wy +wy +wy +wy tK cW AO @@ -1978,9 +2388,16 @@ ql ms BZ wy +wy +wy +wy "} (4,1,1) = {" wy +CO +pB +pB +pB tK Dr ui @@ -1992,10 +2409,17 @@ Ob bS oW tK -wy +tK +tK +tK +ei "} (5,1,1) = {" wy +eN +Bp +rj +eJ tK ge en @@ -2007,10 +2431,17 @@ Hb aJ fK tK -wy +nv +nv +nv +tK "} (6,1,1) = {" wy +eN +Jp +mk +Jp tK XO So @@ -2022,59 +2453,87 @@ vj VM yD tK -wy +Gc +nv +cE +tK "} (7,1,1) = {" -wy -ei -tK +Nk +dX +Jp +Jp +Jp +pB +pB +pB +pB tK +LL tK tK -LL tK tK tK +nv +Nn +Gc tK -ei -wy "} (8,1,1) = {" wy -aL +eN +Jp +jI +Jd +Je +Je +Je +sX zW om -eJ -tK -SH tK yR -aK +SH ba tK -wy +nv +nv +nv +tK "} (9,1,1) = {" -Nk +wy +eN +Jp +Jp +Jp +Jp +Jp +Jp OP +Bz NI -NI -NI -Dn -OL fn jE kc +ja +je +nv Gc +UD tK -wy "} (10,1,1) = {" wy +eN +Xx +IN +OT +OT +YW +kZ aL -YG -FC -si tK jV tK @@ -2082,10 +2541,17 @@ he mo HK tK -wy +nv +nv +nv +tK "} (11,1,1) = {" wy +Fu +Gl +Gl +Gl ei tK tK @@ -2096,12 +2562,19 @@ tK tK tK tK -ei -wy +tK +wB +wB +wB +aK "} (12,1,1) = {" wy Gl +rh +CU +Ve +Gl PJ HP Gl @@ -2112,11 +2585,18 @@ BX Ep AL Ut -wy +eU +Vd +eU +wB "} (13,1,1) = {" wy Gl +sa +Gl +Ch +Gl xo XZ Kj @@ -2127,11 +2607,18 @@ St EO Hr Ut -wy +eU +xM +Xm +wB "} (14,1,1) = {" wy Gl +qw +Gl +Ch +Gl fU vg mC @@ -2142,11 +2629,18 @@ gM bR th Ut -wy +nZ +Tm +Uo +wB "} (15,1,1) = {" wy Gl +KF +Gl +Tu +Gl Kd XY Gl @@ -2157,10 +2651,17 @@ xV oG Hd Ut -wy +US +xM +YG +wB "} (16,1,1) = {" wy +Gl +Gl +Gl +Ch Fu Gl pq @@ -2172,85 +2673,127 @@ Hg Ig FR Ut -wy +US +Tm +YG +wB "} (17,1,1) = {" wy Gl +rh +CU +ch +vf +js +KL +vf Wd qD -Gl -Bl -HI Ut Ut Ut Ut +Ut +op +Tm UK -wy +wB "} (18,1,1) = {" wy Gl +sa +Gl +EA +GU +UX +qb +GU Rz YE -Gl +wB BA -de +xM +Bl wB -pB xM -eU +xm +TE wB -wy "} (19,1,1) = {" wy Gl +pp +Gl +Ch +Gl Gl Gl Gl zF RC lz +Iz +Ma +Ma Wz MT Vs +It wB -wy "} (20,1,1) = {" wy Gl -Ch KF Gl +bc +Ed +si +fp +Gl hW sx wB -fp +bk +SC +Jt +wB Cg -US +qf +Qt wB -wy "} (21,1,1) = {" wy +Fu +Gl +Gl +ZL Gl Tp +OL +Yi +BV PP -nZ -Jt -dE wB wB wB wB wB -wy +wB +Dn +Dn +aK "} (22,1,1) = {" wy +wy +RT +RT +aC Fu Gl Gl @@ -2258,63 +2801,91 @@ Gl gR se tX -eN -mk +UY +FC +WP +la +RT +RT RT -mn wy "} (23,1,1) = {" wy -mn -GU -KT -IN +wy +RT +RT +RT +bj +FF +ST +iA fc HI mn -OT -Bz -aC +TX +ca +Bo mn +RT +RT +RT wy "} (24,1,1) = {" wy -mn -ca -PF -Wf +wy +RT +RT +RT +bj +Wm +Iv +BT Zz Pq mn +Xr tj -ch -bj +Cq mn -Yi +RT +RT +RT +wy "} (25,1,1) = {" wy -mn -Jp -YW -mn +wy +wy +RT +RT +bj +em +Vc +bj fA dE Wn Wn Wn Wn -yx +Wn +RT +RT +wy wy "} (26,1,1) = {" wy -mn -rh +wy +wy +RT +RT +bj +KT +PF rW -bk mw iM gd @@ -2322,14 +2893,21 @@ JA vL Kt Wn +RT +RT +wy wy "} (27,1,1) = {" wy -mn -Tm -ja -mn +wy +wy +wy +RT +bj +mN +vH +bj Vu de ok @@ -2337,14 +2915,21 @@ CS qG kO Wn +RT +wy +wy wy "} (28,1,1) = {" wy -la -mn -mn -mn +wy +wy +wy +wy +Wf +bj +bj +bj Mf iy Wn @@ -2353,9 +2938,16 @@ Wn Wn yx wy +wy +wy +wy "} (29,1,1) = {" wy +wy +wy +wy +wy li Mf gY @@ -2368,10 +2960,17 @@ ap Mf Dx wy +wy +wy +wy "} (30,1,1) = {" wy wy +wy +wy +wy +wy Mf fT RD @@ -2383,10 +2982,17 @@ Xj Mf wy wy +wy +wy +wy "} (31,1,1) = {" wy wy +wy +wy +wy +wy Mf Mf da @@ -2398,11 +3004,18 @@ Mf Mf wy wy +wy +wy +wy "} (32,1,1) = {" wy wy wy +wy +wy +wy +wy MG MG MG @@ -2413,4 +3026,7 @@ MG wy wy wy +wy +wy +wy "} From 5dfb4592e58e05984ade657f27916b4a88ea5da7 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Mon, 26 Aug 2024 18:34:10 -0700 Subject: [PATCH 20/26] final touches for real this time --- .../independent/independent_daniel.dmm | 362 ++++++++++-------- 1 file changed, 199 insertions(+), 163 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 83093ef03ba2..085f9a03721a 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -31,6 +31,10 @@ /obj/structure/closet/crate/hydroponics, /turf/open/floor/plating, /area/ship/cargo) +"aN" = ( +/obj/item/flashlight/lantern, +/turf/open/floor/concrete/tiles, +/area/ship/engineering/engine) "ba" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ dir = 1 @@ -40,11 +44,10 @@ /area/ship/engineering/engine) "bc" = ( /obj/structure/cable{ - icon_state = "0-2" + icon_state = "1-2" }, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "bj" = ( /turf/closed/wall/r_wall, /area/ship/crew/library) @@ -86,12 +89,12 @@ /area/ship/maintenance/central) "ch" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "cE" = ( /obj/machinery/light/dim/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/obj/structure/closet/cabinet, +/turf/open/floor/concrete/tiles, /area/ship/engineering/engine) "cJ" = ( /obj/structure/cable{ @@ -149,6 +152,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/birch, /area/ship/crew) +"dp" = ( +/obj/structure/table/glass, +/obj/item/storage/backpack/duffelbag/med/surgery, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "dE" = ( /obj/structure/cable{ icon_state = "4-8" @@ -218,6 +226,11 @@ "fc" = ( /turf/open/floor/wood/birch, /area/ship/crew) +"fe" = ( +/obj/structure/table/wood/fancy/orange, +/obj/item/candle/infinite, +/turf/open/floor/concrete/tiles, +/area/ship/engineering/engine) "fn" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -288,7 +301,7 @@ }, /obj/machinery/door/firedoor/border_only, /turf/open/floor/hangar/plasteel/white, -/area/ship/medical) +/area/ship/crew/dorm) "ge" = ( /obj/machinery/power/smes, /obj/structure/cable{ @@ -439,6 +452,9 @@ pixel_y = 31 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/sink{ + pixel_y = 23 + }, /turf/open/floor/mineral/titanium/white, /area/ship/crew) "jD" = ( @@ -516,11 +532,9 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "kO" = ( -/obj/machinery/computer/operating{ - dir = 1 - }, -/turf/open/floor/hangar/plasteel/white, -/area/ship/medical) +/obj/structure/closet/cabinet, +/turf/open/floor/carpet/red_gold, +/area/ship/crew/dorm) "kZ" = ( /obj/machinery/light/dim/directional/east, /obj/structure/closet/crate/secure/science, @@ -661,9 +675,8 @@ /turf/open/floor/wood/birch, /area/ship/crew) "ok" = ( -/obj/structure/sign/departments/medbay/alt, /turf/closed/wall/r_wall, -/area/ship/medical) +/area/ship/crew/dorm) "om" = ( /obj/structure/cable{ icon_state = "4-8" @@ -715,15 +728,10 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "pp" = ( -/obj/structure/sink/kitchen{ - pixel_y = 27 - }, -/obj/structure/mirror{ - pixel_y = 39 - }, -/obj/item/towel, -/turf/open/floor/mineral/titanium/white, -/area/ship/crew) +/obj/machinery/airalarm/directional/north, +/obj/machinery/chem_dispenser/fullupgrade, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "pq" = ( /obj/machinery/door/airlock{ name = "Bathroom"; @@ -787,15 +795,9 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "qw" = ( -/obj/structure/mirror{ - pixel_y = 39 - }, -/obj/structure/sink/kitchen{ - pixel_y = 27 - }, -/obj/item/towel, -/turf/open/floor/mineral/titanium/white, -/area/ship/crew) +/obj/machinery/stasis, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "qD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -809,10 +811,21 @@ /turf/open/floor/wood/birch, /area/ship/crew) "qG" = ( +/obj/machinery/light/dim/directional/east, +/obj/structure/dresser, +/turf/open/floor/carpet/red_gold, +/area/ship/crew/dorm) +"qQ" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"rh" = ( /obj/structure/closet/secure_closet/lp/medical, /obj/item/storage/backpack/duffelbag/med/surgery, /obj/item/bodybag/bluespace, -/obj/machinery/light/dim/directional/east, /obj/item/storage/firstaid/tactical, /obj/item/storage/firstaid/ancient, /obj/item/storage/firstaid/advanced, @@ -823,19 +836,6 @@ /obj/item/clothing/neck/stethoscope, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) -"qQ" = ( -/obj/machinery/power/port_gen/pacman, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"rh" = ( -/obj/structure/curtain/bounty, -/obj/item/bedsheet, -/obj/structure/bed, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) "rj" = ( /obj/structure/mecha_wreckage/marauder, /turf/open/floor/plating, @@ -865,12 +865,9 @@ /turf/open/floor/mineral/gold, /area/ship/crew/library) "sa" = ( -/obj/machinery/door/airlock{ - name = "Bathroom"; - dir = 4 - }, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) +/obj/machinery/computer/operating, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "se" = ( /obj/structure/cable{ icon_state = "4-8" @@ -914,6 +911,15 @@ }, /turf/open/floor/wood/birch, /area/ship/crew) +"sW" = ( +/obj/structure/bed/double{ + dir = 4 + }, +/obj/item/bedsheet/double/orange{ + dir = 4 + }, +/turf/open/floor/concrete/tiles, +/area/ship/engineering/engine) "sX" = ( /obj/machinery/light/dim/directional/south, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -1012,14 +1018,18 @@ }, /mob/living/simple_animal/bot/cleanbot, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/hangar/plasteel/white, -/area/ship/medical) +/turf/open/floor/carpet/red_gold, +/area/ship/crew/dorm) "wy" = ( /turf/template_noop, /area/template_noop) "wB" = ( /turf/closed/wall/r_wall, /area/ship/security/armory) +"wH" = ( +/obj/structure/closet/secure_closet/engineering_chief, +/turf/open/floor/concrete/tiles, +/area/ship/engineering/engine) "xm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/window/reinforced/spawner/west, @@ -1107,6 +1117,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/closed/wall/r_wall, /area/ship/engineering/engine) +"Ai" = ( +/obj/machinery/chem_heater, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "AL" = ( /mob/living/carbon/human/species/ipc, /obj/structure/bed/pod, @@ -1132,6 +1146,10 @@ /obj/structure/closet/crate/secure/weapon, /turf/open/floor/plating, /area/ship/engineering/engine) +"Bh" = ( +/obj/structure/filingcabinet/double/grey, +/turf/open/floor/concrete/tiles, +/area/ship/engineering/engine) "Bl" = ( /obj/machinery/porta_turret/ai, /turf/open/floor/mineral/plastitanium/red, @@ -1203,8 +1221,9 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Ch" = ( -/turf/open/floor/carpet/red_gold, -/area/ship/crew) +/obj/structure/curtain, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "Cq" = ( /obj/structure/closet/cardboard, /obj/effect/spawner/lootdrop/donut, @@ -1226,22 +1245,36 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/maintenance/central) +"Cv" = ( +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/ert/engi, +/turf/open/floor/concrete/tiles, +/area/ship/engineering/engine) "CO" = ( /obj/machinery/porta_turret/ship/ballistic, /turf/closed/wall/r_wall, /area/ship/cargo) "CS" = ( -/obj/machinery/vending/medical, -/turf/open/floor/hangar/plasteel/white, -/area/ship/medical) -"CU" = ( -/obj/machinery/door/airlock, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 8 }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) +/obj/machinery/door/window{ + dir = 8 + }, +/obj/structure/toilet{ + dir = 8 + }, +/obj/structure/sink{ + pixel_y = 23 + }, +/obj/structure/window/plasma/reinforced/spawner, +/turf/open/floor/mineral/titanium/white, +/area/ship/crew/dorm) +"CU" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/r_wall, +/area/ship/crew/dorm) "Dn" = ( /obj/machinery/door/poddoor/shutters{ id = "Cannon"; @@ -1304,8 +1337,8 @@ /area/ship/science/ai_chamber) "EA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "EO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -1352,9 +1385,10 @@ /turf/open/floor/circuit, /area/ship/science/ai_chamber) "Gc" = ( -/obj/effect/decal/cleanable/insectguts, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, +/obj/structure/dresser{ + dir = 1 + }, +/turf/open/floor/concrete/tiles, /area/ship/engineering/engine) "Gl" = ( /turf/closed/wall/r_wall, @@ -1519,8 +1553,8 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/hangar/plasteel/white, -/area/ship/medical) +/turf/open/floor/carpet/red_gold, +/area/ship/crew/dorm) "JC" = ( /obj/machinery/power/smes/shuttle{ dir = 4 @@ -1559,24 +1593,19 @@ /turf/open/floor/carpet/lone, /area/ship/crew) "Kt" = ( -/obj/machinery/stasis, /obj/machinery/airalarm/directional/west, -/turf/open/floor/hangar/plasteel/white, -/area/ship/medical) +/obj/item/bedsheet/black, +/obj/structure/bed, +/turf/open/floor/carpet/red_gold, +/area/ship/crew/dorm) "KF" = ( -/obj/structure/curtain, -/obj/machinery/shower{ - dir = 8 - }, -/obj/machinery/door/window{ - dir = 8 - }, -/obj/structure/toilet{ - pixel_y = 1 +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/item/soap/nanotrasen, -/turf/open/floor/mineral/titanium/white, -/area/ship/crew) +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/chem_master, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "KL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/mineral/titanium/white, @@ -1671,9 +1700,7 @@ /turf/template_noop, /area/template_noop) "Nn" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/kirbyplants/photosynthetic, -/turf/open/floor/plating, +/turf/open/floor/concrete/tiles, /area/ship/engineering/engine) "NI" = ( /obj/structure/cable{ @@ -1933,6 +1960,10 @@ /obj/machinery/computer/crew/retro, /turf/open/floor/circuit, /area/ship/science/ai_chamber) +"Sw" = ( +/obj/structure/closet/cabinet, +/turf/open/floor/concrete/tiles, +/area/ship/engineering/engine) "SC" = ( /obj/machinery/firealarm/directional/east, /turf/open/floor/mineral/plastitanium/red, @@ -1968,9 +1999,10 @@ /turf/open/floor/carpet/red_gold, /area/ship/crew) "Tu" = ( -/obj/machinery/firealarm/directional/north, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) +/obj/structure/curtain, +/obj/machinery/vending/medical, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "TE" = ( /obj/structure/window/reinforced/spawner/west, /turf/open/floor/mineral/plastitanium/red, @@ -1993,9 +2025,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/birch, /area/ship/crew) +"Un" = ( +/obj/structure/closet/crate/radiation, +/obj/item/storage/firstaid/radiation, +/obj/item/storage/firstaid/radiation, +/turf/open/floor/concrete/tiles, +/area/ship/engineering/engine) "Uo" = ( /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/ert/engi, +/obj/item/clothing/suit/space/hardsuit/swat, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Ut" = ( @@ -2010,9 +2048,8 @@ /area/ship/bridge) "UD" = ( /obj/machinery/light/dim/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/reagent_containers/food/snacks/breadslice/moldy, -/turf/open/floor/plating, +/obj/structure/closet/radiation, +/turf/open/floor/concrete/tiles, /area/ship/engineering/engine) "UK" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -2074,9 +2111,8 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Ve" = ( -/obj/machinery/airalarm/directional/west, -/turf/open/floor/carpet/red_gold, -/area/ship/crew) +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "Vs" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -2324,7 +2360,7 @@ /obj/structure/barricade/wooden/crude, /obj/structure/barricade/security, /turf/open/floor/carpet/red_gold, -/area/ship/crew) +/area/ship/medical) (1,1,1) = {" wy @@ -2431,9 +2467,9 @@ Hb aJ fK tK -nv -nv -nv +fe +sW +fe tK "} (6,1,1) = {" @@ -2453,8 +2489,8 @@ vj VM yD tK -Gc -nv +Sw +Nn cE tK "} @@ -2475,7 +2511,7 @@ tK tK tK tK -nv +Bh Nn Gc tK @@ -2497,9 +2533,9 @@ yR SH ba tK -nv -nv -nv +wH +Nn +Un tK "} (9,1,1) = {" @@ -2519,8 +2555,8 @@ jE kc ja je -nv -Gc +Nn +Nn UD tK "} @@ -2541,17 +2577,17 @@ he mo HK tK -nv -nv -nv +aN +Nn +Cv tK "} (11,1,1) = {" wy -Fu -Gl -Gl -Gl +yx +Wn +Wn +Wn ei tK tK @@ -2570,9 +2606,9 @@ aK "} (12,1,1) = {" wy -Gl -rh -CU +Wn +qw +Ve Ve Gl PJ @@ -2592,10 +2628,10 @@ wB "} (13,1,1) = {" wy -Gl +Wn sa -Gl -Ch +dp +Ve Gl xo XZ @@ -2614,10 +2650,10 @@ wB "} (14,1,1) = {" wy -Gl +Wn qw -Gl -Ch +Ve +Ve Gl fU vg @@ -2636,10 +2672,10 @@ wB "} (15,1,1) = {" wy -Gl -KF -Gl -Tu +Wn +sa +dp +Ve Gl Kd XY @@ -2658,9 +2694,9 @@ wB "} (16,1,1) = {" wy -Gl -Gl -Gl +Wn +Tu +Ch Ch Fu Gl @@ -2680,9 +2716,9 @@ wB "} (17,1,1) = {" wy -Gl +Wn rh -CU +Ve ch vf js @@ -2702,9 +2738,9 @@ wB "} (18,1,1) = {" wy -Gl -sa -Gl +Wn +Ai +Ve EA GU UX @@ -2724,10 +2760,10 @@ wB "} (19,1,1) = {" wy -Gl +Wn pp -Gl -Ch +Ve +Ve Gl Gl Gl @@ -2746,9 +2782,9 @@ wB "} (20,1,1) = {" wy -Gl +Wn KF -Gl +bc bc Ed si @@ -2768,9 +2804,9 @@ wB "} (21,1,1) = {" wy -Fu -Gl -Gl +yx +Wn +Wn ZL Gl Tp @@ -2866,11 +2902,11 @@ Vc bj fA dE -Wn -Wn -Wn -Wn -Wn +ok +ok +ok +ok +ok RT RT wy @@ -2892,7 +2928,7 @@ gd JA vL Kt -Wn +ok RT RT wy @@ -2914,7 +2950,7 @@ ok CS qG kO -Wn +ok RT wy wy @@ -2932,11 +2968,11 @@ bj bj Mf iy -Wn -Wn -Wn -Wn -yx +ok +ok +ok +ok +CU wy wy wy From c9688083f0996b3decb1852431c2c2ee77facb73 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Tue, 27 Aug 2024 11:18:07 -0700 Subject: [PATCH 21/26] fixes a few more things --- .../independent/independent_daniel.dmm | 141 +++++++++++++----- 1 file changed, 107 insertions(+), 34 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 085f9a03721a..a86cee4662eb 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -212,6 +212,12 @@ /obj/item/storage/bag/ore, /turf/open/floor/plating, /area/ship/cargo) +"eM" = ( +/obj/machinery/light_switch{ + pixel_y = -24 + }, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "eN" = ( /obj/machinery/door/poddoor/shutters{ id = "DanielGarage" @@ -290,7 +296,6 @@ /turf/open/floor/carpet/lone, /area/ship/crew) "gd" = ( -/obj/machinery/door/airlock/medical/glass, /obj/structure/cable{ icon_state = "1-2" }, @@ -300,7 +305,10 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/hangar/plasteel/white, +/obj/machinery/door/airlock{ + name = "Dormitory" + }, +/turf/open/floor/carpet/red_gold, /area/ship/crew/dorm) "ge" = ( /obj/machinery/power/smes, @@ -325,6 +333,26 @@ name = "Saga Bootup Procedure" }, /obj/item/mmi/posibrain, +/obj/item/bodypart/leg/right/robot, +/obj/item/bodypart/leg/right/robot, +/obj/item/bodypart/r_arm/robot, +/obj/item/bodypart/r_arm/robot, +/obj/item/bodypart/leg/left/robot, +/obj/item/bodypart/leg/left/robot, +/obj/item/bodypart/l_arm/robot, +/obj/item/bodypart/l_arm/robot, +/obj/item/bodypart/head/robot, +/obj/item/bodypart/head/robot, +/obj/item/bodypart/chest/robot, +/obj/item/bodypart/chest/robot, +/obj/item/robot_suit, +/obj/item/robot_suit, +/obj/item/borg/upgrade/ai, +/obj/item/borg/upgrade/ai, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "gR" = ( @@ -335,7 +363,6 @@ "gY" = ( /obj/structure/closet/secure_closet/captains, /obj/item/pinpointer/crew, -/obj/item/borg/upgrade/pinpointer, /obj/item/gps, /obj/item/gps, /obj/item/gps, @@ -362,6 +389,11 @@ /obj/item/stack/sheet/rglass, /turf/open/floor/plating, /area/ship/engineering/engine) +"hV" = ( +/obj/structure/closet/crate/secure/plasma, +/obj/item/stack/sheet/cardboard/fifty, +/turf/open/floor/plating, +/area/ship/cargo) "hW" = ( /obj/machinery/light_switch{ pixel_y = 24 @@ -884,18 +916,18 @@ /turf/open/floor/wood/birch, /area/ship/crew) "si" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/implant/radio, -/obj/item/implant/radio, -/obj/item/implant/radio, -/obj/item/implant/radio, -/obj/item/implant/radio, -/obj/item/implant/radio, -/obj/item/implant/radio, -/obj/item/implant/radio, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/closet/wall/directional/west, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /turf/open/floor/carpet/red_gold, /area/ship/crew) "sx" = ( @@ -928,6 +960,9 @@ icon_state = "0-4" }, /obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light_switch{ + pixel_y = -24 + }, /turf/open/floor/plating, /area/ship/cargo) "th" = ( @@ -938,9 +973,9 @@ /turf/open/floor/circuit, /area/ship/science/ai_chamber) "tj" = ( -/obj/structure/salvageable/computer, /obj/machinery/firealarm/directional/east, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/dim/directional/east, /turf/open/floor/plating, /area/ship/maintenance/central) "tK" = ( @@ -954,6 +989,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/plating, /area/ship/maintenance/central) "ui" = ( @@ -965,6 +1003,14 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"uA" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/light_switch{ + pixel_x = -25 + }, +/turf/open/floor/plating, +/area/ship/cargo) "uV" = ( /obj/structure/cable{ icon_state = "2-8" @@ -1150,12 +1196,7 @@ /obj/structure/filingcabinet/double/grey, /turf/open/floor/concrete/tiles, /area/ship/engineering/engine) -"Bl" = ( -/obj/machinery/porta_turret/ai, -/turf/open/floor/mineral/plastitanium/red, -/area/ship/security/armory) "Bo" = ( -/obj/structure/salvageable/server, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light_switch{ pixel_y = -24 @@ -1194,6 +1235,7 @@ /obj/effect/turf_decal/corner/opaque/white/diagonal, /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/southright, +/obj/item/reagent_containers/glass/rag, /turf/open/floor/plasteel, /area/ship/crew/library) "BV" = ( @@ -1243,11 +1285,12 @@ /obj/item/stack/tile/carpet/black/fifty, /obj/item/storage/box/stockparts/t2, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/storage/part_replacer/bluespace, /turf/open/floor/plating, /area/ship/maintenance/central) "Cv" = ( /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/ert/engi, +/obj/item/clothing/suit/space/hardsuit/engine/elite, /turf/open/floor/concrete/tiles, /area/ship/engineering/engine) "CO" = ( @@ -1540,7 +1583,6 @@ /area/ship/cargo) "Jt" = ( /obj/machinery/light/dim/directional/east, -/obj/machinery/porta_turret/ai, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "JA" = ( @@ -1676,7 +1718,7 @@ /obj/structure/window/reinforced/fulltile, /obj/structure/grille, /obj/machinery/door/poddoor/shutters{ - id = "Cannon"; + id = "DanielBridge"; dir = 4 }, /turf/open/floor/mineral/plastitanium, @@ -1687,7 +1729,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-2" }, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) @@ -1767,6 +1809,20 @@ /obj/structure/closet/crate/secure/plasma, /turf/open/floor/plating, /area/ship/cargo) +"Ph" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger{ + pixel_x = 3 + }, +/obj/machinery/recharger{ + pixel_y = 9; + pixel_x = -9 + }, +/obj/machinery/recharger{ + pixel_x = -9 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ship/security/armory) "Pq" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2008,7 +2064,6 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "TX" = ( -/obj/structure/salvageable/circuit_imprinter, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ icon_state = "0-8" @@ -2025,6 +2080,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/birch, /area/ship/crew) +"Ud" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light_switch{ + pixel_x = 29 + }, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "Un" = ( /obj/structure/closet/crate/radiation, /obj/item/storage/firstaid/radiation, @@ -2102,12 +2166,22 @@ "Vd" = ( /obj/item/gun_voucher/syndicate, /obj/item/gun_voucher/syndicate, -/obj/item/clothing/suit/armor/vest/marine, -/obj/item/clothing/head/helmet/marine, -/obj/item/clothing/suit/armor/vest/marine/heavy, -/obj/item/clothing/head/helmet/marine/security, +/obj/item/clothing/suit/armor/vest/marine{ + slowdown = 0 + }, +/obj/item/clothing/head/helmet/marine{ + slowdown = 0 + }, +/obj/item/clothing/suit/armor/vest/marine/heavy{ + slowdown = 0 + }, +/obj/item/clothing/head/helmet/marine/security{ + slowdown = 0 + }, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/wall/red/directional/west, +/obj/item/clothing/under/rank/security/officer/military, +/obj/item/clothing/under/rank/security/officer/military, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Ve" = ( @@ -2212,7 +2286,6 @@ /area/ship/external) "WP" = ( /obj/structure/grille/broken, -/obj/structure/salvageable/autolathe, /obj/effect/decal/cleanable/sprayweb, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -2523,7 +2596,7 @@ Jp jI Jd Je -Je +uA Je sX zW @@ -2565,7 +2638,7 @@ wy eN Xx IN -OT +hV OT YW kZ @@ -2643,7 +2716,7 @@ St EO Hr Ut -eU +Ph xM Xm wB @@ -2751,7 +2824,7 @@ YE wB BA xM -Bl +Tm wB xM xm @@ -2763,7 +2836,7 @@ wy Wn pp Ve -Ve +eM Gl Gl Gl @@ -2784,7 +2857,7 @@ wB wy Wn KF -bc +Ud bc Ed si From cc655081a9cb3b8c163033d89eec38df1e7b069b Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Tue, 17 Sep 2024 20:15:03 -0700 Subject: [PATCH 22/26] final changes --- .../independent/independent_daniel.dmm | 63 ++++++++++--------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index a86cee4662eb..3236e0d3961b 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -353,6 +353,8 @@ /obj/item/assembly/flash/handheld, /obj/item/assembly/flash/handheld, /obj/item/assembly/flash/handheld, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "gR" = ( @@ -361,7 +363,6 @@ /turf/open/floor/wood/birch, /area/ship/crew) "gY" = ( -/obj/structure/closet/secure_closet/captains, /obj/item/pinpointer/crew, /obj/item/gps, /obj/item/gps, @@ -377,6 +378,11 @@ /obj/item/card/bank, /obj/item/card/bank, /obj/item/card/bank, +/obj/structure/closet, +/obj/item/gun/energy/e_gun, +/obj/item/stock_parts/cell/gun/empty, +/obj/item/stock_parts/cell/gun/empty, +/obj/item/stock_parts/cell/gun/empty, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "he" = ( @@ -507,12 +513,12 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "jE" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "jI" = ( @@ -542,9 +548,6 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "kc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -726,10 +729,6 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "op" = ( -/obj/item/stock_parts/cell/gun/empty, -/obj/item/stock_parts/cell/gun/empty, -/obj/item/stock_parts/cell/gun/empty, -/obj/item/gun/energy/e_gun, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/wall/red/directional/north, /turf/open/floor/mineral/plastitanium/red, @@ -820,10 +819,6 @@ /obj/item/ammo_box/magazine/p16, /obj/item/ammo_box/magazine/p16, /obj/item/ammo_box/magazine/p16, -/obj/item/ammo_box/magazine/m12g, -/obj/item/ammo_box/magazine/m12g, -/obj/item/ammo_box/magazine/m12g, -/obj/item/ammo_box/magazine/m12g, /turf/open/floor/plating, /area/ship/engineering/engine) "qw" = ( @@ -1073,9 +1068,9 @@ /turf/closed/wall/r_wall, /area/ship/security/armory) "wH" = ( -/obj/structure/closet/secure_closet/engineering_chief, -/turf/open/floor/concrete/tiles, -/area/ship/engineering/engine) +/obj/machinery/firealarm/directional/south, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "xm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/window/reinforced/spawner/west, @@ -1165,6 +1160,7 @@ /area/ship/engineering/engine) "Ai" = ( /obj/machinery/chem_heater, +/obj/machinery/light/dim/directional/north, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) "AL" = ( @@ -1211,7 +1207,6 @@ pixel_x = -23; id = "DanielGarage" }, -/obj/machinery/vending/mining_equipment, /turf/open/floor/plating, /area/ship/cargo) "Bz" = ( @@ -1286,11 +1281,12 @@ /obj/item/storage/box/stockparts/t2, /obj/effect/decal/cleanable/dirt/dust, /obj/item/storage/part_replacer/bluespace, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plating, /area/ship/maintenance/central) "Cv" = ( /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/engine/elite, +/obj/item/clothing/suit/space/hardsuit/engine, /turf/open/floor/concrete/tiles, /area/ship/engineering/engine) "CO" = ( @@ -1518,7 +1514,8 @@ "It" = ( /obj/machinery/light/dim/directional/south, /obj/machinery/power/emitter/energycannon{ - dir = 4 + dir = 4; + active = 0 }, /obj/structure/cable{ icon_state = "0-1" @@ -1807,6 +1804,7 @@ /area/ship/cargo) "OT" = ( /obj/structure/closet/crate/secure/plasma, +/obj/effect/spawner/lootdrop/maintenance/six, /turf/open/floor/plating, /area/ship/cargo) "Ph" = ( @@ -1972,6 +1970,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/ship/engineering/engine) +"Sd" = ( +/obj/machinery/stasis, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "So" = ( /obj/machinery/power/terminal{ dir = 1 @@ -2025,9 +2028,6 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "SH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/machinery/airalarm/directional/west, /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating, @@ -2087,6 +2087,7 @@ /obj/machinery/light_switch{ pixel_x = 29 }, +/obj/machinery/light/dim/directional/east, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) "Un" = ( @@ -2182,6 +2183,7 @@ /obj/structure/closet/wall/red/directional/west, /obj/item/clothing/under/rank/security/officer/military, /obj/item/clothing/under/rank/security/officer/military, +/obj/item/gun_voucher/syndicate, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Ve" = ( @@ -2192,7 +2194,8 @@ dir = 1 }, /obj/machinery/power/emitter/energycannon{ - dir = 4 + dir = 4; + active = 0 }, /obj/structure/window/reinforced/spawner/north, /obj/structure/cable{ @@ -2327,7 +2330,6 @@ desc = "An immensely old but still widely popular design which has since been ripped off many times by a few cheap individuals, there is markings on the side showing it was made by John Browning."; projectile_damage_multiplier = 1.5 }, -/obj/item/slimepotion/lovepotion, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/maintenance/central) @@ -2339,8 +2341,6 @@ "Xx" = ( /obj/structure/closet/crate/eva, /obj/effect/spawner/lootdrop/maintenance/four, -/obj/effect/spawner/lootdrop/maintenance/six, -/obj/effect/spawner/lootdrop/maintenance/six, /turf/open/floor/plating, /area/ship/cargo) "XO" = ( @@ -2411,6 +2411,7 @@ /area/ship/bridge) "YW" = ( /obj/structure/closet/crate/secure/exo, +/obj/effect/spawner/lootdrop/maintenance/six, /turf/open/floor/plating, /area/ship/cargo) "Zq" = ( @@ -2606,7 +2607,7 @@ yR SH ba tK -wH +Nn Nn Un tK @@ -2724,7 +2725,7 @@ wB (14,1,1) = {" wy Wn -qw +Sd Ve Ve Gl @@ -2748,7 +2749,7 @@ wy Wn sa dp -Ve +wH Gl Kd XY From 3331d097a106542a659019c03deee5bcf7bc4965 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Tue, 17 Sep 2024 20:17:53 -0700 Subject: [PATCH 23/26] small zoning fix --- _maps/shuttles/independent/independent_daniel.dmm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 3236e0d3961b..1777367254cc 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -2662,10 +2662,10 @@ yx Wn Wn Wn -ei -tK -tK -tK +CO +pB +pB +pB xn de tK From 07e074cd0f48c8ba5c1ff873c56345d3c24501e8 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Tue, 17 Sep 2024 20:59:44 -0700 Subject: [PATCH 24/26] stay hydrated --- _maps/shuttles/independent/independent_daniel.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 1777367254cc..275a1a359201 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -1231,6 +1231,7 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/southright, /obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/food/drinks/waterbottle/large/empty, /turf/open/floor/plasteel, /area/ship/crew/library) "BV" = ( From fa7908192dad46751e86ed180d4a5af5b67308ba Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Wed, 18 Sep 2024 12:22:09 -0700 Subject: [PATCH 25/26] hopefully thsis fixes it? --- _maps/shuttles/independent/independent_daniel.dmm | 3 --- 1 file changed, 3 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 275a1a359201..3b7600e63a4a 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -36,9 +36,6 @@ /turf/open/floor/concrete/tiles, /area/ship/engineering/engine) "ba" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ - dir = 1 - }, /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/ship/engineering/engine) From 29a7dc8cdc52b109d918f21782d2abcaabff5411 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Wed, 18 Sep 2024 12:37:04 -0700 Subject: [PATCH 26/26] uhhh mhm --- .../independent/independent_daniel.dmm | 49 ++++++++++++++----- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/_maps/shuttles/independent/independent_daniel.dmm b/_maps/shuttles/independent/independent_daniel.dmm index 3b7600e63a4a..d14704c10290 100644 --- a/_maps/shuttles/independent/independent_daniel.dmm +++ b/_maps/shuttles/independent/independent_daniel.dmm @@ -41,7 +41,7 @@ /area/ship/engineering/engine) "bc" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-8" }, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) @@ -86,6 +86,9 @@ /area/ship/maintenance/central) "ch" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) "cE" = ( @@ -213,6 +216,9 @@ /obj/machinery/light_switch{ pixel_y = -24 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) "eN" = ( @@ -736,6 +742,12 @@ }, /turf/open/floor/circuit, /area/ship/science/ai_chamber) +"oJ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "oW" = ( /obj/item/multitool, /obj/item/clothing/glasses/meson/engine/tray, @@ -773,6 +785,13 @@ }, /turf/open/floor/carpet/lone, /area/ship/crew) +"py" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "pB" = ( /turf/closed/wall/r_wall, /area/ship/cargo) @@ -1066,6 +1085,9 @@ /area/ship/security/armory) "wH" = ( /obj/machinery/firealarm/directional/south, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) "xm" = ( @@ -1374,6 +1396,9 @@ /area/ship/science/ai_chamber) "EA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) "EO" = ( @@ -1636,10 +1661,6 @@ /turf/open/floor/carpet/red_gold, /area/ship/crew/dorm) "KF" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/chem_master, /turf/open/floor/hangar/plasteel/white, /area/ship/medical) @@ -1831,6 +1852,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/birch, /area/ship/crew) +"Pr" = ( +/obj/structure/curtain, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/hangar/plasteel/white, +/area/ship/medical) "PF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2079,9 +2107,6 @@ /turf/open/floor/wood/birch, /area/ship/crew) "Ud" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/light_switch{ pixel_x = 29 }, @@ -2681,7 +2706,7 @@ wy Wn qw Ve -Ve +py Gl PJ HP @@ -2703,7 +2728,7 @@ wy Wn sa dp -Ve +oJ Gl xo XZ @@ -2725,7 +2750,7 @@ wy Wn Sd Ve -Ve +oJ Gl fU vg @@ -2769,7 +2794,7 @@ wy Wn Tu Ch -Ch +Pr Fu Gl pq