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

Update pneumaticCannon.dm

Browse Source
This commit is contained in:
LetterJay
2017-12-23 13:50:48 -06:00
committed by GitHub
parent bec20087c2
commit 709d55bc4a
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/pneumaticCannon.dm
-6
View File
@@ -147,16 +147,10 @@
if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting))
to_chat(user, "<span class='warning'>\The [src] lets out a weak hiss and doesn't react!</span>")
return
<<<<<<< HEAD
if(user.disabilities & CLUMSY && prob(75) && clumsyCheck)
user.visible_message("<span class='warning'>[user] loses their grip on [src], causing it to go off!</span>", "<span class='userdanger'>[src] slips out of your hands and goes off!</span>")
user.dropItemToGround(src, TRUE)
=======
if(user.has_disability(CLUMSY) && prob(75) && clumsyCheck && iscarbon(user))
var/mob/living/carbon/C = user
C.visible_message("<span class='warning'>[C] loses their grip on [src], causing it to go off!</span>", "<span class='userdanger'>[src] slips out of your hands and goes off!</span>")
C.dropItemToGround(src, TRUE)
>>>>>>> 6ce550d... Clownborgs (#33590)
if(prob(10))
target = get_turf(user)
else