Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks

[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
This commit is contained in:
kevinz000
2019-11-26 16:01:48 -07:00
committed by GitHub
22 changed files with 279 additions and 189 deletions
@@ -272,11 +272,11 @@
msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n"
if(reagents.has_reagent("astral"))
msg += "[t_He] have wild, spacey eyes"
msg += "[t_He] has wild, spacey eyes"
if(mind)
msg += " and have a strange, abnormal look to them.\n"
msg += " and they have a strange, abnormal look to them.\n"
else
msg += " and don't look like they're all there.\n"
msg += " and they don't look like they're all there.\n"
if(isliving(user))
var/mob/living/L = user
@@ -57,3 +57,9 @@
return
to_chat(A, "[src] projects into your mind, <b><i> \"[message]\"</b></i>")
log_game("FERMICHEM: [src] has astrally transmitted [message] into [A]")
//Delete the mob if there's no mind! Pay that mob no mind.
/mob/living/simple_animal/astral/Life()
if(!mind)
qdel(src)
. = ..()
@@ -310,6 +310,7 @@
emote_see = list("looks at you eagerly for pets!", "wiggles enthusiastically.")
gold_core_spawnable = NO_SPAWN
var/pseudo_death = FALSE
var/mob/living/carbon/human/origin
/mob/living/simple_animal/pet/cat/custom_cat/death()
if (pseudo_death == TRUE) //secret cat chem