diff --git a/code/modules/events/morph_spawn_vr.dm b/code/modules/events/morph_spawn_vr.dm index f0ef0b95c93..609afe073f8 100644 --- a/code/modules/events/morph_spawn_vr.dm +++ b/code/modules/events/morph_spawn_vr.dm @@ -14,7 +14,8 @@ if(possibleSpawnspots.len) spawnspot = pick(possibleSpawnspots) else - break + kill() // To prevent fake announcements + return if(!spawnspot) kill() // To prevent fake announcements @@ -32,7 +33,8 @@ You are wary of environment around you, but your primal hunger still calls for you to find prey. Seek a convincing disguise, \ using your amorphous form to traverse vents to find and consume weak prey.") to_chat(D, "You can use shift + click on objects to disguise yourself as them, but your strikes are nearly useless when you are disguised. \ - You can undisguise yourself by shift + clicking yourself, but disguise being switched, or turned on and off has a short cooldown.") + You can undisguise yourself by shift + clicking yourself, but disguise being switched, or turned on and off has a short cooldown. You can also ventcrawl, \ + by using alt + click on the vent or scrubber.") newMorph.ckey = D.ckey newMorph.visible_message("A morph appears to crawl out of somewhere.") else diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 2a5c898619c..dfcb366bbe6 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -6036,6 +6036,9 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, +/obj/effect/landmark{ + name = "morphspawn" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "akG" = ( @@ -7014,9 +7017,6 @@ dir = 6 }, /obj/machinery/light, -/obj/effect/landmark{ - name = "morphspawn" - }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/public_garden_one) "ami" = ( @@ -21915,6 +21915,9 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, +/obj/effect/landmark{ + name = "morphspawn" + }, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/xenobiology/xenoflora_storage) "aJC" = ( @@ -21926,9 +21929,6 @@ dir = 4; pixel_x = 24 }, -/obj/effect/landmark{ - name = "morphspawn" - }, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/xenobiology/xenoflora_storage) "aJD" = ( @@ -30656,9 +30656,6 @@ icon_state = "tube-construct-stage1"; dir = 1 }, -/obj/effect/landmark{ - name = "morphspawn" - }, /turf/simulated/floor/wood, /area/vacant/vacant_bar) "aZJ" = ( @@ -32146,6 +32143,9 @@ pixel_x = -23; pixel_y = 0 }, +/obj/effect/landmark{ + name = "morphspawn" + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "bcJ" = ( diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index e84f70d1eb8..1542fcf9a01 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -12704,10 +12704,21 @@ /turf/simulated/floor/plating, /area/engineering/atmos/storage) "ayf" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/engineering/atmos/storage) +/obj/machinery/alarm{ + pixel_x = 0; + pixel_y = 28 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/paramed) "ayg" = ( /obj/effect/floor_decal/rust, /obj/effect/decal/cleanable/dirt, @@ -16205,15 +16216,13 @@ /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "aDV" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 1 - }, -/obj/machinery/computer/cryopod/robot{ - pixel_y = -32 +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark{ + name = "morphspawn" }, /turf/simulated/floor/plating, -/area/engineering/drone_fabrication) +/area/engineering/atmos/storage) "aDW" = ( /obj/effect/floor_decal/industrial/warning/corner{ icon_state = "warningcorner"; @@ -21500,6 +21509,19 @@ /obj/machinery/camera/network/command, /turf/simulated/floor/tiled/dark, /area/bridge_hallway) +"aOp" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/obj/machinery/computer/cryopod/robot{ + pixel_y = -32 + }, +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/plating, +/area/engineering/drone_fabrication) "aOq" = ( /obj/structure/grille, /obj/structure/window/phoronreinforced/full, @@ -22423,19 +22445,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/paramed) -"aPX" = ( -/obj/machinery/alarm{ - pixel_x = 0; - pixel_y = 28 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/paramed) "aPY" = ( /obj/machinery/power/apc{ dir = 1; @@ -38979,7 +38988,7 @@ aBZ aDc aDv aDL -aDV +aOp aAT aED aEp @@ -41185,7 +41194,7 @@ aab aab aac aNz -aPX +ayf aQv aan aaz @@ -41524,7 +41533,7 @@ avf avO awE axu -ayf +aDV avK azC aAx diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 0de805b12b2..7a36ae7a7a8 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -554,12 +554,17 @@ /turf/simulated/floor/wood, /area/maintenance/lower/medsec_maintenance) "abn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/medical/triage) "abo" = ( /obj/structure/bed/chair{ dir = 4 @@ -6421,14 +6426,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aky" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/medsec_maintenance) "akz" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -8497,6 +8503,9 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "aog" = ( +/obj/effect/landmark{ + name = "morphspawn" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) "aoh" = ( @@ -12224,11 +12233,17 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) "auy" = ( -/obj/effect/landmark{ - name = "droppod_landing" +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/outdoors/grass/sif/virgo3b, -/area/tether/surfacebase/outside/outside3) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/recreation_area_restroom) "auz" = ( /obj/item/device/radio/intercom{ dir = 1; @@ -26648,14 +26663,10 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "aSu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/tether/surfacebase/medical/triage) +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether/surface) "aSv" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -27926,10 +27937,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "aUu" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether/surface) +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/shuttle_pad) "aUx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -36602,7 +36614,7 @@ aac aac aac aac -auy +aac aac aac aac @@ -40286,7 +40298,7 @@ app ajR aiD afj -aky +auy agF afP awM @@ -41759,7 +41771,7 @@ aac aac aac aac -auy +aac aac aac aac @@ -43663,7 +43675,7 @@ aac aac aac aaF -abn +aky abS acy adb @@ -44877,7 +44889,7 @@ aOv aKg aKj aPt -aPM +aUu aKj aKj aac @@ -45579,7 +45591,7 @@ aNk aNl aNJ aNP -aUu +aSu aKU abg aOk @@ -45649,7 +45661,7 @@ aab aaq aag aSo -aSu +abn aaz aca aca @@ -45721,7 +45733,7 @@ aNl aNl aNK aNP -aUu +aSu aKU abg aOk @@ -45863,7 +45875,7 @@ aNm aNl aNK aNP -aUu +aSu aKU abg aOk diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index aee79cfcdbf..c4c47ff7615 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -15561,14 +15561,22 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "aAM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/structure/mirror{ + dir = 4; + pixel_x = 28; + pixel_y = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/sink{ + dir = 4; + icon_state = "sink"; + pixel_x = 11; + pixel_y = 0 }, -/turf/simulated/floor/tiled, -/area/tether/station/visitorhallway/laundry) +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/engi_wash) "aAN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16375,6 +16383,17 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) +"aCm" = ( +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_one) "aCn" = ( /obj/machinery/camera/network/civilian{ dir = 4 @@ -17904,6 +17923,35 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +"aEB" = ( +/obj/structure/sink{ + dir = 4; + icon_state = "sink"; + pixel_x = 11; + pixel_y = 0 + }, +/obj/structure/mirror{ + dir = 4; + pixel_x = 28; + pixel_y = 0 + }, +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) +"aEC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled, +/area/tether/station/visitorhallway/laundry) "aEE" = ( /obj/structure/toilet{ dir = 4 @@ -18247,20 +18295,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"aGx" = ( -/obj/structure/mirror{ - dir = 4; - pixel_x = 28; - pixel_y = 0 - }, -/obj/structure/sink{ - dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/engi_wash) "aGy" = ( /obj/structure/cable{ d1 = 1; @@ -21742,14 +21776,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"bou" = ( -/obj/machinery/alarm{ - dir = 8; - icon_state = "alarm0"; - pixel_x = 24 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_one) "bpd" = ( /obj/structure/cable/green{ d1 = 4; @@ -30226,7 +30252,7 @@ axu axv aws azN -bou +aCm aDa aws aBb @@ -31485,7 +31511,7 @@ auz aBE aLj aEM -aGx +aAM aIn aKl aMp @@ -33087,7 +33113,7 @@ aEj azK azU aAd -aAM +aEC aBe aBj ahW @@ -37472,7 +37498,7 @@ aex aAk brX btr -bvs +aEB aCD bvs amU diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 9b9585618f7..fea2bb4960d 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -2056,6 +2056,9 @@ /obj/machinery/alarm{ pixel_y = 22 }, +/obj/effect/landmark{ + name = "morphspawn" + }, /turf/simulated/floor/tiled/dark, /area/security/recstorage) "cW" = ( @@ -8629,19 +8632,12 @@ /turf/simulated/floor/tiled/dark, /area/storage/tech) "mE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/hologram/holopad, +/obj/effect/landmark{ + name = "morphspawn" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, -/area/storage/tech) +/turf/simulated/floor/tiled/techfloor, +/area/ai_server_room) "mF" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/highsecurity{ @@ -11569,9 +11565,22 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "rf" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled/techfloor, -/area/ai_server_room) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled/dark, +/area/storage/tech) "rg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -15190,6 +15199,9 @@ dir = 4 }, /obj/effect/floor_decal/techfloor, +/obj/effect/landmark{ + name = "morphspawn" + }, /turf/simulated/floor/tiled/dark, /area/medical/resleeving) "wZ" = ( @@ -15658,6 +15670,12 @@ /obj/structure/railing, /turf/simulated/floor, /area/maintenance/station/medbay) +"xJ" = ( +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled/white, +/area/medical/recoveryrestroom) "xK" = ( /obj/item/clothing/suit/straight_jacket, /obj/item/clothing/mask/muzzle, @@ -27879,7 +27897,7 @@ aP aP lv ej -mE +rf pA nY aP @@ -33595,7 +33613,7 @@ BM Cf Cz CM -Ce +xJ EG EQ aa @@ -36254,7 +36272,7 @@ iK dZ hh mV -rf +mE ng hh lm diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index c6db32e214c..8c595b8e82c 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2492,6 +2492,9 @@ icon_state = "intact-scrubbers"; dir = 4 }, +/obj/effect/landmark{ + name = "morphspawn" + }, /turf/simulated/floor/tiled, /area/security/eva) "dY" = ( @@ -2819,10 +2822,20 @@ /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "ew" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/tether) +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled/white, +/area/security/security_bathroom) "ex" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -6344,11 +6357,10 @@ /turf/simulated/floor/tiled, /area/security/hallwayaux) "jV" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/maintenance/station/cargo) +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/excursion/tether) "jW" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -26355,13 +26367,11 @@ /turf/simulated/floor/bluegrid, /area/ai_core_foyer) "OY" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_l" +/obj/effect/landmark{ + name = "morphspawn" }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1/station) +/turf/simulated/floor/tiled/dark, +/area/security/nuke_storage) "OZ" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -26972,12 +26982,14 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "Qg" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 +/obj/machinery/light/small{ + dir = 1 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1/station) +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled, +/area/maintenance/station/cargo) "Qh" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/vehicle/train/trolley{ @@ -27080,9 +27092,22 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "Qp" = ( +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/medical_restroom) +"Qq" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; - icon_state = "propulsion_r" + icon_state = "propulsion_l" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1/station) +"Qr" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, @@ -27106,6 +27131,14 @@ "Qt" = ( /turf/simulated/wall, /area/tether/exploration) +"Qu" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_r" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1/station) "Qw" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -28850,18 +28883,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"VJ" = ( -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/turf/simulated/floor/tiled/white, -/area/security/security_bathroom) "VK" = ( /obj/structure/table/woodentable, /obj/machinery/light{ @@ -34292,7 +34313,7 @@ vt xw xw zg -zT +OY Bc BX PA @@ -36019,7 +36040,7 @@ KE KE KE MP -Nl +Qp KE ab ab @@ -39092,7 +39113,7 @@ dS dd SX ST -VJ +ew UT fb UV @@ -39288,11 +39309,11 @@ MK Iy ab NL -OY -Qg -Qg -Qg -Qp +Qq +Qr +Qr +Qr +Qu NL vt vt @@ -40515,7 +40536,7 @@ Zy WG dj XA -ew +jV ms Oz be @@ -40540,7 +40561,7 @@ he xS un AH -jV +Qg yP AH Ai @@ -40657,7 +40678,7 @@ UJ Xb dj XN -ew +jV ms Xq be @@ -40799,7 +40820,7 @@ iW WS dj XN -ew +jV ms Xq be @@ -41082,7 +41103,7 @@ jZ WR Xo XN -ew +jV cK ms Xq @@ -41650,7 +41671,7 @@ ea kx dj XN -ew +jV cK ms mq @@ -41935,7 +41956,7 @@ kQ TG dj XN -ew +jV ms mq be @@ -42077,7 +42098,7 @@ kR Vd dj XN -ew +jV ms QL be @@ -42219,7 +42240,7 @@ ZE ZB dj XB -ew +jV ms Sq be