Skip to content

Commit

Permalink
revert
Browse files Browse the repository at this point in the history
oops
  • Loading branch information
ihatethisengine committed Jul 26, 2023
1 parent 947dd1e commit 4c51ba0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@
var/mob/living/carbon/xenomorph/xeno
var/pull_multiplier = 1
var/egg_laying_multiplier = 1
var/need_weeds = TRUE
//Strains Below
remaining_points = 6

Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,7 @@
if(iscarrier(src))
huggers_max = caste.huggers_max
eggs_max = caste.eggs_max
need_weeds = mutators.need_weeds


/mob/living/carbon/xenomorph/proc/recalculate_acid()
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/life.dm
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,8 @@ Make sure their actual health updates immediately.*/

if(W && W.linked_hive.is_ally(src))
return TRUE //weeds, yes!
if(need_weeds)
return FALSE //needs weeds, doesn't have any
if(hive && hive.living_xeno_queen && !is_mainship_level(hive.living_xeno_queen.loc.z) && is_mainship_level(loc.z))
return FALSE //We are on the ship, but the Queen isn't
return TRUE //we have off-weed healing, and either we're on Almayer with the Queen, or we're on non-Almayer, or the Queen is dead, good enough!
Expand Down

0 comments on commit 4c51ba0

Please sign in to comment.