fixoo

yes more rebase fixe dreammaker moment aaaa please final one yas ah Impaler gets tail stabby Update code/modules/mob/living/carbon/xenomorph/mutators/strains/burrower/impaler.dm Co-authored-by: harryob <[email protected]> Apply suggestions from code review Co-authored-by: BeagleGaming1 <[email protected]> Apply suggestions from code review Co-authored-by: BeagleGaming1 <[email protected]> Apply suggestions from code review Co-authored-by: BeagleGaming1 <[email protected]> more applied suggestions (squash edition)
cmss13-devs · Jun 8, 2023 · c2de745 · c2de745
1 parent a30f27e
commit c2de745
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 33 deletions.
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
@@ -827,7 +827,7 @@
 /obj/structure/machinery/door/airlock/dropship_hatch/ex_act(severity)
 	return
 
-/obj/structure/machinery/door/airlock/dropship_hatch/initialize_pass_flags(var/datum/pass_flags_container/PF)
+/obj/structure/machinery/door/airlock/dropship_hatch/initialize_pass_flags(datum/pass_flags_container/PF)
 	..()
 	if (PF)
 		PF.flags_can_pass_all = NONE

diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
@@ -275,7 +275,7 @@
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ex_act(severity)
 	return
 
-/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/initialize_pass_flags(var/datum/pass_flags_container/PF)
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/initialize_pass_flags(datum/pass_flags_container/PF)
 	..()
 	if (PF)
 		PF.flags_can_pass_all = NONE

diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
@@ -300,7 +300,7 @@
 	unslashable = TRUE
 	unacidable = TRUE
 
-/obj/structure/machinery/door/poddoor/shutters/almayer/locked/initialize_pass_flags(var/datum/pass_flags_container/PF)
+/obj/structure/machinery/door/poddoor/shutters/almayer/locked/initialize_pass_flags(datum/pass_flags_container/PF)
 	..()
 	if (PF)
 		PF.flags_can_pass_all = NONE

diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm
@@ -131,7 +131,7 @@
 /obj/structure/machinery/door/poddoor/shutters/almayer/pressure/ex_act(severity)
 	return
 
-/obj/structure/machinery/door/poddoor/shutters/almayer/pressure/initialize_pass_flags(var/datum/pass_flags_container/PF)
+/obj/structure/machinery/door/poddoor/shutters/almayer/pressure/initialize_pass_flags(datum/pass_flags_container/PF)
 	..()
 	if (PF)
 		PF.flags_can_pass_all = NONE

diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm
@@ -487,10 +487,10 @@
 	desc = ""
 	icon_state = "ground_spike"
 	mouse_opacity = FALSE
-	var/mob/living/carbon/Xenomorph/source_xeno = null
+	var/mob/living/carbon/xenomorph/source_xeno = null
 
 /obj/effect/xenomorph/ground_spike/New(loc, source_xeno = null, ttl = 10)
-	if(isXeno(source_xeno))
+	if(isxeno(source_xeno))
 		src.source_xeno = source_xeno
 	..(loc)
 	QDEL_IN(src, ttl)

diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
@@ -20,7 +20,7 @@
 	if(climbable)
 		verbs += /obj/structure/proc/climb_on
 
-/obj/structure/initialize_pass_flags(var/datum/pass_flags_container/PF)
+/obj/structure/initialize_pass_flags(datum/pass_flags_container/PF)
 	..()
 	if (PF)
 		PF.flags_can_pass_all = PASS_BURROWED

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm
@@ -10,7 +10,7 @@
 	ability_primacy = XENO_PRIMARY_ACTION_3
 
 /datum/action/xeno_action/activable/burrow/use_ability(atom/A)
-	var/mob/living/carbon/Xenomorph/X = owner
+	var/mob/living/carbon/xenomorph/X = owner
 	if(X.burrow && X.mutation_type != BURROWER_IMPALER)
 		X.tunnel(get_turf(A))
 	else
@@ -40,7 +40,7 @@
 	ability_primacy = XENO_PRIMARY_ACTION_3
 
 /datum/action/xeno_action/onclick/burrow/use_ability(atom/A)
-	var/mob/living/carbon/Xenomorph/X = owner
+	var/mob/living/carbon/xenomorph/X = owner
 	if(X.burrow && X.mutation_type != BURROWER_IMPALER)
 		X.tunnel(get_turf(A))
 	else

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm
@@ -94,7 +94,7 @@
 	if(burrow)
 		addtimer(CALLBACK(src, PROC_REF(process_burrow)), 1 SECONDS)
 
-/mob/living/carbon/Xenomorph/proc/process_burrow_impaler(var/turf/T = get_turf(src))
+/mob/living/carbon/xenomorph/proc/process_burrow_impaler(turf/T = get_turf(src))
 	var/obj/effect/alien/weeds/weeds = locate() in T
 	if(!burrow)
 		return
@@ -103,7 +103,7 @@
 	if(burrow)
 		addtimer(CALLBACK(src, PROC_REF(process_burrow_impaler)), 0.5 SECONDS)
 
