From 26cb63f7fca6b637e23cccc9d9b542e505ad3d43 Mon Sep 17 00:00:00 2001 From: Screemonster Date: Fri, 3 Mar 2017 16:01:17 +0000 Subject: [PATCH] preview icon for xenochimera, fixes feral in stasis, raises shock threshold --- .../species/station/station_special_vr.dm | 4 ++-- icons/mob/human_races/r_xenochimera.dmi | Bin 7751 -> 3113 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index ff3f800b0ff..4301f45ccdf 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -53,7 +53,7 @@ //handle feral triggers - if(H.nutrition <= 200||H.traumatic_shock > 10) // Stress factors are in play + if(H.nutrition <= 200||H.traumatic_shock > 36) // Stress factors are in play // If they're hungry, give nag messages. if (!istype(H.loc, /mob)) // if they're in a mob, skip the hunger stuff so it doesn't mess with drain/absorption modes. if(H.nutrition < 200 && H.nutrition > 150) @@ -73,7 +73,7 @@ H.feral = min(150-H.nutrition, H.feral+1) //Feralness increases while this hungry, capped at 50-150 depending on hunger. // If they're hurt, chance of snapping. Not if they're straight-up KO'd though. - if (H.stat == CONSCIOUS && H.traumatic_shock >=20) + if (H.stat == CONSCIOUS && H.traumatic_shock >=36 && H.in_stasis == 0) //30 brute/burn, or 18 halloss. if (2.5*H.halloss >= H.traumatic_shock) //If the majority of their shock is due to halloss, greater chance of snapping. if(prob(min(10,(0.2 * H.traumatic_shock)))) if(H.feral == 0) diff --git a/icons/mob/human_races/r_xenochimera.dmi b/icons/mob/human_races/r_xenochimera.dmi index 48bf99fff14b8eceb9788ccca2ab7ad4e829c256..ab87cb183e8f4a599f8ae71d6f5b28d71fc85b87 100644 GIT binary patch literal 3113 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 literal 7751 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