Merge remote-tracking branch 'upstream/master'

_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm

@@ -13,6 +13,10 @@
 	icon_state = "dark"
 	},
 /area/ruin/space/abandoned_engi_sat)
+"aR" = (
+/mob/living/simple_animal/hostile/carp/megacarp,
+/turf/template_noop,
+/area/template_noop)
 "bi" = (
 /obj/structure/chair/comfy/black{
 	dir = 8
@@ -239,6 +243,7 @@
 /area/ruin/space/abandoned_engi_sat)
 "hB" = (
 /obj/structure/table,
+/obj/item/salvage/ruin/nanotrasen,
 /turf/simulated/floor/carpet/airless,
 /area/ruin/space/abandoned_engi_sat)
 "hE" = (
@@ -567,7 +572,6 @@
 "pX" = (
 /obj/structure/closet{
 	icon_state = "eng_secure";
-	opened = 1;
 	open_door_sprite = "eng_secure_door";
 	name = "engineer's locker"
 	},
@@ -577,6 +581,10 @@
 /obj/effect/spawner/random_spawners/wall_rusted_always,
 /turf/simulated/wall/r_wall,
 /area/ruin/space/abandoned_engi_sat)
+"rn" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
 "rr" = (
 /obj/structure/lattice,
 /turf/template_noop,
@@ -1079,6 +1087,11 @@
 	name = "floor"
 	},
 /area/ruin/space/abandoned_engi_sat)
+"Ig" = (
+/obj/structure/table,
+/obj/item/salvage/ruin/nanotrasen,
+/turf/simulated/floor/plasteel,
+/area/ruin/space/abandoned_engi_sat)
 "Iz" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/spawner/random_spawners/wall_rusted_always,
@@ -1204,6 +1217,10 @@
 	icon_state = "blue"
 	},
 /area/ruin/space/abandoned_engi_sat)
+"OW" = (
+/mob/living/simple_animal/hostile/asteroid/hivelord,
+/turf/simulated/floor/plating,
+/area/ruin/space/abandoned_engi_sat)
 "OZ" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/cable{
@@ -1410,6 +1427,11 @@
 /obj/structure/bed,
 /turf/simulated/floor/carpet/airless,
 /area/ruin/space/abandoned_engi_sat)
+"Xq" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/hostile/asteroid/hivelord,
+/turf/simulated/floor/plating,
+/area/ruin/space/abandoned_engi_sat)
 "XP" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
@@ -1550,13 +1572,13 @@ LP
 "}
 (2,1,1) = {"
 LP
+rn
 LP
 LP
 LP
 LP
 LP
-LP
-LP
+rn
 LP
 LP
 LP
@@ -1586,9 +1608,9 @@ LP
 LP
 LP
 LP
+rn
 LP
-LP
-LP
+rn
 LP
 LP
 LP
@@ -1780,7 +1802,7 @@ Iz
 hE
 LP
 LP
-LP
+aR
 LP
 LP
 LP
@@ -1974,7 +1996,7 @@ kt
 eP
 fA
 XP
-et
+OW
 et
 Yz
 CP
@@ -2040,7 +2062,7 @@ kZ
 Tw
 YE
 jG
-XP
+Xq
 XP
 Ud
 fA
@@ -2308,7 +2330,7 @@ oL
 mW
 NM
 mW
-BR
+Ig
 IC
 IC
 ao
@@ -2357,11 +2379,11 @@ LP
 Gi
 LP
 LP
+rn
 LP
 LP
 LP
-LP
-LP
+rn
 LP
 "}
 (26,1,1) = {"
@@ -2427,7 +2449,7 @@ px
 LP
 LP
 LP
-LP
+rn
 LP
 LP
 LP
@@ -2486,7 +2508,7 @@ uQ
 qu
 LP
 LP
-LP
+rn
 LP
 LP
 LP
@@ -2523,7 +2545,7 @@ LP
 LP
 LP
 LP
-LP
+rn
 LP
 LP
 LP

_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm

@@ -8,6 +8,10 @@
 "c" = (
 /turf/simulated/mineral/random/high_chance,
 /area/ruin/space/unpowered)
+"V" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
 
 (1,1,1) = {"
 a
@@ -83,7 +87,7 @@ a
 a
 a
 a
-a
+V
 a
 a
 a
@@ -158,7 +162,7 @@ c
 a
 a
 a
-a
+V
 a
 a
 a
@@ -220,10 +224,10 @@ a
 a
 a
 a
+V
 a
 a
-a
-a
+V
 a
 a
 a
@@ -254,7 +258,7 @@ a
 (12,1,1) = {"
 a
 a
-a
+V
 a
 a
 c
@@ -322,7 +326,7 @@ a
 a
 a
 a
-a
+V
 a
 a
 a

_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm

@@ -11,6 +11,18 @@
 "d" = (
 /turf/simulated/mineral/random/high_chance,
 /area/ruin/space/unpowered)
+"t" = (
+/obj/structure/spawner/mining/basilisk,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"R" = (
+/obj/structure/spawner/mining/goliath,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
+"V" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/template_noop,
+/area/template_noop)
 
 (1,1,1) = {"
 a
@@ -105,7 +117,7 @@ a
 a
 a
 b
-b
+t
 b
 c
 c
@@ -367,7 +379,7 @@ b
 (17,1,1) = {"
 a
 a
-a
+V
 b
 a
 a
@@ -388,8 +400,8 @@ a
 "}
 (18,1,1) = {"
 a
-a
-a
+V
+V
 b
 b
 a
@@ -400,7 +412,7 @@ a
 b
 b
 b
-b
+R
 b
 b
 b
@@ -413,7 +425,7 @@ a
 a
 a
 a
-a
+V
 a
 a
 a