+Yamerol, tweaked PE, tweaked CM3000, tweaked medpH.

This commit is contained in:
Fermi
2019-07-02 22:15:32 +01:00
parent d83fe49556
commit 946fbff999
12 changed files with 142 additions and 27 deletions
@@ -295,8 +295,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
A.cure(FALSE)
SEND_SIGNAL(C, COMSIG_SPECIES_GAIN, src, old_species)
C.lewd = C.client.prefs.lewdchem
if(C.client)
C.lewd = C.client.prefs.lewdchem
//CITADEL EDIT
if(NOAROUSAL in species_traits)
+2 -1
View File
@@ -281,7 +281,7 @@
var/datum/disease/D = thing
if(D.spread_flags & DISEASE_SPREAD_CONTACT_SKIN)
ContactContractDisease(D)
if(iscarbon(L))
var/mob/living/carbon/C = L
if(HAS_TRAIT(src, TRAIT_STRONG_GRABBER))
@@ -329,6 +329,7 @@
to_chat(src, "<span class='notice'>You have given up life and succumbed to death.</span>")
death()
/mob/living/incapacitated(ignore_restraints, ignore_grab)
if(stat || IsUnconscious() || IsStun() || IsKnockdown() || recoveringstam || (!ignore_restraints && restrained(ignore_grab))) // CIT CHANGE - adds recoveringstam check here
return TRUE