cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #375 from Shadow-Quill/patch-1

Browse Source 
Teshari get unscared while vored now
This commit is contained in:
Repede
2019-12-21 16:03:22 -05:00
committed by GitHub
parent de2d494fae 5476450579
commit 06a47d15d5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/mob/living/carbon/human/species/station/seromi.dm
View File

@@ -145,12 +145,14 @@
// If they're dead or unconcious they're a bit beyond this kind of thing. // If they're dead or unconcious they're a bit beyond this kind of thing.
if(H.stat) if(H.stat)
return return
// Vored? Not gonna get frightened.
if(ishuman(H.loc))
return
// No point processing if we're already stressing the hell out. // No point processing if we're already stressing the hell out.
if(H.hallucination >= hallucination_cap && H.loneliness_stage >= warning_cap) if(H.hallucination >= hallucination_cap && H.loneliness_stage >= warning_cap)
return return
// Vored? Not gonna get frightened.
if(ishuman(H.loc))
if(H.loneliness_stage > 0)
H.loneliness_stage -= 4
return
// Check for company. // Check for company.
for(var/mob/living/M in viewers(H)) for(var/mob/living/M in viewers(H))
if(!istype(M, /mob/living/carbon) && !istype(M, /mob/living/silicon/robot)) if(!istype(M, /mob/living/carbon) && !istype(M, /mob/living/silicon/robot))
@@ -221,4 +223,4 @@
if(ms != "") if(ms != "")
H << ms H << ms
H.next_loneliness_time = world.time+500 H.next_loneliness_time = world.time+500