Merge pull request #64 from Bubberstation/master

[UPSTREAM UPDATE] 29.12.2024
SPLURT-Station · Dec 29, 2024 · 4f7bcc2 · 4f7bcc2
2 parents 3ebd8bb + e7b7473
commit 4f7bcc2
Show file tree

Hide file tree

Showing 52 changed files with 882 additions and 1,911 deletions.
diff --git a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_mining_site_skyrat.dmm b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_mining_site_skyrat.dmm
diff --git a/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm b/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm
@@ -30,7 +30,6 @@
 /area/ruin/space/djstation)
 "t" = (
 /obj/structure/closet/secure_closet/freezer/fridge/all_access,
-/obj/machinery/light/directional/south,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/iron,

diff --git a/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm b/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
@@ -351,7 +351,7 @@
 "kp" = (
 /obj/effect/spawner/random/environmentally_safe_anomaly/immobile,
 /turf/template_noop,
-/area/space)
+/area/space/nearstation)
 "kt" = (
 /obj/effect/turf_decal/tile/purple/half/contrasted{
 	dir = 1

diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -285,7 +285,7 @@
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "ET" = (
-/mob/living/basic/lizard,
+/mob/living/basic/lizard/space,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "Fo" = (

diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm
@@ -122,7 +122,6 @@
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "lm" = (
 /obj/structure/spider/stickyweb,
-/obj/structure/spider/stickyweb/very_sticky,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "mf" = (
@@ -182,7 +181,6 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "qX" = (
-/obj/structure/spider/stickyweb/very_sticky,
 /obj/item/food/badrecipe/moldy,
 /obj/structure/spider/stickyweb,
 /obj/item/food/spidereggs{

diff --git a/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm b/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm
@@ -147,8 +147,8 @@
 /turf/open/floor/iron/dark/airless,
 /area/ruin/space/prison_shuttle)
 "O" = (
-/mob/living/basic/cockroach,
 /obj/effect/turf_decal/tile/brown/fourcorners,
+/obj/effect/decal/cleanable/xenoblood/xsplatter,
 /turf/open/floor/iron/dark/airless,
 /area/ruin/space/prison_shuttle)
 "P" = (

diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm
@@ -1269,7 +1269,7 @@
 /area/ruin/space/has_grav/cargodise_freighter/utility)
 "vH" = (
 /turf/closed/mineral/random/high_chance,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "vJ" = (
 /obj/structure/chair/sofa/right/maroon{
 	dir = 4

diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/clothing_facility.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/clothing_facility.dmm
@@ -7,7 +7,7 @@
 /area/ruin/space/has_grav/powered/skyrat/clothing_facility)
 "c" = (
 /turf/closed/mineral/random,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "d" = (
 /obj/machinery/destructive_scanner,
 /turf/open/floor/iron/dark,

diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/crash.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/crash.dmm
@@ -4,108 +4,108 @@
 /area/template_noop)
 "c" = (
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "d" = (
 /obj/effect/turf_decal/sand/plating,
 /turf/open/floor/plating,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "e" = (
 /obj/item/storage/toolbox/syndicate,
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "g" = (
 /obj/effect/decal/cleanable/blood/gibs,
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "l" = (
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/blood/gibs/down,
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "m" = (
 /turf/closed/mineral/random/high_chance,
 /area/ruin/space)
 "t" = (
 /obj/effect/decal/cleanable/blood/splatter,
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "v" = (
 /turf/closed/wall/mineral/titanium/spaceship,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "x" = (
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/blood/gibs/up,
 /obj/effect/turf_decal/sand,
 /turf/open/floor/plating,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "B" = (
 /obj/effect/decal/fakelattice,
 /obj/effect/turf_decal/sand,
 /turf/open/misc/asteroid/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "C" = (
 /obj/machinery/power/shuttle_engine/propulsion{
 	dir = 8
 	},
 /turf/template_noop,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "H" = (
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/blood/gibs/limb{
 	dir = 4
 	},
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "I" = (
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/blood/gibs/body,
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "K" = (
 /obj/effect/spawner/random/engineering/flashlight,
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "L" = (
 /obj/structure/closet/crate,
 /obj/effect/spawner/random/engineering/material_rare,
 /obj/effect/spawner/random/engineering/material_rare,
 /obj/effect/spawner/random/engineering/material,
 /obj/effect/spawner/random/engineering/material,
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "O" = (
 /obj/structure/closet/crate,
 /obj/effect/spawner/random/engineering/tool_advanced,
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "R" = (
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/blood/gibs/limb,
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "T" = (
 /obj/effect/spawner/random/engineering/material_cheap,
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "U" = (
 /obj/effect/turf_decal/sand,
 /obj/effect/turf_decal/sand/plating,
 /turf/open/floor/plating,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "V" = (
 /obj/structure/closet/crate,
 /obj/effect/spawner/random/engineering/toolbox,
 /obj/effect/spawner/random/engineering/toolbox,
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "X" = (
 /obj/effect/turf_decal/sand,
 /turf/open/floor/plating,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 "Y" = (
 /obj/machinery/power/port_gen/pacman/super,
 /turf/open/floor/iron/dark/airless,
-/area/ruin/unpowered/no_grav)
+/area/ruin/space/unpowered)
 
 (1,1,1) = {"
 a