shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactors explosions

Browse Source
This commit is contained in:
CitadelStationBot
2017-05-24 16:45:00 -05:00
parent 869953cd18
commit 11344c4682
41 changed files with 932 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/experimentor.dm
+1 -1
View File
@@ -683,7 +683,7 @@
spawn(rand(35,100))
if(src.loc == user)
visible_message("<span class='notice'>The [src]'s top opens, releasing a powerful blast!</span>")
explosion(user.loc, -1, rand(1,5), rand(1,5), rand(1,5), rand(1,5), flame_range = 2)
explosion(user.loc, -1, rand(1,5), rand(1,5), rand(1,5), rand(1,5), flame_range = 2)
warn_admins(user, "Explosion")
qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!!
code/modules/research/experimentor.dm.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm (rejected hunks)
@@ -352,7 +352,7 @@
FB.fire()
else if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("<span class='danger'>[src] malfunctions, melting [exp_on] and releasing a burst of flame!</span>")
- SSexplosion.Create(src.loc, -1, 0, 0, 0, 0, flame_range = 2)
+ explosion(src.loc, -1, 0, 0, 0, 0, flame_range = 2)
investigate_log("Experimentor started a fire.", "experimentor")
ejectItem(TRUE)
else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))