Let Soldiers attack unconscious U-S

cmss13-devs · Sep 25, 2024 · 9726958 · 9726958
1 parent ac476a4
commit 9726958
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm
@@ -745,7 +745,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
 		if(XENO_CASTE_HELLHOUND)
 			M = /mob/living/carbon/xenomorph/hellhound
 		if(XENO_CASTE_SOLDIER)
-			M = /mob/living/carbon/xenomorph/soldieR
+			M = /mob/living/carbon/xenomorph/soldier
 		if(XENO_CASTE_KING)
 			M = /mob/living/carbon/xenomorph/king
 	return M

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Soldier.dm b/code/modules/mob/living/carbon/xenomorph/castes/Soldier.dm
@@ -7,7 +7,6 @@
 	max_health = XENO_HEALTH_TIER_2
 	plasma_gain = XENO_PLASMA_GAIN_TIER_8
 	plasma_max = XENO_PLASMA_TIER_10
-	crystal_max = XENO_CRYSTAL_LOW
 	xeno_explosion_resistance = XENO_EXPLOSIVE_ARMOR_TIER_1
 	armor_deflection = XENO_ARMOR_TIER_1
 	evasion = XENO_EVASION_MEDIUM
@@ -41,7 +40,6 @@
 	acid_blood_damage = 35 /// Strong acid blood. Should be a define in the future.
 	acid_blood_spatter = TRUE /// Testing variable, means that their blood can melt objects in the environment. Primarily barricades.
 
-	mutation_type = SOLDIER_NORMAL
 	icon_xeno = 'icons/mob/xenos/soldier.dmi'
 	icon_xenonid = 'icons/mob/xenonids/drone.dmi'
 
@@ -99,10 +97,6 @@
 		aggression_cur = AGGRESSION_NO_HIVE ///If we do not have a hive, bump up aggression to go lethal instead.
 		aggression_min = AGGRESSION_NO_HIVE
 
-	/// This is so stupid. Mutators are set inline with new, and are not created on Initialize(). However, pull_multiplier is then overriden by the personal mutator pull_multiplier on Initialize() with recalculate_actions().
-	mutators.pull_multiplier = initial(pull_multiplier)
-	pull_multiplier = mutators.pull_multiplier
-
 /mob/living/carbon/xenomorph/soldier/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, used_weapon = null, sharp = 0, edge = 0, force = FALSE)
 	. = ..() //It will take the previous arguments.
 

diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm b/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm
@@ -138,7 +138,9 @@ At bare minimum, make sure the relevant checks from parent types gets copied in
 //          MOBS           //
 /////////////////////////////
 /mob/living/ai_check_stat(mob/living/carbon/xenomorph/X)
-	return stat == CONSCIOUS && !(locate(/datum/effects/crit) in effects_list)
+//	if(X.target_unconscious)
+//		return TRUE
+	return X.target_unconscious || stat == CONSCIOUS && !(locate(/datum/effects/crit) in effects_list)
 
 /////////////////////////////
 //         CARBON          //