From c97b08e1adfffcd7568ff6048f0c366b8ff59618 Mon Sep 17 00:00:00 2001 From: SomeGuyEatingPie Date: Sat, 2 Jul 2022 06:56:49 +0100 Subject: [PATCH 1/3] Initialise Inserted working changes to random shuttle spawing --- .../RandomRuins/SpaceRuins/whiteshipdock.dmm | 11 +- _maps/shuttles/whiteship_Sophie1.dmm | 2701 +++++++++++++++++ code/datums/shuttles.dm | 6 +- code/game/area/areas/shuttles.dm | 26 +- code/modules/shuttle/shuttle.dm | 25 +- 5 files changed, 2756 insertions(+), 13 deletions(-) create mode 100644 _maps/shuttles/whiteship_Sophie1.dmm diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm index 0bcfba90..ca0a4b55 100644 --- a/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm +++ b/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm @@ -3,16 +3,7 @@ /turf/open/space/basic, /area/space) "b" = ( -/obj/docking_port/stationary{ - dheight = 0; - dir = 2; - dwidth = 11; - height = 22; - id = "whiteship_away"; - name = "Deep Space"; - width = 35; - json_key = "whiteship" - }, +/obj/docking_port/stationary/picked/whiteship, /turf/open/space, /area/space) diff --git a/_maps/shuttles/whiteship_Sophie1.dmm b/_maps/shuttles/whiteship_Sophie1.dmm new file mode 100644 index 00000000..eafd1db2 --- /dev/null +++ b/_maps/shuttles/whiteship_Sophie1.dmm @@ -0,0 +1,2701 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/template_noop, +/area/template_noop) +"ab" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/reagentgrinder, +/obj/item/reagent_containers/food/drinks/shaker{ + step_x = -10 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"ac" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/crew) +"ad" = ( +/obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/docking_port/mobile{ + callTime = 250; + dheight = 0; + dir = 2; + dwidth = 11; + height = 17; + id = "whiteship"; + launch_status = 0; + movement_force = list("KNOCKDOWN"=0,"THROW"=0); + name = "NT Frigate"; + port_direction = 8; + preferred_direction = 4; + width = 27 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/crew) +"ae" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/kitchen) +"af" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_windows" + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/kitchen) +"ag" = ( +/obj/machinery/porta_turret/centcom_shuttle/weak{ + dir = 4 + }, +/turf/closed/wall/mineral/titanium, +/area/shuttle/Sophie/kitchen) +"ah" = ( +/obj/structure/sign/warning/docking, +/turf/closed/wall/mineral/titanium, +/area/shuttle/Sophie/engine) +"ai" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/engine) +"aj" = ( +/obj/machinery/shower{ + pixel_y = 15 + }, +/obj/item/soap, +/obj/structure/curtain, +/obj/machinery/light/small, +/turf/open/floor/plasteel/freezer, +/area/shuttle/Sophie/crew) +"ak" = ( +/obj/structure/toilet{ + pixel_y = 16 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + pixel_x = 28 + }, +/turf/open/floor/plasteel/freezer, +/area/shuttle/Sophie/crew) +"al" = ( +/obj/structure/bed{ + name = "Sophie's bed"; + desc = "Get out of here you creep!" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/airalarm/all_access{ + dir = 8; + pixel_x = 24 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/item/bedsheet/hop, +/turf/open/floor/wood, +/area/shuttle/Sophie/crew) +"am" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/airalarm/all_access{ + dir = 8; + pixel_x = 24 + }, +/obj/structure/bed/dogbed{ + name = "Jasper's bed"; + desc = "A comfy-looking cat bed. You can even strap your pet in, in case the gravity turns off." + }, +/turf/open/floor/wood, +/area/shuttle/Sophie/crew) +"an" = ( +/obj/structure/closet/emcloset/anchored, +/obj/item/storage/firstaid/o2{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/machinery/camera{ + network = list("Sophie1"); + name = "Frigate Camera"; + dir = 4; + c_tag = Port Airlock + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/crew) +"ao" = ( +/obj/structure/sign/warning/vacuum/external{ + pixel_x = 32 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/crew) +"ap" = ( +/obj/machinery/vending/boozeomat/all_access{ + product_ads = ""; + product_slogans = "" + }, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"aq" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/chem_dispenser/drinks/beer, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"ar" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"as" = ( +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"at" = ( +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1 + }, +/obj/machinery/power/apc{ + dir = 8; + name = "Frigate Bar APC"; + pixel_x = -24; + req_access = null + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"au" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/structure/closet/secure_closet/freezer/meat, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"av" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/closet/crate, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/reagent_containers/glass/beaker/waterbottle/large{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle, +/obj/item/reagent_containers/glass/beaker/waterbottle{ + pixel_x = 3; + pixel_y = -3 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/kitchen) +"aw" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/closet/crate, +/obj/item/reagent_containers/food/snacks/candy{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/reagent_containers/food/snacks/candy, +/obj/item/reagent_containers/food/snacks/candy{ + pixel_x = 3; + pixel_y = -1 + }, +/obj/item/reagent_containers/food/snacks/cookie{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/reagent_containers/food/snacks/cookie{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/reagent_containers/food/snacks/chocolatebar, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/kitchen) +"ax" = ( +/turf/closed/wall/mineral/titanium, +/area/shuttle/Sophie/kitchen) +"ay" = ( +/obj/structure/shuttle/engine/propulsion/left{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/shuttle/Sophie/engine) +"az" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/shuttle/Sophie/engine) +"aA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/storage/bag/trash{ + pixel_x = 6 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"aB" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/item/weldingtool/largetank, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"aC" = ( +/obj/structure/sign/departments/restroom, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/crew) +"aD" = ( +/obj/machinery/door/airlock{ + name = "Restroom" + }, +/turf/open/floor/plasteel/freezer, +/area/shuttle/Sophie/crew) +"aE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock{ + name = "Sophie's Room" + }, +/turf/open/floor/wood, +/area/shuttle/Sophie/crew) +"aF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock{ + name = "Jasper's Room" + }, +/turf/open/floor/wood, +/area/shuttle/Sophie/crew) +"aG" = ( +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/crew) +"aH" = ( +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/fans/tiny, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"aI" = ( +/obj/structure/sign/warning/docking, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/medbay) +"aJ" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/external/glass{ + name = "E.V.A Access" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/crew) +"aK" = ( +/obj/machinery/power/terminal, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"aL" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"aM" = ( +/obj/structure/shuttle/engine/propulsion/right{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/shuttle/Sophie/engine) +"aN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"aQ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/crew) +"aR" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/crew) +"aS" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/crew) +"aT" = ( +/obj/machinery/light/small, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/airalarm/all_access{ + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/crew) +"aU" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/power/apc{ + dir = 1; + name = "Frigate Crew Quarters APC"; + pixel_y = 24; + req_access = null + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/crew) +"aV" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/crew) +"aW" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/external/glass{ + name = "E.V.A Access" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"aX" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/dark{ + dir = 8 + }, +/area/shuttle/Sophie/crew) +"aY" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/crew) +"aZ" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/crew) +"ba" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"bb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"bc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"bd" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/vending/dinnerware{ + product_ads = "" + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"be" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/crew) +"bf" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"bg" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/processor, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"bh" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_windows" + }, +/turf/open/floor/plating/airless, +/area/shuttle/Sophie/kitchen) +"bi" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_windows" + }, +/turf/open/floor/plating/airless, +/area/shuttle/Sophie/kitchen) +"bj" = ( +/obj/structure/sign/poster/official/fruit_bowl, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/lounge) +"bk" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/airalarm/all_access{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"bl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"bm" = ( +/obj/structure/sign/departments/engineering, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/engine) +"bn" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/crew) +"bo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/item/storage/wallet/random, +/obj/item/clothing/under/rank/centcom_officer{ + desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time."; + name = "\improper dusty old CentCom jumpsuit" + }, +/obj/item/clothing/under/rank/centcom_commander{ + desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time."; + name = "\improper dusty old CentCom jumpsuit" + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/closet, +/obj/machinery/camera{ + network = list("Sophie1"); + name = "Frigate Camera"; + dir = 1; + c_tag = Crew Quarters + }, +/obj/item/clothing/under/plaid_skirt{ + name = "Sophie's spare red plaid skirt"; + desc = "Comes with a burger pocket and cupholder attached." + }, +/obj/item/clothing/shoes/jackboots/tall{ + desc = "the label reads: 'Doc Martiens'." + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/crew) +"bp" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Crew Quarters" + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/crew) +"bq" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/public/glass{ + name = "Crew Quarters" + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/crew) +"br" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/stack/rods/fifty, +/obj/item/wrench, +/obj/item/t_scanner, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/crew) +"bs" = ( +/obj/effect/turf_decal/delivery/white, +/obj/machinery/suit_storage_unit/standard_unit, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/crew) +"bt" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical, +/obj/item/clothing/head/welding{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/machinery/airalarm/all_access{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/crew) +"bu" = ( +/obj/structure/sign/barsign, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/lounge) +"bw" = ( +/obj/structure/table, +/obj/machinery/microwave, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"bx" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/closet/secure_closet/freezer/kitchen, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"by" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"bz" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"bA" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 4 + }, +/obj/item/flashlight{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/head/welding{ + pixel_x = -2; + pixel_y = 1 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/obj/item/multitool{ + pixel_y = -13 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"bB" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/bridge) +"bC" = ( +/obj/machinery/door/airlock/command{ + name = "Bridge" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"bD" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/bridge) +"bE" = ( +/obj/machinery/vending/cola/black{ + product_ads = ""; + product_slogans = "" + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie) +"bF" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie) +"bG" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"bH" = ( +/obj/structure/closet/firecloset{ + anchored = 1 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie) +"bI" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_windows" + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/crew) +"bJ" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"bK" = ( +/obj/structure/table, +/obj/item/storage/fancy/donut_box, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/camera{ + network = list("Sophie1"); + name = "Frigate Camera"; + dir = 1; + c_tag = Kitchen + }, +/obj/machinery/airalarm/all_access{ + dir = 1; + pixel_y = -24 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"bL" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/sink/kitchen{ + pixel_y = -7; + dir = 1 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"bM" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/item/beacon, +/turf/open/floor/plasteel, +/area/shuttle/Sophie) +"bN" = ( +/obj/effect/turf_decal/bot_white, +/obj/machinery/space_heater, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/kitchen) +"bO" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/rack, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/multitool, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/kitchen) +"bP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/machinery/meter, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"bQ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"bR" = ( +/obj/machinery/turretid{ + icon_state = "control_kill"; + lethal = 1; + locked = 0; + pixel_x = -28; + req_access = null + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"bS" = ( +/obj/structure/table, +/obj/item/folder/blue{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/pen{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/machinery/recharger, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"bT" = ( +/obj/machinery/door/firedoor, +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_bridge" + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/bridge) +"bU" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/airalarm/all_access{ + dir = 8; + pixel_x = 24 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie) +"bV" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 1 + }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"bW" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -4 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/item/pen{ + pixel_x = -4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/gun/energy/laser/retro{ + name = "Sophie's laser gun"; + desc = "Never been fired and only dropped once."; + step_x = 5; + step_y = 5 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"bX" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"bY" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"bZ" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/computer/security{ + dir = 8; + network = list("Sophie1"); + name = "frigate security camera console" + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"ca" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/medbay) +"cb" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel, +/area/shuttle/Sophie) +"cc" = ( +/obj/structure/sign/warning/electricshock, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/engine) +"cd" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/camera{ + network = list("Sophie1"); + name = "Frigate Camera"; + dir = 8; + c_tag = Engine Bay + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"ce" = ( +/obj/structure/table, +/obj/item/storage/photo_album{ + pixel_y = 12 + }, +/obj/item/camera, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/apc{ + dir = 8; + name = "Frigate Bridge APC"; + pixel_x = -24; + req_access = null + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/camera{ + network = list("Sophie1"); + name = "Frigate Camera"; + dir = 4; + c_tag = Bridge + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"cf" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/mob/living/simple_animal/pet/cat/space{ + name = "Jasper"; + desc = "A certain HoP's adopted pet and trusted co-pilot." + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"cg" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"ch" = ( +/obj/machinery/computer/shuttle/white_ship{ + dir = 8; + name = "Sophie1 Ship Console" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"cj" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/obj/machinery/quantumpad, +/obj/machinery/camera{ + network = list("Sophie1"); + name = "Frigate Camera"; + dir = 8; + c_tag = Centeral Hallway + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie) +"ck" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/power/smes/engineering{ + charge = 4e+006; + output_level = 10000 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"cl" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/power/apc{ + dir = 4; + name = "Frigate Engineering APC"; + pixel_x = 24; + req_access = null + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"cm" = ( +/obj/structure/table, +/obj/item/radio/off{ + pixel_x = 6; + pixel_y = 14 + }, +/obj/item/gps{ + gpstag = "SPH1"; + pixel_x = -9; + pixel_y = 15 + }, +/obj/item/megaphone, +/obj/machinery/airalarm/all_access{ + dir = 4; + pixel_x = -24 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"cn" = ( +/turf/closed/wall/mineral/titanium, +/area/shuttle/Sophie/engine) +"co" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie) +"cp" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ + dir = 8; + x_offset = -2; + y_offset = -8; + name = "Sophie1 Navigation Computer" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"cq" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie) +"cr" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie) +"cs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/computer/monitor{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"ct" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/button/door{ + id = "whiteship_windows"; + name = "Windows Blast Door Control"; + pixel_x = -24; + pixel_y = -5 + }, +/obj/machinery/button/door{ + id = "whiteship_bridge"; + name = "Bridge Blast Door Control"; + pixel_x = -24; + pixel_y = 5 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"cu" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/item/radio/intercom, +/obj/item/toy/figure/hop{ + step_x = 5; + step_y = -5 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"cv" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie) +"cw" = ( +/turf/closed/wall/mineral/titanium, +/area/shuttle/Sophie) +"cx" = ( +/turf/closed/wall/mineral/titanium, +/area/shuttle/Sophie/lounge) +"cy" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_windows" + }, +/turf/open/floor/plating, +/area/shuttle/Sophie) +"cz" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_windows" + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/lounge) +"cA" = ( +/obj/machinery/porta_turret/centcom_shuttle/weak{ + dir = 4 + }, +/turf/closed/wall/mineral/titanium, +/area/shuttle/Sophie/lounge) +"cB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, +/obj/item/wrench, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"cC" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/structure/closet/secure_closet/freezer/kitchen, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"cD" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/obj/machinery/telecomms/relay/preset/auto, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"cE" = ( +/obj/machinery/vending/coffee{ + product_ads = "" + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie) +"cF" = ( +/obj/structure/closet/emcloset/anchored, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie) +"cG" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/lounge) +"cH" = ( +/obj/machinery/vending/mealdor{ + product_slogans = "" + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/lounge) +"cI" = ( +/obj/machinery/camera{ + network = list("Sophie1"); + name = "Frigate Camera"; + c_tag = Lounge + }, +/obj/machinery/vending/sovietsoda{ + product_ads = "" + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/lounge) +"cJ" = ( +/obj/machinery/vending/snack/random{ + product_ads = ""; + product_slogans = "" + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/lounge) +"cK" = ( +/obj/machinery/airalarm/all_access{ + pixel_y = 24 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/turf/open/floor/wood, +/area/shuttle/Sophie/lounge) +"cL" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/closet/cardboard, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/lounge) +"cM" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/ore_box, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/lounge) +"cN" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/airalarm/all_access{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"cO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/closet/crate/secure/weapon, +/obj/item/gun/energy/laser/retro, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"cP" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/medbay) +"cQ" = ( +/obj/structure/rack, +/obj/item/defibrillator, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/medbay) +"cR" = ( +/obj/structure/sign/departments/medbay/alt, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/medbay) +"cS" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/medbay) +"cT" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/medbay) +"cU" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/table, +/obj/item/stack/sheet/metal/fifty, +/obj/item/storage/toolbox/electrical{ + pixel_x = -3; + pixel_y = 8 + }, +/obj/item/stock_parts/cell/high{ + charge = 100; + maxcharge = 15000; + pixel_x = 3; + pixel_y = -1 + }, +/obj/machinery/cell_charger, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/medbay) +"cV" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/rack, +/obj/item/storage/belt/utility, +/obj/item/radio/off{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/radio/off, +/obj/machinery/airalarm/all_access{ + pixel_y = 24 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/medbay) +"cW" = ( +/obj/structure/sign/poster/official/high_class_martini, +/turf/closed/wall/mineral/titanium, +/area/shuttle/Sophie/lounge) +"cX" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/wood, +/area/shuttle/Sophie/lounge) +"cY" = ( +/obj/structure/chair/sofa{ + dir = 8; + name = "comfy couch" + }, +/obj/item/toy/plush/metha, +/turf/open/floor/carpet, +/area/shuttle/Sophie/lounge) +"cZ" = ( +/obj/structure/table/wood/fancy, +/obj/item/reagent_containers/food/drinks/drinkingglass/filled{ + list_reagents = list(/datum/reagent/consumable/ethanol/pina_colada=50) + }, +/turf/open/floor/carpet, +/area/shuttle/Sophie/lounge) +"da" = ( +/obj/machinery/computer/security/telescreen/entertainment, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/lounge) +"db" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/wood, +/area/shuttle/Sophie/lounge) +"dc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"dd" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"de" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance/external/glass, +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"df" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/medbay) +"dg" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/medbay) +"dh" = ( +/obj/machinery/door/airlock/medical{ + name = "Medbay Storage" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/medbay) +"di" = ( +/obj/structure/table, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/suit/apron/surgical, +/turf/open/floor/plasteel/white, +/area/shuttle/Sophie/medbay) +"dj" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/camera{ + network = list("Sophie1"); + name = "Frigate Camera"; + c_tag = Medbay + }, +/turf/open/floor/plasteel/white/side{ + dir = 9 + }, +/area/shuttle/Sophie/medbay) +"dk" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel/white/side{ + dir = 1 + }, +/area/shuttle/Sophie/medbay) +"dl" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel/white/side{ + dir = 1 + }, +/area/shuttle/Sophie/medbay) +"dm" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white/side{ + dir = 5 + }, +/area/shuttle/Sophie/medbay) +"dn" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 5 + }, +/obj/machinery/light/small/built, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/medbay) +"do" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/medbay) +"dp" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, +/obj/machinery/light/small, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/medbay) +"dq" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/external/glass{ + name = "E.V.A Access" + }, +/obj/structure/fans/tiny, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/medbay) +"dr" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/external/glass{ + name = "E.V.A Access" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/lounge) +"ds" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/chair/sofa/left{ + desc = "More inviting than the average couch."; + name = "comfy couch"; + dir = 4 + }, +/turf/open/floor/carpet, +/area/shuttle/Sophie/lounge) +"dt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/wood, +/area/shuttle/Sophie/lounge) +"du" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/table/wood/fancy, +/obj/item/pizzabox/meat, +/turf/open/floor/carpet, +/area/shuttle/Sophie/lounge) +"dv" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/lounge) +"dw" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/jukebox, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/lounge) +"dx" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/poddoor{ + id = "whiteship_windows" + }, +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating/airless, +/area/shuttle/Sophie/lounge) +"dy" = ( +/obj/machinery/door/poddoor{ + id = "whiteship_windows" + }, +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating/airless, +/area/shuttle/Sophie/lounge) +"dz" = ( +/obj/structure/sign/poster/contraband/donut_corp, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/kitchen) +"dA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/closet/crate, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/glass{ + amount = 10 + }, +/obj/item/storage/box/lights/bulbs, +/obj/item/stack/sheet/mineral/plasma{ + amount = 10 + }, +/obj/item/storage/box/lights/mixed, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"dB" = ( +/obj/structure/closet/crate, +/obj/item/shovel, +/obj/item/pickaxe, +/obj/item/mining_scanner, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) +"dC" = ( +/obj/structure/chair/sofa/right{ + desc = "More inviting than the average couch."; + dir = 8; + name = "comfy couch" + }, +/turf/open/floor/carpet, +/area/shuttle/Sophie/lounge) +"dD" = ( +/obj/machinery/vending/medical{ + req_access = null + }, +/turf/open/floor/plasteel/white/side, +/area/shuttle/Sophie/medbay) +"dE" = ( +/obj/machinery/airalarm/all_access{ + dir = 8; + pixel_x = 24 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/white/side, +/area/shuttle/Sophie/medbay) +"dF" = ( +/obj/structure/table/optable, +/obj/item/storage/firstaid/regular, +/turf/open/floor/plasteel/white/side{ + dir = 8 + }, +/area/shuttle/Sophie/medbay) +"dG" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/medbay) +"dH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/medbay) +"dI" = ( +/obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/shuttle/Sophie/medbay) +"dJ" = ( +/obj/structure/cable, +/obj/machinery/power/apc{ + dir = 8; + name = "Frigate Cargo APC"; + pixel_x = -24; + req_access = null + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/wood, +/area/shuttle/Sophie/lounge) +"dK" = ( +/obj/structure/chair/sofa{ + dir = 4; + name = "comfy couch" + }, +/turf/open/floor/carpet, +/area/shuttle/Sophie/lounge) +"dL" = ( +/turf/open/floor/wood, +/area/shuttle/Sophie/lounge) +"dM" = ( +/obj/structure/sign/warning/docking, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/crew) +"dN" = ( +/obj/structure/table, +/obj/item/reagent_containers/glass/bottle/epinephrine{ + pixel_x = 6 + }, +/obj/item/reagent_containers/glass/bottle/charcoal{ + pixel_x = -3 + }, +/obj/item/reagent_containers/syringe, +/turf/open/floor/plasteel/white, +/area/shuttle/Sophie/medbay) +"dO" = ( +/obj/structure/table, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = 4 + }, +/obj/machinery/airalarm/all_access{ + dir = 1; + pixel_y = -24 + }, +/turf/open/floor/plasteel/white, +/area/shuttle/Sophie/medbay) +"dP" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/turf/open/floor/plasteel/white/side{ + dir = 4 + }, +/area/shuttle/Sophie/medbay) +"dQ" = ( +/obj/machinery/iv_drip, +/obj/effect/turf_decal/bot, +/obj/structure/cable, +/obj/machinery/power/apc{ + name = "Frigate Medbay APC"; + pixel_y = -24; + req_access = null + }, +/turf/open/floor/plasteel/white, +/area/shuttle/Sophie/medbay) +"dR" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/blood{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/random, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/white, +/area/shuttle/Sophie/medbay) +"dS" = ( +/obj/structure/closet/emcloset/anchored, +/obj/item/storage/firstaid/o2{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/machinery/camera{ + network = list("Sophie1"); + name = "Frigate Camera"; + dir = 4; + c_tag = Starboard Airlock + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/medbay) +"dT" = ( +/obj/structure/sign/warning/vacuum/external{ + pixel_x = 32 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/medbay) +"dU" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/computer/arcade/orion_trail{ + dir = 4; + settlers = list("Sophie","Jasper","Ian") + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/lounge) +"dV" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/wood, +/area/shuttle/Sophie/lounge) +"dW" = ( +/obj/structure/chair/sofa/corner{ + name = "comfy couch"; + dir = 4 + }, +/turf/open/floor/carpet, +/area/shuttle/Sophie/lounge) +"dX" = ( +/obj/structure/chair/sofa{ + dir = 1; + name = "comfy couch" + }, +/turf/open/floor/carpet, +/area/shuttle/Sophie/lounge) +"dY" = ( +/obj/structure/chair/sofa/corner{ + name = "comfy couch"; + dir = 8 + }, +/turf/open/floor/carpet, +/area/shuttle/Sophie/lounge) +"dZ" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/lounge) +"ea" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/lounge) +"eb" = ( +/obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/medbay) +"fl" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) +"hH" = ( +/obj/structure/sign/poster/contraband/red_rum, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/kitchen) +"iM" = ( +/turf/closed/wall/mineral/titanium, +/area/shuttle/Sophie/medbay) +"oo" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/crew) +"qB" = ( +/obj/structure/sign/poster/contraband/eat, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/lounge) +"tp" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/turf/open/floor/wood, +/area/shuttle/Sophie/lounge) +"vm" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/medbay) +"xD" = ( +/obj/structure/sign/warning/nosmoking/circle, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/bridge) +"DZ" = ( +/obj/effect/turf_decal/delivery/white, +/obj/machinery/suit_storage_unit/standard_unit, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/medbay) +"Fd" = ( +/obj/structure/sign/poster/official/bless_this_spess, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie) +"SY" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_windows" + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/medbay) + +(1,1,1) = {" +aa +aa +aa +aa +cn +ay +aM +ah +aH +ah +ay +aM +cn +aa +aa +aa +aa +"} +(2,1,1) = {" +aa +cn +ay +aM +ai +az +az +ai +bG +cc +az +az +ai +ay +aM +cn +aa +"} +(3,1,1) = {" +aa +ai +az +az +ai +by +bP +bV +aK +ck +cs +cB +ai +az +az +ai +aa +"} +(4,1,1) = {" +aa +ai +aA +aN +bk +bz +bQ +bz +cd +cl +bz +bz +cN +dc +dA +ai +aa +"} +(5,1,1) = {" +aa +ai +aB +dd +bl +bA +xD +bB +bB +bB +bB +cD +cO +dd +dB +ai +aa +"} +(6,1,1) = {" +aa +ai +ai +de +bm +bB +bB +bW +ce +cm +bB +bB +bm +de +ai +ai +aa +"} +(7,1,1) = {" +ac +ac +ac +aQ +bn +bC +bR +bX +cf +bX +ct +bC +cP +df +dD +vm +iM +"} +(8,1,1) = {" +ac +aj +aC +aR +bo +bD +bS +fl +cg +bY +cu +bD +cQ +dg +dE +dN +vm +"} +(9,1,1) = {" +ac +ak +aD +aS +ac +bB +bT +bZ +ch +cp +bT +bB +vm +dh +vm +vm +vm +"} +(10,1,1) = {" +ac +ac +ac +aT +ac +bE +bT +bT +bT +bT +bT +cE +vm +dj +dF +dO +vm +"} +(11,1,1) = {" +bI +al +aE +oo +bp +bF +bF +bF +bM +cq +cq +cq +cS +dk +dH +di +SY +"} +(12,1,1) = {" +ac +ac +ac +aU +bq +cb +bU +cb +cj +cr +cv +cr +cT +dl +dG +dQ +vm +"} +(13,1,1) = {" +bI +am +aF +aV +ac +bH +co +cy +Fd +cy +co +cF +cR +dm +dP +dR +SY +"} +(14,1,1) = {" +ac +ac +ac +aJ +ac +co +cw +aa +aa +aa +cw +co +vm +dq +vm +vm +vm +"} +(15,1,1) = {" +dM +an +be +aX +br +ac +aa +aa +aa +aa +aa +vm +cU +dn +ca +dS +aI +"} +(16,1,1) = {" +ad +ao +aG +aY +bs +bI +aa +aa +aa +aa +aa +SY +DZ +do +dI +dT +eb +"} +(17,1,1) = {" +dM +ac +be +aZ +bt +ac +aa +aa +aa +aa +aa +vm +cV +dp +ca +vm +aI +"} +(18,1,1) = {" +ae +ap +ae +aW +ae +ae +ax +aa +aa +aa +cx +dv +cW +dr +dv +dU +dv +"} +(19,1,1) = {" +hH +ab +at +ba +bd +bw +ae +aa +aa +aa +dv +cG +cX +dt +dJ +dV +dv +"} +(20,1,1) = {" +af +aq +bf +bb +bf +bJ +af +aa +aa +aa +cz +cH +dL +ds +dK +dW +cz +"} +(21,1,1) = {" +ae +ar +bf +bc +bf +bK +ae +aa +aa +aa +bj +cI +dL +du +cZ +dX +bu +"} +(22,1,1) = {" +ae +as +bf +bf +bf +bL +ae +aa +aa +aa +dv +cJ +dL +dC +cY +dY +dv +"} +(23,1,1) = {" +ae +cC +aL +bf +bx +au +ae +aa +aa +aa +dv +cK +db +dL +db +tp +dv +"} +(24,1,1) = {" +af +av +dz +bg +ae +bN +af +aa +aa +aa +cz +cL +da +dw +qB +dZ +cz +"} +(25,1,1) = {" +ae +aw +ae +bh +ae +bO +ae +aa +aa +aa +dv +cM +dv +dx +dv +ea +dv +"} +(26,1,1) = {" +ag +ae +ae +bi +ae +ae +ag +aa +aa +aa +cA +dv +dv +dy +dv +dv +cA +"} +(27,1,1) = {" +aa +ax +ae +bi +ae +ax +aa +aa +aa +aa +aa +cx +dv +dy +dv +cx +aa +"} diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 94c02f0e..81c81551 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -423,6 +423,10 @@ suffix = "whiteship_pod" name = "Salvage Pod" +/datum/map_template/shuttle/whiteship/Sophie1 + suffix = "Sophie1" + name = "Sophie's Ship" + /datum/map_template/shuttle/cargo/box suffix = "box" name = "supply shuttle (Box)" @@ -535,4 +539,4 @@ /datum/map_template/shuttle/snowdin/excavation suffix = "excavation" - name = "Snowdin Excavation Elevator" \ No newline at end of file + name = "Snowdin Excavation Elevator" diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index ab4fa10d..4637decc 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -93,6 +93,30 @@ /area/shuttle/abandoned/pod name = "Abandoned Ship Pod" +/area/shuttle/Sophie + name = "Sophie's Ship" + blob_allowed = FALSE + requires_power = TRUE + canSmoothWithAreas = /area/shuttle/abandoned + +/area/shuttle/Sophie/bridge + name = "Sophie's Ship Bridge" + +/area/shuttle/Sophie/engine + name = "Sophie's Ship Engine" + +/area/shuttle/Sophie/kitchen + name = "Sophie's Ship kitchen" + +/area/shuttle/Sophie/lounge + name = "Sophie's Ship lounge" + +/area/shuttle/Sophie/crew + name = "Sophie's Ship Crew Quarters" + +/area/shuttle/Sophie/medbay + name = "Sophie's Ship Medbay" + ////////////////////////////Single-area shuttles//////////////////////////// /area/shuttle/transit @@ -200,4 +224,4 @@ name = "Tiny Freighter" /area/shuttle/caravan/freighter3 - name = "Tiny Freighter" \ No newline at end of file + name = "Tiny Freighter" diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 44a70f53..70f395ec 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -29,7 +29,7 @@ // may result. if(force) ..() - . = QDEL_HINT_QUEUE + return QDEL_HINT_QUEUE else return QDEL_HINT_LETMELIVE @@ -227,6 +227,29 @@ reserved_area = null return ..() +/obj/docking_port/stationary/picked + ///Holds a list of map name strings for the port to pick from + var/list/shuttlekeys + +/obj/docking_port/stationary/picked/Initialize(mapload) + . = ..() + if(!LAZYLEN(shuttlekeys)) + WARNING("Random docking port [id] loaded with no shuttle keys") + return + var/selectedid = pick(shuttlekeys) + roundstart_template = SSmapping.shuttle_templates[selectedid] + +/obj/docking_port/stationary/picked/whiteship + name = "Deep Space" + id = "whiteship_away" + dheight = 0 + dir = 2 + dwidth = 11 + height = 22 + width = 35 + //shuttlekeys = list("whiteship_meta", "whiteship_pubby", "whiteship_box", "whiteship_cere", "whiteship_kilo", "whiteship_donut", "whiteship_delta", "whiteship_Sophie1") + shuttlekeys = list("whiteship_Sophie1") + /obj/docking_port/mobile name = "shuttle" icon_state = "pinonclose" From 012aa4499f633b340d88bdf8cfe0cc66453f7c75 Mon Sep 17 00:00:00 2001 From: SomeGuyEatingPie Date: Sat, 2 Jul 2022 18:07:09 +0100 Subject: [PATCH 2/3] Finished Tested and ready to merge --- _maps/shuttles/whiteship_Sophie1.dmm | 777 ++++++++++++--------------- _maps/shuttles/whiteship_delta.dmm | 2 +- code/game/area/areas/shuttles.dm | 2 +- code/modules/shuttle/white_ship.dm | 5 + 4 files changed, 339 insertions(+), 447 deletions(-) diff --git a/_maps/shuttles/whiteship_Sophie1.dmm b/_maps/shuttles/whiteship_Sophie1.dmm index eafd1db2..088ca3b9 100644 --- a/_maps/shuttles/whiteship_Sophie1.dmm +++ b/_maps/shuttles/whiteship_Sophie1.dmm @@ -3,17 +3,8 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/reagentgrinder, -/obj/item/reagent_containers/food/drinks/shaker{ - step_x = -10 - }, -/turf/open/floor/plasteel, -/area/shuttle/Sophie/kitchen) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie) "ac" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/Sophie/crew) @@ -54,7 +45,6 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/Sophie/kitchen) "ah" = ( -/obj/structure/sign/warning/docking, /turf/closed/wall/mineral/titanium, /area/shuttle/Sophie/engine) "ai" = ( @@ -83,18 +73,18 @@ /turf/open/floor/plasteel/freezer, /area/shuttle/Sophie/crew) "al" = ( +/obj/machinery/light/small{ + dir = 1 + }, /obj/structure/bed{ name = "Sophie's bed"; - desc = "Get out of here you creep!" + desc = "Hey! Get out of here you creep!" }, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/airalarm/all_access{ dir = 8; pixel_x = 24 }, -/obj/machinery/light/small{ - dir = 1 - }, /obj/item/bedsheet/hop, /turf/open/floor/wood, /area/shuttle/Sophie/crew) @@ -108,8 +98,7 @@ pixel_x = 24 }, /obj/structure/bed/dogbed{ - name = "Jasper's bed"; - desc = "A comfy-looking cat bed. You can even strap your pet in, in case the gravity turns off." + name = "Jasper's Bed" }, /turf/open/floor/wood, /area/shuttle/Sophie/crew) @@ -119,12 +108,6 @@ pixel_x = 3; pixel_y = 3 }, -/obj/machinery/camera{ - network = list("Sophie1"); - name = "Frigate Camera"; - dir = 4; - c_tag = Port Airlock - }, /turf/open/floor/plating, /area/shuttle/Sophie/crew) "ao" = ( @@ -141,18 +124,6 @@ product_ads = ""; product_slogans = "" }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, /turf/open/floor/plasteel, /area/shuttle/Sophie/kitchen) "aq" = ( @@ -169,8 +140,6 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/table, -/obj/machinery/chem_dispenser/drinks, /turf/open/floor/plasteel, /area/shuttle/Sophie/kitchen) "as" = ( @@ -185,6 +154,9 @@ /turf/open/floor/plasteel, /area/shuttle/Sophie/kitchen) "at" = ( +/obj/machinery/light/small{ + dir = 8 + }, /obj/structure/cable{ icon_state = "0-2"; pixel_y = 1 @@ -199,20 +171,16 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/machinery/light/small{ - dir = 8 - }, /turf/open/floor/plasteel, /area/shuttle/Sophie/kitchen) "au" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/structure/closet/secure_closet/freezer/meat, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/closet/secure_closet/freezer/kitchen, /turf/open/floor/plasteel, /area/shuttle/Sophie/kitchen) "av" = ( @@ -239,6 +207,7 @@ /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/kitchen) "aw" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/turf_decal/bot_white, /obj/structure/closet/crate, /obj/item/reagent_containers/food/snacks/candy{ @@ -309,14 +278,14 @@ "aE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock{ - name = "Sophie's Room" + name = "Sophie's cabin" }, /turf/open/floor/wood, /area/shuttle/Sophie/crew) "aF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock{ - name = "Jasper's Room" + name = "Jasper's cabin" }, /turf/open/floor/wood, /area/shuttle/Sophie/crew) @@ -327,29 +296,10 @@ }, /turf/open/floor/plating, /area/shuttle/Sophie/crew) -"aH" = ( -/obj/machinery/door/airlock/external, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/structure/fans/tiny, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/shuttle/Sophie/engine) -"aI" = ( -/obj/structure/sign/warning/docking, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/Sophie/medbay) "aJ" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -362,23 +312,6 @@ /obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/shuttle/Sophie/crew) -"aK" = ( -/obj/machinery/power/terminal, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/shuttle/Sophie/engine) -"aL" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/shuttle/Sophie/kitchen) "aM" = ( /obj/structure/shuttle/engine/propulsion/right{ dir = 8 @@ -460,6 +393,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "0-8" + }, /obj/structure/cable{ icon_state = "2-8" }, @@ -478,6 +414,7 @@ /turf/open/floor/plasteel, /area/shuttle/Sophie/crew) "aV" = ( +/obj/machinery/light/small, /obj/structure/cable{ icon_state = "4-8" }, @@ -485,17 +422,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/light/small, /turf/open/floor/plasteel, /area/shuttle/Sophie/crew) "aW" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -505,7 +437,6 @@ /obj/machinery/door/airlock/external/glass{ name = "E.V.A Access" }, -/obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/shuttle/Sophie/kitchen) @@ -513,15 +444,15 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 6 }, +/obj/machinery/light/small{ + dir = 1 + }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, /turf/open/floor/plasteel/dark{ dir = 8 }, @@ -542,6 +473,9 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 10 }, +/obj/machinery/light/small{ + dir = 1 + }, /obj/structure/cable{ icon_state = "4-8" }, @@ -551,9 +485,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/obj/machinery/light/small{ - dir = 1 - }, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/crew) "ba" = ( @@ -597,54 +528,64 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/machinery/vending/dinnerware{ - product_ads = "" - }, +/obj/machinery/vending/dinnerware, /turf/open/floor/plasteel, /area/shuttle/Sophie/kitchen) "be" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/Sophie/crew) +/obj/machinery/door/airlock/external/glass{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/fans/tiny, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/shuttle/Sophie/engine) "bf" = ( -/obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/effect/turf_decal/tile/bar, /turf/open/floor/plasteel, /area/shuttle/Sophie/kitchen) "bg" = ( /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/processor, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/processor, +/turf/open/floor/plasteel/dark, /area/shuttle/Sophie/kitchen) "bh" = ( /obj/structure/window/reinforced{ dir = 8 }, /obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/poddoor{ - id = "whiteship_windows" - }, /turf/open/floor/plating/airless, /area/shuttle/Sophie/kitchen) "bi" = ( /obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating/airless, +/area/shuttle/Sophie/kitchen) +"bj" = ( +/obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/poddoor{ id = "whiteship_windows" }, /turf/open/floor/plating/airless, /area/shuttle/Sophie/kitchen) -"bj" = ( -/obj/structure/sign/poster/official/fruit_bowl, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/Sophie/lounge) "bk" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -662,12 +603,12 @@ /turf/open/floor/plating, /area/shuttle/Sophie/engine) "bl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, /turf/open/floor/plating, /area/shuttle/Sophie/engine) "bm" = ( @@ -675,6 +616,9 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/Sophie/engine) "bn" = ( +/obj/machinery/light/small{ + dir = 8 + }, /obj/structure/cable{ icon_state = "1-2" }, @@ -703,18 +647,13 @@ dir = 8 }, /obj/structure/closet, -/obj/machinery/camera{ - network = list("Sophie1"); - name = "Frigate Camera"; - dir = 1; - c_tag = Crew Quarters - }, /obj/item/clothing/under/plaid_skirt{ - name = "Sophie's spare red plaid skirt"; - desc = "Comes with a burger pocket and cupholder attached." + desc = "Comes with a burger pocket and cupholder."; + name = "Sophie's spare outfit" }, /obj/item/clothing/shoes/jackboots/tall{ - desc = "the label reads: 'Doc Martiens'." + name = "Sophie's spare boots"; + desc = "The tag reads: Doc Martiens." }, /turf/open/floor/plasteel, /area/shuttle/Sophie/crew) @@ -745,7 +684,6 @@ }, /obj/item/stack/rods/fifty, /obj/item/wrench, -/obj/item/t_scanner, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/crew) "bs" = ( @@ -771,9 +709,9 @@ /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/crew) "bu" = ( -/obj/structure/sign/barsign, +/obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/Sophie/lounge) +/area/shuttle/Sophie/medbay) "bw" = ( /obj/structure/table, /obj/machinery/microwave, @@ -784,14 +722,13 @@ /turf/open/floor/plasteel, /area/shuttle/Sophie/kitchen) "bx" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, /obj/machinery/light/small{ dir = 4 }, -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar, /turf/open/floor/plasteel, /area/shuttle/Sophie/kitchen) "by" = ( @@ -802,13 +739,6 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, /area/shuttle/Sophie/engine) -"bz" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/shuttle/Sophie/engine) "bA" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical{ @@ -826,9 +756,8 @@ dir = 4; pixel_x = 24 }, -/obj/item/multitool{ - pixel_y = -13 - }, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, /turf/open/floor/plating, /area/shuttle/Sophie/engine) "bB" = ( @@ -846,28 +775,25 @@ /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/bridge) "bD" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/Sophie/bridge) -"bE" = ( -/obj/machinery/vending/cola/black{ - product_ads = ""; - product_slogans = "" - }, -/turf/open/floor/plasteel/dark, -/area/shuttle/Sophie) -"bF" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/shuttle/Sophie) -"bG" = ( /obj/structure/cable{ icon_state = "4-8" }, /turf/open/floor/plating, /area/shuttle/Sophie/engine) +"bE" = ( +/obj/machinery/vending/cola/black{ + product_slogans = ""; + product_ads = "" + }, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie) +"bG" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_windows" + }, +/turf/open/floor/plating, +/area/shuttle/Sophie) "bH" = ( /obj/structure/closet/firecloset{ anchored = 1 @@ -887,6 +813,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/item/paper/fluff/ruins/sophie, /turf/open/floor/plasteel, /area/shuttle/Sophie/kitchen) "bK" = ( @@ -896,12 +823,6 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/machinery/camera{ - network = list("Sophie1"); - name = "Frigate Camera"; - dir = 1; - c_tag = Kitchen - }, /obj/machinery/airalarm/all_access{ dir = 1; pixel_y = -24 @@ -914,8 +835,8 @@ dir = 1 }, /obj/structure/sink/kitchen{ - pixel_y = -7; - dir = 1 + dir = 1; + pixel_y = -7 }, /turf/open/floor/plasteel, /area/shuttle/Sophie/kitchen) @@ -1006,10 +927,10 @@ dir = 8; pixel_x = 24 }, -/obj/effect/turf_decal/tile/blue, /obj/machinery/light/small{ dir = 4 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel, /area/shuttle/Sophie) "bV" = ( @@ -1020,7 +941,6 @@ dir = 1 }, /obj/machinery/light/small{ - brightness = 3; dir = 8 }, /turf/open/floor/plating, @@ -1045,9 +965,7 @@ }, /obj/item/gun/energy/laser/retro{ name = "Sophie's laser gun"; - desc = "Never been fired and only dropped once."; - step_x = 5; - step_y = 5 + desc = "Looks like it's not been used in a while." }, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/bridge) @@ -1062,7 +980,9 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/bridge) "bZ" = ( @@ -1075,17 +995,17 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/computer/security{ - dir = 8; - network = list("Sophie1"); - name = "frigate security camera console" +/obj/machinery/computer/crew{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/bridge) "ca" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/Sophie/medbay) +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie) "cb" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1095,20 +1015,17 @@ /turf/open/floor/plasteel, /area/shuttle/Sophie) "cc" = ( -/obj/structure/sign/warning/electricshock, -/turf/closed/wall/mineral/titanium/nodiagonal, +/obj/machinery/power/terminal, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, /area/shuttle/Sophie/engine) "cd" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/camera{ - network = list("Sophie1"); - name = "Frigate Camera"; - dir = 8; - c_tag = Engine Bay - }, /turf/open/floor/plating, /area/shuttle/Sophie/engine) "ce" = ( @@ -1135,12 +1052,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/camera{ - network = list("Sophie1"); - name = "Frigate Camera"; - dir = 4; - c_tag = Bridge - }, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/bridge) "cf" = ( @@ -1154,9 +1065,10 @@ dir = 8 }, /mob/living/simple_animal/pet/cat/space{ - name = "Jasper"; - desc = "A certain HoP's adopted pet and trusted co-pilot." + desc = "A cartain HoP's trusted copilot!"; + name = "Jasper" }, +/obj/machinery/holopad, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/bridge) "cg" = ( @@ -1170,8 +1082,7 @@ /area/shuttle/Sophie/bridge) "ch" = ( /obj/machinery/computer/shuttle/white_ship{ - dir = 8; - name = "Sophie1 Ship Console" + dir = 8 }, /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -1189,12 +1100,6 @@ dir = 4 }, /obj/machinery/quantumpad, -/obj/machinery/camera{ - network = list("Sophie1"); - name = "Frigate Camera"; - dir = 8; - c_tag = Centeral Hallway - }, /turf/open/floor/plasteel, /area/shuttle/Sophie) "ck" = ( @@ -1209,7 +1114,6 @@ icon_state = "0-4" }, /obj/machinery/light/small{ - brightness = 3; dir = 8 }, /turf/open/floor/plating, @@ -1257,18 +1161,18 @@ }, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/bridge) -"cn" = ( -/turf/closed/wall/mineral/titanium, -/area/shuttle/Sophie/engine) "co" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/Sophie) +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/bridge) "cp" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ dir = 8; x_offset = -2; - y_offset = -8; - name = "Sophie1 Navigation Computer" + y_offset = -8 }, /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -1329,11 +1233,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/item/radio/intercom, -/obj/item/toy/figure/hop{ - step_x = 5; - step_y = -5 - }, +/obj/item/paper/fluff/ruins/sophie, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/bridge) "cv" = ( @@ -1345,10 +1245,10 @@ dir = 4; pixel_x = 24 }, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/light/small{ dir = 4 }, -/obj/machinery/light/small{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, /turf/open/floor/plasteel, @@ -1360,12 +1260,8 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/Sophie/lounge) "cy" = ( -/obj/effect/spawner/structure/window/shuttle, -/obj/machinery/door/poddoor{ - id = "whiteship_windows" - }, -/turf/open/floor/plating, -/area/shuttle/Sophie) +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/lounge) "cz" = ( /obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/poddoor{ @@ -1389,17 +1285,6 @@ /obj/item/wrench, /turf/open/floor/plating, /area/shuttle/Sophie/engine) -"cC" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/obj/structure/closet/secure_closet/freezer/kitchen, -/turf/open/floor/plasteel, -/area/shuttle/Sophie/kitchen) "cD" = ( /obj/machinery/firealarm{ dir = 4; @@ -1423,20 +1308,15 @@ /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/lounge) "cH" = ( -/obj/machinery/vending/mealdor{ - product_slogans = "" - }, +/obj/machinery/vending/mealdor, +/obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/lounge) "cI" = ( -/obj/machinery/camera{ - network = list("Sophie1"); - name = "Frigate Camera"; - c_tag = Lounge - }, /obj/machinery/vending/sovietsoda{ product_ads = "" }, +/obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/lounge) "cJ" = ( @@ -1444,25 +1324,18 @@ product_ads = ""; product_slogans = "" }, +/obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/lounge) "cK" = ( -/obj/machinery/airalarm/all_access{ - pixel_y = 24 - }, /obj/effect/turf_decal/stripes/white/line{ dir = 4 }, /turf/open/floor/wood, /area/shuttle/Sophie/lounge) -"cL" = ( -/obj/effect/turf_decal/bot_white, -/obj/structure/closet/cardboard, -/turf/open/floor/plasteel/dark, -/area/shuttle/Sophie/lounge) "cM" = ( /obj/effect/turf_decal/bot_white, -/obj/structure/ore_box, +/obj/structure/closet/cardboard, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/lounge) "cN" = ( @@ -1490,6 +1363,9 @@ /turf/open/floor/plating, /area/shuttle/Sophie/engine) "cP" = ( +/obj/machinery/light/small{ + dir = 8 + }, /obj/structure/cable{ icon_state = "1-2" }, @@ -1500,9 +1376,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/light/small{ - dir = 8 - }, /turf/open/floor/plasteel, /area/shuttle/Sophie/medbay) "cQ" = ( @@ -1553,7 +1426,7 @@ pixel_x = 3; pixel_y = -1 }, -/obj/machinery/cell_charger, +/obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/medbay) "cV" = ( @@ -1572,9 +1445,9 @@ /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/medbay) "cW" = ( -/obj/structure/sign/poster/official/high_class_martini, -/turf/closed/wall/mineral/titanium, -/area/shuttle/Sophie/lounge) +/obj/structure/sign/warning/electricshock, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/engine) "cX" = ( /obj/machinery/light/small{ dir = 8 @@ -1583,22 +1456,25 @@ /area/shuttle/Sophie/lounge) "cY" = ( /obj/structure/chair/sofa{ - dir = 8; - name = "comfy couch" + dir = 8 }, /obj/item/toy/plush/metha, /turf/open/floor/carpet, /area/shuttle/Sophie/lounge) "cZ" = ( /obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/drinkingglass/filled{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ list_reagents = list(/datum/reagent/consumable/ethanol/pina_colada=50) }, +/obj/machinery/computer/security/telescreen/entertainment{ + network = list("ss13"); + pixel_y = 64; + pixel_x = 96 + }, /turf/open/floor/carpet, /area/shuttle/Sophie/lounge) "da" = ( -/obj/machinery/computer/security/telescreen/entertainment, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/open/floor/wood, /area/shuttle/Sophie/lounge) "db" = ( /obj/machinery/light/small{ @@ -1628,6 +1504,9 @@ /turf/open/floor/plating, /area/shuttle/Sophie/engine) "de" = ( +/obj/machinery/door/airlock/engineering{ + name = "Engineering" + }, /obj/structure/cable{ icon_state = "4-8" }, @@ -1637,7 +1516,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/door/airlock/maintenance/external/glass, /obj/structure/fans/tiny, /turf/open/floor/plating, /area/shuttle/Sophie/engine) @@ -1678,6 +1556,9 @@ /turf/open/floor/plasteel/white, /area/shuttle/Sophie/medbay) "dj" = ( +/obj/machinery/light/small{ + dir = 1 + }, /obj/structure/cable{ icon_state = "4-8" }, @@ -1687,14 +1568,6 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/camera{ - network = list("Sophie1"); - name = "Frigate Camera"; - c_tag = Medbay - }, /turf/open/floor/plasteel/white/side{ dir = 9 }, @@ -1743,7 +1616,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 5 }, -/obj/machinery/light/small/built, +/obj/machinery/light/small, /obj/structure/cable{ icon_state = "4-8" }, @@ -1790,21 +1663,12 @@ name = "E.V.A Access" }, /obj/structure/fans/tiny, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/shuttle/Sophie/medbay) "dr" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -1822,8 +1686,6 @@ dir = 4 }, /obj/structure/chair/sofa/left{ - desc = "More inviting than the average couch."; - name = "comfy couch"; dir = 4 }, /turf/open/floor/carpet, @@ -1842,12 +1704,10 @@ dir = 8 }, /obj/structure/table/wood/fancy, -/obj/item/pizzabox/meat, +/obj/item/reagent_containers/food/snacks/pizza/meat, +/obj/item/paper/fluff/ruins/sophie, /turf/open/floor/carpet, /area/shuttle/Sophie/lounge) -"dv" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/Sophie/lounge) "dw" = ( /obj/structure/window/reinforced{ dir = 4 @@ -1869,23 +1729,20 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/door/poddoor{ - id = "whiteship_windows" - }, /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating/airless, /area/shuttle/Sophie/lounge) "dy" = ( -/obj/machinery/door/poddoor{ - id = "whiteship_windows" - }, /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating/airless, /area/shuttle/Sophie/lounge) "dz" = ( -/obj/structure/sign/poster/contraband/donut_corp, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/Sophie/kitchen) +/obj/effect/spawner/structure/window/shuttle, +/obj/machinery/door/poddoor{ + id = "whiteship_windows" + }, +/turf/open/floor/plating/airless, +/area/shuttle/Sophie/lounge) "dA" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1899,21 +1756,19 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 10 }, -/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/shuttle/Sophie/engine) "dB" = ( /obj/structure/closet/crate, /obj/item/shovel, /obj/item/pickaxe, +/obj/item/storage/box/lights/mixed, /obj/item/mining_scanner, /turf/open/floor/plating, /area/shuttle/Sophie/engine) "dC" = ( /obj/structure/chair/sofa/right{ - desc = "More inviting than the average couch."; - dir = 8; - name = "comfy couch" + dir = 8 }, /turf/open/floor/carpet, /area/shuttle/Sophie/lounge) @@ -1924,13 +1779,13 @@ /turf/open/floor/plasteel/white/side, /area/shuttle/Sophie/medbay) "dE" = ( +/obj/machinery/light/small{ + dir = 4 + }, /obj/machinery/airalarm/all_access{ dir = 8; pixel_x = 24 }, -/obj/machinery/light/small{ - dir = 4 - }, /turf/open/floor/plasteel/white/side, /area/shuttle/Sophie/medbay) "dF" = ( @@ -1959,6 +1814,9 @@ /turf/open/floor/plating, /area/shuttle/Sophie/medbay) "dJ" = ( +/obj/machinery/light/small{ + dir = 8 + }, /obj/structure/cable, /obj/machinery/power/apc{ dir = 8; @@ -1966,25 +1824,14 @@ pixel_x = -24; req_access = null }, -/obj/machinery/light/small{ - dir = 8 - }, /turf/open/floor/wood, /area/shuttle/Sophie/lounge) "dK" = ( /obj/structure/chair/sofa{ - dir = 4; - name = "comfy couch" + dir = 4 }, /turf/open/floor/carpet, /area/shuttle/Sophie/lounge) -"dL" = ( -/turf/open/floor/wood, -/area/shuttle/Sophie/lounge) -"dM" = ( -/obj/structure/sign/warning/docking, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/Sophie/crew) "dN" = ( /obj/structure/table, /obj/item/reagent_containers/glass/bottle/epinephrine{ @@ -2043,12 +1890,6 @@ pixel_x = 3; pixel_y = 3 }, -/obj/machinery/camera{ - network = list("Sophie1"); - name = "Frigate Camera"; - dir = 4; - c_tag = Starboard Airlock - }, /turf/open/floor/plating, /area/shuttle/Sophie/medbay) "dT" = ( @@ -2085,21 +1926,18 @@ /area/shuttle/Sophie/lounge) "dW" = ( /obj/structure/chair/sofa/corner{ - name = "comfy couch"; dir = 4 }, /turf/open/floor/carpet, /area/shuttle/Sophie/lounge) "dX" = ( /obj/structure/chair/sofa{ - dir = 1; - name = "comfy couch" + dir = 1 }, /turf/open/floor/carpet, /area/shuttle/Sophie/lounge) "dY" = ( /obj/structure/chair/sofa/corner{ - name = "comfy couch"; dir = 8 }, /turf/open/floor/carpet, @@ -2112,6 +1950,7 @@ "ea" = ( /obj/effect/turf_decal/bot_white, /obj/structure/reagent_dispensers/fueltank, +/obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/lounge) "eb" = ( @@ -2122,22 +1961,25 @@ }, /turf/open/floor/plating, /area/shuttle/Sophie/medbay) -"fl" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/shuttle/Sophie/bridge) -"hH" = ( -/obj/structure/sign/poster/contraband/red_rum, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/Sophie/kitchen) "iM" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/Sophie/medbay) +"lg" = ( +/obj/effect/turf_decal/bot_white, +/obj/structure/ore_box, +/turf/open/floor/plasteel/dark, +/area/shuttle/Sophie/lounge) +"oh" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar, +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) "oo" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2148,36 +1990,64 @@ }, /turf/open/floor/plasteel, /area/shuttle/Sophie/crew) -"qB" = ( -/obj/structure/sign/poster/contraband/eat, +"vl" = ( +/obj/structure/sign/poster/contraband/red_rum, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/Sophie/lounge) -"tp" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/turf/open/floor/wood, -/area/shuttle/Sophie/lounge) +/area/shuttle/Sophie/kitchen) "vm" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/Sophie/medbay) -"xD" = ( -/obj/structure/sign/warning/nosmoking/circle, +"yR" = ( +/obj/structure/sign/poster/contraband/donut_corp, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/Sophie/bridge) +/area/shuttle/Sophie/kitchen) +"Cn" = ( +/obj/structure/sign/poster/official/fruit_bowl, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/lounge) "DZ" = ( /obj/effect/turf_decal/delivery/white, /obj/machinery/suit_storage_unit/standard_unit, /turf/open/floor/plasteel/dark, /area/shuttle/Sophie/medbay) -"Fd" = ( +"El" = ( /obj/structure/sign/poster/official/bless_this_spess, /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/Sophie) +"GU" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/bridge) +"HN" = ( +/obj/structure/sign/barsign, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/lounge) +"ID" = ( +/obj/structure/sign/poster/contraband/eat, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/lounge) +"IY" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/closet/secure_closet/freezer/meat, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"Sh" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/reagentgrinder, +/obj/item/reagent_containers/food/drinks/shaker{ + pixel_x = -7 + }, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) "SY" = ( /obj/effect/spawner/structure/window/shuttle, /obj/machinery/door/poddoor{ @@ -2185,21 +2055,38 @@ }, /turf/open/floor/plating, /area/shuttle/Sophie/medbay) +"UC" = ( +/obj/structure/sign/poster/official/high_class_martini, +/turf/closed/wall/mineral/titanium, +/area/shuttle/Sophie/lounge) +"Vg" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks, +/turf/open/floor/plasteel, +/area/shuttle/Sophie/kitchen) +"Xd" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/Sophie/crew) (1,1,1) = {" aa aa aa aa -cn -ay -aM -ah -aH ah ay aM -cn +ah +be +ah +ay +aM +ah aa aa aa @@ -2207,21 +2094,21 @@ aa "} (2,1,1) = {" aa -cn +ah ay aM ai az az ai -bG -cc +bD +cW az az ai ay aM -cn +ah aa "} (3,1,1) = {" @@ -2233,7 +2120,7 @@ ai by bP bV -aK +cc ck cs cB @@ -2249,13 +2136,13 @@ ai aA aN bk -bz +cd bQ -bz +cd cd cl -bz -bz +cd +cd cN dc dA @@ -2269,7 +2156,7 @@ aB dd bl bA -xD +bB bB bB bB @@ -2325,13 +2212,13 @@ aj aC aR bo -bD +GU bS -fl -cg bY +cg +co cu -bD +GU cQ dg dE @@ -2382,9 +2269,9 @@ al aE oo bp -bF -bF -bF +ca +ca +ca bM cq cq @@ -2421,11 +2308,11 @@ aF aV ac bH -co -cy -Fd -cy -co +ab +bG +El +bG +ab cF cR dm @@ -2439,13 +2326,13 @@ ac ac aJ ac -co +ab cw aa aa aa cw -co +ab vm dq vm @@ -2453,9 +2340,9 @@ vm vm "} (15,1,1) = {" -dM +ac an -be +Xd aX br ac @@ -2467,9 +2354,9 @@ aa vm cU dn -ca +bu dS -aI +vm "} (16,1,1) = {" ad @@ -2491,9 +2378,9 @@ dT eb "} (17,1,1) = {" -dM ac -be +ac +Xd aZ bt ac @@ -2505,9 +2392,9 @@ aa vm cV dp -ca +bu +vm vm -aI "} (18,1,1) = {" ae @@ -2521,16 +2408,16 @@ aa aa aa cx -dv -cW +cy +UC dr -dv +cy dU -dv +cy "} (19,1,1) = {" -hH -ab +vl +Sh at ba bd @@ -2539,20 +2426,20 @@ ae aa aa aa -dv +cy cG cX dt dJ dV -dv +cy "} (20,1,1) = {" af aq -bf +ar bb -bf +ar bJ af aa @@ -2560,7 +2447,7 @@ aa aa cz cH -dL +da ds dK dW @@ -2568,65 +2455,65 @@ cz "} (21,1,1) = {" ae +Vg ar -bf bc -bf +ar bK ae aa aa aa -bj +Cn cI -dL +da du cZ dX -bu +HN "} (22,1,1) = {" ae as -bf -bf -bf +ar +ar +ar bL ae aa aa aa -dv +cy cJ -dL +da dC cY dY -dv +cy "} (23,1,1) = {" ae -cC -aL -bf -bx au +bx +bf +oh +IY ae aa aa aa -dv +cy cK db -dL +da db -tp -dv +cK +cy "} (24,1,1) = {" af av -dz +yR bg ae bN @@ -2635,10 +2522,10 @@ aa aa aa cz -cL -da +cM +cy dw -qB +ID dZ cz "} @@ -2653,13 +2540,13 @@ ae aa aa aa -dv -cM -dv +cy +lg +cy dx -dv +cy ea -dv +cy "} (26,1,1) = {" ag @@ -2673,18 +2560,18 @@ aa aa aa cA -dv -dv +cy +cy dy -dv -dv +cy +cy cA "} (27,1,1) = {" aa ax ae -bi +bj ae ax aa @@ -2693,9 +2580,9 @@ aa aa aa cx -dv -dy -dv +cy +dz +cy cx aa "} diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 7ecbe59b..5612ec68 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -29,7 +29,7 @@ height = 17; id = "whiteship"; launch_status = 0; - movement_force = list("KNOCKDOWN" = 0, "THROW" = 0); + movement_force = list("KNOCKDOWN"=0,"THROW"=0); name = "NT Frigate"; port_direction = 8; preferred_direction = 4; diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index 4637decc..91dc5957 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -97,7 +97,7 @@ name = "Sophie's Ship" blob_allowed = FALSE requires_power = TRUE - canSmoothWithAreas = /area/shuttle/abandoned + canSmoothWithAreas = /area/shuttle/Sophie /area/shuttle/Sophie/bridge name = "Sophie's Ship Bridge" diff --git a/code/modules/shuttle/white_ship.dm b/code/modules/shuttle/white_ship.dm index f25fe30f..5cdb12a5 100644 --- a/code/modules/shuttle/white_ship.dm +++ b/code/modules/shuttle/white_ship.dm @@ -54,3 +54,8 @@ loot = list(/obj/mecha/working/ripley/mining = 1, /obj/structure/mecha_wreckage/ripley = 5) lootdoubles = FALSE + +/obj/item/paper/fluff/ruins/sophie + name = "Handwritten note" + + info = "Hello, if you are reading this, you've must have come across my ship.
You're welcome to borrow it to get about if its an emergency. Just plase dont leave it an mess.
- Sophie Johnson (HoP of General Station 13)" From 50427020182b692b9b31e4f61ff8bc5baaf52fb6 Mon Sep 17 00:00:00 2001 From: SomeGuyEatingPie <94908713+SomeGuyEatingPie@users.noreply.github.com> Date: Sat, 2 Jul 2022 19:49:43 +0100 Subject: [PATCH 3/3] Remove edits for testing Forgot to remove an edit I made for testing --- code/modules/shuttle/shuttle.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 70f395ec..06beeb6d 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -247,8 +247,7 @@ dwidth = 11 height = 22 width = 35 - //shuttlekeys = list("whiteship_meta", "whiteship_pubby", "whiteship_box", "whiteship_cere", "whiteship_kilo", "whiteship_donut", "whiteship_delta", "whiteship_Sophie1") - shuttlekeys = list("whiteship_Sophie1") + shuttlekeys = list("whiteship_meta", "whiteship_pubby", "whiteship_box", "whiteship_cere", "whiteship_kilo", "whiteship_donut", "whiteship_delta", "whiteship_Sophie1") /obj/docking_port/mobile name = "shuttle"