-/mob/living/carbon/Xenomorph/proc/burrow_off()
+/mob/living/carbon/xenomorph/proc/burrow_off()
 	if(caste_type && GLOB.xeno_datum_list[caste_type])
 		caste = GLOB.xeno_datum_list[caste_type]
 	to_chat(src, SPAN_NOTICE("You resurface."))
@@ -277,7 +277,7 @@
 
 //Impaler Burrower Abilities
 /datum/action/xeno_action/activable/burrowed_spikes/use_ability(atom/A)
-	var/mob/living/carbon/Xenomorph/X = owner
+	var/mob/living/carbon/xenomorph/X = owner
 	if(!istype(X))
 		return
 
@@ -346,7 +346,7 @@
 	..()
 	return
 
-/datum/action/xeno_action/activable/burrowed_spikes/proc/handle_damage(var/mob/living/carbon/Xenomorph/X, target_turfs, telegraph_atom_list, damage)
+/datum/action/xeno_action/activable/burrowed_spikes/proc/handle_damage(mob/living/carbon/xenomorph/X, target_turfs, telegraph_atom_list, damage)
 	for (var/turf/target_turf in target_turfs)
 		telegraph_atom_list += new /obj/effect/xenomorph/ground_spike(target_turf, X)
 		for (var/mob/living/carbon/C in target_turf)
@@ -369,7 +369,7 @@
 
 
 /datum/action/xeno_action/activable/sunken_tail/use_ability(atom/A)
-	var/mob/living/carbon/Xenomorph/X = owner
+	var/mob/living/carbon/xenomorph/X = owner
 	if(!istype(X))
 		return
 
@@ -423,12 +423,12 @@
 	return
 
 /datum/action/xeno_action/activable/sunken_tail/can_use_action()
-	var/mob/living/carbon/Xenomorph/X = owner
+	var/mob/living/carbon/xenomorph/X = owner
 	if(!X) return
 	if(X.burrow) return FALSE
 	return ..()
 
-/datum/action/xeno_action/activable/sunken_tail/proc/handle_damage(var/mob/living/carbon/Xenomorph/X, target_turfs, damage, var/spike_circle = FALSE)
+/datum/action/xeno_action/activable/sunken_tail/proc/handle_damage(mob/living/carbon/xenomorph/X, target_turfs, damage, spike_circle = FALSE)
 	new /obj/effect/xenomorph/ground_spike(target_turfs, X)
 	for (var/mob/living/carbon/C in target_turfs)
 		if (C.stat == DEAD || HAS_TRAIT(C, TRAIT_NESTED))
@@ -465,14 +465,14 @@
 	for(var/dirn in alldirs)
 		recursive_spread(get_step(T, dirn), dist_left - 1, orig_depth, damage)
 
-/datum/action/xeno_action/activable/sunken_tail/proc/warning_circle(turf/T, mob/living/carbon/Xenomorph/X)
+/datum/action/xeno_action/activable/sunken_tail/proc/warning_circle(turf/T, mob/living/carbon/xenomorph/X)
 	if(!istype(T))
 		return
 
 	new /obj/effect/xenomorph/xeno_telegraph/red(T, (windup_delay/2))
 
 /datum/action/xeno_action/onclick/ensconce/use_ability()
-	var/mob/living/carbon/Xenomorph/xeno = owner
+	var/mob/living/carbon/xenomorph/xeno = owner
 	if(!istype(xeno))
 		return
 
@@ -492,7 +492,7 @@
 		to_chat(xeno, SPAN_XENOWARNING("You need to do this on weeds!"))
 		return
 
-	var/mob/living/carbon/Xenomorph/Burrower/burrowerfortified = locate() in T
+	var/mob/living/carbon/xenomorph/burrower/burrowerfortified = locate() in T
 	if(burrowerfortified != xeno)
 		if(burrowerfortified.fortify)
 			to_chat(xeno, SPAN_XENOWARNING("There is already another sister burrowed here!"))
@@ -529,12 +529,12 @@
 	return
 
 /datum/action/xeno_action/onclick/ensconce/can_use_action()
-	var/mob/living/carbon/Xenomorph/X = owner
+	var/mob/living/carbon/xenomorph/X = owner
 	if(!X) return
 	if(X.burrow) return FALSE
 	return ..()
 
-/datum/action/xeno_action/onclick/ensconce/proc/fortify_switch(var/mob/living/carbon/Xenomorph/X, var/fortify_state)
+/datum/action/xeno_action/onclick/ensconce/proc/fortify_switch(mob/living/carbon/xenomorph/X, fortify_state)
 	if(X.fortify == fortify_state)
 		return
 
@@ -574,7 +574,7 @@
 	UnregisterSignal(owner, COMSIG_MOB_DEATH)
 	fortify_switch(owner, FALSE)
 
-/datum/action/xeno_action/onclick/ensconce/proc/process_ensconce(var/mob/living/carbon/Xenomorph/xeno)
+/datum/action/xeno_action/onclick/ensconce/proc/process_ensconce(mob/living/carbon/xenomorph/xeno)
 	var/turf/T = get_turf(xeno)
 	var/obj/effect/alien/weeds/weeds = locate() in T
 	if(!xeno.fortify)

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm
@@ -890,7 +890,7 @@
 /datum/action/xeno_action/activable/tail_stab/use_ability(atom/targetted_atom)
 	var/mob/living/carbon/xenomorph/stabbing_xeno = owner
 
