mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
Some more types which need Destroy to return qdel hints!
This commit is contained in:
@@ -189,7 +189,7 @@
|
|||||||
/obj/structure/AIcore/deactivated/Destroy()
|
/obj/structure/AIcore/deactivated/Destroy()
|
||||||
if(src in empty_playable_ai_cores)
|
if(src in empty_playable_ai_cores)
|
||||||
empty_playable_ai_cores -= src
|
empty_playable_ai_cores -= src
|
||||||
..()
|
return ..()
|
||||||
|
|
||||||
/obj/structure/AIcore/deactivated/proc/load_ai(var/mob/living/silicon/ai/transfer, var/obj/item/device/aicard/card, var/mob/user)
|
/obj/structure/AIcore/deactivated/proc/load_ai(var/mob/living/silicon/ai/transfer, var/obj/item/device/aicard/card, var/mob/user)
|
||||||
|
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
|
|||||||
req_console_supplies -= department
|
req_console_supplies -= department
|
||||||
if(departmentType & RC_INFO)
|
if(departmentType & RC_INFO)
|
||||||
req_console_information -= department
|
req_console_information -= department
|
||||||
..()
|
return ..()
|
||||||
|
|
||||||
/obj/machinery/requests_console/attack_hand(user as mob)
|
/obj/machinery/requests_console/attack_hand(user as mob)
|
||||||
if(..(user))
|
if(..(user))
|
||||||
|
|||||||
@@ -139,7 +139,7 @@
|
|||||||
/obj/structure/foamedmetal/Destroy()
|
/obj/structure/foamedmetal/Destroy()
|
||||||
density = 0
|
density = 0
|
||||||
update_nearby_tiles(1)
|
update_nearby_tiles(1)
|
||||||
..()
|
return ..()
|
||||||
|
|
||||||
/obj/structure/foamedmetal/proc/updateicon()
|
/obj/structure/foamedmetal/proc/updateicon()
|
||||||
if(metal == 1)
|
if(metal == 1)
|
||||||
|
|||||||
@@ -149,12 +149,9 @@
|
|||||||
..()
|
..()
|
||||||
|
|
||||||
/obj/structure/closet/body_bag/cryobag/Destroy()
|
/obj/structure/closet/body_bag/cryobag/Destroy()
|
||||||
if(syringe)
|
qdel_null(syringe)
|
||||||
qdel(syringe)
|
qdel_null(tank)
|
||||||
syringe = null
|
return ..()
|
||||||
qdel(tank)
|
|
||||||
tank = null
|
|
||||||
..()
|
|
||||||
|
|
||||||
/obj/structure/closet/body_bag/cryobag/open()
|
/obj/structure/closet/body_bag/cryobag/open()
|
||||||
. = ..()
|
. = ..()
|
||||||
|
|||||||
@@ -152,4 +152,4 @@
|
|||||||
/obj/item/radio/integrated/signal/Destroy()
|
/obj/item/radio/integrated/signal/Destroy()
|
||||||
if(radio_controller)
|
if(radio_controller)
|
||||||
radio_controller.remove_object(src, frequency)
|
radio_controller.remove_object(src, frequency)
|
||||||
..()
|
return ..()
|
||||||
|
|||||||
@@ -19,6 +19,11 @@
|
|||||||
New()
|
New()
|
||||||
create_reagents(1000)
|
create_reagents(1000)
|
||||||
|
|
||||||
|
Destroy()
|
||||||
|
qdel_null(detonator)
|
||||||
|
qdel_null_list(beakers)
|
||||||
|
return ..()
|
||||||
|
|
||||||
attack_self(mob/user as mob)
|
attack_self(mob/user as mob)
|
||||||
if(!stage || stage==1)
|
if(!stage || stage==1)
|
||||||
if(detonator)
|
if(detonator)
|
||||||
|
|||||||
@@ -52,7 +52,7 @@
|
|||||||
/obj/item/weapon/implant/Destroy()
|
/obj/item/weapon/implant/Destroy()
|
||||||
if(part)
|
if(part)
|
||||||
part.implants.Remove(src)
|
part.implants.Remove(src)
|
||||||
..()
|
return ..()
|
||||||
|
|
||||||
/obj/item/weapon/implant/attackby(obj/item/I, mob/user)
|
/obj/item/weapon/implant/attackby(obj/item/I, mob/user)
|
||||||
if(istype(I, /obj/item/weapon/implanter))
|
if(istype(I, /obj/item/weapon/implanter))
|
||||||
|
|||||||
@@ -24,8 +24,8 @@
|
|||||||
ion_trail.set_up(src)
|
ion_trail.set_up(src)
|
||||||
|
|
||||||
/obj/item/weapon/tank/jetpack/Destroy()
|
/obj/item/weapon/tank/jetpack/Destroy()
|
||||||
qdel(ion_trail)
|
qdel_null(ion_trail)
|
||||||
..()
|
return ..()
|
||||||
|
|
||||||
/obj/item/weapon/tank/jetpack/examine(mob/user)
|
/obj/item/weapon/tank/jetpack/examine(mob/user)
|
||||||
. = ..()
|
. = ..()
|
||||||
|
|||||||
@@ -435,7 +435,7 @@
|
|||||||
|
|
||||||
/obj/item/weapon/weldingtool/experimental/Destroy()
|
/obj/item/weapon/weldingtool/experimental/Destroy()
|
||||||
processing_objects -= src
|
processing_objects -= src
|
||||||
..()
|
return ..()
|
||||||
|
|
||||||
/obj/item/weapon/weldingtool/experimental/process()
|
/obj/item/weapon/weldingtool/experimental/process()
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -116,7 +116,7 @@
|
|||||||
unbuckle_mob()
|
unbuckle_mob()
|
||||||
|
|
||||||
processing_objects -= src
|
processing_objects -= src
|
||||||
..()
|
return ..()
|
||||||
|
|
||||||
/obj/effect/energy_net/process()
|
/obj/effect/energy_net/process()
|
||||||
if(isnull(buckled_mob) || buckled_mob.loc != loc)
|
if(isnull(buckled_mob) || buckled_mob.loc != loc)
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
/obj/item/weapon/reagent_containers/glass/rag/Destroy()
|
/obj/item/weapon/reagent_containers/glass/rag/Destroy()
|
||||||
processing_objects -= src //so we don't continue turning to ash while gc'd
|
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)
|
/obj/item/weapon/reagent_containers/glass/rag/attack_self(mob/user as mob)
|
||||||
if(on_fire)
|
if(on_fire)
|
||||||
|
|||||||
@@ -127,9 +127,6 @@
|
|||||||
)
|
)
|
||||||
item_state = "boxing"
|
item_state = "boxing"
|
||||||
|
|
||||||
/obj/structure/window/reinforced/holowindow/Destroy()
|
|
||||||
..()
|
|
||||||
|
|
||||||
/obj/structure/window/reinforced/holowindow/attackby(obj/item/W as obj, mob/user as mob)
|
/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)) return//I really wish I did not need this
|
||||||
if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
|
if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
|
||||||
@@ -183,12 +180,6 @@
|
|||||||
qdel(src)
|
qdel(src)
|
||||||
return
|
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)
|
/obj/machinery/door/window/holowindoor/attackby(obj/item/weapon/I as obj, mob/user as mob)
|
||||||
|
|
||||||
if (src.operating == 1)
|
if (src.operating == 1)
|
||||||
@@ -224,9 +215,6 @@
|
|||||||
visible_message("[src] fades away as it shatters!")
|
visible_message("[src] fades away as it shatters!")
|
||||||
qdel(src)
|
qdel(src)
|
||||||
|
|
||||||
/obj/structure/bed/chair/holochair/Destroy()
|
|
||||||
..()
|
|
||||||
|
|
||||||
/obj/structure/bed/chair/holochair/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
/obj/structure/bed/chair/holochair/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||||
if(istype(W, /obj/item/weapon/wrench))
|
if(istype(W, /obj/item/weapon/wrench))
|
||||||
user << ("<span class='notice'>It's a holochair, you can't dismantle it!</span>")
|
user << ("<span class='notice'>It's a holochair, you can't dismantle it!</span>")
|
||||||
@@ -419,6 +407,10 @@
|
|||||||
for(var/mob/M in currentarea)
|
for(var/mob/M in currentarea)
|
||||||
M << "FIGHT!"
|
M << "FIGHT!"
|
||||||
|
|
||||||
|
// A window that disappears when the ready button is pressed
|
||||||
|
/obj/structure/window/reinforced/holowindow/disappearing
|
||||||
|
name = "Event Window"
|
||||||
|
|
||||||
//Holocarp
|
//Holocarp
|
||||||
|
|
||||||
/mob/living/simple_animal/hostile/carp/holodeck
|
/mob/living/simple_animal/hostile/carp/holodeck
|
||||||
|
|||||||
@@ -51,7 +51,7 @@
|
|||||||
// Description: Removes reference to the communicator, so it can qdel() successfully.
|
// Description: Removes reference to the communicator, so it can qdel() successfully.
|
||||||
/mob/living/voice/Destroy()
|
/mob/living/voice/Destroy()
|
||||||
comm = null
|
comm = null
|
||||||
..()
|
return ..()
|
||||||
|
|
||||||
// Proc: ghostize()
|
// Proc: ghostize()
|
||||||
// Parameters: None
|
// Parameters: None
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
/obj/item/weapon/reagent_containers/borghypo/Destroy()
|
/obj/item/weapon/reagent_containers/borghypo/Destroy()
|
||||||
processing_objects.Remove(src)
|
processing_objects.Remove(src)
|
||||||
..()
|
return ..()
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg+
|
/obj/item/weapon/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg+
|
||||||
if(++charge_tick < recharge_time)
|
if(++charge_tick < recharge_time)
|
||||||
|
|||||||
Reference in New Issue
Block a user