Quick in case.

This commit is contained in:
Fermi
2019-07-02 22:42:07 +01:00
parent 946fbff999
commit 27aad8f117
9 changed files with 84 additions and 78 deletions
@@ -295,8 +295,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
A.cure(FALSE)
SEND_SIGNAL(C, COMSIG_SPECIES_GAIN, src, old_species)
if(C.client)
C.lewd = C.client.prefs.lewdchem
//CITADEL EDIT
if(NOAROUSAL in species_traits)
+8 -1
View File
@@ -318,9 +318,16 @@
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(whispered as num)
set name = "Succumb"
set category = "IC"
message_admins("succumb pressed")
if(src.has_status_effect(/datum/status_effect/chem/enthrall))
message_admins("status found")
var/datum/status_effect/chem/enthrall/E = src.has_status_effect(/datum/status_effect/chem/enthrall)
if(E.phase < 3)
message_admins("increasing phase")
E.phase += 1
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)
adjustOxyLoss(health - HEALTH_THRESHOLD_DEAD)