Merge pull request #3528 from X0-11/melee-fix

Melee fix
HaloSpaceStation · Feb 2, 2024 · b3b9afd · b3b9afd
2 parents 3a33f52 + 1d8c60a
commit b3b9afd
Show file tree

Hide file tree

Showing 25 changed files with 2 additions and 2 deletions.
diff --git a/code/modules/halo/Forerunner/Halo.dmi → code/modules/halo/forerunner/Halo.dmi b/code/modules/halo/Forerunner/Halo.dmi → code/modules/halo/forerunner/Halo.dmi
diff --git a/code/modules/halo/Forerunner/Monitor.dmi → code/modules/halo/forerunner/Monitor.dmi b/code/modules/halo/Forerunner/Monitor.dmi → code/modules/halo/forerunner/Monitor.dmi
diff --git a/code/modules/halo/Forerunner/Sentinel.dmi → code/modules/halo/forerunner/Sentinel.dmi b/code/modules/halo/Forerunner/Sentinel.dmi → code/modules/halo/forerunner/Sentinel.dmi
diff --git a/...dules/halo/Forerunner/airlocks/door32.dmi → ...dules/halo/forerunner/airlocks/door32.dmi b/...dules/halo/Forerunner/airlocks/door32.dmi → ...dules/halo/forerunner/airlocks/door32.dmi
diff --git a/...modules/halo/Forerunner/airlocks/doors.dm → ...modules/halo/forerunner/airlocks/doors.dm b/...modules/halo/Forerunner/airlocks/doors.dm → ...modules/halo/forerunner/airlocks/doors.dm
diff --git a/...es/halo/Forerunner/forerunner_weapons.dmi → ...es/halo/forerunner/forerunner_weapons.dmi b/...es/halo/Forerunner/forerunner_weapons.dmi → ...es/halo/forerunner/forerunner_weapons.dmi
diff --git a/...alo/Forerunner/heavy_sentinel_spawner.dmi → ...alo/forerunner/heavy_sentinel_spawner.dmi b/...alo/Forerunner/heavy_sentinel_spawner.dmi → ...alo/forerunner/heavy_sentinel_spawner.dmi
diff --git a/code/modules/halo/Forerunner/knight.dm → code/modules/halo/forerunner/knight.dm b/code/modules/halo/Forerunner/knight.dm → code/modules/halo/forerunner/knight.dm
diff --git a/code/modules/halo/Forerunner/knight.dmi → code/modules/halo/forerunner/knight.dmi b/code/modules/halo/Forerunner/knight.dmi → code/modules/halo/forerunner/knight.dmi
diff --git a/code/modules/halo/Forerunner/monitor.dm → code/modules/halo/forerunner/monitor.dm b/code/modules/halo/Forerunner/monitor.dm → code/modules/halo/forerunner/monitor.dm
diff --git a/code/modules/halo/Forerunner/sentinel.dm → code/modules/halo/forerunner/sentinel.dm b/code/modules/halo/Forerunner/sentinel.dm → code/modules/halo/forerunner/sentinel.dm
diff --git a/code/modules/halo/Forerunner/sentinel_kit.dm → code/modules/halo/forerunner/sentinel_kit.dm b/code/modules/halo/Forerunner/sentinel_kit.dm → code/modules/halo/forerunner/sentinel_kit.dm
diff --git a/.../modules/halo/Forerunner/sentinel_kit.dmi → .../modules/halo/forerunner/sentinel_kit.dmi b/.../modules/halo/Forerunner/sentinel_kit.dmi → .../modules/halo/forerunner/sentinel_kit.dmi
diff --git a/...dules/halo/Forerunner/sentinel_spawner.dm → ...dules/halo/forerunner/sentinel_spawner.dm b/...dules/halo/Forerunner/sentinel_spawner.dm → ...dules/halo/forerunner/sentinel_spawner.dm
diff --git a/.../halo/Forerunner/species/knight/knight.dm → .../halo/forerunner/species/knight/knight.dm b/.../halo/Forerunner/species/knight/knight.dm → .../halo/forerunner/species/knight/knight.dm
diff --git a/...halo/Forerunner/species/knight/knight.dmi → ...halo/forerunner/species/knight/knight.dmi b/...halo/Forerunner/species/knight/knight.dmi → ...halo/forerunner/species/knight/knight.dmi
diff --git a/...orerunner/species/knight/knight_armour.dm → ...orerunner/species/knight/knight_armour.dm b/...orerunner/species/knight/knight_armour.dm → ...orerunner/species/knight/knight_armour.dm
diff --git a/...rerunner/species/knight/knight_armour.dmi → ...rerunner/species/knight/knight_armour.dmi b/...rerunner/species/knight/knight_armour.dmi → ...rerunner/species/knight/knight_armour.dmi
diff --git a/...orerunner/species/knight/knight_blood.dmi → ...orerunner/species/knight/knight_blood.dmi b/...orerunner/species/knight/knight_blood.dmi → ...orerunner/species/knight/knight_blood.dmi
diff --git a/.../Forerunner/species/knight/knight_dam.dmi → .../forerunner/species/knight/knight_dam.dmi b/.../Forerunner/species/knight/knight_dam.dmi → .../forerunner/species/knight/knight_dam.dmi
diff --git a/...orerunner/species/knight/knight_outfit.dm → ...orerunner/species/knight/knight_outfit.dm b/...orerunner/species/knight/knight_outfit.dm → ...orerunner/species/knight/knight_outfit.dm
diff --git a/...runner/species/knight/knight_template.dmi → ...runner/species/knight/knight_template.dmi b/...runner/species/knight/knight_template.dmi → ...runner/species/knight/knight_template.dmi
diff --git a/code/modules/halo/Forerunner/watcher.dm → code/modules/halo/forerunner/watcher.dm b/code/modules/halo/Forerunner/watcher.dm → code/modules/halo/forerunner/watcher.dm
diff --git a/code/modules/halo/Forerunner/watcher.dmi → code/modules/halo/forerunner/watcher.dmi b/code/modules/halo/Forerunner/watcher.dmi → code/modules/halo/forerunner/watcher.dmi
diff --git 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"