Some more types which need Destroy to return qdel hints!

This commit is contained in:
Leshana
2017-06-12 10:48:02 -04:00
parent 997c033d7e
commit c91dc333cd
14 changed files with 24 additions and 30 deletions

View File

@@ -35,7 +35,7 @@
/obj/item/weapon/reagent_containers/glass/rag/Destroy()
processing_objects -= src //so we don't continue turning to ash while gc'd
..()
return ..()
/obj/item/weapon/reagent_containers/glass/rag/attack_self(mob/user as mob)
if(on_fire)

View File

@@ -127,9 +127,6 @@
)
item_state = "boxing"
/obj/structure/window/reinforced/holowindow/Destroy()
..()
/obj/structure/window/reinforced/holowindow/attackby(obj/item/W as obj, mob/user as mob)
if(!istype(W)) return//I really wish I did not need this
if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
@@ -183,12 +180,6 @@
qdel(src)
return
/obj/structure/window/reinforced/holowindow/disappearing/Destroy()
..()
/obj/machinery/door/window/holowindoor/Destroy()
..()
/obj/machinery/door/window/holowindoor/attackby(obj/item/weapon/I as obj, mob/user as mob)
if (src.operating == 1)
@@ -224,9 +215,6 @@
visible_message("[src] fades away as it shatters!")
qdel(src)
/obj/structure/bed/chair/holochair/Destroy()
..()
/obj/structure/bed/chair/holochair/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/wrench))
user << ("<span class='notice'>It's a holochair, you can't dismantle it!</span>")
@@ -419,6 +407,10 @@
for(var/mob/M in currentarea)
M << "FIGHT!"
// A window that disappears when the ready button is pressed
/obj/structure/window/reinforced/holowindow/disappearing
name = "Event Window"
//Holocarp
/mob/living/simple_animal/hostile/carp/holodeck

View File

@@ -51,7 +51,7 @@
// Description: Removes reference to the communicator, so it can qdel() successfully.
/mob/living/voice/Destroy()
comm = null
..()
return ..()
// Proc: ghostize()
// Parameters: None

View File

@@ -35,7 +35,7 @@
/obj/item/weapon/reagent_containers/borghypo/Destroy()
processing_objects.Remove(src)
..()
return ..()
/obj/item/weapon/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg+
if(++charge_tick < recharge_time)