Bull is now a Crusher strain (ft. a minor rework)

code/__DEFINES/action.dm

@@ -50,6 +50,8 @@
 #define VREF_MUTABLE_GAS_MINE_TIMER "VREF_GASMINE_CHARGETIMER"
 // extra reference for how long untill we recharge a new gas mine
 #define VREF_MUTABLE_ACID_MINE_TIMER "VREF_ACIDMINE_CHARGETIMER"
+// extra reference for how many scorched earth charges we have
+#define VREF_MUTABLE_SCORCHED_EARTH "VREF_SCORCHED_EARTH"
 
 /// Actions that toggle on click/trigger
 #define ACTION_TOGGLE "toggle"

code/__DEFINES/dcs/signals/signals_keybindings.dm

@@ -193,6 +193,7 @@
 #define COMSIG_XENOABILITY_TOGGLE_CHARGE "xenoability_toggle_charge"
 #define COMSIG_XENOABILITY_CRESTTOSS "xenoability_cresttoss"
 #define COMSIG_XENOABILITY_ADVANCE "xenoability_advance"
+#define COMSIG_XENOABILITY_SCORCHED_EARTH "xenoability_scorched_earth"
 
 #define COMSIG_XENOABILITY_DEVOUR "xenoability_devour"
 #define COMSIG_XENOABILITY_DRAIN "xenoability_drain"
@@ -202,10 +203,6 @@
 #define COMSIG_XENOABILITY_CARNAGE "xenoability_carnage"
 #define COMSIG_XENOABILITY_FEAST "xenoability_feast"
 
-#define COMSIG_XENOABILITY_BULLCHARGE "xenoability_bullcharge"
-#define COMSIG_XENOABILITY_BULLHEADBUTT "xenoability_bullheadbutt"
-#define COMSIG_XENOABILITY_BULLGORE "xenoability_bullgore"
-
 #define COMSIG_XENOABILITY_TAIL_SWEEP "xenoability_tail_sweep"
 #define COMSIG_XENOABILITY_FORWARD_CHARGE "xenoability_forward_charge"
 #define COMSIG_XENOABILITY_CREST_DEFENSE "xenoability_crest_defense"

code/__DEFINES/is_helpers.dm

@@ -117,7 +117,6 @@ GLOBAL_VAR_INIT(refid_filter, TYPEID(filter(type="angular_blur")))
 #define isxenoqueen(A) (istype(A, /mob/living/carbon/xenomorph/queen))
 #define isxenoshrike(A) (istype(A, /mob/living/carbon/xenomorph/shrike))
 #define isxenodefiler(A) (istype(A, /mob/living/carbon/xenomorph/defiler))
-#define isxenobull(A) (istype(A, /mob/living/carbon/xenomorph/bull))
 #define isxenohivemind(A) (istype(A, /mob/living/carbon/xenomorph/hivemind))
 #define isxenowraith(A) (istype(A, /mob/living/carbon/xenomorph/wraith))
 #define isxenowidow(A) (istype(A, /mob/living/carbon/xenomorph/widow))

code/_globalvars/lists/mobs.dm

