From 312eef291883e210129bebdc68782a8dd281f675 Mon Sep 17 00:00:00 2001
From: Birdtalon <birdtalon@gmail.com>
Date: Mon, 13 Nov 2023 21:02:29 +0000
Subject: [PATCH] step

removes more redundant code
---
 .../abilities/warrior/warrior_abilities.dm    | 41 -------------------
 .../abilities/warrior/warrior_macros.dm       | 21 ----------
 .../abilities/warrior/warrior_powers.dm       |  2 +-
 3 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm
index bd6e2bb8d08b..5127ca6fe4ed 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm
@@ -1,17 +1,3 @@
-// toggle agility
-/datum/action/xeno_action/onclick/toggle_agility
-	name = "Toggle Agility"
-	action_icon_state = "agility_on"
-	ability_name = "toggle agility"
-	macro_path = /datum/action/xeno_action/verb/verb_toggle_agility
-	action_type = XENO_ACTION_CLICK
-	xeno_cooldown = 10
-
-/datum/action/xeno_action/onclick/toggle_agility/can_use_action()
-	var/mob/living/carbon/xenomorph/X = owner
-	if(X && !X.buckled && !X.is_mob_incapacitated())
-		return TRUE
-
 // Warrior Fling
 /datum/action/xeno_action/activable/fling
 	name = "Fling"
@@ -28,7 +14,6 @@
 	var/weaken_power = 0.5
 	var/slowdown = 2
 
-
 // Warrior Lunge
 /datum/action/xeno_action/activable/lunge
 	name = "Lunge"
@@ -44,8 +29,6 @@
 	var/click_miss_cooldown = 15
 	var/twitch_message_cooldown = 0 //apparently this is necessary for a tiny code that makes the lunge message on cooldown not be spammable, doesn't need to be big so 5 will do.
 
-// Warrior Agility
-
 /datum/action/xeno_action/activable/warrior_punch
 	name = "Punch"
 	action_icon_state = "punch"
@@ -60,27 +43,3 @@
 	var/base_punch_damage_synth = 30
 	var/base_punch_damage_pred = 25
 	var/damage_variance = 5
-
-/datum/action/xeno_action/activable/uppercut
-	name = "Uppercut"
-	action_icon_state = "rav_clothesline"
-	ability_name = "uppercut"
-	macro_path = /datum/action/xeno_action/verb/verb_uppercut
-	action_type = XENO_ACTION_CLICK
-	ability_primacy = XENO_PRIMARY_ACTION_3
-	xeno_cooldown = 100
-	var/base_damage = 15
-	var/base_knockback = 40
-	var/base_knockdown = 0.25
-	var/knockout_power = 11 // 11 seconds
-	var/base_healthgain = 5 // in percents of health per ko point
-
-/datum/action/xeno_action/activable/jab
-	name = "Jab"
-	action_icon_state = "pounce"
-	ability_name = "jab"
-	macro_path = /datum/action/xeno_action/verb/verb_jab
-	action_type = XENO_ACTION_CLICK
-	ability_primacy = XENO_PRIMARY_ACTION_2
-	xeno_cooldown = 40
-
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_macros.dm b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_macros.dm
index 09a24c079fd0..63d97bb69aa2 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_macros.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_macros.dm
@@ -19,24 +19,3 @@
 	set hidden = TRUE
 	var/action_name = "Punch"
 	handle_xeno_macro(src, action_name)
-
-/datum/action/xeno_action/verb/verb_jab()
-	set category = "Alien"
-	set name = "Jab"
-	set hidden = TRUE
-	var/action_name = "Jab"
-	handle_xeno_macro(src, action_name)
-
-/datum/action/xeno_action/verb/verb_uppercut()
-	set category = "Alien"
-	set name = "Uppercut"
-	set hidden = TRUE
-	var/action_name = "Uppercut"
-	handle_xeno_macro(src, action_name)
-
-/datum/action/xeno_action/verb/verb_toggle_agility()
-	set category = "Alien"
-	set name = "Toggle Agility"
-	set hidden = TRUE
-	var/action_name = "Toggle Agility"
-	handle_xeno_macro(src, action_name)
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm
index 4160c43ae494..cde2e3432e7b 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm
@@ -90,7 +90,7 @@
 	var/turf/throw_turf = xeno.loc
 	var/turf/temp = xeno.loc
 
-	for (var/x in 0 to fling_distance-1)
+	for (var/step in 0 to fling_distance-1)
 		temp = get_step(throw_turf, facing)
 		if (!temp)
 			break