mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 19:44:09 +01:00
Fix remaining non-returning Destroys()
Plus a little refactor to mining flaps and spacepod doors- they now use CanAtmosPass instead of manually setting the turf to no-atmos-passing
This commit is contained in:
@@ -70,8 +70,8 @@
|
||||
else if(A.a_right == src)
|
||||
A.a_right = null
|
||||
src.holder = null
|
||||
..()
|
||||
|
||||
return ..()
|
||||
|
||||
pulsed(var/radio = 0)
|
||||
if(holder && (wires & WIRE_RECEIVE))
|
||||
activate()
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
a_left.holder = null
|
||||
if(a_right)
|
||||
a_right.holder = null
|
||||
..()
|
||||
return ..()
|
||||
|
||||
attach(var/obj/item/device/D, var/obj/item/device/D2, var/mob/user)
|
||||
if((!D)||(!D2)) return 0
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
if(stat!=DEAD) //If not dead.
|
||||
death(1) //Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA
|
||||
ghostize() //Ghostize checks for key so nothing else is necessary.
|
||||
..()
|
||||
return ..()
|
||||
|
||||
say_understands(var/other)//Goddamn is this hackish, but this say code is so odd
|
||||
if (istype(other, /mob/living/silicon/ai))
|
||||
|
||||
@@ -216,8 +216,8 @@
|
||||
held_item = null
|
||||
|
||||
robogibs(src.loc, viruses)
|
||||
src.Destroy()
|
||||
return
|
||||
qdel(src)
|
||||
|
||||
//Cannibalized from the parrot mob. ~Zuhayr
|
||||
|
||||
/mob/living/simple_animal/spiderbot/verb/drop_held_item()
|
||||
|
||||
@@ -201,7 +201,7 @@
|
||||
|
||||
/obj/structure/cable/singularity_pull(S, current_size)
|
||||
if(current_size >= STAGE_FIVE)
|
||||
Destroy()
|
||||
qdel(src)
|
||||
|
||||
// the cable coil object, used for laying cable
|
||||
|
||||
|
||||
@@ -135,7 +135,7 @@ obj/item/weapon/gun/energy/laser/retro
|
||||
|
||||
Destroy()
|
||||
processing_objects.Remove(src)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
|
||||
process()
|
||||
@@ -172,7 +172,7 @@ obj/item/weapon/gun/energy/laser/retro
|
||||
|
||||
Destroy()
|
||||
processing_objects.Remove(src)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
|
||||
process()
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
Destroy()
|
||||
processing_objects.Remove(src)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
|
||||
process()
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
|
||||
Destroy()
|
||||
processing_objects.Remove(src)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
process()
|
||||
charge_tick++
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
user << "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow."
|
||||
var/obj/item/weapon/shard/shrapnel/S = new()
|
||||
S.loc = get_turf(src)
|
||||
src.Destroy()
|
||||
qdel(src)
|
||||
|
||||
/obj/item/weapon/arrow/baguette
|
||||
name = "baguette"
|
||||
|
||||
@@ -637,7 +637,7 @@ atom/proc/create_reagents(var/max_vol)
|
||||
|
||||
/datum/reagents/Destroy()
|
||||
for(var/datum/reagent/reagent in reagent_list)
|
||||
reagent.Destroy()
|
||||
qdel(reagent)
|
||||
|
||||
if(my_atom)
|
||||
my_atom = null
|
||||
|
||||
@@ -166,7 +166,7 @@ datum
|
||||
if(src.data["virus"])
|
||||
var/datum/disease/D = src.data["virus"]
|
||||
D.cure(0)
|
||||
..()
|
||||
return ..()
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
@@ -190,16 +190,16 @@
|
||||
if(istype(target, /obj/item/weapon/reagent_containers/food/snacks))
|
||||
if(!reagents.total_volume)
|
||||
user << "<span class='warning'>You tear open [src], but there's nothing in it.</span>"
|
||||
Destroy()
|
||||
qdel(src)
|
||||
return
|
||||
if(target.reagents.total_volume >= target.reagents.maximum_volume)
|
||||
user << "<span class='warning'>You tear open [src], but [target] is stacked so high that it just drips off!</span>" //Not sure if food can ever be full, but better safe than sorry.
|
||||
Destroy()
|
||||
qdel(src)
|
||||
return
|
||||
else
|
||||
user << "<span class='notice'>You tear open [src] above [target] and the condiments drip onto it.</span>"
|
||||
src.reagents.trans_to(target, amount_per_transfer_from_this)
|
||||
Destroy()
|
||||
qdel(src)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/condiment/pack/on_reagent_change()
|
||||
if(reagents.reagent_list.len > 0)
|
||||
|
||||
@@ -481,7 +481,7 @@
|
||||
|
||||
singularity_pull(S, current_size)
|
||||
if(current_size >= STAGE_FIVE)
|
||||
Destroy()
|
||||
qdel(src)
|
||||
|
||||
// virtual disposal object
|
||||
// travels through pipes in lieu of actual items
|
||||
@@ -685,11 +685,11 @@
|
||||
// otherwise, do normal expel from turf
|
||||
if(H)
|
||||
expel(H, T, 0)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
singularity_pull(S, current_size)
|
||||
if(current_size >= STAGE_FIVE)
|
||||
Destroy()
|
||||
qdel(src)
|
||||
|
||||
// returns the direction of the next pipe object, given the entrance dir
|
||||
// by default, returns the bitmask of remaining directions
|
||||
|
||||
Reference in New Issue
Block a user