30-09 merge #101

30-09 merge
Fluffy-Frontier · Sep 29, 2023 · 9af064b · 9af064b
2 parents c426957 + cbd0d03
commit 9af064b
Show file tree

Hide file tree

Showing 412 changed files with 7,756 additions and 5,213 deletions.
diff --git a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm
@@ -872,7 +872,7 @@
 /area/ruin/syndicate_lava_base/cargo)
 "gp" = (
 /obj/machinery/light/floor,
-/obj/machinery/atmospherics/components/unary/cryo_cell,
+/obj/machinery/cryo_cell,
 /turf/open/floor/iron/dark,
 /area/ruin/syndicate_lava_base/medbay)
 "gs" = (

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_strong_rock.dmm b/_maps/RandomRuins/LavaRuins/lavaland_strong_rock.dmm
@@ -4,7 +4,7 @@
 /area/template_noop)
 "b" = (
 /turf/closed/mineral/strong,
-/area/template_noop)
+/area/lavaland/surface/outdoors)
 
 (1,1,1) = {"
 a

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -3716,7 +3716,7 @@
 "OZ" = (
 /obj/effect/turf_decal/bot,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/suit_storage_unit/syndicate,
+/obj/machinery/suit_storage_unit/syndicate/lavaland,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/ruin/syndicate_lava_base/engineering)

diff --git a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_arena.dmm b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_arena.dmm
@@ -113,10 +113,9 @@
 /obj/structure/stone_tile{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/asteroid/hivelord{
+/mob/living/basic/mining/hivelord/no_wander{
 	color = "red";
 	name = "gate guardian";
-	wander = 0
 	},
 /turf/open/lava/smooth/lava_land_surface{
 	slowdown = 0
@@ -308,10 +307,9 @@
 /obj/structure/stone_tile{
 	dir = 1
 	},
-/mob/living/simple_animal/hostile/asteroid/hivelord{
+/mob/living/basic/mining/hivelord/no_wander{
 	color = "red";
 	name = "gate guardian";
-	wander = 0
 	},
 /turf/open/lava/smooth/lava_land_surface{
 	slowdown = 0
@@ -627,10 +625,9 @@
 /obj/structure/stone_tile{
 	dir = 1
 	},
-/mob/living/simple_animal/hostile/asteroid/hivelord{
+/mob/living/basic/mining/hivelord/no_wander{
 	color = "red";
 	name = "gate guardian";
-	wander = 0
 	},
 /turf/open/indestructible/boss,
 /area/lavaland/surface/outdoors)
@@ -778,10 +775,9 @@
 /obj/structure/stone_tile{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/asteroid/hivelord{
+/mob/living/basic/mining/hivelord/no_wander{
 	color = "red";
 	name = "gate guardian";
-	wander = 0
 	},
 /turf/open/indestructible/boss,
 /area/lavaland/surface/outdoors)

diff --git a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm
@@ -1393,7 +1393,7 @@
 /turf/open/floor/plating,
 /area/ruin/syndicate_lava_base/medbay)
 "oe" = (
-/obj/machinery/atmospherics/components/unary/cryo_cell,
+/obj/machinery/cryo_cell,
 /turf/open/floor/iron/dark,
 /area/ruin/syndicate_lava_base/medbay)
 "oi" = (

diff --git a/_maps/RandomRuins/SpaceRuins/atmosasteroidruin.dmm b/_maps/RandomRuins/SpaceRuins/atmosasteroidruin.dmm
@@ -637,7 +637,7 @@
 /obj/effect/turf_decal/tile/yellow/half{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/asteroid/hivelord,
+/mob/living/basic/mining/hivelord,
 /turf/open/floor/iron/co2_pressurized,
 /area/ruin/space/has_grav/atmosasteroid)
 "RK" = (

diff --git a/_maps/RandomRuins/SpaceRuins/prey_pod.dmm b/_maps/RandomRuins/SpaceRuins/prey_pod.dmm
@@ -17,7 +17,7 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/asteroid/hivelord,
+/mob/living/basic/mining/hivelord,
 /turf/open/floor/mineral/titanium/white/airless,
 /area/ruin/space/has_grav)
 "p" = (
@@ -32,7 +32,7 @@
 /area/ruin/space/has_grav)
 "D" = (
 /obj/structure/chair/comfy/shuttle,
-/mob/living/simple_animal/hostile/asteroid/hivelord,
+/mob/living/basic/mining/hivelord,
 /turf/open/floor/mineral/titanium/white/airless,
 /area/ruin/space/has_grav)
 "E" = (
@@ -57,7 +57,7 @@
 /turf/open/floor/mineral/titanium/white/airless,
 /area/ruin/space/has_grav)
 "S" = (
-/mob/living/simple_animal/hostile/asteroid/hivelord,
+/mob/living/basic/mining/hivelord,
 /turf/open/floor/mineral/titanium/white/airless,
 /area/ruin/space/has_grav)
 "T" = (

diff --git a/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm b/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm
@@ -56,7 +56,7 @@
 /turf/open/floor/plating/airless,
 /area/ruin/space/prison_shuttle)
 "q" = (
-/mob/living/simple_animal/hostile/asteroid/hivelord,
+/mob/living/basic/mining/hivelord,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space/prison_shuttle)
 "r" = (
@@ -84,7 +84,7 @@
 /turf/open/floor/mineral/titanium/tiled/airless,
 /area/ruin/space/prison_shuttle)
 "w" = (
-/mob/living/simple_animal/hostile/asteroid/hivelord,
+/mob/living/basic/mining/hivelord,
 /turf/open/floor/plating/airless,
 /area/ruin/space/prison_shuttle)
 "x" = (

diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/syndibase.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/syndibase.dmm
@@ -164,7 +164,7 @@
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/powered)
 "pF" = (
-/obj/machinery/atmospherics/components/unary/cryo_cell,
+/obj/machinery/cryo_cell,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/powered)
 "pL" = (

diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/wreckedhomestead.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/wreckedhomestead.dmm
@@ -161,7 +161,7 @@
 /turf/open/floor/plating/airless,
 /area/ruin/unpowered)
 "Az" = (
-/obj/machinery/atmospherics/components/unary/cryo_cell,
+/obj/machinery/cryo_cell,
 /obj/effect/mapping_helpers/burnt_floor,
 /turf/open/floor/plating/airless,
 /area/ruin/unpowered)

diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
@@ -426,7 +426,7 @@
 /turf/open/floor/iron/white,
 /area/awaymission/cabin)
 "bF" = (
-/obj/machinery/atmospherics/components/unary/cryo_cell,
+/obj/machinery/cryo_cell,
 /turf/open/floor/iron/white,
 /area/awaymission/cabin)
 "bG" = (

diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm
@@ -5164,7 +5164,7 @@
 /turf/open/floor/iron/smooth_large,
 /area/awaymission/black_mesa/hecu_zone_external_hall)
 "dcv" = (
-/obj/machinery/atmospherics/components/unary/cryo_cell,
+/obj/machinery/cryo_cell,
 /turf/open/floor/iron/smooth_large,
 /area/awaymission/black_mesa/xen/acid_lake_building)
 "ddi" = (

diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
@@ -1042,7 +1042,7 @@
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior/cryo)
 "fc" = (
-/obj/machinery/atmospherics/components/unary/cryo_cell,
+/obj/machinery/cryo_cell,
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior/cryo)
 "fd" = (
@@ -1083,7 +1083,7 @@
 /area/awaymission/research/interior/cryo)
 "fh" = (
 /obj/effect/decal/cleanable/blood/drip,
-/obj/machinery/atmospherics/components/unary/cryo_cell,
+/obj/machinery/cryo_cell,
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior/cryo)
 "fk" = (