Merge remote-tracking branch 'off/master' into merge-upstream

ss220club · Jun 8, 2024 · e58386c · e58386c
2 parents 83521dc + fbcae8a
commit e58386c
Show file tree

Hide file tree

Showing 268 changed files with 208,147 additions and 900 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm
diff --git a/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm b/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
@@ -121,7 +121,7 @@
 	dir = 6
 	},
 /obj/structure/table/reinforced,
-/obj/item/reactive_armour_shell,
+/obj/item/reactive_armor_shell,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)

diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -13,6 +13,7 @@
 		#include "map_files\Mining\Lavaland.dmm"
 		#include "map_files\NorthStar\north_star.dmm"
 		#include "map_files\tramstation\tramstation.dmm"
+		#include "map_files\wawastation\wawastation.dmm"
 
 		#ifdef CIBUILDING
 			#include "templates.dm"