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

Merge pull request #9880 from PsiOmegaDelta/150621-MeteorExAct

Browse Source 
Corrects two ex_acts.
This commit is contained in:
GinjaNinja32
2015-06-21 13:16:23 +01:00
parent b810e1e4aa 8100f286a6
commit 4b5899fa30
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/events/clang.dm
View File

@@ -34,7 +34,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
else if (istype(clong, /mob)) else if (istype(clong, /mob))
if(clong.density || prob(10)) if(clong.density || prob(10))
clong.ex_act(1) clong.ex_act(2)
else else
qdel(src) qdel(src)

2
code/modules/projectiles/projectile/special.dm
View File

@@ -59,7 +59,7 @@
if(src)//Do not add to this if() statement, otherwise the meteor won't delete them if(src)//Do not add to this if() statement, otherwise the meteor won't delete them
if(A) if(A)
A.ex_act(3) A.ex_act(2)
playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1) playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
for(var/mob/M in range(10, src)) for(var/mob/M in range(10, src))