cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix various runtimes (#48563)

Browse Source 
The grille one could use a lower level solution eventually. As in 
separation of simple animal attack/visuals/aftereffects but that's 
bigger refactor.

* Fixes explosion dismemberment runtime.
* Fixes removing pen from PDA runtime.
* Mulebot bullet act runtime.
* Trying to refuel plasmacutter with fuel runtime.
* Fixes grille runtime.
* Teslium reaction runtime
* lavaland elite win runtime
This commit is contained in:
AnturK
2020-01-05 07:13:10 +01:00
committed by Tad Hardesty
parent 44618a4d85
commit e624cabe5d
7 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/grille.dm
+1 -1
View File
@@ -82,7 +82,7 @@
. = ..()
if(!.)
return
if(!shock(user, 70))
if(!shock(user, 70) && !QDELETED(src)) //Last hit still shocks but shouldn't deal damage to the grille
take_damage(rand(5,10), BRUTE, "melee", 1)
/obj/structure/grille/attack_paw(mob/user)