From 375df96682a74bd270afb16ee37ef8e40becf07a Mon Sep 17 00:00:00 2001 From: Ossa88 Date: Thu, 15 Aug 2024 02:17:02 -0700 Subject: [PATCH] Mushi Edits --- .../shuttles/nanotrasen/nanotrasen_osprey.dmm | 1673 ++++++----------- code/modules/cargo/packs/animal.dm | 8 + code/modules/cargo/packs/machinery.dm | 12 + code/modules/cargo/packs/vendor_refill.dm | 57 +- code/modules/hydroponics/grown/spaceflora.dm | 2 +- 5 files changed, 653 insertions(+), 1099 deletions(-) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm index 389882dd21f3..341cb1224936 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm @@ -85,15 +85,10 @@ /area/ship/cargo) "aE" = ( /obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/cargo/office) "aI" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 1 - }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel/white, /area/ship/medical) "aL" = ( @@ -156,7 +151,6 @@ /obj/machinery/camera/autoname{ dir = 8 }, -/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "bg" = ( @@ -202,9 +196,6 @@ dir = 9 }, /obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "bF" = ( @@ -249,33 +240,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/ship/cargo) -"bO" = ( -/obj/structure/railing/wood{ - dir = 8 - }, -/obj/machinery/vending/games, -/turf/open/floor/wood, -/area/ship/cargo/office) -"bS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "bT" = ( -/obj/structure/mecha_wreckage/gygax{ - name = "\The mistake" - }, +/obj/structure/spider/stickyweb, +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/toy/figure/cargotech, /turf/open/floor/plating, /area/ship/cargo) -"cb" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/lime, -/turf/open/floor/plasteel/white, -/area/ship/medical) "cd" = ( /obj/machinery/door/airlock/medical{ name = "Infirmary"; @@ -342,12 +312,10 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) "co" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /turf/open/floor/plasteel/white, /area/ship/science) "cp" = ( @@ -368,14 +336,27 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/canteen) "ct" = ( +/obj/structure/closet/secure_closet{ + icon_state = "science"; + name = "scientist's locker"; + req_access_txt = "47" + }, /obj/effect/turf_decal/corner/opaque/mauve{ dir = 4 }, /obj/effect/turf_decal/corner/opaque/mauve{ dir = 1 }, +/obj/item/storage/backpack/duffelbag, +/obj/item/storage/backpack/messenger/tox, +/obj/item/storage/backpack/satchel/tox, +/obj/item/storage/backpack/science, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/under/rank/rnd/scientist/skirt, +/obj/item/clothing/under/rank/rnd/scientist, +/obj/item/clothing/suit/toggle/labcoat/science, +/obj/item/clothing/glasses/science, /obj/machinery/light/directional/north, -/obj/effect/turf_decal/rechargefloor, /turf/open/floor/plasteel/white, /area/ship/science) "cD" = ( @@ -383,7 +364,10 @@ name = "AI Core Access"; req_one_access_txt = "16" }, -/obj/machinery/telecomms/broadcaster, +/obj/structure/rack, +/obj/item/aicard, +/obj/item/borg/upgrade/ai, +/obj/item/mmi/posibrain, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "cI" = ( @@ -431,13 +415,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) -"cU" = ( -/obj/structure/bookcase/random, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "cY" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -459,7 +436,6 @@ dir = 8; pixel_y = 0 }, -/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "dm" = ( @@ -530,13 +506,6 @@ /obj/structure/sign/departments/medbay/alt, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical) -"dF" = ( -/obj/structure/bookcase/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "dJ" = ( /obj/effect/turf_decal/corner/transparent/neutral{ dir = 4 @@ -554,7 +523,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "dN" = ( @@ -566,8 +534,7 @@ "dP" = ( /obj/structure/bed, /obj/structure/curtain/cloth/fancy, -/obj/structure/bed/double, -/obj/item/bedsheet/double/captain, +/obj/item/bedsheet/captain, /turf/open/floor/carpet/royalblue, /area/ship/bridge) "dS" = ( @@ -729,7 +696,7 @@ /area/ship/engineering/atmospherics) "eZ" = ( /obj/structure/sign/warning/vacuum/external, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/science/ai_chamber) "fa" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -753,7 +720,6 @@ "fc" = ( /obj/structure/table/wood, /obj/machinery/light/small/directional/north, -/obj/structure/bedsheetbin, /turf/open/floor/wood, /area/ship/crew/dorm) "fg" = ( @@ -772,7 +738,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/item/trash/can/food/peaches/maint, /obj/machinery/light/small/directional/north, -/obj/machinery/ore_silo, /turf/open/floor/plating, /area/ship/cargo) "fj" = ( @@ -827,12 +792,6 @@ }, /turf/open/floor/engine/hull, /area/ship/external) -"fO" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "fU" = ( /obj/machinery/button/door{ dir = 1; @@ -868,9 +827,6 @@ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "gg" = ( @@ -887,10 +843,6 @@ }, /turf/open/floor/plasteel, /area/ship/cargo) -"gk" = ( -/obj/structure/bookcase/random, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "go" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible{ dir = 4 @@ -928,11 +880,6 @@ /obj/effect/turf_decal/industrial/shutoff, /turf/open/floor/plasteel, /area/ship/hallway/central) -"gz" = ( -/obj/structure/bookcase/random, -/obj/machinery/light/floor, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "gB" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -967,10 +914,6 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/central) -"gL" = ( -/obj/structure/stairs, -/turf/open/floor/wood, -/area/ship/cargo/office) "gM" = ( /obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/poddoor/shutters{ @@ -1015,7 +958,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/machinery/porta_turret/ai, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "hg" = ( @@ -1029,7 +971,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/hallway/central) "hh" = ( -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium, /area/ship/science) "hj" = ( /obj/machinery/mass_driver{ @@ -1072,7 +1014,7 @@ color = "Black"; dir = 1 }, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/science) "ht" = ( /obj/structure/closet/secure_closet{ @@ -1100,7 +1042,6 @@ /obj/item/clothing/head/caphat/parade, /obj/item/clothing/suit/armor/vest/capcarapace, /obj/item/clothing/gloves/color/captain/nt, -/obj/item/clothing/under/rank/civilian/lawyer/galaxy, /turf/open/floor/carpet/royalblue, /area/ship/bridge) "hv" = ( @@ -1211,17 +1152,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/corner/opaque/ntblue{ - dir = 1 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"io" = ( -/obj/machinery/computer/arcade/orion_trail{ - dir = 1 - }, -/turf/open/floor/wood, -/area/ship/cargo/office) "ip" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1256,7 +1188,15 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen) "it" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/sleeper{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "iv" = ( @@ -1266,7 +1206,7 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew/dorm) "iw" = ( -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium, /area/ship/cargo) "iA" = ( /obj/structure/disposalpipe/segment{ @@ -1288,9 +1228,6 @@ icon_state = "4-8" }, /obj/machinery/light/directional/north, -/obj/effect/turf_decal/corner/opaque/ntblue{ - dir = 4 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "iD" = ( @@ -1307,7 +1244,7 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen) "iI" = ( -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium, /area/ship/cargo/office) "iM" = ( /obj/structure/table, @@ -1364,7 +1301,7 @@ color = "Black"; dir = 1 }, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/science) "jc" = ( /obj/machinery/light/directional/north, @@ -1379,9 +1316,6 @@ }, /turf/open/floor/plasteel, /area/ship/crew/janitor) -"jh" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/crew/canteen) "jk" = ( /obj/machinery/medical_kiosk, /obj/effect/turf_decal/corner/opaque/blue{ @@ -1467,10 +1401,6 @@ }, /turf/open/floor/wood, /area/ship/crew/canteen) -"jR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "jU" = ( /obj/structure/sink/kitchen{ dir = 4; @@ -1485,20 +1415,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plasteel, /area/ship/crew/canteen) -"jV" = ( -/obj/structure/table/glass, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_x = -3; - pixel_y = 13 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/pink, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/item/clothing/neck/stethoscope, -/turf/open/floor/plasteel/white, -/area/ship/medical) "kb" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel/patterned/grid, @@ -1681,6 +1597,10 @@ }, /turf/open/floor/plasteel, /area/ship/cargo/office) +"kU" = ( +/obj/machinery/recharge_station, +/turf/open/floor/circuit, +/area/ship/science/ai_chamber) "kV" = ( /obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/poddoor/shutters{ @@ -1701,9 +1621,6 @@ /obj/structure/railing{ layer = 2.91 }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "la" = ( @@ -1764,13 +1681,21 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/science/ai_chamber) "lr" = ( +/obj/machinery/door/window/brigdoor/westleft{ + name = "AI Core Access"; + req_one_access_txt = "16" + }, +/obj/structure/AIcore, +/obj/item/circuitboard/aicore, +/obj/item/stack/sheet/rglass{ + amount = 5 + }, /obj/item/radio/intercom/directional/south, /obj/item/radio/intercom/directional/north{ frequency = 1351; freqlock = 1 }, /obj/item/radio/intercom/wideband/directional/east, -/obj/machinery/recharge_station, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "lt" = ( @@ -1967,21 +1892,32 @@ /turf/open/floor/plasteel, /area/ship/cargo/office) "mu" = ( -/obj/machinery/mineral/ore_redemption, +/obj/machinery/conveyor{ + dir = 8; + id = "osprey_production" + }, /turf/open/floor/plating, /area/ship/cargo) "my" = ( +/obj/structure/table, +/obj/item/stack/packageWrap{ + pixel_y = 9 + }, +/obj/item/hand_labeler{ + pixel_x = 2; + pixel_y = 8 + }, /obj/effect/turf_decal/corner/opaque/mauve{ dir = 1 }, /obj/effect/turf_decal/corner/opaque/mauve{ dir = 8 }, -/obj/item/radio/intercom/directional/west, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/item/storage/box/gloves{ + pixel_x = -3; + pixel_y = -8 }, -/obj/machinery/disposal/bin, +/obj/item/radio/intercom/directional/west, /turf/open/floor/plasteel/white, /area/ship/science) "mB" = ( @@ -1995,11 +1931,6 @@ /obj/effect/turf_decal/industrial/caution, /turf/open/floor/plasteel/tech/techmaint, /area/ship/hallway/central) -"mE" = ( -/obj/structure/table/wood, -/obj/machinery/bookbinder, -/turf/open/floor/wood, -/area/ship/cargo/office) "mF" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -2010,7 +1941,14 @@ /turf/open/floor/plasteel, /area/ship/cargo/office) "mH" = ( -/obj/structure/reagent_dispensers/watertank, +/obj/structure/closet/crate, +/obj/item/stack/sheet/metal/five{ + pixel_x = -3 + }, +/obj/item/stack/sheet/glass/five{ + pixel_x = 2; + pixel_y = 5 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "mI" = ( @@ -2024,7 +1962,6 @@ icon_state = "4-8" }, /obj/machinery/light/directional/south, -/obj/effect/turf_decal/corner/opaque/ntblue, /turf/open/floor/plasteel, /area/ship/hallway/central) "mR" = ( @@ -2115,29 +2052,10 @@ /obj/effect/turf_decal/corner/opaque/ntblue, /turf/open/floor/plasteel/dark, /area/ship/bridge) -"nC" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/lime, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/machinery/vending/medical, -/turf/open/floor/plasteel/white, -/area/ship/medical) "nE" = ( /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/item/stack/sheet/glass/five{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/item/stack/sheet/metal/five{ - pixel_x = -3 - }, -/obj/structure/closet/crate, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "nK" = ( @@ -2175,19 +2093,16 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/ship/medical) -"nN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/corner/opaque/lime{ +"nT" = ( +/obj/structure/filingcabinet/double/grey, +/obj/effect/turf_decal/corner/opaque/brown{ dir = 8 }, -/obj/effect/turf_decal/corner/opaque/lime{ +/obj/effect/turf_decal/corner/opaque/brown{ dir = 1 }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"nT" = ( -/obj/structure/railing/wood, -/turf/open/floor/wood/bamboo, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/plasteel, /area/ship/cargo/office) "nZ" = ( /obj/structure/disposalpipe/segment{ @@ -2409,26 +2324,6 @@ }, /turf/open/floor/plating, /area/ship/science/ai_chamber) -"pf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"pi" = ( -/obj/effect/turf_decal/corner/opaque/blue, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/obj/machinery/door/airlock/public/glass, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/white, -/area/ship/medical) "pk" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -2439,7 +2334,7 @@ /turf/open/floor/plasteel, /area/ship/crew/cryo) "pm" = ( -/obj/machinery/computer/communications{ +/obj/structure/frame/computer{ dir = 8 }, /turf/open/floor/plasteel/tech/grid, @@ -2583,14 +2478,27 @@ /turf/open/floor/plating, /area/ship/engineering) "qb" = ( +/obj/structure/closet/secure_closet{ + icon_state = "science"; + name = "scientist's locker"; + req_access_txt = "47" + }, /obj/effect/turf_decal/corner/opaque/mauve{ dir = 4 }, /obj/effect/turf_decal/corner/opaque/mauve{ dir = 1 }, +/obj/item/storage/backpack/duffelbag, +/obj/item/storage/backpack/messenger/tox, +/obj/item/storage/backpack/satchel/tox, +/obj/item/storage/backpack/science, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/under/rank/rnd/scientist/skirt, +/obj/item/clothing/under/rank/rnd/scientist, +/obj/item/clothing/suit/toggle/labcoat/science, +/obj/item/clothing/glasses/science, /obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/mech_bay_recharge_port, /turf/open/floor/plasteel/white, /area/ship/science) "qc" = ( @@ -2614,19 +2522,6 @@ /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) -"qr" = ( -/obj/effect/turf_decal/corner/opaque/blue, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/obj/machinery/door/airlock/public/glass, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/white, -/area/ship/medical) "qs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2643,40 +2538,25 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"qt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/closet/crate/internals, -/obj/item/clothing/head/helmet/space/orange, -/obj/item/clothing/head/helmet/space/orange, -/obj/item/clothing/head/helmet/space/orange, -/obj/item/clothing/suit/space/orange, -/obj/item/clothing/suit/space/orange, -/obj/item/clothing/suit/space/orange, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) "qv" = ( /obj/structure/disposalpipe/segment{ dir = 8 }, /obj/effect/turf_decal/corner/transparent/neutral, /obj/structure/closet/emcloset/wall/directional/south, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"qL" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, +"qw" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/item/trash/can, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"qL" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, @@ -2722,14 +2602,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel, /area/ship/crew/canteen) -"qR" = ( -/obj/structure/extinguisher_cabinet/directional/south, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/wood, -/area/ship/cargo/office) "qX" = ( /obj/machinery/atmospherics/components/unary/shuttle/heater{ dir = 4 @@ -2786,12 +2658,6 @@ /obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/science/ai_chamber) -"rh" = ( -/obj/machinery/computer/arcade/battle{ - dir = 1 - }, -/turf/open/floor/wood, -/area/ship/cargo/office) "ry" = ( /obj/item/storage/backpack/explorer, /obj/item/storage/backpack/satchel/explorer, @@ -2810,10 +2676,6 @@ pixel_y = -32 }, /obj/machinery/airalarm/directional/west, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gps, -/obj/item/gps, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) "rz" = ( @@ -2825,22 +2687,6 @@ }, /turf/open/floor/wood, /area/ship/crew/dorm) -"rA" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/obj/machinery/door/window{ - dir = 8; - icon_state = "right"; - name = "Medical Supplies"; - opacity = 1 - }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/brute, -/turf/open/floor/plasteel/white, -/area/ship/medical) "rG" = ( /obj/machinery/power/shuttle/engine/fueled/plasma{ dir = 4 @@ -2912,16 +2758,12 @@ dir = 8 }, /obj/machinery/light/directional/south, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "rX" = ( /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, -/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "rZ" = ( @@ -2942,7 +2784,7 @@ /area/ship/crew/canteen) "sd" = ( /obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/science) "si" = ( /obj/structure/disposalpipe/segment{ @@ -2951,9 +2793,6 @@ /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "sl" = ( @@ -3027,6 +2866,38 @@ /turf/open/floor/plasteel, /area/ship/crew/canteen) "sE" = ( +/obj/item/reagent_containers/food/snacks/canned/beans{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/food/snacks/canned/beans{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/reagent_containers/food/snacks/canned/beans{ + pixel_x = -2 + }, +/obj/item/reagent_containers/food/drinks/waterbottle/large{ + pixel_x = 5 + }, +/obj/item/reagent_containers/food/drinks/waterbottle/large{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/reagent_containers/food/drinks/waterbottle/large{ + pixel_x = 8; + pixel_y = -3 + }, +/obj/structure/closet/crate{ + name = "food crate" + }, +/obj/item/storage/cans/sixbeer, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -3036,8 +2907,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/closet/crate, -/obj/item/vending_refill/coffee, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "sG" = ( @@ -3151,19 +3020,6 @@ /obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/bridge) -"tz" = ( -/obj/structure/table/optable, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "tF" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3177,6 +3033,9 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, +/obj/structure/closet/crate, +/obj/item/vending_refill/coffee, +/obj/effect/spawner/lootdrop/maintenance/three, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -3191,9 +3050,6 @@ dir = 4 }, /obj/structure/closet/emcloset/wall/directional/north, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 1 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "tO" = ( @@ -3266,12 +3122,6 @@ /obj/effect/turf_decal/box/white{ color = "#2CB2E8" }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 1 - }, /turf/open/floor/plasteel/white, /area/ship/medical) "uq" = ( @@ -3307,6 +3157,7 @@ /turf/open/floor/plasteel, /area/ship/crew/janitor) "ux" = ( +/obj/machinery/computer/operating, /obj/effect/turf_decal/corner/opaque/pink{ dir = 8 }, @@ -3346,7 +3197,6 @@ /obj/effect/turf_decal/trimline/opaque/blue/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/white, /area/ship/medical) "uI" = ( @@ -3375,14 +3225,6 @@ }, /turf/open/floor/plasteel, /area/ship/crew/janitor) -"uL" = ( -/obj/machinery/door/airlock/mining{ - name = "Cargo Office"; - req_access_txt = "31" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "uM" = ( /obj/machinery/door/airlock{ name = "Cryopod Room" @@ -3403,9 +3245,6 @@ "uN" = ( /obj/effect/turf_decal/corner/transparent/neutral, /obj/item/kirbyplants/random, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "uQ" = ( @@ -3413,23 +3252,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) -"va" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"ve" = ( -/obj/machinery/sleeper, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/lime, -/turf/open/floor/plasteel/white, -/area/ship/medical) "vi" = ( /obj/structure/table, /obj/item/storage/bag/trash{ @@ -3518,11 +3340,6 @@ }, /turf/open/floor/plating, /area/ship/crew/janitor) -"vQ" = ( -/obj/structure/table/wood, -/obj/machinery/computer/bookmanagement, -/turf/open/floor/wood, -/area/ship/cargo/office) "vY" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible, /obj/structure/cable{ @@ -3533,12 +3350,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) -"wa" = ( -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "wb" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -3651,10 +3462,13 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "wr" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/blue, /obj/effect/turf_decal/corner/opaque/blue{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/white, /area/ship/medical) "wx" = ( @@ -3745,6 +3559,9 @@ dir = 4 }, /obj/effect/turf_decal/corner/opaque/lime, +/obj/structure/sign/poster/official/moth/epi{ + pixel_y = 32 + }, /obj/machinery/light/directional/east, /turf/open/floor/plasteel/white, /area/ship/medical) @@ -3910,7 +3727,8 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "xN" = ( -/obj/machinery/vending/clothing, +/obj/structure/table/wood, +/obj/item/flashlight/lamp, /turf/open/floor/wood, /area/ship/crew/dorm) "xP" = ( @@ -3950,28 +3768,16 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"ya" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/spawner/north, -/obj/machinery/door/window{ - dir = 8; - icon_state = "right"; - name = "Medical Supplies"; - opacity = 1 - }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/o2, -/turf/open/floor/plasteel/white, -/area/ship/medical) "yc" = ( /obj/structure/closet/secure_closet{ icon_state = "med"; name = "medicine locker" }, +/obj/item/storage/firstaid/fire{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/storage/firstaid/regular, /obj/machinery/button/door{ dir = 1; id = "ospreymed"; @@ -3987,11 +3793,6 @@ /obj/machinery/camera/autoname{ dir = 1 }, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/obj/item/clothing/neck/stethoscope, /turf/open/floor/plasteel/white, /area/ship/medical) "yd" = ( @@ -4060,9 +3861,6 @@ /obj/machinery/status_display/shuttle{ pixel_x = 32 }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "yC" = ( @@ -4100,6 +3898,7 @@ }, /obj/machinery/door/window/brigdoor/westleft{ dir = 4; + name = "Comms Relay"; req_one_access_txt = "61" }, /turf/open/floor/circuit, @@ -4119,7 +3918,6 @@ /obj/machinery/status_display/shuttle{ pixel_x = 32 }, -/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "yS" = ( @@ -4247,7 +4045,6 @@ }, /obj/machinery/vending/snack/random, /obj/machinery/light/directional/east, -/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "zL" = ( @@ -4339,7 +4136,6 @@ /obj/effect/turf_decal/trimline/opaque/blue/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/white, /area/ship/medical) "Ag" = ( @@ -4372,7 +4168,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/corner/opaque/ntblue, /turf/open/floor/plasteel, /area/ship/hallway/central) "Aj" = ( @@ -4415,10 +4210,6 @@ dir = 4 }, /obj/item/kirbyplants/random, -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 1 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "AR" = ( @@ -4470,6 +4261,7 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Bc" = ( +/obj/structure/table/optable, /obj/effect/turf_decal/corner/opaque/pink{ dir = 4 }, @@ -4562,21 +4354,9 @@ }, /turf/open/floor/plating, /area/ship/cargo/office) -"Bx" = ( -/obj/machinery/door/window/brigdoor/westleft{ - dir = 4; - req_one_access_txt = "61" - }, -/obj/structure/AIcore, -/obj/item/circuitboard/aicore, -/obj/item/stack/sheet/rglass{ - amount = 5 - }, -/turf/open/floor/circuit, -/area/ship/science/ai_chamber) "BH" = ( /obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/dorm) "BK" = ( /obj/structure/disposalpipe/segment{ @@ -4662,15 +4442,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"Cs" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "Cu" = ( /obj/effect/turf_decal/box/corners{ dir = 4 @@ -4682,8 +4453,8 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Cv" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/medical) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/cargo) "Cw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/patterned, @@ -4698,9 +4469,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/closet/crate{ - name = "food crate" - }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "CC" = ( @@ -4719,15 +4487,11 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/effect/turf_decal/corner/opaque/ntblue{ - dir = 4 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "CF" = ( -/obj/machinery/light/dim/directional/north, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) +/turf/closed/wall/mineral/titanium, +/area/ship/medical) "CH" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -4781,11 +4545,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/white, /area/ship/medical) "CT" = ( @@ -4829,6 +4588,8 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Dj" = ( +/obj/structure/table/glass, +/obj/item/defibrillator, /obj/effect/turf_decal/corner/opaque/pink{ dir = 4 }, @@ -4836,7 +4597,9 @@ dir = 1 }, /obj/effect/turf_decal/corner/opaque/pink, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_x = 25 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "Dq" = ( @@ -4847,6 +4610,7 @@ /turf/open/floor/engine/hull, /area/ship/external) "Dx" = ( +/obj/structure/reagent_dispensers/fueltank, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned/cargo_one, @@ -4866,11 +4630,6 @@ }, /turf/open/floor/wood, /area/ship/crew/canteen) -"DC" = ( -/obj/structure/crate_shelf, -/obj/machinery/light/directional/west, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "DE" = ( /obj/effect/turf_decal/industrial/loading{ dir = 8 @@ -4890,7 +4649,7 @@ /obj/structure/sign/number/eight{ color = "Black" }, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/cargo/office) "DH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -4925,7 +4684,7 @@ color = "Black"; dir = 1 }, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/science) "DU" = ( /obj/structure/sign/nanotrasen, @@ -4954,6 +4713,10 @@ /turf/open/floor/wood, /area/ship/crew/canteen) "Ee" = ( +/obj/structure/closet/secure_closet{ + icon_state = "med_secure"; + name = "medical doctor's locker" + }, /obj/structure/cable{ icon_state = "0-4" }, @@ -4963,6 +4726,16 @@ /obj/effect/turf_decal/corner/opaque/blue{ dir = 1 }, +/obj/item/storage/backpack/duffelbag/med, +/obj/item/storage/backpack/messenger/med, +/obj/item/storage/backpack/satchel/med, +/obj/item/storage/backpack/medic, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/under/rank/medical/doctor/skirt, +/obj/item/clothing/under/rank/medical/doctor, +/obj/item/clothing/suit/toggle/labcoat, +/obj/item/storage/belt/medical, +/obj/item/clothing/glasses/hud/health, /obj/machinery/power/apc/auto_name/directional/west, /obj/machinery/light_switch{ dir = 4; @@ -4995,7 +4768,6 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 4 }, -/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "Ey" = ( @@ -5053,7 +4825,6 @@ /obj/item/folder, /obj/item/pen, /obj/machinery/light/small/directional/south, -/obj/item/flashlight/lamp, /turf/open/floor/wood, /area/ship/crew/dorm) "EW" = ( @@ -5180,14 +4951,11 @@ /obj/structure/sign/warning/docking{ pixel_y = -8 }, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/central) "FL" = ( /turf/open/floor/plasteel, /area/ship/crew/cryo) -"FN" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ship/science/ai_chamber) "FP" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -5197,22 +4965,14 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) -"FS" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/pink, -/obj/item/defibrillator/loaded, -/turf/open/floor/plasteel/white, -/area/ship/medical) "FV" = ( /obj/structure/sign/departments/restroom, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) "FZ" = ( +/obj/structure/table/wood, +/obj/structure/bedsheetbin, /obj/item/radio/intercom/directional/north, -/obj/machinery/vending/autodrobe, /turf/open/floor/wood, /area/ship/crew/dorm) "Ga" = ( @@ -5236,9 +4996,6 @@ /area/ship/crew/canteen) "Ge" = ( /obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "Gk" = ( @@ -5348,10 +5105,6 @@ }, /turf/open/floor/wood, /area/ship/crew/dorm) -"GQ" = ( -/obj/machinery/photocopier, -/turf/open/floor/wood, -/area/ship/cargo/office) "GU" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/borderfloor{ @@ -5400,10 +5153,6 @@ }, /obj/item/storage/box/masks, /obj/machinery/light/directional/east, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/ship/medical) "Hf" = ( @@ -5482,10 +5231,6 @@ pixel_x = -1; pixel_y = 12 }, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/ship/medical) "Hy" = ( @@ -5539,8 +5284,13 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) "HU" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/blue{ + dir = 8 + }, /obj/effect/turf_decal/corner/opaque/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/white, /area/ship/medical) "HV" = ( @@ -5562,6 +5312,8 @@ /obj/effect/turf_decal/corner/opaque/brown{ dir = 1 }, +/obj/machinery/photocopier, +/obj/machinery/computer/helm/viewscreen/directional/west, /turf/open/floor/plasteel, /area/ship/cargo/office) "Ig" = ( @@ -5594,9 +5346,6 @@ icon_state = "1-2" }, /obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "Iq" = ( @@ -5677,19 +5426,15 @@ /obj/effect/turf_decal/box/corners{ dir = 8 }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) -"IC" = ( -/obj/machinery/computer/operating, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/pink, -/turf/open/floor/plasteel/white, -/area/ship/medical) +/obj/structure/closet/crate/internals, +/obj/item/clothing/suit/space/orange, +/obj/item/clothing/suit/space/orange, +/obj/item/clothing/suit/space/orange, +/obj/item/clothing/head/helmet/space/orange, +/obj/item/clothing/head/helmet/space/orange, +/obj/item/clothing/head/helmet/space/orange, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) "IL" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/science) @@ -5750,11 +5495,11 @@ /obj/effect/turf_decal/box/corners{ dir = 4 }, -/obj/structure/closet/crate, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "IY" = ( -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium, /area/ship/engineering/atmospherics) "Jc" = ( /obj/structure/disposalpipe/segment, @@ -5766,11 +5511,6 @@ }, /turf/open/floor/noslip, /area/ship/engineering) -"Jk" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/turf/open/floor/wood, -/area/ship/cargo/office) "Jl" = ( /obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{ dir = 1 @@ -5873,22 +5613,12 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 4 }, -/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "JX" = ( /obj/structure/sign/departments/engineering, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/janitor) -"JZ" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "Ka" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -5911,23 +5641,6 @@ /obj/machinery/camera/autoname, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) -"Kh" = ( -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 8 - }, -/obj/machinery/shower{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/warning, -/obj/effect/turf_decal/industrial/warning{ - dir = 5 - }, -/obj/structure/curtain, -/turf/open/floor/plasteel/white, -/area/ship/medical) "Ko" = ( /obj/structure/window/plasma/reinforced, /obj/structure/cable{ @@ -5958,6 +5671,10 @@ /turf/open/floor/wood, /area/ship/crew/dorm) "KE" = ( +/obj/structure/closet/secure_closet{ + icon_state = "brig_phys"; + name = "paramedic's locker" + }, /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/corner/opaque/blue{ dir = 8 @@ -5965,6 +5682,16 @@ /obj/effect/turf_decal/corner/opaque/blue{ dir = 1 }, +/obj/item/storage/backpack/duffelbag/med, +/obj/item/storage/backpack/satchel/med, +/obj/item/storage/backpack/medic, +/obj/item/storage/backpack/messenger/para, +/obj/item/clothing/shoes/sneakers/blue, +/obj/item/clothing/under/rank/medical/paramedic/skirt, +/obj/item/clothing/under/rank/medical/paramedic, +/obj/item/clothing/head/soft/paramedic, +/obj/item/storage/belt/medical, +/obj/item/clothing/glasses/hud/health, /turf/open/floor/plasteel/white, /area/ship/medical) "KI" = ( @@ -5993,14 +5720,6 @@ /obj/machinery/computer/med_data{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/white, /area/ship/medical) "Ll" = ( @@ -6040,9 +5759,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/ship/crew/canteen) -"LA" = ( -/turf/closed/wall/mineral/plastitanium, -/area/template_noop) "LB" = ( /obj/machinery/atmospherics/pipe/manifold/orange/visible, /obj/effect/turf_decal/industrial/warning{ @@ -6055,7 +5771,13 @@ name = "AI Core Access"; req_one_access_txt = "16" }, -/obj/machinery/telecomms/receiver, +/obj/structure/rack, +/obj/item/aiModule/core/full/asimov, +/obj/item/aiModule/core/full/corp, +/obj/item/aiModule/core/freeformcore, +/obj/item/aiModule/reset/purge{ + pixel_y = 5 + }, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "LF" = ( @@ -6147,15 +5869,6 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) -"Mp" = ( -/obj/effect/turf_decal/corner/opaque/ntblue{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/ntblue{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) "Mu" = ( /obj/structure/window/reinforced{ dir = 8 @@ -6212,27 +5925,6 @@ /obj/structure/sign/departments/engineering, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) -"MH" = ( -/obj/structure/window/plasma/reinforced/spawner/east, -/obj/structure/window/plasma/reinforced/spawner/north, -/obj/structure/window/plasma/reinforced/spawner/west, -/obj/structure/window/plasma/reinforced/spawner, -/obj/structure/flora/ausbushes/sunnybush, -/obj/structure/flora/junglebush, -/obj/machinery/light/floor, -/turf/open/floor/grass/ship, -/area/ship/medical) -"MI" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/lime, -/obj/machinery/vending/cola/random, -/turf/open/floor/plasteel/white, -/area/ship/medical) "MJ" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -6261,7 +5953,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/ship/cargo) "MM" = ( -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium, /area/ship/engineering) "MR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -6291,9 +5983,6 @@ dir = 8 }, /obj/machinery/light/directional/west, -/obj/effect/turf_decal/corner/opaque/ntblue{ - dir = 1 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "Nm" = ( @@ -6417,15 +6106,19 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 4 }, -/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) "NH" = ( +/obj/structure/table/glass, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_x = -3; + pixel_y = 13 + }, /obj/effect/turf_decal/corner/opaque/pink{ dir = 4 }, /obj/effect/turf_decal/corner/opaque/pink, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/item/clothing/gloves/color/latex/nitrile, /turf/open/floor/plasteel/white, /area/ship/medical) "NP" = ( @@ -6578,22 +6271,6 @@ }, /turf/open/floor/plating, /area/ship/cargo) -"OE" = ( -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/corner/transparent/neutral, -/turf/open/floor/plasteel, -/area/ship/hallway/central) -"OF" = ( -/obj/effect/turf_decal/corner/opaque/blue, -/turf/open/floor/plasteel/white, -/area/ship/medical) "OG" = ( /obj/machinery/conveyor_switch/oneway{ id = "osprey_production" @@ -6609,35 +6286,14 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) -"OK" = ( -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 4 - }, -/obj/machinery/stasis{ - dir = 4 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/plasteel/white, -/area/ship/medical) "OS" = ( /obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/poddoor/shutters{ id = "ospreymed" }, /obj/machinery/door/firedoor/window, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/medical) -"OT" = ( -/obj/structure/crate_shelf, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "OV" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -6689,27 +6345,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) -"Ph" = ( -/obj/structure/closet/secure_closet{ - icon_state = "med_secure"; - name = "medical doctor's locker" - }, -/obj/item/storage/backpack/duffelbag/med, -/obj/item/storage/backpack/messenger/med, -/obj/item/storage/backpack/medic, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/under/rank/medical/doctor/skirt, -/obj/item/clothing/under/rank/medical/doctor, -/obj/item/clothing/suit/toggle/labcoat, -/obj/item/clothing/glasses/hud/health, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "Pj" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -6737,19 +6372,6 @@ "Po" = ( /turf/open/floor/plasteel/dark, /area/ship/science) -"Pp" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/machinery/door/airlock/public/glass, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/white, -/area/ship/medical) "Pq" = ( /obj/effect/turf_decal/corner/transparent/neutral{ dir = 4 @@ -6758,23 +6380,8 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/effect/turf_decal/corner/transparent/neutral, /turf/open/floor/plasteel, /area/ship/hallway/central) -"PD" = ( -/obj/machinery/sleeper, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 - }, -/obj/machinery/light/dim/directional/north, -/turf/open/floor/plasteel/white, -/area/ship/medical) "PE" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/corner/opaque/mauve{ @@ -6801,7 +6408,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/crew/cryo) "PP" = ( -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium, /area/ship/crew/cryo) "PQ" = ( /obj/structure/disposalpipe/sorting/mail/flip{ @@ -6865,6 +6472,9 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -6874,9 +6484,6 @@ /obj/effect/turf_decal/trimline/opaque/blue/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /turf/open/floor/plasteel/white, /area/ship/medical) "Qr" = ( @@ -6903,9 +6510,6 @@ dir = 4 }, /obj/machinery/light/dim/directional/north, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 1 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "Qv" = ( @@ -6926,32 +6530,8 @@ dir = 9 }, /obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) -"Qz" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced/unanchored, -/obj/machinery/door/window{ - dir = 8; - icon_state = "right"; - name = "Medical Supplies"; - opacity = 1 - }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/radiation, -/turf/open/floor/plasteel/white, -/area/ship/medical) -"QB" = ( -/obj/machinery/light/directional/south, -/turf/open/floor/wood, -/area/ship/cargo/office) "QD" = ( /obj/machinery/atmospherics/components/binary/volume_pump, /obj/effect/turf_decal/industrial/warning/corner{ @@ -6963,14 +6543,16 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/opaque/blue/corner, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /turf/open/floor/plasteel/white, /area/ship/medical) "QI" = ( @@ -7009,20 +6591,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) -"QQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/ship/hallway/central) "QW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -7034,7 +6602,7 @@ /obj/structure/sign/number/one{ color = "Black" }, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/cargo/office) "Ri" = ( /obj/structure/cable{ @@ -7048,16 +6616,11 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) -"Rm" = ( -/obj/structure/table/wood, -/obj/machinery/printer, -/turf/open/floor/wood, -/area/ship/cargo/office) "Ro" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) "Rq" = ( -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium, /area/ship/crew/dorm) "Rr" = ( /turf/open/floor/plasteel/stairs/left{ @@ -7123,21 +6686,8 @@ }, /obj/item/stack/sheet/mineral/plasma/twenty, /obj/machinery/light/directional/north, -/obj/item/storage/box/stockparts/t3, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) -"RH" = ( -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/lime{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "RI" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -7178,11 +6728,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/ship/cargo) -"RT" = ( -/obj/structure/bookcase/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "RU" = ( /obj/structure/table/wood, /obj/item/toy/plush/carpplushie, @@ -7222,9 +6767,11 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "Se" = ( -/obj/machinery/airalarm/directional/south, -/turf/open/floor/wood, -/area/ship/cargo/office) +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/ship/science) "Si" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -7333,7 +6880,6 @@ dir = 5 }, /obj/item/radio/intercom/directional/west, -/obj/item/gps, /turf/open/floor/plasteel/dark, /area/ship/bridge) "SO" = ( @@ -7375,13 +6921,26 @@ /obj/structure/disposalpipe/junction/flip{ dir = 4 }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel, -/area/ship/cargo/office) -"SU" = ( -/obj/machinery/cryopod{ - dir = 1 - }, +/obj/structure/closet/secure_closet{ + icon_state = "cargo"; + name = "\proper cargo technician's locker"; + req_access_txt = "31" + }, +/obj/item/storage/backpack, +/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/messenger, +/obj/item/storage/backpack/duffelbag, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/under/rank/cargo/tech/skirt, +/obj/item/clothing/under/rank/cargo/tech, +/obj/item/clothing/head/safety_helmet, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plasteel, +/area/ship/cargo/office) +"SU" = ( +/obj/machinery/cryopod{ + dir = 1 + }, /obj/structure/window/reinforced{ dir = 4 }, @@ -7391,21 +6950,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew/cryo) "SW" = ( -/obj/structure/closet/secure_closet{ - icon_state = "science"; - name = "scientist's locker"; - req_access_txt = "47" - }, -/obj/item/storage/backpack/duffelbag, -/obj/item/storage/backpack/messenger/tox, -/obj/item/storage/backpack/satchel/tox, -/obj/item/storage/backpack/science, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/under/rank/rnd/scientist/skirt, -/obj/item/clothing/under/rank/rnd/scientist, -/obj/item/clothing/suit/toggle/labcoat/science, -/obj/item/clothing/glasses/science, -/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/button/door{ dir = 8; id = "ospreysci_window"; @@ -7447,13 +6991,12 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) "Ti" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 4 +/obj/machinery/conveyor/inverted{ + dir = 5; + id = "osprey_production" }, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/white, -/area/ship/medical) +/turf/open/floor/plating, +/area/ship/cargo) "Tn" = ( /obj/structure/cable{ icon_state = "0-8" @@ -7563,9 +7106,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, /turf/open/floor/plasteel, /area/ship/hallway/central) "TJ" = ( @@ -7629,7 +7169,7 @@ /area/ship/cargo) "TZ" = ( /obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/rnd/production/circuit_imprinter, +/obj/machinery/rnd/production/circuit_imprinter/department/science, /turf/open/floor/plasteel/dark, /area/ship/science) "Uc" = ( @@ -7652,16 +7192,12 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) "Uj" = ( -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 1 +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor/shutters{ + id = "ospreywindows" }, -/obj/effect/turf_decal/corner/opaque/blue, -/obj/machinery/door/airlock/public/glass, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/white, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/plating, /area/ship/medical) "Uo" = ( /obj/structure/disposalpipe/segment{ @@ -7680,13 +7216,21 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering/atmospherics) "UB" = ( +/obj/machinery/sleeper{ + dir = 4 + }, /obj/effect/turf_decal/corner/opaque/lime{ dir = 1 }, /obj/effect/turf_decal/corner/opaque/lime{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/corner/opaque/lime{ + dir = 8 + }, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_x = -25 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "UG" = ( @@ -7733,7 +7277,7 @@ /area/ship/medical) "Vl" = ( /obj/structure/sign/warning/vacuum/external, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/cargo) "Vq" = ( /obj/machinery/conveyor{ @@ -7857,9 +7401,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) -"VU" = ( -/turf/open/floor/wood, -/area/ship/cargo/office) "VV" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/science/ai_chamber) @@ -7899,13 +7440,14 @@ /turf/open/floor/plasteel, /area/ship/cargo) "Wj" = ( +/obj/machinery/mineral/processing_unit, /turf/open/floor/plating, /area/ship/cargo) "Wk" = ( /obj/structure/sign/number/four{ color = "Black" }, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/cargo/office) "Wn" = ( /obj/structure/table/wood, @@ -7921,9 +7463,6 @@ }, /turf/template_noop, /area/template_noop) -"Wr" = ( -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "Ws" = ( /obj/structure/chair/comfy/orange/directional/east, /obj/effect/landmark/start/head_of_personnel, @@ -7973,10 +7512,6 @@ "WU" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering) -"WV" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "WZ" = ( /obj/machinery/door/airlock/public/glass{ name = "Canteen"; @@ -8135,19 +7670,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/engineering) -"XP" = ( -/obj/effect/turf_decal/corner/opaque/mauve{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/mauve{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/mauve{ - dir = 8 - }, -/obj/machinery/computer/mech_bay_power_console, -/turf/open/floor/plasteel/white, -/area/ship/science) "XR" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -8190,11 +7712,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/central) -"XY" = ( -/obj/structure/bookcase/random, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/wood/bamboo, -/area/ship/cargo/office) "Yc" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/plasteel/patterned/grid, @@ -8225,23 +7742,16 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plasteel, /area/ship/crew/cryo) -"Yz" = ( -/obj/structure/chair/stool, -/turf/open/floor/wood, -/area/ship/cargo/office) "YD" = ( /obj/structure/chair/office/light, /obj/effect/landmark/start/medical_doctor, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/blue{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/blue, /turf/open/floor/plasteel/white, /area/ship/medical) "YF" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/clipboard, +/obj/item/pen/red, /obj/machinery/button/door{ dir = 4; id = "ospreycargo"; @@ -8263,7 +7773,18 @@ /obj/effect/turf_decal/corner/opaque/brown{ dir = 8 }, -/obj/structure/table, +/obj/item/folder/yellow, +/obj/item/stamp/denied{ + pixel_x = 4 + }, +/obj/item/stamp{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/pen/red, +/obj/item/holochip{ + credits = 4000 + }, /turf/open/floor/plasteel, /area/ship/cargo/office) "YH" = ( @@ -8305,6 +7826,10 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "YP" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /obj/effect/turf_decal/corner/opaque/mauve{ dir = 1 }, @@ -8324,18 +7849,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) -"YV" = ( -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/pink{ - dir = 8 - }, -/obj/machinery/stasis{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ship/medical) "Zj" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/borderfloor{ @@ -8384,10 +7897,6 @@ }, /turf/open/floor/plasteel, /area/ship/cargo) -"ZB" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/plasteel/white, -/area/ship/medical) "ZC" = ( /obj/structure/cable{ icon_state = "0-4" @@ -8397,7 +7906,7 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "ZJ" = ( -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/central) "ZK" = ( /obj/structure/window/reinforced{ @@ -8411,28 +7920,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/porta_turret/ai, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "ZR" = ( -/obj/structure/rack, -/obj/item/aiModule/core/freeformcore, -/obj/item/aiModule/reset/purge{ - pixel_y = 5 - }, -/obj/item/aiModule/core/full/corp, -/obj/item/aiModule/core/full/asimov, -/obj/item/mmi/posibrain, -/obj/item/borg/upgrade/ai, -/obj/item/borg/upgrade/ai, -/obj/item/aicard, -/obj/machinery/door/window/brigdoor/westleft, -/obj/machinery/door/window/brigdoor/westleft{ - dir = 4; - req_one_access_txt = "61" - }, -/obj/structure/window/plasma/reinforced/spawner, -/obj/structure/window/plasma/reinforced/spawner/north, +/obj/machinery/porta_turret/ai, /turf/open/floor/circuit, /area/ship/science/ai_chamber) "ZW" = ( @@ -8456,24 +7947,24 @@ /area/ship/science/ai_chamber) "ZY" = ( /obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/rnd/production/protolathe, +/obj/machinery/rnd/production/protolathe/department/science, /turf/open/floor/plasteel/dark, /area/ship/science) "ZZ" = ( /obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/cryo) (1,1,1) = {" li -MM +WU pD pD rG rG pD pD -MM +WU li li li @@ -8489,26 +7980,26 @@ li li li li -IY +yj Hk Hk wT wT Hk Hk -IY +yj li "} (2,1,1) = {" li -MM +WU Tn VA qX Tr Tn VA -MM +WU li li li @@ -8524,26 +8015,26 @@ li li li li -IY +yj wo wQ kB hU wo wQ -IY +yj li "} (3,1,1) = {" li -MM +WU eE eE EW LB eE eE -MM +WU li li li @@ -8559,26 +8050,26 @@ li li li li -IY +yj kG kG cJ cJ kG kG -IY +yj li "} (4,1,1) = {" li -MM +WU pP ap KC Gr oi mZ -MM +WU li li li @@ -8594,26 +8085,26 @@ li li li li -IY +yj Iv Bl Tz ra Ri dS -IY +yj li "} (5,1,1) = {" li -MM +WU NT Yc RY SD BN ci -MM +WU MM li li @@ -8629,7 +8120,7 @@ li li li IY -IY +yj pT pH kb @@ -8641,7 +8132,7 @@ li "} (6,1,1) = {" li -MM +WU qc PS Fj @@ -8649,17 +8140,17 @@ QD vY yg Tg -MM +WU ao kP uz -FN -FN -FN -FN -FN -FN -FN +VV +VV +VV +VV +VV +VV +VV ao kP uz @@ -8676,7 +8167,7 @@ li "} (7,1,1) = {" li -MM +WU qa gX hr @@ -8684,21 +8175,21 @@ vx XK jn MT -FN +VV Aj -FN +VV HE -FN -Bx +VV +kU VV yP VV -Bx -FN +kU +VV pe eZ ZX -FN +VV RB qp HV @@ -8711,7 +8202,7 @@ li "} (8,1,1) = {" li -MM +WU RE JO uh @@ -8741,12 +8232,12 @@ sq sw cp Uc -IY +yj li "} (9,1,1) = {" li -MM +WU Hf gX oQ @@ -8776,12 +8267,12 @@ HK hm HK Qb -IY +yj li "} (10,1,1) = {" li -MM +WU Mu Ix WK @@ -8811,12 +8302,12 @@ lV Mo eX fU -IY +yj li "} (11,1,1) = {" li -MM +WU Qv lz Em @@ -8846,12 +8337,12 @@ NP yj pJ gC -IY +yj li "} (12,1,1) = {" li -MM +WU Zo LF LK @@ -8881,12 +8372,12 @@ lM yj oo oo -IY +yj li "} (13,1,1) = {" li -MM +WU bH Xz OA @@ -8916,12 +8407,12 @@ RI yj ik lA -IY +yj li "} (14,1,1) = {" li -MM +WU WU WU WU @@ -8951,7 +8442,7 @@ yj yj yj yj -IY +yj li "} (15,1,1) = {" @@ -8997,7 +8488,7 @@ Tq rJ bl yQ -OE +sJ sJ gy yE @@ -9061,7 +8552,7 @@ li "} (18,1,1) = {" li -Rq +IW iO KD fb @@ -9076,7 +8567,7 @@ gT wn UL YR -UT +UL UT UL Ry @@ -9091,12 +8582,12 @@ ea yI Su dw -PP +gV li "} (19,1,1) = {" li -Rq +IW fc pv iv @@ -9126,12 +8617,12 @@ PJ UZ uk SU -PP +gV li "} (20,1,1) = {" li -Rq +IW rz SO Xv @@ -9161,12 +8652,12 @@ tp yl gB sI -PP +gV li "} (21,1,1) = {" li -Rq +IW Oh hv LV @@ -9176,16 +8667,16 @@ IW bh Cn mg +Cn +ak +ak +ak ak -Mp -Mp -Mp -Mp Ni -Mp -Mp -Mp -Mp +ak +ak +ak +ak in RW Cn @@ -9196,22 +8687,22 @@ FL FL FL EO -PP +gV li "} (22,1,1) = {" li Rq -Rq +IW FZ xN ET -Rq -Rq +IW +IW ZJ Es cY -QQ +Nd Nd Si Nd @@ -9225,12 +8716,12 @@ eG Qy Ge ZJ -PP -PP +gV +gV bs Fr Wb -PP +gV PP li "} @@ -9243,7 +8734,7 @@ YI YI Rq li -ZJ +sG su ZJ AB @@ -9259,7 +8750,7 @@ zU uN ZJ kV -ZJ +sG li PP EN @@ -9280,8 +8771,8 @@ li li li li -ZJ -jh +sG +cq cq cq cq @@ -9291,8 +8782,8 @@ cq WZ zy cq -jh -ZJ +cq +sG li li li @@ -9421,7 +8912,7 @@ li li li li -jh +cq lY rH gt @@ -9462,7 +8953,7 @@ rH rH sl sC -xb +qw ly pK lh @@ -9526,7 +9017,7 @@ li li li li -jh +cq DK tO qN @@ -9536,12 +9027,12 @@ DA yq tT DY -jh -iI -iI -iI -iI -iI +cq +li +li +li +li +li li li li @@ -9556,12 +9047,12 @@ li li li li -Cv -Cv -Cv -Cv -Cv -Cv +li +li +li +li +li +Zr Zr Zr Zr @@ -9571,14 +9062,14 @@ Zr ke xB Zr -Cv -DC -OT -OT -DC -iI -iI -iI +Zr +li +li +li +li +li +li +li li li li @@ -9590,13 +9081,13 @@ li li li li -Cv -Cv -OK -YV -YV -Kh -Ph +li +li +li +li +li +li +Zr ux Xl KE @@ -9606,14 +9097,14 @@ Zr eP dN Ih -Cv -Wr -Wr -Wr -Wr -gL -qR -iI +Zr +li +li +li +li +li +li +li li li li @@ -9625,13 +9116,13 @@ li li li li -Cv -tz -wa -WN -WN -WN -WN +li +li +li +li +li +li +Uj Bc WN Vh @@ -9640,16 +9131,16 @@ aW nL PV FP -fO +HU Uj -Wr -Wr -Wr -nT -bO -QB -iI -iI +li +li +li +li +li +li +li +li li li li @@ -9660,31 +9151,31 @@ li li li li -Cv -IC -FS -jV -NH -NH -NH +li +li +li +li +li +li +Uj Dj NH -Ti +WN CQ Lc OS QE uE HU -qr -bS -XY -cU -nT -VU -Yz -rh -iI +Uj +li +li +li +li +li +li +li +li li li li @@ -9695,15 +9186,15 @@ li li li li -Cv -PD -JZ -JZ -JZ -cb -MH -RH -Cs +li +li +li +li +li +li +Zr +Zr +Zr aI un YD @@ -9712,14 +9203,14 @@ zQ vl jk Zr -Wr -gz -gz -nT -GQ -Yz -io -iI +li +li +li +li +li +li +li +li li li li @@ -9730,31 +9221,31 @@ li li li li -Cv -ve -va -gH -it -pf -nN +li +li +li +li +li +li +Uj UB it -it -ZB +WN +CQ Hx oW Qm Ac wr -Pp -jR -RT -dF -nT -Rm -Se -iI -iI +Uj +li +li +li +li +li +li +li +li li li li @@ -9765,13 +9256,13 @@ li li li li -Cv -Cv -MI -va -WN -WN -WN +li +li +li +li +li +li +Uj IU WN gH @@ -9780,15 +9271,15 @@ yc Zr Sm il -OF -pi -Wr -gk -gk -nT -vQ -QB -iI +wr +Uj +li +li +li +li +li +li +li li li li @@ -9801,12 +9292,12 @@ li li li li -Cv -Cv -nC -ya -rA -Qz +li +li +li +li +CF +Zr wR JD gg @@ -9816,14 +9307,14 @@ Zr CH QK Sd -Cv +Zr CF -Wr -WV -nT -mE -Jk -iI +li +li +li +li +li +li li li li @@ -9837,28 +9328,28 @@ li li li li -LA -IL +li +hh IL IL IL IL -Cv +Zr cd cd dE Zr xJ oX +Pl +Pl +Pl +Pl iI -iI -uL -uL -iI -iI -iI -iI -iI +li +li +li +li li li li @@ -9873,7 +9364,7 @@ li li li hh -XP +IL YP my kL @@ -9888,9 +9379,8 @@ Xe Pl YF Ie -Ie -iI -iI +nT +Pl iI li li @@ -9898,6 +9388,7 @@ li li li li +li "} (42,1,1) = {" li @@ -9907,9 +9398,9 @@ li li li li -hh +IL qb -hG +Se co Oj pL @@ -9925,7 +9416,7 @@ AS mW tH Nv -iI +Pl li li li @@ -9942,7 +9433,7 @@ li li li li -hh +IL ct hG Iq @@ -9960,7 +9451,7 @@ aL mF ZW Zs -iI +Pl li li li @@ -9977,7 +9468,7 @@ li li li li -hh +IL PE Vf iM @@ -9995,7 +9486,7 @@ kS yn mq SG -iI +Pl li li li @@ -10012,7 +9503,7 @@ li li li li -hh +IL fF TG ss @@ -10030,7 +9521,7 @@ Nr tH IT SR -iI +Pl li li li @@ -10161,7 +9652,7 @@ IL Hy yd IX -qt +CA Gk gw QJ @@ -10223,9 +9714,9 @@ li li li iw -iw +Cv bT -Wj +Ti Wj Wc yd @@ -10239,7 +9730,7 @@ ZK iZ wd ry -iw +Cv iw li li @@ -10258,7 +9749,7 @@ li li li li -iw +Cv fh mu OG @@ -10274,7 +9765,7 @@ Fs NA Cj TP -iw +Cv li li li @@ -10294,7 +9785,7 @@ li li li iw -iw +Cv Gw cN jo @@ -10308,7 +9799,7 @@ yT na ML Oq -iw +Cv iw li li @@ -10330,19 +9821,19 @@ li li li iw -iw -iw -iw -iw +Cv +Cv +Cv +Cv wx Gt Gt Gt Os Vl -iw -iw -iw +Cv +Cv +Cv iw li li @@ -10367,7 +9858,7 @@ li li li iw -iw +Cv Dq fJ fJ @@ -10375,7 +9866,7 @@ hQ fJ fJ qM -iw +Cv iw li li @@ -10402,7 +9893,7 @@ li li li li -iw +Cv li li li @@ -10410,7 +9901,7 @@ li li li li -iw +Cv li li li diff --git a/code/modules/cargo/packs/animal.dm b/code/modules/cargo/packs/animal.dm index 621d376035d6..af18249c12a7 100644 --- a/code/modules/cargo/packs/animal.dm +++ b/code/modules/cargo/packs/animal.dm @@ -132,6 +132,14 @@ /mob/living/simple_animal/hostile/retaliate/poison/snake) crate_name = "snake crate" +/datum/supply_pack/animal/mothroach + name = "Mothroach Crate" + desc = "So Corporate heard you wanted your own Moff Nyan to put in your pocket? Well here you go!" + cost = 7500 + contains = list(/mob/living/simple_animal/pet/mothroach, + /obj/item/clothing/neck/petcollar) + crate_name = "mothroach crate" + /* Insane */ diff --git a/code/modules/cargo/packs/machinery.dm b/code/modules/cargo/packs/machinery.dm index f25e4818329e..a493b39d7446 100644 --- a/code/modules/cargo/packs/machinery.dm +++ b/code/modules/cargo/packs/machinery.dm @@ -129,6 +129,18 @@ crate_name = "robotics assembly crate" crate_type = /obj/structure/closet/crate/science +/* + RND Core machines +*/ + +/datum/supply_pack/machinery/rndboards + name = "RND Starter Kit" + desc = "Everything needed to get an RND department running or to expand your ship properly! Without the hassle!" + cost = 10000 + contains = list(/obj/item/storage/box/rndboards/old) + crate_name = "rnd starter kit crate" + crate_type = /obj/structure/closet/crate/secure/science + /* Miscellaneous machines */ diff --git a/code/modules/cargo/packs/vendor_refill.dm b/code/modules/cargo/packs/vendor_refill.dm index 8a36ff91f7e0..67d3ca704ff5 100644 --- a/code/modules/cargo/packs/vendor_refill.dm +++ b/code/modules/cargo/packs/vendor_refill.dm @@ -24,13 +24,6 @@ contains = list(/obj/item/vending_refill/snack) crate_name = "snacks supply crate" -/datum/supply_pack/vendor_refill/autodrobe - name = "Autodrobe Supply Crate" - desc = "Autodrobe missing your favorite dress? Solve that issue today with this autodrobe refill." - cost = 1000 - contains = list(/obj/item/vending_refill/autodrobe) - crate_name = "autodrobe supply crate" - /datum/supply_pack/vendor_refill/cigarette name = "Cigarette Supply Crate" desc = "Don't believe the reports - smoke today! Contains a cigarette vending machine refill." @@ -44,3 +37,53 @@ cost = 1000 contains = list(/obj/item/vending_refill/games) crate_name = "games supply crate" + +/datum/supply_pack/vendor_refill/autodrobe + name = "Autodrobe Supply Crate" + desc = "Autodrobe missing your favorite dress? Solve that issue today with this autodrobe refill." + cost = 1000 + contains = list(/obj/item/vending_refill/autodrobe) + crate_name = "autodrobe supply crate" + +/datum/supply_pack/vendor_refill/clothing + name = "ClothesMate Supply Crate" + desc = "Is your resident Moff Nyan hungry? Get her one of these! Oh and it's kinda decent at filling out your wardrobe where the Autodrobe could not!" + cost = 1000 + contains = list(/obj/item/vending_refill/clothing) + crate_name = "clothesmate supply crate" + +/datum/supply_pack/vendor_refill/departmentwhite1 + name = "Science Deparments Wardrobe Supply Crate" + desc = "Science Department clothing vendor refills. Now you can look like a proper scientist!" + cost = 4000 + contains = list(/obj/item/vending_refill/wardrobe/science_wardrobe, + /obj/item/vending_refill/wardrobe/viro_wardrobe, + /obj/item/vending_refill/wardrobe/gene_wardrobe, + /obj/item/vending_refill/wardrobe/robo_wardrobe) + crate_name = "departmental supply crate" + +/datum/supply_pack/vendor_refill/departmentwhite2 + name = "Medical Departments Wardrobe Supply Crate" + desc = "Medical Department clothing vendor refills. Now you can look like a proper doctor!" + cost = 2000 + contains = list(/obj/item/vending_refill/wardrobe/medi_wardrobe, + /obj/item/vending_refill/wardrobe/chem_wardrobe) + crate_name = "departmental supply crate" + +/datum/supply_pack/vendor_refill/departmentyellow + name = "Engineering/Cargo Departments Wardrobe Supply Crate" + desc = "Engineering and Cargo Department clothing vendor refills. Now you can look like proper engineers or cargo technicians!" + cost = 3000 + contains = list(/obj/item/vending_refill/wardrobe/engi_wardrobe, + /obj/item/vending_refill/wardrobe/atmos_wardrobe, + /obj/item/vending_refill/wardrobe/cargo_wardrobe) + crate_name = "departmental supply crate" + +/datum/supply_pack/vendor_refill/departmentred + name = "Security Departments Wardrobe Supply Crate" + desc = "Security Department clothing vendor refills. Now you can look like someone with a blatant disregard for assistant lives!" + cost = 2000 + contains = list(/obj/item/vending_refill/wardrobe/sec_wardrobe, + /obj/item/vending_refill/wardrobe/det_wardrobe) + crate_name = "departmental supply crate" + diff --git a/code/modules/hydroponics/grown/spaceflora.dm b/code/modules/hydroponics/grown/spaceflora.dm index 429817036be1..bbcb6e1ab909 100644 --- a/code/modules/hydroponics/grown/spaceflora.dm +++ b/code/modules/hydroponics/grown/spaceflora.dm @@ -25,7 +25,7 @@ icon_state = "seed-voidmelon" species = "voidmelon" plantname = "voidmelon Vines" - product = /obj/item/reagent_containers/food/snacks/grown/watermelon + product = /obj/item/reagent_containers/food/snacks/grown/voidmelon lifespan = 50 endurance = 40 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'