-	if(stabbing_xeno.burrow || stabbing_xeno.is_ventcrawling)
+	if(stabbing_xeno.burrow && stabbing_xeno.mutation_type != BURROWER_IMPALER || stabbing_xeno.is_ventcrawling)
 		to_chat(stabbing_xeno, SPAN_XENOWARNING("You must be above ground to do this."))
 		return
 

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm
@@ -90,7 +90,7 @@
 		canmove = FALSE
 		return canmove
 
-/mob/living/carbon/Xenomorph/Burrower/ex_act(severity)
+/mob/living/carbon/xenomorph/burrower/ex_act(severity)
 	if(burrow && mutation_type != BURROWER_IMPALER)
 		return
 	else if(burrow)
@@ -103,22 +103,22 @@
 		return
 	..()
 
-/mob/living/carbon/Xenomorph/Burrower/attack_hand()
+/mob/living/carbon/xenomorph/burrower/attack_hand()
 	if(burrow && mutation_type != BURROWER_IMPALER)
 		return
 	..()
 
-/mob/living/carbon/Xenomorph/Burrower/attackby()
+/mob/living/carbon/xenomorph/burrower/attackby()
 	if(burrow && mutation_type != BURROWER_IMPALER)
 		return
 	..()
 
-/mob/living/carbon/Xenomorph/Burrower/bullet_act()
+/mob/living/carbon/xenomorph/burrower/bullet_act()
 	if(burrow && mutation_type != BURROWER_IMPALER)
 		return
 	. = ..()
 
-/mob/living/carbon/Xenomorph/Burrower/get_projectile_hit_chance(obj/item/projectile/P)
+/mob/living/carbon/xenomorph/burrower/get_projectile_hit_chance(obj/item/projectile/P)
 	. = ..()
 	if(burrow && mutation_type != BURROWER_IMPALER)
 		return 0

diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/burrower/impaler.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/burrower/impaler.dm
@@ -13,21 +13,21 @@
 		/datum/action/xeno_action/activable/corrosive_acid,
 		/datum/action/xeno_action/activable/place_construction,
 		/datum/action/xeno_action/onclick/plant_weeds,
-		/datum/action/xeno_action/onclick/place_trap
+		/datum/action/xeno_action/onclick/place_trap,
 	)
 	mutator_actions_to_add = list(
 		/datum/action/xeno_action/activable/burrowed_spikes,
 		/datum/action/xeno_action/activable/sunken_tail,
 		/datum/action/xeno_action/onclick/burrow,
-		/datum/action/xeno_action/onclick/ensconce
+		/datum/action/xeno_action/onclick/ensconce,
 	)
 
 /datum/xeno_mutator/burrower_impaler/apply_mutator(datum/mutator_set/individual_mutators/MS)
 	. = ..()
 	if (. == 0)
 		return
 
-	var/mob/living/carbon/Xenomorph/Burrower/B = MS.xeno
+	var/mob/living/carbon/xenomorph/burrower/B = MS.xeno
 	B.mutation_type = BURROWER_IMPALER
 
 	mutator_update_actions(B)

diff --git a/code/modules/mob/living/living_verbs.dm b/code/modules/mob/living/living_verbs.dm
@@ -11,8 +11,8 @@
 		to_chat(src, SPAN_WARNING("You can't resist in your current state."))
 		return
 
-	if(isXeno(src))
-		var/mob/living/carbon/Xenomorph/Xeno = src
+	if(isxeno(src))
+		var/mob/living/carbon/xenomorph/Xeno = src
 		if(Xeno.burrow)
 			to_chat(src, SPAN_WARNING("You can't resist in your current state."))
 			return

diff --git a/colonialmarines.dme b/colonialmarines.dme
@@ -1879,6 +1879,7 @@
 #include "code\modules\mob\living\carbon\xenomorph\mutators\behavior_delegate.dm"
 #include "code\modules\mob\living\carbon\xenomorph\mutators\mutator.dm"
 #include "code\modules\mob\living\carbon\xenomorph\mutators\strains\boiler\trapper.dm"
+#include "code\modules\mob\living\carbon\xenomorph\mutators\strains\burrower\impaler.dm"
 #include "code\modules\mob\living\carbon\xenomorph\mutators\strains\carrier\eggsac.dm"
 #include "code\modules\mob\living\carbon\xenomorph\mutators\strains\crusher\charger.dm"
 #include "code\modules\mob\living\carbon\xenomorph\mutators\strains\defender\steel_crest.dm"

diff --git a/icons/mob/hud/actions_xeno.dmi b/icons/mob/hud/actions_xeno.dmi
diff --git a/icons/mob/xenonids/Effects.dmi b/icons/mob/xenonids/Effects.dmi
diff --git a/icons/mob/xenos/effects.dmi b/icons/mob/xenos/effects.dmi