@@ -83,8 +83,6 @@ GLOBAL_LIST_INIT(all_xeno_types, list(
 	/mob/living/carbon/xenomorph/hivelord/primordial,
 	/mob/living/carbon/xenomorph/carrier,
 	/mob/living/carbon/xenomorph/carrier/primordial,
-	/mob/living/carbon/xenomorph/bull,
-	/mob/living/carbon/xenomorph/bull/primordial,
 	/mob/living/carbon/xenomorph/queen,
 	/mob/living/carbon/xenomorph/queen/primordial,
 	/mob/living/carbon/xenomorph/king,
@@ -109,6 +107,8 @@ GLOBAL_LIST_INIT(all_xeno_types, list(
 	/mob/living/carbon/xenomorph/defiler/primordial,
 	/mob/living/carbon/xenomorph/crusher,
 	/mob/living/carbon/xenomorph/crusher/primordial,
+	/mob/living/carbon/xenomorph/crusher/bull,
+	/mob/living/carbon/xenomorph/crusher/bull/primordial,
 	/mob/living/carbon/xenomorph/widow,
 	/mob/living/carbon/xenomorph/widow/primordial,
 	/mob/living/carbon/xenomorph/shrike,
@@ -129,7 +129,7 @@ GLOBAL_LIST_INIT(all_xeno_types, list(
 	))
 
 GLOBAL_LIST_INIT(xeno_types_tier_one, list(/datum/xeno_caste/runner, /datum/xeno_caste/drone, /datum/xeno_caste/sentinel, /datum/xeno_caste/defender))
-GLOBAL_LIST_INIT(xeno_types_tier_two, list(/datum/xeno_caste/hunter, /datum/xeno_caste/warrior, /datum/xeno_caste/spitter, /datum/xeno_caste/hivelord, /datum/xeno_caste/carrier, /datum/xeno_caste/bull, /datum/xeno_caste/puppeteer, /datum/xeno_caste/pyrogen))
+GLOBAL_LIST_INIT(xeno_types_tier_two, list(/datum/xeno_caste/hunter, /datum/xeno_caste/warrior, /datum/xeno_caste/spitter, /datum/xeno_caste/hivelord, /datum/xeno_caste/carrier, /datum/xeno_caste/puppeteer, /datum/xeno_caste/pyrogen))
 GLOBAL_LIST_INIT(xeno_types_tier_three, list(/datum/xeno_caste/gorger, /datum/xeno_caste/widow, /datum/xeno_caste/ravager, /datum/xeno_caste/praetorian, /datum/xeno_caste/boiler, /datum/xeno_caste/defiler, /datum/xeno_caste/crusher, /datum/xeno_caste/shrike, /datum/xeno_caste/behemoth, /datum/xeno_caste/warlock))
 GLOBAL_LIST_INIT(xeno_types_tier_four, list(/datum/xeno_caste/shrike, /datum/xeno_caste/queen, /datum/xeno_caste/king))
 

code/datums/gamemodes/_game_mode.dm

@@ -449,12 +449,8 @@ GLOBAL_LIST_INIT(bioscan_locations, list(
 		parts += "[GLOB.round_statistics.spitter_scatter_spits] number of times Spitters horked up scatter spits."
 	if(GLOB.round_statistics.ravager_endures)
 		parts += "[GLOB.round_statistics.ravager_endures] number of times Ravagers used Endure."
-	if(GLOB.round_statistics.bull_crush_hit)
-		parts += "[GLOB.round_statistics.bull_crush_hit] number of times Bulls crushed marines."
-	if(GLOB.round_statistics.bull_gore_hit)
-		parts += "[GLOB.round_statistics.bull_gore_hit] number of times Bulls gored marines."
-	if(GLOB.round_statistics.bull_headbutt_hit)
-		parts += "[GLOB.round_statistics.bull_headbutt_hit] number of times Bulls headbutted marines."
+	if(GLOB.round_statistics.bull_hit)
+		parts += "[GLOB.round_statistics.bull_hit] number of times Bulls charged into marines."
 	if(GLOB.round_statistics.hunter_marks)
 		parts += "[GLOB.round_statistics.hunter_marks] number of times Hunters marked a target for death."
 	if(GLOB.round_statistics.ravager_rages)

code/datums/keybinding/xeno.dm

@@ -286,27 +286,6 @@
 	keybind_signal = COMSIG_XENOABILITY_HIGH_PRESSURE_SPIT
 	hotkey_keys = list("E")
 
-/datum/keybinding/xeno/plow_charge
-	name = "plow_charge"
-	full_name = "Bull: Plow Charge"
-	description = "A charge that plows through the victims."
-	keybind_signal = COMSIG_XENOABILITY_BULLCHARGE
-	hotkey_keys = list("Q")
-
-/datum/keybinding/xeno/headbutt_charge
-	name = "headbutt_charge"
-	full_name = "Bull: Headbutt Charge"
-	description = "A charge that tosses the victim forward or backwards, depending on intent."
-	keybind_signal = COMSIG_XENOABILITY_BULLHEADBUTT
-	hotkey_keys = list("F")
-
-/datum/keybinding/xeno/gore_charge
-	name = "gore_charge"
-	full_name = "Bull: Gore Charge"
-	description = "A charge that gores the victim."
-	keybind_signal = COMSIG_XENOABILITY_BULLGORE
-	hotkey_keys = list("R")
-
 /datum/keybinding/xeno/throw_hugger
 	name = "throw_hugger"
 	full_name = "Carrier: Throw Hugger"
@@ -383,6 +362,13 @@
 	keybind_signal = COMSIG_XENOABILITY_ADVANCE
 	hotkey_keys = list("F")
 
+/datum/keybinding/xeno/scorched_earth
+	name = "Scorched Earth"
+	full_name = "Bull: Scorched Earth"
+	description = "When activated, gain three charges of Scorched Earth. These can be used to dash towards a targeted location, leaving damaging trails of plasma behind."
+	keybind_signal = COMSIG_XENOABILITY_SCORCHED_EARTH
+	hotkey_keys = list("F")
+
 /datum/keybinding/xeno/forward_charge
 	name = "forward charge"
 	full_name = "Defender: Forward charge"

code/datums/round_statistics.dm

@@ -37,7 +37,6 @@ GLOBAL_DATUM_INIT(round_statistics, /datum/round_statistics, new)
 	var/trap_holes = 0
 	var/boiler_acid_smokes = 0
 	var/boiler_neuro_smokes = 0
-	var/crusher_stomps = 0
 	var/crusher_stomp_victims = 0
 	var/praetorian_acid_sprays = 0
 	var/praetorian_spray_direct_hits = 0
@@ -79,9 +78,7 @@ GLOBAL_DATUM_INIT(round_statistics, /datum/round_statistics, new)
 	var/spitter_acid_sprays = 0
 	var/spitter_scatter_spits = 0
 	var/wraith_phase_shifts = 0
-	var/bull_crush_hit = 0
-	var/bull_gore_hit = 0
-	var/bull_headbutt_hit = 0
+	var/bull_hit = 0
 	var/ravager_endures = 0
 	var/hunter_marks = 0
 	var/hunter_silence_targets = 0

code/modules/admin/panels/player_panel.dm

@@ -458,7 +458,6 @@ ADMIN_VERB_ONLY_CONTEXT_MENU(show_player_panel, R_BAN, "Show Player Panel", mob/
 		<a href='byond://?src=[ref];transform=defender;mob=[REF(M)]'>Defender</a> |
 		<br> Alien Tier 2:
 		<a href='byond://?src=[ref];transform=hunter;mob=[REF(M)]'>Hunter</a> |
-		<a href='byond://?src=[ref];transform=bull;mob=[REF(M)]'>Bull</a> |
 		<a href='byond://?src=[ref];transform=warrior;mob=[REF(M)]'>Warrior</a> |
 		<a href='byond://?src=[ref];transform=spitter;mob=[REF(M)]'>Spitter</a> |
 		<a href='byond://?src=[ref];transform=hivelord;mob=[REF(M)]'>Hivelord</a> |

code/modules/admin/topic.dm

@@ -408,8 +408,6 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"]
 				newmob = M.change_mob_type(/mob/living/carbon/xenomorph/drone, location, null, delmob)
 			if("sentinel")
 				newmob = M.change_mob_type(/mob/living/carbon/xenomorph/sentinel, location, null, delmob)
-			if("bull")
-				newmob = M.change_mob_type(/mob/living/carbon/xenomorph/bull, location, null, delmob)
 			if("hunter")
 				newmob = M.change_mob_type(/mob/living/carbon/xenomorph/hunter, location, null, delmob)
 			if("carrier")

code/modules/mob/living/carbon/xenomorph/castes/behemoth/castedatum_behemoth.dm

@@ -29,7 +29,7 @@
 	// *** Evolution *** //
 	upgrade_threshold = TIER_THREE_THRESHOLD
 
-	deevolves_to = /datum/xeno_caste/bull
+	deevolves_to = /datum/xeno_caste/warrior
 
 	// *** Flags *** //
 	caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_IS_STRONG|CASTE_STAGGER_RESISTANT