cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 05:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Tastyfish
2012-01-01 16:45:56 -05:00
parent 343832e431 6b16ac377b
commit 698a9eddbd
10 changed files with 4226 additions and 3865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/carbon/human/emote.dm
View File

@@ -183,10 +183,9 @@
message = "<B>[src]</B> makes a weak noise."
m_type = 2
/* if ("deathgasp")
if ("deathgasp")
message = "<B>[src]</B> seizes up and falls limp, \his eyes dead and lifeless..."
m_type = 1 */
//No. --SkyMarshal
m_type = 1
if ("giggle")
if (!muzzled)

7
code/modules/mob/living/carbon/human/life.dm
View File

@@ -998,9 +998,12 @@
D.cure()
if(!virus2)
for(var/obj/effect/decal/cleanable/blood/B in src.loc)
if(B.virus2)
for(var/obj/effect/decal/cleanable/blood/B in view(1,src))
if(B.virus2 && get_infection_chance())
infect_virus2(src,B.virus2)
for(var/obj/effect/decal/cleanable/mucus/M in view(1,src))
if(M.virus2 && get_infection_chance())
infect_virus2(src,M.virus2)
else
virus2.activate(src)