Merge remote-tracking branch 'upstream/master220' into better-kits

ss220-space · Nov 4, 2024 · ea2aecc · ea2aecc
2 parents 33ab0df + a308063
commit ea2aecc
Show file tree

Hide file tree

Showing 110 changed files with 3,918 additions and 2,527 deletions.
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cube.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cube.dmm
@@ -10,6 +10,7 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "d" = (
+/obj/effect/mapping_helpers/no_lava,
 /turf/simulated/wall/indestructible,
 /area/lavaland/surface/outdoors)
 "e" = (

diff --git a/_maps/map_files/RandomZLevels/spacebattle.dmm b/_maps/map_files/RandomZLevels/spacebattle.dmm
@@ -1432,7 +1432,7 @@
 	id = "GATE";
 	req_access = list(150)
 	},
-/obj/machinery/door/poddoor{
+/obj/machinery/door/poddoor/impassable{
 	id_tag = "GATE";
 	layer = 2.8
 	},
@@ -6895,7 +6895,7 @@
 /area/awaymission/spacebattle/hallway9)
 "tC" = (
 /obj/structure/table/reinforced,
-/obj/machinery/door_control{
+/obj/machinery/door_control/secure{
 	id = "GATE";
 	name = "Nuke Vault Door Controller"
 	},

diff --git a/_maps/map_files/RandomZLevels/stationCollision.dmm b/_maps/map_files/RandomZLevels/stationCollision.dmm
@@ -1007,7 +1007,7 @@
 	},
 /area/awaymission/research)
 "dm" = (
-/obj/singularity/narsie/sc_Narsie,
+/obj/singularity/god/narsie/sc_Narsie,
 /turf/space,
 /area/awaymission/research)
 "dn" = (