diff --git a/code/modules/halo/Forerunner/Halo.dmi b/code/modules/halo/forerunner/Halo.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/Halo.dmi
rename to code/modules/halo/forerunner/Halo.dmi
diff --git a/code/modules/halo/Forerunner/Monitor.dmi b/code/modules/halo/forerunner/Monitor.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/Monitor.dmi
rename to code/modules/halo/forerunner/Monitor.dmi
diff --git a/code/modules/halo/Forerunner/Sentinel.dmi b/code/modules/halo/forerunner/Sentinel.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/Sentinel.dmi
rename to code/modules/halo/forerunner/Sentinel.dmi
diff --git a/code/modules/halo/Forerunner/airlocks/door32.dmi b/code/modules/halo/forerunner/airlocks/door32.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/airlocks/door32.dmi
rename to code/modules/halo/forerunner/airlocks/door32.dmi
diff --git a/code/modules/halo/Forerunner/airlocks/doors.dm b/code/modules/halo/forerunner/airlocks/doors.dm
similarity index 100%
rename from code/modules/halo/Forerunner/airlocks/doors.dm
rename to code/modules/halo/forerunner/airlocks/doors.dm
diff --git a/code/modules/halo/Forerunner/forerunner_weapons.dmi b/code/modules/halo/forerunner/forerunner_weapons.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/forerunner_weapons.dmi
rename to code/modules/halo/forerunner/forerunner_weapons.dmi
diff --git a/code/modules/halo/Forerunner/heavy_sentinel_spawner.dmi b/code/modules/halo/forerunner/heavy_sentinel_spawner.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/heavy_sentinel_spawner.dmi
rename to code/modules/halo/forerunner/heavy_sentinel_spawner.dmi
diff --git a/code/modules/halo/Forerunner/knight.dm b/code/modules/halo/forerunner/knight.dm
similarity index 100%
rename from code/modules/halo/Forerunner/knight.dm
rename to code/modules/halo/forerunner/knight.dm
diff --git a/code/modules/halo/Forerunner/knight.dmi b/code/modules/halo/forerunner/knight.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/knight.dmi
rename to code/modules/halo/forerunner/knight.dmi
diff --git a/code/modules/halo/Forerunner/monitor.dm b/code/modules/halo/forerunner/monitor.dm
similarity index 100%
rename from code/modules/halo/Forerunner/monitor.dm
rename to code/modules/halo/forerunner/monitor.dm
diff --git a/code/modules/halo/Forerunner/sentinel.dm b/code/modules/halo/forerunner/sentinel.dm
similarity index 100%
rename from code/modules/halo/Forerunner/sentinel.dm
rename to code/modules/halo/forerunner/sentinel.dm
diff --git a/code/modules/halo/Forerunner/sentinel_kit.dm b/code/modules/halo/forerunner/sentinel_kit.dm
similarity index 100%
rename from code/modules/halo/Forerunner/sentinel_kit.dm
rename to code/modules/halo/forerunner/sentinel_kit.dm
diff --git a/code/modules/halo/Forerunner/sentinel_kit.dmi b/code/modules/halo/forerunner/sentinel_kit.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/sentinel_kit.dmi
rename to code/modules/halo/forerunner/sentinel_kit.dmi
diff --git a/code/modules/halo/Forerunner/sentinel_spawner.dm b/code/modules/halo/forerunner/sentinel_spawner.dm
similarity index 100%
rename from code/modules/halo/Forerunner/sentinel_spawner.dm
rename to code/modules/halo/forerunner/sentinel_spawner.dm
diff --git a/code/modules/halo/Forerunner/species/knight/knight.dm b/code/modules/halo/forerunner/species/knight/knight.dm
similarity index 100%
rename from code/modules/halo/Forerunner/species/knight/knight.dm
rename to code/modules/halo/forerunner/species/knight/knight.dm
diff --git a/code/modules/halo/Forerunner/species/knight/knight.dmi b/code/modules/halo/forerunner/species/knight/knight.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/species/knight/knight.dmi
rename to code/modules/halo/forerunner/species/knight/knight.dmi
diff --git a/code/modules/halo/Forerunner/species/knight/knight_armour.dm b/code/modules/halo/forerunner/species/knight/knight_armour.dm
similarity index 100%
rename from code/modules/halo/Forerunner/species/knight/knight_armour.dm
rename to code/modules/halo/forerunner/species/knight/knight_armour.dm
diff --git a/code/modules/halo/Forerunner/species/knight/knight_armour.dmi b/code/modules/halo/forerunner/species/knight/knight_armour.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/species/knight/knight_armour.dmi
rename to code/modules/halo/forerunner/species/knight/knight_armour.dmi
diff --git a/code/modules/halo/Forerunner/species/knight/knight_blood.dmi b/code/modules/halo/forerunner/species/knight/knight_blood.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/species/knight/knight_blood.dmi
rename to code/modules/halo/forerunner/species/knight/knight_blood.dmi
diff --git a/code/modules/halo/Forerunner/species/knight/knight_dam.dmi b/code/modules/halo/forerunner/species/knight/knight_dam.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/species/knight/knight_dam.dmi
rename to code/modules/halo/forerunner/species/knight/knight_dam.dmi
diff --git a/code/modules/halo/Forerunner/species/knight/knight_outfit.dm b/code/modules/halo/forerunner/species/knight/knight_outfit.dm
similarity index 100%
rename from code/modules/halo/Forerunner/species/knight/knight_outfit.dm
rename to code/modules/halo/forerunner/species/knight/knight_outfit.dm
diff --git a/code/modules/halo/Forerunner/species/knight/knight_template.dmi b/code/modules/halo/forerunner/species/knight/knight_template.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/species/knight/knight_template.dmi
rename to code/modules/halo/forerunner/species/knight/knight_template.dmi
diff --git a/code/modules/halo/Forerunner/watcher.dm b/code/modules/halo/forerunner/watcher.dm
similarity index 100%
rename from code/modules/halo/Forerunner/watcher.dm
rename to code/modules/halo/forerunner/watcher.dm
diff --git a/code/modules/halo/Forerunner/watcher.dmi b/code/modules/halo/forerunner/watcher.dmi
similarity index 100%
rename from code/modules/halo/Forerunner/watcher.dmi
rename to code/modules/halo/forerunner/watcher.dmi
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"