TGS Test Merge (#5432)

code/__DEFINES/xeno.dm

@@ -62,6 +62,9 @@
 
 #define ACID_SPRAY_LINE 0
 #define ACID_SPRAY_CONE 1
+/// Defines for Abomination ability /datum/action/xeno_action/activable/feralfrenzy
+#define SINGLETARGETGUT 0
+#define AOETARGETGUT 1
 
 #define WARDEN_HEAL_SHIELD 0
 #define WARDEN_HEAL_HP 1

code/datums/ammo/energy.dm

@@ -230,3 +230,10 @@
 		var/mob/living/carbon/xenomorph/xeno = hit_mob
 		xeno.apply_damage(damage * 0.75, BURN)
 		xeno.interference = 30
+
+/datum/ammo/energy/yautja/rifle/bolt/set_bullet_traits()
+	. = ..()
+	LAZYADD(traits_to_give, list(
+		BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary)
+	))
+

code/modules/cm_preds/yaut_weapons.dm

@@ -998,7 +998,7 @@
 
 /obj/item/weapon/gun/energy/yautja/plasmarifle/set_gun_config_values()
 	..()
-	set_fire_delay(FIRE_DELAY_TIER_6*2)
+	set_fire_delay(FIRE_DELAY_TIER_4*2)
 	accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_10
 	accuracy_mult_unwielded = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_10
 	scatter = SCATTER_AMOUNT_TIER_6

code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_abilities.dm

@@ -1,52 +1,76 @@
-/datum/action/xeno_action/activable/pounce/predalien
-	name = "Leap"
+
+/datum/action/xeno_action/onclick/feralrush
+	name = "Feral Rush"
+	action_icon_state = "charge_spit"
+	ability_name = "toughen up"
+	macro_path = /datum/action/xeno_action/verb/verb_feralrush
 	ability_primacy = XENO_PRIMARY_ACTION_1
+	action_type = XENO_ACTION_ACTIVATE
+	xeno_cooldown = 12 SECONDS
+
+	// Config
+	var/speed_duration = 3 SECONDS
+	var/armor_duration = 6 SECONDS
+	var/speed_buff_amount = 0.8 // Go from shit slow to kindafast
+	var/armor_buff_amount = 10 // hopefully-minor buff so they can close the distance
 
-	knockdown = FALSE
+	var/speed_buff = FALSE
+	var/armor_buff = FALSE
 
-	distance = 5
-	knockdown = FALSE // Should we knock down the target?
-	slash = FALSE // Do we slash upon reception?
-	freeze_self = FALSE // Should we freeze ourselves after the lunge?
-	should_destroy_objects = TRUE   // Only used for ravager charge
 
 /datum/action/xeno_action/onclick/predalien_roar
 	name = "Roar"
 	action_icon_state = "screech"
 	ability_name = "roar"
 	action_type = XENO_ACTION_CLICK
 	ability_primacy = XENO_PRIMARY_ACTION_2
+	macro_path = /datum/action/xeno_action/verb/verb_predalien_roar
 	xeno_cooldown = 25 SECONDS
-	plasma_cost = 50
-
 	var/predalien_roar = list("sound/voice/predalien_roar.ogg")
 	var/bonus_damage_scale = 2.5
 	var/bonus_speed_scale = 0.05
 
-/datum/action/xeno_action/onclick/smash
-	name = "Smash"
-	action_icon_state = "stomp"
-	ability_name = "smash"
+/datum/action/xeno_action/activable/feral_smash
+	name = "Feral Smash"
+	ability_name = "Feral Smash"
+	action_icon_state = "lunge"
 	action_type = XENO_ACTION_CLICK
+	macro_path = /datum/action/xeno_action/verb/feral_smash
 	ability_primacy = XENO_PRIMARY_ACTION_3
 	xeno_cooldown = 20 SECONDS
-	plasma_cost = 80
-
-	var/freeze_duration = 1.5 SECONDS
 
-	var/activation_delay = 1 SECONDS
-	var/smash_sounds = list('sound/effects/alien_footstep_charge1.ogg', 'sound/effects/alien_footstep_charge2.ogg', 'sound/effects/alien_footstep_charge3.ogg')
+	// Configurables
+	var/grab_range = 4
+	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.
+	var/smash_damage = 20
+	var/smash_scale = 10
+	var/stun_duration = 2 SECONDS
 
-/datum/action/xeno_action/activable/devastate
-	name = "Devastate"
-	action_icon_state = "gut"
-	ability_name = "devastate"
+/datum/action/xeno_action/activable/feralfrenzy
+	name = "Feral Frenzy"
+	action_icon_state = "rav_eviscerate"
+	ability_name = "Feral Frenzy"
 	action_type = XENO_ACTION_CLICK
 	ability_primacy = XENO_PRIMARY_ACTION_4
-	xeno_cooldown = 20 SECONDS
-	plasma_cost = 110
-
-	var/activation_delay = 1 SECONDS
+	macro_path = /datum/action/xeno_action/verb/verb_feralfrenzy
+	xeno_cooldown = 15 SECONDS
 
+	//AOE
+	var/activation_delay_aoe = 1 SECONDS
+	var/base_damage_aoe = 15
+	var/damage_scale_aoe = 10
+	//SINGLE TARGET
+	var/activation_delay = 0.5 SECONDS
 	var/base_damage = 25
-	var/damage_scale = 10 // How much it scales by every kill
+	var/damage_scale = 10
+	var/targeting = SINGLETARGETGUT
+	/// The orange used for a AOETARGETGUT
+	var/range = 2
+
+/datum/action/xeno_action/onclick/toggle_gut_targeting
+	name = "Toggle Gutting Type"
+	action_icon_state = "gut" // starting targetting is SINGLETARGETGUT
+	macro_path = /datum/action/xeno_action/verb/verb_toggle_gut_targeting
+	action_type = XENO_ACTION_ACTIVATE
+	ability_primacy = XENO_PRIMARY_ACTION_5

code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_macros.dm

@@ -0,0 +1,35 @@
+/datum/action/xeno_action/verb/verb_feralfrenzy()
+	set category = "Alien"
+	set name = "Feral Frenzy"
+	set hidden = TRUE
+	var/action_name = "Feral Frenzy"
+	handle_xeno_macro(src, action_name)
+
+/datum/action/xeno_action/verb/verb_toggle_gut_targeting()
+	set category = "Alien"
+	set name = "Toggle Gutting Type"
+	set hidden = TRUE
+	var/action_name = "Toggle Gutting Type"
+	handle_xeno_macro(src, action_name)
+
+
+/datum/action/xeno_action/verb/verb_feralrush()
+	set category = "Alien"
+	set name = "Feral Rush"
+	set hidden = TRUE
+	var/action_name = "Feral Rush"
+	handle_xeno_macro(src, action_name)
+
+/datum/action/xeno_action/verb/verb_predalien_roar()
+	set category = "Alien"
+	set name = "Predalien Roar"
+	set hidden = TRUE
+	var/action_name = "Roar"
+	handle_xeno_macro(src, action_name)
+
+/datum/action/xeno_action/verb/feral_smash()
+	set category = "Alien"
+	set name = "Feral Smash"
+	set hidden = TRUE
+	var/action_name = "Feral Smash"
+	handle_xeno_macro(src, action_name)