floor fixes and gun memes

This commit is contained in:
Poojawa
2018-09-22 03:50:37 -05:00
parent 2905299386
commit 720b25c6f5
4 changed files with 9 additions and 22 deletions
@@ -37,7 +37,7 @@
/obj/item/gun/energy/decloner/update_icon()
..()
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
if(cell.charge > shot.e_cost)
if(!QDELETED(cell) && (cell.charge > shot.e_cost))
add_overlay("decloner_spin")
/obj/item/gun/energy/floragun
@@ -153,7 +153,7 @@
// Tool procs, in case plasma cutter is used as welder
/obj/item/gun/energy/plasmacutter/tool_use_check(mob/living/user, amount)
if(cell.charge >= amount * 100)
if(!QDELETED(cell) && (cell.charge >= amount * 100))
return TRUE
to_chat(user, "<span class='warning'>You need more charge to complete this task!</span>")