Merge branch 'master' into drywall

_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm

@@ -608,7 +608,7 @@
 	dir = 9
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/spawner/burrow/lava_planet,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered/winter_biodome/living_quarters)
 "fs" = (
@@ -896,7 +896,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/spawner/burrow/lava_planet,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered/winter_biodome/living_quarters)
 "lq" = (
@@ -952,7 +952,7 @@
 "mD" = (
 /obj/effect/turf_decal/solgov/wood/center,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/spawner/burrow/lava_planet,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/wood,
 /area/ruin/unpowered/winter_biodome/living_quarters)
 "mX" = (
@@ -1081,7 +1081,7 @@
 	},
 /obj/effect/turf_decal/corner/opaque/solgovgold/diagonal,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/spawner/burrow/lava_planet,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered/winter_biodome/engineering)
 "qt" = (
@@ -1467,10 +1467,10 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/blood/gibs/up,
-/obj/structure/spawner/burrow/lava_planet,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/wood,
 /area/ruin/unpowered/winter_biodome/entrance)
 "Ar" = (
@@ -1925,7 +1925,7 @@
 /turf/open/floor/wood,
 /area/ruin/unpowered/winter_biodome/sauna)
 "Lf" = (
-/obj/structure/spawner/burrow/lava_planet,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/grass/snow,
 /area/ruin/unpowered/winter_biodome)
 "Lt" = (

_maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm

@@ -542,7 +542,7 @@
 /area/ruin/unpowered/buried_shrine)
 "nq" = (
 /obj/structure/stone_tile/surrounding,
-/obj/structure/spawner/burrow/lava_planet,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "nz" = (
@@ -930,7 +930,10 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "wM" = (
-/obj/structure/stone_tile/slab,
+/obj/structure/stone_tile/surrounding/cracked{
+	dir = 4
+	},
+/obj/structure/stone_tile/center,
 /obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
@@ -1648,6 +1651,7 @@
 	dir = 1
 	},
 /obj/structure/spawner/burrow/lava_planet,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "QR" = (
@@ -1864,7 +1868,7 @@
 /obj/structure/stone_tile{
 	dir = 1
 	},
-/obj/structure/spawner/burrow/lava_planet,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit,
 /area/ruin/unpowered/buried_shrine)
 "Xr" = (
@@ -3928,7 +3932,7 @@ LJ
 ta
 NN
 ta
-Xv
+wM
 Ad
 mM
 Ad
@@ -4095,7 +4099,7 @@ ee
 WZ
 WZ
 yz
-wM
+Ad
 tL
 WZ
 Yh

_maps/shuttles/inteq/inteq_valor.dmm

@@ -539,11 +539,11 @@
 	},
 /obj/effect/turf_decal/borderfloorwhite,
 /obj/machinery/button/door{
+	dir = 1;
 	id = "valor_surgery";
 	name = "Privacy Shutters";
-	pixel_y = 8;
-	dir = 1;
-	pixel_x = 8
+	pixel_x = 8;
+	pixel_y = 8
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -640,10 +640,10 @@
 /area/ship/hallway/port)
 "fO" = (
 /obj/structure/closet/secure_closet{
+	icon_door = "prisoner";
 	icon_state = "prisoner";
 	name = "shuttle pilot locker";
-	req_access = list(3);
-	icon_door = "prisoner"
+	req_access = list(3)
 	},
 /obj/item/clothing/head/beret/sec/inteq,
 /obj/item/clothing/head/soft/inteq,
@@ -1951,6 +1951,7 @@
 	},
 /obj/effect/turf_decal/corner_techfloor_gray/full,
 /obj/machinery/cell_charger,
+/obj/item/clothing/gloves/color/yellow,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "sc" = (
@@ -2884,8 +2885,8 @@
 	pixel_y = 4
 	},
 /obj/item/reagent_containers/syringe{
-	pixel_y = -4;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = -4
 	},
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/medical)
@@ -4034,11 +4035,11 @@
 /obj/machinery/airalarm/directional/east,
 /obj/effect/turf_decal/borderfloorwhite,
 /obj/machinery/button/door{
+	dir = 1;
 	id = "valor_surgery";
 	name = "Privacy Shutters";
-	pixel_y = -23;
-	dir = 1;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = -23
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -4532,8 +4533,8 @@
 /obj/structure/table/glass,
 /obj/machinery/computer/med_data/laptop{
 	dir = 8;
-	pixel_y = 7;
-	pixel_x = 3
+	pixel_x = 3;
+	pixel_y = 7
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/medical)
@@ -5124,8 +5125,8 @@
 	},
 /obj/structure/table,
 /obj/item/storage/toolbox/emergency/shuttle{
-	pixel_y = 9;
-	pixel_x = -1
+	pixel_x = -1;
+	pixel_y = 9
 	},
 /obj/item/gps{
 	pixel_x = 6;