Succumb tweak. Ready to merge.
This commit is contained in:
@@ -88,4 +88,4 @@
|
||||
AM.Hear(rendered, src, language, message, , spans)
|
||||
|
||||
if(critical) //Dying words.
|
||||
succumb(1)
|
||||
succumb()
|
||||
|
||||
@@ -318,20 +318,19 @@
|
||||
visible_message("<b>[src]</b> points at [A].", "<span class='notice'>You point at [A].</span>")
|
||||
return TRUE
|
||||
|
||||
/mob/living/verb/succumb(whispered as null)
|
||||
/mob/living/verb/succumb()
|
||||
set name = "Succumb"
|
||||
set category = "IC"
|
||||
if(src.has_status_effect(/datum/status_effect/chem/enthrall))
|
||||
var/datum/status_effect/chem/enthrall/E = src.has_status_effect(/datum/status_effect/chem/enthrall)
|
||||
if(E.phase < 3)
|
||||
E.enthrallTally += 50
|
||||
to_chat(src, "<span class='notice'>You give into [E.master]'s influence'.</span>")
|
||||
to_chat(src, "<span class='notice'>You give into [E.master]'s influence.</span>")
|
||||
if (InCritical())
|
||||
log_message("Has [whispered ? "whispered his final words" : "succumbed to death"] while in [InFullCritical() ? "hard":"soft"] critical with [round(health, 0.1)] points of health!", LOG_ATTACK)
|
||||
log_message("Has succumbed to death while in [InFullCritical() ? "hard":"soft"] critical with [round(health, 0.1)] points of health!", LOG_ATTACK)
|
||||
adjustOxyLoss(health - HEALTH_THRESHOLD_DEAD)
|
||||
updatehealth()
|
||||
if(!whispered)
|
||||
to_chat(src, "<span class='notice'>You have given up life and succumbed to death.</span>")
|
||||
to_chat(src, "<span class='notice'>You have given up life and succumbed to death.</span>")
|
||||
death()
|
||||
|
||||
|
||||
|
||||
@@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
|
||||
send_speech(message, message_range, src, bubble_type, spans, language, message_mode)
|
||||
|
||||
if(succumbed)
|
||||
succumb(1)
|
||||
succumb()
|
||||
to_chat(src, compose_message(src, language, message, , spans, message_mode))
|
||||
|
||||
return 1
|
||||
|
||||
Reference in New Issue
Block a user