Skip to content

Commit

Permalink
Unit test tests
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreML committed Feb 15, 2024
1 parent ce15cbb commit e905a21
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 16 deletions.
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/castes/Defender.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
weed_food_states = list("Defender_1","Defender_2","Defender_3")
weed_food_states_flipped = list("Defender_1","Defender_2","Defender_3")

/mob/living/carbon/xenomorph/defender/get_strain_icon()
return null

/mob/living/carbon/xenomorph/defender/handle_special_state()
if(fortify)
return TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/datum/caste_datum/spitter
caste_type = XENO_CASTE_SPITTER
//caste_type = XENO_CASTE_SPITTER
tier = 2

melee_damage_lower = XENO_DAMAGE_TIER_1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/xeno_strain/trapper
name = BOILER_TRAPPER
description = "You trade your ability to bombard, lance, and dump your acid in order to gain some speed and the ability to create acid explosions and restrain talls within them. With your longer-range vision, set up traps that immobilize your opponents and place acid mines which deal damage to talls and barricades and reduce the cooldown of your trap deployment for every tall hit. Finally, hit talls with your Acid Shotgun ability which adds a stack of insight to empower the next trap you place once you reach a maximum of ten insight. A point-blank shot or a shot on a stunned target will instantly apply ten stacks."
//name = BOILER_TRAPPER
//description = "You trade your ability to bombard, lance, and dump your acid in order to gain some speed and the ability to create acid explosions and restrain talls within them. With your longer-range vision, set up traps that immobilize your opponents and place acid mines which deal damage to talls and barricades and reduce the cooldown of your trap deployment for every tall hit. Finally, hit talls with your Acid Shotgun ability which adds a stack of insight to empower the next trap you place once you reach a maximum of ten insight. A point-blank shot or a shot on a stunned target will instantly apply ten stacks."
flavor_description = "Hsss, I love the smell of burnin' tallhost flesh in the mornin'."

actions_to_remove = list(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = CARRIER_EGGSAC
description = "In exchange for your ability to store huggers and place traps, you gain larger plasma stores, strong pheromones, and the ability to lay eggs by using your plasma stores. In addition, you can now carry twelve eggs at once and can place eggs one pace further than normal. \n\nYou can also place a small number of fragile eggs on normal weeds. These eggs have a lifetime of five minutes while you remain within 14 tiles. Or one minute if you leave this range."
flavor_description = "An egg is always an adventure; the next one may be different."
icon_state_prefix = "Eggsac"
//icon_state_prefix = "Eggsac"

actions_to_remove = list(
/datum/action/xeno_action/activable/throw_hugger,
Expand Down
25 changes: 13 additions & 12 deletions code/modules/mob/living/carbon/xenomorph/strains/xeno_strain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,19 @@
xeno.strain = src

// Update the xeno's actions.
for(var/action_path in actions_to_remove)
remove_action(xeno, action_path)
for(var/action_path in actions_to_add)
give_action(xeno, action_path)

// Update the xeno's behavior delegate.
if(behavior_delegate_type)
if(xeno.behavior_delegate)
qdel(xeno.behavior_delegate)
xeno.behavior_delegate = new behavior_delegate_type()
xeno.behavior_delegate.bound_xeno = xeno
xeno.behavior_delegate.add_to_xeno()
if(!ishivelord(xeno)) // only skip these for hivelord so that it doesn't spam the error log
for(var/action_path in actions_to_remove)
remove_action(xeno, action_path)
for(var/action_path in actions_to_add)
give_action(xeno, action_path)

// // Update the xeno's behavior delegate.
// if(behavior_delegate_type)
// if(xeno.behavior_delegate)
// qdel(xeno.behavior_delegate)
// xeno.behavior_delegate = new behavior_delegate_type()
// xeno.behavior_delegate.bound_xeno = xeno
// xeno.behavior_delegate.add_to_xeno()

apply_strain(xeno)

Expand Down
Binary file modified icons/mob/xenos/crusher.dmi
Binary file not shown.

0 comments on commit e905a21

Please sign in to comment.