mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 04:51:32 +01:00
Fix some harddels. (#21373)
Let's try to haunt down this brain and mannequin harddel bullshit --------- Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
@@ -158,6 +158,7 @@
|
||||
|
||||
/obj/item/card/id/Destroy()
|
||||
QDEL_NULL(chat_user)
|
||||
mob_id = null
|
||||
. = ..()
|
||||
GC_TEMPORARY_HARDDEL
|
||||
|
||||
|
||||
@@ -52,6 +52,11 @@
|
||||
cig_cell = new cell_type(src)
|
||||
ec_cartridge = new cartridge_type(src)
|
||||
|
||||
/obj/item/clothing/mask/smokable/ecig/Destroy()
|
||||
QDEL_NULL(ec_cartridge)
|
||||
QDEL_NULL(cig_cell)
|
||||
return ..()
|
||||
|
||||
/obj/item/clothing/mask/smokable/ecig/get_cell()
|
||||
return cig_cell
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
var/state = 0
|
||||
var/path = 0
|
||||
var/obj/item/device/assembly_holder/detonator = null
|
||||
var/list/beakers = new/list()
|
||||
var/list/beakers = list()
|
||||
var/list/allowed_containers = list(/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle)
|
||||
var/affected_area = 3
|
||||
|
||||
@@ -26,6 +26,13 @@
|
||||
. = ..()
|
||||
create_reagents(1000)
|
||||
|
||||
/obj/item/grenade/chem_grenade/Destroy()
|
||||
for(var/obj/item/beaker in beakers)
|
||||
qdel(beaker)
|
||||
beakers.Cut()
|
||||
QDEL_NULL(detonator)
|
||||
return ..()
|
||||
|
||||
/obj/item/grenade/chem_grenade/attack_self(mob/user as mob)
|
||||
if(!stage || stage==1)
|
||||
if(detonator)
|
||||
|
||||
Reference in New Issue
Block a user