Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allows wardens to heal eachother again at half the health and gives a bigger message #5982

Merged
merged 7 commits into from
Mar 25, 2024
Merged

Allows wardens to heal eachother again at half the health and gives a bigger message #5982

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e4c4a50
change
Mar 19, 2024
acf0ded
Update code/modules/mob/living/carbon/xenomorph/abilities/praetorian/…
Red-byte3D Mar 19, 2024
4ab62f1
Update code/modules/mob/living/carbon/xenomorph/abilities/praetorian/…
Red-byte3D Mar 19, 2024
1175893
Update code/modules/mob/living/carbon/xenomorph/abilities/praetorian/…
Red-byte3D Mar 19, 2024
29d214b
reju
Mar 19, 2024
bb52d61
bigger message
Mar 19, 2024
4a4c189
heal message
Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,9 +828,6 @@
if (!X.Adjacent(A))
to_chat(X, SPAN_XENODANGER("We must be within touching distance of [targetXeno]!"))
return
if(istype(targetXeno.strain, /datum/xeno_strain/warden))
to_chat(X, SPAN_XENODANGER("We cannot heal a sister of the same strain!"))
return
if (SEND_SIGNAL(targetXeno, COMSIG_XENO_PRE_HEAL) & COMPONENT_CANCEL_XENO_HEAL)
to_chat(X, SPAN_XENOWARNING("We cannot heal this xeno!"))
return
Expand All @@ -847,13 +844,21 @@
if (!behavior.use_internal_hp_ability(bonus_heal))
bonus_heal = 0

to_chat(X, SPAN_XENODANGER("We heal [targetXeno]!"))
to_chat(X, SPAN_XENOHIGHDANGER("We heal [targetXeno]!"))
to_chat(targetXeno, SPAN_XENOHIGHDANGER("We are healed by [X]!"))
targetXeno.gain_health(heal_amount + bonus_heal)
//Amount to heal in this cast of the ability
var/quantity_healed = heal_amount
if(istype(targetXeno.strain, /datum/xeno_strain/warden))
// Half the healing if warden
quantity_healed = quantity_healed / 2
else
quantity_healed = quantity_healed + bonus_heal

targetXeno.gain_health(quantity_healed)
targetXeno.visible_message(SPAN_BOLDNOTICE("[X] places its claws on [targetXeno], and its wounds are quickly sealed!")) //marines probably should know if a xeno gets healed
X.gain_health(heal_amount*0.5 + bonus_heal*0.5)
X.flick_heal_overlay(3 SECONDS, "#00B800")
behavior.transferred_healing += heal_amount
behavior.transferred_healing += quantity_healed
use_plasma = TRUE //it's already hard enough to gauge health without hp showing on the mob
targetXeno.flick_heal_overlay(3 SECONDS, "#00B800")//so the visible_message and recovery overlay will warn marines and possibly predators that the xenomorph has been healed!

Expand All @@ -869,7 +874,7 @@
if (!behavior.use_internal_hp_ability(debuff_cost))
return

to_chat(X, SPAN_XENODANGER("We rejuvenate [targetXeno]!"))
to_chat(X, SPAN_XENOHIGHDANGER("We rejuvenate [targetXeno]!"))
to_chat(targetXeno, SPAN_XENOHIGHDANGER("We are rejuvenated by [X]!"))
targetXeno.visible_message(SPAN_BOLDNOTICE("[X] points at [targetXeno], and it spasms as it recuperates unnaturally quickly!")) //marines probably should know if a xeno gets rejuvenated
targetXeno.xeno_jitter(1 SECONDS) //it might confuse them as to why the queen got up half a second after being AT rocketed, and give them feedback on the Praetorian rejuvenating
Expand Down
Loading