diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm index 7cbee23c98..16cfb6a9e4 100644 --- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/DJstation.dmm @@ -372,6 +372,10 @@ /obj/structure/disposaloutlet, /turf/open/floor/plating/airless, /area/space/nearstation) +"nZ" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/space/djstation) "Co" = ( /obj/machinery/door/airlock/external{ name = "Ruskie DJ Station" @@ -551,7 +555,7 @@ aw aw aw aw -af +nZ af af aa diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index c446f3c652..601e3c4795 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -4567,6 +4567,10 @@ icon_state = "damaged2" }, /area/ruin/space/derelict/singularity_engine) +"Yy" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/space/derelict/hallway/primary) "ZB" = ( /obj/structure/lattice, /turf/template_noop, @@ -11294,7 +11298,7 @@ cs fZ fZ fZ -fZ +Yy fZ hD gL diff --git a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm index 1681cf1e55..ddfebf4855 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm @@ -132,6 +132,10 @@ }, /turf/open/floor/plating/airless, /area/ruin/space/abandoned_tele) +"R" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/r_wall, +/area/ruin/space/abandoned_tele) (1,1,1) = {" a @@ -306,7 +310,7 @@ a a b b -b +R b b a diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index c6ce7bc4ec..701eec926a 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -839,6 +839,10 @@ "bX" = ( /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) +"kJ" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/r_wall, +/area/ruin/space/has_grav/abandonedzoo) "lo" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -993,7 +997,7 @@ aa at at aF -at +kJ aU ay ay diff --git a/_maps/RandomRuins/SpaceRuins/advancedlab.dmm b/_maps/RandomRuins/SpaceRuins/advancedlab.dmm index c12458ed16..87f9d0b9af 100644 --- a/_maps/RandomRuins/SpaceRuins/advancedlab.dmm +++ b/_maps/RandomRuins/SpaceRuins/advancedlab.dmm @@ -279,6 +279,10 @@ }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/advancedlab) +"W" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/space/has_grav/powered/advancedlab) (1,1,1) = {" a @@ -448,7 +452,7 @@ f f f f -b +W b b b diff --git a/_maps/RandomRuins/SpaceRuins/arcade.dmm b/_maps/RandomRuins/SpaceRuins/arcade.dmm index c68d3b224e..ba77d05e8c 100644 --- a/_maps/RandomRuins/SpaceRuins/arcade.dmm +++ b/_maps/RandomRuins/SpaceRuins/arcade.dmm @@ -158,6 +158,10 @@ /obj/item/gun/energy/pumpaction/toy, /turf/open/floor/engine, /area/ruin/powered) +"P" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/mineral/titanium/survival/pod, +/area/ruin/powered) (1,1,1) = {" a @@ -430,7 +434,7 @@ b c c c -d +P f l r diff --git a/_maps/RandomRuins/SpaceRuins/augmentationfacility.dmm b/_maps/RandomRuins/SpaceRuins/augmentationfacility.dmm index 2a25a3b6e7..d37a2a9e44 100644 --- a/_maps/RandomRuins/SpaceRuins/augmentationfacility.dmm +++ b/_maps/RandomRuins/SpaceRuins/augmentationfacility.dmm @@ -288,6 +288,10 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel, /area/ruin/powered) +"Y" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/r_wall/rust, +/area/ruin/powered) (1,1,1) = {" a @@ -492,7 +496,7 @@ a b c c -d +Y i p s diff --git a/_maps/RandomRuins/SpaceRuins/bigape.dmm b/_maps/RandomRuins/SpaceRuins/bigape.dmm index 93583e8ebf..a4301aaeec 100644 --- a/_maps/RandomRuins/SpaceRuins/bigape.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigape.dmm @@ -71,6 +71,11 @@ /obj/item/grown/bananapeel, /turf/open/floor/plating/beach/sand, /area/ruin/powered) +"J" = ( +/obj/structure/fans/tiny/invisible, +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/open/floor/plating/beach/sand, +/area/ruin/powered) (1,1,1) = {" a @@ -102,7 +107,7 @@ a b b g -d +J d b b diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index b78380e642..13e6fe7173 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -1894,6 +1894,10 @@ }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost) +"Cx" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/space/has_grav/derelictoutpost/cargostorage) "CH" = ( /obj/structure/alien/weeds{ color = "#4BAE56"; @@ -2877,7 +2881,7 @@ nD ab rY cm -dL +Cx eb dW es diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm index 2f5c14191b..4924c3ea3e 100644 --- a/_maps/RandomRuins/SpaceRuins/bus.dmm +++ b/_maps/RandomRuins/SpaceRuins/bus.dmm @@ -334,6 +334,10 @@ /obj/item/stack/sheet/metal/fifty, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) +"uJ" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/mineral/ash_rock, +/area/ruin/unpowered/no_grav) "XA" = ( /obj/structure/fluff/bus/passable/seat{ icon_state = "backseat" @@ -549,7 +553,7 @@ aa ab ab ab -ab +uJ ab ab ad diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm index 0dd669aafc..9e73cb13c4 100644 --- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm +++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm @@ -1325,6 +1325,10 @@ }, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter2) +"IG" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/mineral/random, +/area/ruin/unpowered) (1,1,1) = {" aa @@ -5236,7 +5240,7 @@ aa bt bt bt -bt +IG bt aa aa diff --git a/_maps/RandomRuins/SpaceRuins/clericden.dmm b/_maps/RandomRuins/SpaceRuins/clericden.dmm index 7e75689ac6..4d2ddf5bba 100644 --- a/_maps/RandomRuins/SpaceRuins/clericden.dmm +++ b/_maps/RandomRuins/SpaceRuins/clericden.dmm @@ -196,6 +196,10 @@ /obj/item/paper/fluff/ruins/clericsden/warning, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) +"W" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/unpowered/no_grav) (1,1,1) = {" a @@ -423,7 +427,7 @@ a e e d -d +W e O d diff --git a/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm b/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm index e9167a6a25..fb6291a9fe 100644 --- a/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm +++ b/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm @@ -339,6 +339,10 @@ "V" = ( /turf/closed/wall/r_wall/rust, /area/space/nearstation) +"Z" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/r_wall/rust, +/area/ruin/space/has_grav/powered/ancient_shuttle) (1,1,1) = {" a @@ -432,7 +436,7 @@ a a a d -d +Z H b b diff --git a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm index 3adef24b4e..f1a84270b5 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm @@ -157,6 +157,10 @@ /obj/item/shovel, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) +"I" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/mineral/random, +/area/ruin/unpowered/no_grav) (1,1,1) = {" a @@ -413,7 +417,7 @@ b c b b -b +I b b b diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index c0e0d1e0b0..a4d4265acc 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -2456,6 +2456,10 @@ /obj/structure/lattice, /turf/template_noop, /area/awaymission/BMPship/Midship) +"RA" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/mineral/random, +/area/awaymission/BMPship) (1,1,1) = {" aa @@ -3661,7 +3665,7 @@ ce ce aq gb -gb +RA gb gb gb diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index ea821570bd..6161296f2a 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -3314,6 +3314,10 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/crusher) +"Qz" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/mineral/iron, +/area/ruin/space/has_grav/deepstorage/kitchen) (1,1,1) = {" aa @@ -4582,7 +4586,7 @@ aN bb bw bM -af +Qz cq cM cX diff --git a/_maps/RandomRuins/SpaceRuins/derelict1.dmm b/_maps/RandomRuins/SpaceRuins/derelict1.dmm index 123f49eff7..de91e02c0f 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict1.dmm @@ -87,6 +87,10 @@ /obj/item/organ/alien/plasmavessel/small, /turf/open/floor/plating/airless, /area/ruin/unpowered) +"O" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/unpowered) (1,1,1) = {" a @@ -873,7 +877,7 @@ c c f n -c +O c c q diff --git a/_maps/RandomRuins/SpaceRuins/derelict2.dmm b/_maps/RandomRuins/SpaceRuins/derelict2.dmm index 61c0913ac6..24402a3d0e 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict2.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict2.dmm @@ -113,6 +113,10 @@ /obj/machinery/light/small, /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered/dinner_for_two) +"I" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/space/has_grav/powered/dinner_for_two) (1,1,1) = {" a @@ -329,7 +333,7 @@ a a a a -f +I j i i diff --git a/_maps/RandomRuins/SpaceRuins/derelict3.dmm b/_maps/RandomRuins/SpaceRuins/derelict3.dmm index 37b726dc75..467d146bca 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict3.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict3.dmm @@ -17,6 +17,10 @@ /obj/structure/lattice, /turf/template_noop, /area/space/nearstation) +"A" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/unpowered/no_grav) (1,1,1) = {" a @@ -930,7 +934,7 @@ b b b c -c +A c c b diff --git a/_maps/RandomRuins/SpaceRuins/derelict4.dmm b/_maps/RandomRuins/SpaceRuins/derelict4.dmm index 5aeb872327..02d1192d59 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict4.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict4.dmm @@ -89,6 +89,10 @@ /obj/structure/girder, /turf/open/floor/plating/airless, /area/ruin/unpowered) +"S" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/mineral, +/area/ruin/unpowered) (1,1,1) = {" a @@ -517,7 +521,7 @@ b b b b -b +S b b d diff --git a/_maps/RandomRuins/SpaceRuins/derelict5.dmm b/_maps/RandomRuins/SpaceRuins/derelict5.dmm index 93486d1056..37a27970d1 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict5.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict5.dmm @@ -72,6 +72,10 @@ /obj/machinery/door/airlock/external, /turf/open/floor/plating, /area/ruin/unpowered) +"V" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/unpowered) (1,1,1) = {" a @@ -769,7 +773,7 @@ j f f e -e +V p l e diff --git a/_maps/RandomRuins/SpaceRuins/derelict6.dmm b/_maps/RandomRuins/SpaceRuins/derelict6.dmm index 0a53b517d6..b947251f8a 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict6.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict6.dmm @@ -516,6 +516,10 @@ }, /turf/template_noop, /area/ruin/unpowered) +"BF" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/unpowered) (1,1,1) = {" aa @@ -803,7 +807,7 @@ ag ag ag ag -ai +BF ai aS aW diff --git a/_maps/RandomRuins/SpaceRuins/emptyshell.dmm b/_maps/RandomRuins/SpaceRuins/emptyshell.dmm index 7cbaa3a0b6..1e8646351c 100644 --- a/_maps/RandomRuins/SpaceRuins/emptyshell.dmm +++ b/_maps/RandomRuins/SpaceRuins/emptyshell.dmm @@ -57,6 +57,10 @@ /obj/structure/lattice, /turf/template_noop, /area/space/nearstation) +"V" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/r_wall, +/area/ruin/unpowered) (1,1,1) = {" a @@ -215,7 +219,7 @@ a b a c -c +V d d d diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm index b82f89d087..04745fa56b 100644 --- a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm +++ b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm @@ -364,6 +364,10 @@ "W" = ( /turf/open/floor/plating, /area/ruin/space/has_grav/gasthelizard) +"Y" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/space/has_grav/gasthelizard) "Z" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -584,7 +588,7 @@ a a b c -c +Y c c c diff --git a/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm index ab5086e534..b0fb9c22c2 100644 --- a/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm +++ b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm @@ -82,6 +82,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating/asteroid/airless, /area/ruin/space/has_grav) +"L" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/mineral/random, +/area/ruin/space/has_grav) "T" = ( /obj/machinery/door/airlock/survival_pod/glass{ dir = 4 @@ -622,7 +626,7 @@ b b b b -b +L b b b diff --git a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm index d8677f11d8..31fbf7bbe2 100644 --- a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm +++ b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm @@ -201,6 +201,10 @@ initial_gas_mix = "TEMP=2.7" }, /area/ruin/unpowered/no_grav) +"S" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/r_wall/rust, +/area/ruin/space/has_grav/hilbertresearchfacility) "U" = ( /turf/open/floor/plasteel/stairs/medium{ initial_gas_mix = "TEMP=2.7" @@ -357,7 +361,7 @@ a a b c -c +S c c c diff --git a/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm b/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm index 9bb394663a..dbab0e2984 100644 --- a/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm +++ b/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm @@ -145,6 +145,10 @@ /obj/structure/bed, /turf/open/floor/mineral/titanium/purple, /area/ruin/space/has_grav/powered/authorship) +"X" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/space/has_grav/powered/authorship) (1,1,1) = {" a @@ -193,7 +197,7 @@ c p t p -c +X A n c diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index a4d5564ca3..945c3cf88d 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -2098,6 +2098,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 6 }, +/obj/machinery/spaceship_navigation_beacon/invion, /turf/closed/wall, /area/ruin/space/has_grav/listeningstation) "RA" = ( diff --git a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm index dbe8722b83..11d7646000 100644 --- a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm +++ b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm @@ -59,6 +59,10 @@ }, /turf/open/floor/mineral/titanium/blue, /area/ruin/space/has_grav/powered/mechtransport) +"o" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/mineral/titanium, +/area/ruin/space/has_grav/powered/mechtransport) "p" = ( /obj/machinery/door/airlock/hatch{ name = "Cockpit"; @@ -320,7 +324,7 @@ X b d d -d +o u A y diff --git a/_maps/RandomRuins/SpaceRuins/miracle.dmm b/_maps/RandomRuins/SpaceRuins/miracle.dmm index ba22f46236..8a77885868 100644 --- a/_maps/RandomRuins/SpaceRuins/miracle.dmm +++ b/_maps/RandomRuins/SpaceRuins/miracle.dmm @@ -1,6 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /obj/item/storage/backpack/satchel/flat/secret/miracle_ruin, +/obj/machinery/spaceship_navigation_beacon/invion, /turf/open/floor/fakespace{ initial_gas_mix = "TEMP=2.7" }, diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm index 9ac2fed86f..3465f024ea 100644 --- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm +++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm @@ -928,6 +928,10 @@ /obj/item/organ/tail/cat, /turf/open/floor/plasteel/freezer, /area/ruin/space/has_grav/powered/cat_man) +"qI" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/space/has_grav/powered/cat_man) "Bl" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -1690,7 +1694,7 @@ aa aa ab ab -ad +qI ad ad ad diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm index f54cf1b062..9079cc3cb5 100644 --- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm @@ -905,6 +905,10 @@ /obj/machinery/teleport/hub, /turf/open/floor/plating, /area/tcommsat/chamber) +"iO" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/r_wall, +/area/tcommsat/chamber) (1,1,1) = {" aa @@ -3061,7 +3065,7 @@ ag ag ag ag -ag +iO aT bc bs diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index f2c7d6c59b..60f947be89 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -5057,6 +5057,10 @@ }, /turf/open/floor/plasteel/white, /area/ruin/space/has_grav/ancientstation) +"TY" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/template_noop, +/area/template_noop) "Un" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7907,7 +7911,7 @@ cX bD aa aa -aa +TY bD fQ gI diff --git a/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm b/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm index 0ff8aaf97d..5b4568d4ce 100644 --- a/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm @@ -68,6 +68,10 @@ }, /turf/open/floor/plasteel/airless, /area/ruin/space/oldteleporter) +"o" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/r_wall, +/area/ruin/space/oldteleporter) (1,1,1) = {" a @@ -146,7 +150,7 @@ a b b d -d +o g e l diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm index 42185f116b..39f1215a0a 100644 --- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm @@ -1209,6 +1209,10 @@ }, /turf/template_noop, /area/template_noop) +"Cu" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/space/has_grav/onehalf/drone_bay) "Ky" = ( /turf/template_noop, /area/space/nearstation) @@ -1774,7 +1778,7 @@ aa aa ar ar -ar +Cu bs bH ar diff --git a/_maps/RandomRuins/SpaceRuins/originalcontent.dmm b/_maps/RandomRuins/SpaceRuins/originalcontent.dmm index 2945a06b25..e406573177 100644 --- a/_maps/RandomRuins/SpaceRuins/originalcontent.dmm +++ b/_maps/RandomRuins/SpaceRuins/originalcontent.dmm @@ -913,6 +913,10 @@ }, /turf/open/indestructible/paper, /area/ruin/powered) +"Mh" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/open/indestructible/paper, +/area/ruin/powered) "Ns" = ( /obj/item/paper/secretrecipe, /turf/open/indestructible/paper, @@ -1561,7 +1565,7 @@ af af af af -af +Mh af af al diff --git a/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm b/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm index 347d0a093f..163eb253a1 100644 --- a/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm +++ b/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm @@ -95,6 +95,10 @@ /obj/structure/shuttle/engine/propulsion/burst, /turf/template_noop, /area/ruin/powered) +"M" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/indestructible/oldshuttle, +/area/ruin/powered) (1,1,1) = {" a @@ -322,7 +326,7 @@ a a e c -c +M c c c diff --git a/_maps/RandomRuins/SpaceRuins/skelter.dmm b/_maps/RandomRuins/SpaceRuins/skelter.dmm index 694d093eeb..47824eec63 100644 --- a/_maps/RandomRuins/SpaceRuins/skelter.dmm +++ b/_maps/RandomRuins/SpaceRuins/skelter.dmm @@ -4193,6 +4193,10 @@ }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/skelter/sec) +"GU" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/mineral/titanium, +/area/ruin/space/has_grav/skelter) "JR" = ( /obj/effect/turf_decal/weather, /turf/open/floor/plating/airless{ @@ -4492,7 +4496,7 @@ hu hS ip gg -ae +GU ae ae ah diff --git a/_maps/RandomRuins/SpaceRuins/spacediner.dmm b/_maps/RandomRuins/SpaceRuins/spacediner.dmm index 755e5531bb..7e6c7ac218 100644 --- a/_maps/RandomRuins/SpaceRuins/spacediner.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacediner.dmm @@ -842,6 +842,7 @@ /area/ruin/space/diner/interior) "cl" = ( /obj/structure/grille/broken, +/obj/machinery/spaceship_navigation_beacon/invion, /turf/open/floor/plating, /area/ruin/space/diner/interior) "cm" = ( diff --git a/_maps/RandomRuins/SpaceRuins/spacehermit.dmm b/_maps/RandomRuins/SpaceRuins/spacehermit.dmm index a2c7b18966..80e98cad2d 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehermit.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehermit.dmm @@ -383,6 +383,10 @@ }, /turf/open/floor/plating/asteroid, /area/ruin/powered) +"sU" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/mineral/random, +/area/ruin/powered) "wU" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/bot, @@ -1020,7 +1024,7 @@ aZ aZ bb bb -bb +sU af aq af diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 43aaaf835b..ddf26ff433 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -5017,6 +5017,10 @@ /obj/structure/pool/Lboard, /turf/open/pool, /area/ruin/space/has_grav/hotel/pool) +"pV" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/space/has_grav/hotel/guestroom/room_4) "sN" = ( /obj/machinery/door/airlock/external/glass, /obj/structure/cable/yellow{ @@ -7313,7 +7317,7 @@ aa ab ac ag -ap +pV ap ap ap diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm index aa5126fb65..570b3cfb6b 100644 --- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm +++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm @@ -368,6 +368,10 @@ }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/turretedoutpost) +"pa" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/r_wall, +/area/ruin/space/has_grav/turretedoutpost) "tK" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -597,7 +601,7 @@ ac ac ac ac -ad +pa ad aI aI diff --git a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm index a1b2271d96..c7a5c336e3 100644 --- a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm +++ b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm @@ -208,6 +208,10 @@ /obj/machinery/light/small, /turf/open/floor/plasteel/vaporwave, /area/ruin/space/has_grav/powered/aesthetic) +"Q" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/space/has_grav/powered/aesthetic) "R" = ( /obj/machinery/light/small{ dir = 1 @@ -461,7 +465,7 @@ a a d d -f +Q f g f diff --git a/_maps/RandomRuins/SpaceRuins/way_home.dmm b/_maps/RandomRuins/SpaceRuins/way_home.dmm index ed455736c2..bcc73edc13 100644 --- a/_maps/RandomRuins/SpaceRuins/way_home.dmm +++ b/_maps/RandomRuins/SpaceRuins/way_home.dmm @@ -12,6 +12,10 @@ /obj/structure/signpost/salvation, /turf/open/floor/plating/asteroid/airless, /area/ruin/space/way_home) +"S" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/mineral/random, +/area/ruin/space/way_home) (1,1,1) = {" a @@ -266,7 +270,7 @@ b b b b -b +S b b c diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm index ca0a4b55aa..7c7bc27fe8 100644 --- a/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm +++ b/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm @@ -6,6 +6,10 @@ /obj/docking_port/stationary/picked/whiteship, /turf/open/space, /area/space) +"Z" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/open/space/basic, +/area/space) (1,1,1) = {" a @@ -29,7 +33,7 @@ a a a a -a +Z "} (2,1,1) = {" a diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm index 873d805a03..378e0f0aaa 100644 --- a/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm +++ b/_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm @@ -1,74 +1,62 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/closed/wall/mineral/titanium, -/area/ruin/space/has_grav/whiteship/box) -"c" = ( +"ak" = ( +/obj/machinery/door/airlock/titanium, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"d" = ( +"bG" = ( +/obj/machinery/door/window/northright, +/obj/effect/decal/remains/human, +/turf/open/floor/mineral/titanium/purple, +/area/ruin/space/has_grav/whiteship/box) +"ei" = ( +/turf/closed/wall/mineral/titanium, +/area/ruin/space/has_grav/whiteship/box) +"ej" = ( +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating, +/area/ruin/space/has_grav/whiteship/box) +"fa" = ( +/obj/item/multitool, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"he" = ( +/obj/structure/shuttle/engine/propulsion/right{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/whiteship/box) +"jN" = ( /obj/structure/shuttle/engine/propulsion/left{ dir = 8 }, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/whiteship/box) -"e" = ( -/obj/structure/table, -/obj/item/radio/off, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"f" = ( -/obj/structure/table, -/obj/item/screwdriver, -/obj/structure/light_construct{ - dir = 1 - }, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"g" = ( -/obj/machinery/computer/pod{ - dir = 8; - id = "oldship_ruin_gun" - }, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"h" = ( +"lC" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8 }, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/whiteship/box) -"i" = ( -/obj/structure/shuttle/engine/heater{ +"oG" = ( +/obj/structure/frame/computer{ + anchored = 1; dir = 8 }, -/obj/structure/window/reinforced{ +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"ps" = ( +/obj/structure/chair{ dir = 4 }, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/whiteship/box) -"j" = ( -/turf/closed/wall/mineral/titanium/interior, -/area/ruin/space/has_grav/whiteship/box) -"k" = ( -/obj/structure/rack, -/obj/item/clothing/suit/space/hardsuit/medical, -/obj/item/clothing/mask/breath, +/obj/effect/decal/remains/human, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"l" = ( -/turf/open/floor/plating, -/area/ruin/space/has_grav/whiteship/box) -"m" = ( -/obj/item/stock_parts/cell{ - charge = 100; - maxcharge = 15000 - }, +"qi" = ( +/obj/structure/table, +/obj/item/gun/energy/laser/retro, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"n" = ( +"qF" = ( /obj/structure/rack, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/emergency_oxygen, @@ -77,94 +65,164 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"o" = ( -/obj/machinery/door/airlock/public/glass, +"qS" = ( +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"rh" = ( +/obj/structure/light_construct/small, /turf/open/floor/plating, /area/ruin/space/has_grav/whiteship/box) -"p" = ( -/obj/machinery/mass_driver{ - dir = 4; - icon_state = "mass_driver"; - id = "oldship_ruin_gun" +"rn" = ( +/obj/structure/light_construct/small{ + dir = 1 }, /turf/open/floor/plating, /area/ruin/space/has_grav/whiteship/box) -"q" = ( +"ry" = ( +/obj/structure/table, +/obj/item/screwdriver, +/obj/structure/light_construct{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"sW" = ( +/obj/machinery/computer{ + desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; + dir = 8; + name = "Broken Computer" + }, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"td" = ( +/obj/structure/bed, +/obj/item/bedsheet, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/purple, +/area/ruin/space/has_grav/whiteship/box) +"uU" = ( +/obj/structure/rack, +/obj/item/clothing/suit/space/hardsuit/medical, +/obj/item/clothing/mask/breath, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"vM" = ( +/obj/structure/table, +/obj/item/radio/off, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"vR" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"wr" = ( +/obj/structure/light_construct/small{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"xi" = ( +/obj/structure/light_construct, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"xV" = ( /obj/machinery/door/poddoor{ id = "oldship_ruin_gun"; name = "pod bay door" }, /turf/open/floor/plating, /area/ruin/space/has_grav/whiteship/box) -"r" = ( -/obj/structure/shuttle/engine/propulsion/right{ - dir = 8 - }, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/whiteship/box) -"s" = ( -/obj/structure/light_construct/small, -/turf/open/floor/plating, -/area/ruin/space/has_grav/whiteship/box) -"t" = ( -/obj/machinery/door/airlock/titanium, -/turf/open/floor/plating, -/area/ruin/space/has_grav/whiteship/box) -"u" = ( -/obj/structure/frame/computer{ - anchored = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"v" = ( +"yu" = ( /obj/machinery/computer{ desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; name = "Broken Computer" }, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"w" = ( -/obj/machinery/door/airlock/titanium, +"yv" = ( +/obj/structure/table, +/obj/item/storage/firstaid/regular{ + pixel_x = 6; + pixel_y = -5 + }, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"x" = ( +"zF" = ( +/obj/machinery/door/window, +/turf/open/floor/mineral/titanium/purple, +/area/ruin/space/has_grav/whiteship/box) +"Be" = ( +/obj/structure/light_construct{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"BC" = ( +/obj/structure/light_construct{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"Cb" = ( +/obj/structure/light_construct/small{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"Dg" = ( +/obj/structure/table, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"Ew" = ( /obj/structure/chair{ dir = 1 }, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"y" = ( -/obj/item/shard{ - icon_state = "medium" +"GC" = ( +/obj/structure/chair, +/turf/open/floor/mineral/titanium/white, +/area/ruin/space/has_grav/whiteship/box) +"Kp" = ( +/obj/machinery/computer/pod{ + dir = 8; + id = "oldship_ruin_gun" }, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"z" = ( -/obj/structure/light_construct, -/turf/open/floor/mineral/titanium/white, +"Lf" = ( +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plating/airless, /area/ruin/space/has_grav/whiteship/box) -"A" = ( +"Nj" = ( /obj/structure/light_construct{ dir = 1 }, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"B" = ( -/obj/effect/spawner/structure/window/shuttle, -/turf/open/floor/plating, -/area/ruin/space/has_grav/whiteship/box) -"C" = ( -/obj/structure/table, +"NT" = ( +/obj/structure/frame/computer{ + anchored = 1; + dir = 1 + }, +/obj/structure/light_construct, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"D" = ( -/obj/machinery/door/window, -/turf/open/floor/mineral/titanium/purple, +"Os" = ( +/turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"E" = ( +"Qs" = ( /obj/structure/bed, /obj/item/bedsheet, /obj/structure/window/reinforced, @@ -173,125 +231,67 @@ }, /turf/open/floor/mineral/titanium/purple, /area/ruin/space/has_grav/whiteship/box) -"F" = ( -/obj/structure/table, -/obj/item/gun/energy/laser/retro, +"RD" = ( +/obj/item/shard{ + icon_state = "medium" + }, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"G" = ( +"RY" = ( +/obj/machinery/door/airlock/public/glass, +/turf/open/floor/plating, +/area/ruin/space/has_grav/whiteship/box) +"Sy" = ( /obj/machinery/door/airlock/public/glass, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"H" = ( -/obj/structure/light_construct{ - dir = 4 +"Tc" = ( +/turf/closed/wall/mineral/titanium/interior, +/area/ruin/space/has_grav/whiteship/box) +"Wq" = ( +/obj/machinery/mass_driver{ + dir = 4; + icon_state = "mass_driver"; + id = "oldship_ruin_gun" + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/whiteship/box) +"WD" = ( +/obj/item/stock_parts/cell{ + charge = 100; + maxcharge = 15000 }, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"I" = ( -/obj/structure/light_construct/small{ - dir = 4 - }, +"Xe" = ( +/obj/item/scalpel, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"J" = ( -/obj/structure/light_construct{ - dir = 8 - }, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"K" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/decal/remains/human, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"L" = ( -/obj/machinery/computer{ - desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; - dir = 8; - name = "Broken Computer" - }, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"M" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"N" = ( -/obj/structure/light_construct/small{ - dir = 8 - }, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"O" = ( +"Xp" = ( +/turf/template_noop, +/area/template_noop) +"Xq" = ( /obj/structure/table, /obj/item/tank/internals/oxygen, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"P" = ( -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"Q" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/mineral/titanium/purple, -/area/ruin/space/has_grav/whiteship/box) -"R" = ( -/obj/machinery/door/window/northright, -/obj/effect/decal/remains/human, -/turf/open/floor/mineral/titanium/purple, -/area/ruin/space/has_grav/whiteship/box) -"S" = ( -/obj/item/multitool, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"T" = ( -/obj/structure/light_construct/small{ - dir = 1 - }, +"XE" = ( +/obj/machinery/door/airlock/titanium, /turf/open/floor/plating, /area/ruin/space/has_grav/whiteship/box) -"U" = ( -/obj/structure/chair, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"V" = ( +"Ya" = ( /obj/structure/frame/computer{ - anchored = 1; + anchored = 1 + }, +/obj/machinery/light{ dir = 1 }, -/obj/structure/light_construct, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) -"W" = ( -/obj/item/scalpel, -/turf/open/floor/mineral/titanium/white, +"Zh" = ( +/turf/open/floor/plating, /area/ruin/space/has_grav/whiteship/box) -"X" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular{ - pixel_x = 6; - pixel_y = -5 - }, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"Y" = ( -/obj/structure/frame/computer{ - anchored = 1; - dir = 8 - }, -/turf/open/floor/mineral/titanium/white, -/area/ruin/space/has_grav/whiteship/box) -"Z" = ( +"Zz" = ( /obj/machinery/sleeper{ dir = 8 }, @@ -299,809 +299,813 @@ /obj/structure/light_construct, /turf/open/floor/mineral/titanium/white, /area/ruin/space/has_grav/whiteship/box) +"ZI" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/mineral/titanium, +/area/ruin/space/has_grav/whiteship/box) (1,1,1) = {" -a -a -a -a -a -a -a -a -b -b -t -b -b -a -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +ei +XE +ei +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (2,1,1) = {" -a -a -a -a -a -a -a -a -b -j -c -j -b -a -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +Tc +Os +Tc +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (3,1,1) = {" -a -a -a -a -a -a -a -a -b -c -c -c -b -a -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +Os +Os +Os +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (4,1,1) = {" -a -a -a -a -a -a -a -a -b -c -c -c -b -a -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +Os +Os +Os +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (5,1,1) = {" -a -a -a -a -a -a -a -a -b -c -c -c -b -a -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +Os +Os +Os +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (6,1,1) = {" -a -a -a -a -a -a -a -a -b -c -c -z -b -a -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +Os +Os +xi +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (7,1,1) = {" -a -a -a -a -a -a -a -a -b -c -c -c -b -a -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +Os +Os +Os +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (8,1,1) = {" -a -a -a -a -a -a -a -a -b -c -c -c -b -a -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +Os +Os +Os +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (9,1,1) = {" -a -a -a -a -a -a -a -a -b -c -c -M -b -a -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +Os +Os +vR +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (10,1,1) = {" -a -a -a -a -a -a -a -a -b -j -c -j -b -a -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +Tc +Os +Tc +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (11,1,1) = {" -a -a -a -a -a -a -a -a -b -b -w -b -b -a -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +ei +ak +ei +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (12,1,1) = {" -a -a -a -a -a -a -a -a -a -b -c -b -a -a -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +Os +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (13,1,1) = {" -a -a -a -a -a -a -a -a -b -b -w -b -b -a -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +ei +ak +ei +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (14,1,1) = {" -a -a -a -a -a -a -a -b -b -j -c -j -b -b -a -a -a -a -a -a -a +Xp +Xp +Xp +Xp +Xp +Xp +Xp +ei +ei +Tc +Os +Tc +ei +ei +Xp +Xp +Xp +Xp +Xp +Xp +Xp "} (15,1,1) = {" -b -d -h -h -h -r -a -b -j -c -c -c -j -b -a -d -h -h -h -r -b +ei +jN +lC +lC +lC +he +Xp +ei +Tc +Os +Os +Os +Tc +ei +Xp +jN +lC +lC +lC +he +ei "} (16,1,1) = {" -b -b -i -i -i -b -b -b -A -c -c -c -z -b -b -b -i -i -i -b -b +ei +ei +Lf +Lf +Lf +ei +ei +ei +Nj +Os +Os +Os +xi +ei +ei +ei +Lf +Lf +Lf +ei +ei "} (17,1,1) = {" -a -b -j -l -l -j -b -j -c -c -c -c -c -j -b -j -l -l -j -b -a +Xp +ei +Tc +Zh +Zh +Tc +ei +Tc +Os +Os +Os +Os +Os +Tc +ei +Tc +Zh +Zh +Tc +ei +Xp "} (18,1,1) = {" -a -a -b -j -l -s -b -c -c -c -c -c -c -P -b -T -l -j -b -a -a +Xp +Xp +ei +Tc +Zh +rh +ei +Os +Os +Os +Os +Os +Os +qS +ei +rn +Zh +Tc +ei +Xp +Xp "} (19,1,1) = {" -a -a -a -b -b -t -b -b -b -B -G -B -b -b -b -t -b -b -a -a -a +Xp +Xp +Xp +ei +ei +XE +ei +ei +ei +ej +Sy +ej +ei +ei +ei +XE +ei +ei +Xp +Xp +Xp "} (20,1,1) = {" -a -a -a -b -b -c -c -c -c -c -c -c -c -c -c -c -b -b -a -a -a +Xp +Xp +Xp +ei +ei +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +ei +ei +Xp +Xp +Xp "} (21,1,1) = {" -a -a -b -b -j -m -c -c -c -c -H -c -c -c -c -c -b -b -b -a -a +Xp +Xp +ei +ei +Tc +WD +Os +Os +Os +Os +BC +Os +Os +Os +Os +Os +ei +ei +ei +Xp +Xp "} (22,1,1) = {" -a -b -b -j -c -c -c -c -b -b -b -b -b -b -c -c -b -b -b -b -a +Xp +ei +ei +Tc +Os +Os +Os +Os +ei +ei +ei +ei +ei +ei +Os +Os +ei +ei +ei +ei +Xp "} (23,1,1) = {" -b -b -b -b -b -b -j -c -b -D -c -N -c -w -c -c -w -c -j -b -a +ei +ei +ei +ei +ei +ei +Tc +Os +ei +zF +Os +wr +Os +ak +Os +Os +ak +Os +Tc +ei +Xp "} (24,1,1) = {" -t -c -c -k -k -j -b -z -b -E -c -O -Q -b -A -c -b -c -X -b -b +XE +Os +Os +uU +uU +Tc +ei +xi +ei +Qs +Os +Xq +td +ei +Nj +Os +ei +Os +yv +ei +ei "} (25,1,1) = {" -b -c -c -c -c -n -b -c -w -c -I -c -R -b -c -c -b -c -c -j -b +ei +Os +Os +Os +Os +qF +ei +Os +ak +Os +Cb +Os +bG +ei +Os +Os +ei +Os +Os +Tc +ei "} (26,1,1) = {" -b -e -c -c -c -c -b -c -b -b -b -b -b -b -c -m -B -W -c -c -b +ei +vM +Os +Os +Os +Os +ei +Os +ei +ei +ei +ei +ei +ei +Os +WD +ej +Xe +Os +Os +ei "} (27,1,1) = {" -b -f -c -c -c -c -w -c -c -c -J -c -c -c -c -c -B -c -c -Z -b +ei +ry +Os +Os +Os +Os +ak +Os +Os +Os +Be +Os +Os +Os +Os +Os +ej +Os +Os +Zz +ei "} (28,1,1) = {" -b -c -c -c -c -c -b -j -c -c -c -c -c -c -c -S -B -c -c -c -b +ei +Os +Os +Os +Os +Os +ei +Tc +Os +Os +Os +Os +Os +Os +Os +fa +ej +Os +Os +Os +ei "} (29,1,1) = {" -b -c -c -c -c -j -b -b -b -B -G -B -b -b -b -b -b -c -c -c -b +ei +Os +Os +Os +Os +Tc +ZI +ei +ei +ej +Sy +ej +ei +ei +ei +ei +ei +Os +Os +Os +ei "} (30,1,1) = {" -b -c -c -c -j -b -j -c -c -c -c -c -c -C -C -C -b -c -c -j -b +ei +Os +Os +Os +Tc +ei +Tc +Os +Os +Os +Os +Os +Os +Dg +Dg +Dg +ei +Os +Os +Tc +ei "} (31,1,1) = {" -t -c -g -c -b -j -c -c -c -c -c -c -c -c -c -c -j -j -Y -b -a +XE +Os +Kp +Os +ei +Tc +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os +Tc +Tc +oG +ei +Xp "} (32,1,1) = {" -b -b -b -o -b -u -x -c -c -c -c -c -c -c -c -U -V -b -b -b -a +ei +ei +ei +RY +ei +Ya +Ew +Os +Os +Os +Os +Os +Os +Os +Os +GC +NT +ei +ei +ei +Xp "} (33,1,1) = {" -a -a -b -p -b -v -x -c -c -C -K -C -c -c -c -c -j -b -b -a -a +Xp +Xp +ei +Wq +ei +yu +Ew +Os +Os +Dg +ps +Dg +Os +Os +Os +Os +Tc +ei +ei +Xp +Xp "} (34,1,1) = {" -a -a -b -q -b -j -y -c -c -F -L -C -c -c -c -j -b -b -a -a -a +Xp +Xp +ei +xV +ei +Tc +RD +Os +Os +qi +sW +Dg +Os +Os +Os +Tc +ei +ei +Xp +Xp +Xp "} (35,1,1) = {" -a -a -a -a -b -b -b -B -B -B -B -B -B -B -b -b -b -a -a -a -a +Xp +Xp +Xp +Xp +ei +ei +ei +ej +ej +ej +ej +ej +ej +ej +ei +ei +ei +Xp +Xp +Xp +Xp "} diff --git a/_maps/map_files/generic/SpaceDock.dmm b/_maps/map_files/generic/SpaceDock.dmm index 1188aa25fb..023dbdd99f 100644 --- a/_maps/map_files/generic/SpaceDock.dmm +++ b/_maps/map_files/generic/SpaceDock.dmm @@ -15,6 +15,10 @@ }, /turf/open/space, /area/space) +"Q" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/open/space/basic, +/area/space) (1,1,1) = {" a @@ -271,7 +275,7 @@ a a a a -a +Q "} (2,1,1) = {" a diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm index 8ea4b95d03..7a58179a2d 100644 --- a/code/modules/research/techweb/_techweb_node.dm +++ b/code/modules/research/techweb/_techweb_node.dm @@ -106,4 +106,5 @@ "destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "bepis", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab", "paystand", "space_heater", "beaker", "large_beaker", "xlarge_beaker", "bucket", "hypovial", "large_hypovial", "syringe", "pillbottle", "sec_shellclip", "sec_beanbag", "sec_rshot", "sec_bshot", "sec_slug", "sec_islug", "sec_dart", "sec_38", "sec_38lethal", - "rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass", "salestagger", "light_replacer") + "rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass", "salestagger", "light_replacer", + "shuttle_creator", "engine_plasma", "engine_heater", "shuttle_control", "shuttle_docker","spaceship_navigation_beacon") diff --git a/modular_splurt/_maps/RandomRuins/SpaceRuins/radiostation.dmm b/modular_splurt/_maps/RandomRuins/SpaceRuins/radiostation.dmm index 8da26c8a5c..a2629faf63 100644 --- a/modular_splurt/_maps/RandomRuins/SpaceRuins/radiostation.dmm +++ b/modular_splurt/_maps/RandomRuins/SpaceRuins/radiostation.dmm @@ -750,6 +750,7 @@ pixel_y = 8; name = "Radio Broadcaster" }, +/obj/machinery/spaceship_navigation_beacon/invion, /turf/closed/wall, /area/ruin/space/radiostation/control_room) "Rm" = ( diff --git a/modular_splurt/_maps/RandomRuins/SpaceRuins/spacehotelsplurt.dmm b/modular_splurt/_maps/RandomRuins/SpaceRuins/spacehotelsplurt.dmm index 3bf53dedae..bfdad29f60 100644 --- a/modular_splurt/_maps/RandomRuins/SpaceRuins/spacehotelsplurt.dmm +++ b/modular_splurt/_maps/RandomRuins/SpaceRuins/spacehotelsplurt.dmm @@ -1180,6 +1180,10 @@ }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/power) +"fU" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall/r_wall, +/area/ruin/space/has_grav/hotel) "fV" = ( /obj/structure/toilet/secret/low_loot{ dir = 8 @@ -11182,7 +11186,7 @@ Tg rf GG Tg -Tg +fU WV Xb Tg diff --git a/modular_splurt/_maps/RandomRuins/SpaceRuins/syndielistenspace.dmm b/modular_splurt/_maps/RandomRuins/SpaceRuins/syndielistenspace.dmm index 25aba3405e..9fd32a6974 100644 --- a/modular_splurt/_maps/RandomRuins/SpaceRuins/syndielistenspace.dmm +++ b/modular_splurt/_maps/RandomRuins/SpaceRuins/syndielistenspace.dmm @@ -1428,6 +1428,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation) +"Ly" = ( +/obj/machinery/spaceship_navigation_beacon/invion, +/turf/closed/wall, +/area/ruin/space/has_grav/listeningstation) "LL" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -1990,7 +1994,7 @@ ac aS ac ac -ac +Ly ac ac ac diff --git a/modular_splurt/code/modules/shuttle/gigab.dm b/modular_splurt/code/modules/shuttle/gigab.dm new file mode 100644 index 0000000000..61431c56fe --- /dev/null +++ b/modular_splurt/code/modules/shuttle/gigab.dm @@ -0,0 +1,5 @@ +/obj/machinery/spaceship_navigation_beacon/invion + name = "wall" + icon = 'modular_splurt/icons/obj/objects.dmi' + icon_state = "invisible" + invisibility = INVISIBILITY_ABSTRACT diff --git a/modular_splurt/icons/obj/objects.dmi b/modular_splurt/icons/obj/objects.dmi index 482a918c34..e05cf67951 100644 Binary files a/modular_splurt/icons/obj/objects.dmi and b/modular_splurt/icons/obj/objects.dmi differ diff --git a/tgstation.dme b/tgstation.dme index c78686686e..582978187c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4760,11 +4760,11 @@ #include "modular_splurt\code\modules\language\signlanguage.dm" #include "modular_splurt\code\modules\language\xenocommon.dm" #include "modular_splurt\code\modules\mapping\lavaland_jungle_gen.dm" +#include "modular_splurt\code\modules\mapping\map_template.dm" #include "modular_splurt\code\modules\mapping\mapping_helpers\baseturf.dm" +#include "modular_splurt\code\modules\mapping\modular_map_loader\modular_map_loader.dm" #include "modular_splurt\code\modules\mentor\mentor_mouse.dm" #include "modular_splurt\code\modules\mentor\mentor_verbs.dm" -#include "modular_splurt\code\modules\mapping\map_template.dm" -#include "modular_splurt\code\modules\mapping\modular_map_loader\modular_map_loader.dm" #include "modular_splurt\code\modules\mining\equipment\kinetic_crusher.dm" #include "modular_splurt\code\modules\mining\equipment\machine_vending.dm" #include "modular_splurt\code\modules\mining\lavaland\necropolis_chests.dm" @@ -4937,6 +4937,7 @@ #include "modular_splurt\code\modules\ruins\objects_and_mobs\ash_walker_den.dm" #include "modular_splurt\code\modules\ruins\objects_and_mobs\radio.dm" #include "modular_splurt\code\modules\ruins\spaceruin_code\hilbertshotel.dm" +#include "modular_splurt\code\modules\shuttle\gigab.dm" #include "modular_splurt\code\modules\shuttle\slaver.dm" #include "modular_splurt\code\modules\smithing\anvil.dm" #include "modular_splurt\code\modules\smithing\finished_items.dm"