diff --git a/baystation12.dme b/baystation12.dme
index 8465e9a321886..7938c7eb761ca 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1648,7 +1648,6 @@
 #include "code\modules\halo\covenant\structures_machines\lekgolo_spawner.dm"
 #include "code\modules\halo\covenant\structures_machines\lights.dm"
 #include "code\modules\halo\covenant\structures_machines\modular_computer.dm"
-#include "code\modules\halo\covenant\structures_machines\newscaster.dm"
 #include "code\modules\halo\covenant\structures_machines\pillar_lift.dm"
 #include "code\modules\halo\covenant\structures_machines\pinch_fusion.dm"
 #include "code\modules\halo\covenant\structures_machines\plasmabattery.dm"
@@ -1774,24 +1773,15 @@
 #include "code\modules\halo\flood\types\pure.dm"
 #include "code\modules\halo\flood\types\sangheili.dm"
 #include "code\modules\halo\floorsigns\floorsigns.dm"
-#include "code\modules\halo\flora\ausflora.dm"
-#include "code\modules\halo\flora\jungle_tree.dm"
-#include "code\modules\halo\flora\swamp_mushrooms.dm"
-#include "code\modules\halo\flora\swamp_tree.dm"
 #include "code\modules\halo\forerunner\knight.dm"
 #include "code\modules\halo\forerunner\monitor.dm"
 #include "code\modules\halo\forerunner\sentinel.dm"
 #include "code\modules\halo\forerunner\sentinel_kit.dm"
 #include "code\modules\halo\forerunner\sentinel_spawner.dm"
 #include "code\modules\halo\forerunner\watcher.dm"
-#include "code\modules\halo\forerunner\airlocks\doors.dm"
 #include "code\modules\halo\forerunner\species\knight\knight.dm"
 #include "code\modules\halo\forerunner\species\knight\knight_armour.dm"
 #include "code\modules\halo\forerunner\species\knight\knight_outfit.dm"
-#include "code\modules\halo\forerunner\turfs\floor.dm"
-#include "code\modules\halo\forerunner\turfs\materials.dm"
-#include "code\modules\halo\forerunner\turfs\walls.dm"
-#include "code\modules\halo\icons\machinery\lamp.dm"
 #include "code\modules\halo\insurrection\access_ids.dm"
 #include "code\modules\halo\insurrection\commando_outfits.dm"
 #include "code\modules\halo\insurrection\faxmachine.dm"
@@ -2106,7 +2096,6 @@
 #include "code\modules\halo\structures\atmos_machinery.dm"
 #include "code\modules\halo\structures\barbedwire.dm"
 #include "code\modules\halo\structures\barricade.dm"
-#include "code\modules\halo\structures\bench.dm"
 #include "code\modules\halo\structures\citymapturfs.dm"
 #include "code\modules\halo\structures\closets.dm"
 #include "code\modules\halo\structures\cryopod.dm"
@@ -2114,8 +2103,6 @@
 #include "code\modules\halo\structures\diesel_gen.dm"
 #include "code\modules\halo\structures\electric_fence.dm"
 #include "code\modules\halo\structures\explosive.dm"
-#include "code\modules\halo\structures\fence.dm"
-#include "code\modules\halo\structures\fountain.dm"
 #include "code\modules\halo\structures\girder_override.dm"
 #include "code\modules\halo\structures\repairable_component.dm"
 #include "code\modules\halo\structures\sandbag.dm"
@@ -2156,7 +2143,6 @@
 #include "code\modules\halo\trade\trade_items\weapon_unsc.dm"
 #include "code\modules\halo\turfs\area.dm"
 #include "code\modules\halo\turfs\cityprops.dm"
-#include "code\modules\halo\turfs\grass.dm"
 #include "code\modules\halo\turfs\interiorobjs.dm"
 #include "code\modules\halo\turfs\interiorstructures.dm"
 #include "code\modules\halo\turfs\mineral_field.dm"
@@ -2164,8 +2150,10 @@
 #include "code\modules\halo\turfs\signs.dm"
 #include "code\modules\halo\turfs\streetobjs.dm"
 #include "code\modules\halo\turfs\tech_floors.dm"
-#include "code\modules\halo\turfs\tiles.dm"
 #include "code\modules\halo\turfs\water_overrides.dm"
+#include "code\modules\halo\turfs\forerunner\floor.dm"
+#include "code\modules\halo\turfs\forerunner\materials.dm"
+#include "code\modules\halo\turfs\forerunner\walls.dm"
 #include "code\modules\halo\unsc\access.dm"
 #include "code\modules\halo\unsc\combatdogs.dm"
 #include "code\modules\halo\unsc\crew_monitor.dm"
diff --git a/code/modules/halo/misc/melee_strikes.dm b/code/modules/halo/misc/melee_strikes.dm
index b4113e2a8ee86..982a78e210aca 100644
--- a/code/modules/halo/misc/melee_strikes.dm
+++ b/code/modules/halo/misc/melee_strikes.dm
@@ -41,14 +41,14 @@
 	. = ..()
 
 /obj/item/proc/has_melee_strike(var/mob/user)
-	if(isnull(melee_strikes))
+	if(isnull(melee_strikes) || melee_strikes.len == 0)
 		return null
 	if(isnull(melee_strike))
 		melee_strike = melee_strikes[1]
 		if(!isnull(melee_strike))
 			melee_strike.strike_active(user)
 
-	return melee_strike
+	return 1
 
 /obj/item/proc/verb_swap_stances()
 	set name = "Swap Stances"