mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-05 23:11:52 +00:00
Fixes grabs runtiming on qdel()
This commit is contained in:
@@ -71,10 +71,13 @@
|
||||
|
||||
|
||||
/obj/item/weapon/grab/process()
|
||||
if(gcDestroyed) // GC is trying to delete us, we'll kill our processing so we can cleanly GC
|
||||
return PROCESS_KILL
|
||||
|
||||
confirm()
|
||||
if(!assailant)
|
||||
qdel(src)
|
||||
return
|
||||
qdel(src) // Same here, except we're trying to delete ourselves.
|
||||
return PROCESS_KILL
|
||||
|
||||
if(assailant.client)
|
||||
assailant.client.screen -= hud
|
||||
@@ -407,7 +410,11 @@
|
||||
|
||||
/obj/item/weapon/grab/dropped()
|
||||
loc = null
|
||||
qdel(src)
|
||||
if(!destroying)
|
||||
qdel(src)
|
||||
|
||||
/obj/item/weapon/grab
|
||||
var/destroying = 0
|
||||
|
||||
/obj/item/weapon/grab/Destroy()
|
||||
animate(affecting, pixel_x = 0, pixel_y = 0, 4, 1, LINEAR_EASING)
|
||||
@@ -421,4 +428,5 @@
|
||||
assailant = null
|
||||
qdel(hud)
|
||||
hud = null
|
||||
..()
|
||||
destroying = 1 // stops us calling qdel(src) on dropped()
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user