cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some hallucination updates. Should make fake attackers work better, and allowed more than one to occur at once. Also: Health properly updates with halloss, which was an oversight on my part.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3330 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
joe.heinemeyer@gmail.com
2012-03-20 03:12:51 +00:00
parent 2cdb2d9225
commit fa3c701eb2
3 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
+2 -2
View File
@@ -122,8 +122,8 @@
handle_disabilities()
if(hallucination > 0)
if(hallucinations.len == 0 && hallucination >= 20 && health > 0)
if(prob(5))
if(hallucination >= 20 && health > 0)
if(prob(3))
fake_attack(src)
//for(var/atom/a in hallucinations)
// a.hallucinate(src)
code/modules/mob/living/living.dm
+1 -1
View File
@@ -8,7 +8,7 @@
/mob/living/proc/updatehealth()
if(!src.nodamage)
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() - src.getCloneLoss()
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() - src.getCloneLoss() -src.halloss
else
src.health = 100
src.stat = 0