mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-22 08:01:16 +00:00
Partially ports the GLOB system
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
sparks.attach(loc)
|
||||
|
||||
/obj/item/weapon/antag_spawner/Destroy()
|
||||
qdel_null(sparks)
|
||||
QDEL_NULL(sparks)
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/antag_spawner/proc/spawn_antag(client/C, turf/T)
|
||||
|
||||
@@ -149,8 +149,8 @@
|
||||
..()
|
||||
|
||||
/obj/structure/closet/body_bag/cryobag/Destroy()
|
||||
qdel_null(syringe)
|
||||
qdel_null(tank)
|
||||
QDEL_NULL(syringe)
|
||||
QDEL_NULL(tank)
|
||||
return ..()
|
||||
|
||||
/obj/structure/closet/body_bag/cryobag/open()
|
||||
|
||||
@@ -1473,9 +1473,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
if (src.id && prob(90)) //IDs are kept in 90% of the cases
|
||||
src.id.forceMove(get_turf(src.loc))
|
||||
else
|
||||
qdel_null(src.id)
|
||||
qdel_null(src.cartridge)
|
||||
qdel_null(src.pai)
|
||||
QDEL_NULL(src.id)
|
||||
QDEL_NULL(src.cartridge)
|
||||
QDEL_NULL(src.pai)
|
||||
return ..()
|
||||
|
||||
/obj/item/device/pda/clown/Crossed(AM as mob|obj) //Clown PDA is slippery.
|
||||
|
||||
@@ -79,7 +79,7 @@ var/list/civilian_cartridges = list(
|
||||
var/list/stored_data = list()
|
||||
|
||||
/obj/item/weapon/cartridge/Destroy()
|
||||
qdel_null(radio)
|
||||
QDEL_NULL(radio)
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/cartridge/engineering
|
||||
|
||||
@@ -298,8 +298,8 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
|
||||
all_communicators -= src
|
||||
processing_objects -= src
|
||||
listening_objects.Remove(src)
|
||||
qdel_null(camera)
|
||||
qdel_null(exonet)
|
||||
QDEL_NULL(camera)
|
||||
QDEL_NULL(exonet)
|
||||
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -32,8 +32,8 @@
|
||||
|
||||
/obj/item/device/defib_kit/Destroy()
|
||||
. = ..()
|
||||
qdel_null(paddles)
|
||||
qdel_null(bcell)
|
||||
QDEL_NULL(paddles)
|
||||
QDEL_NULL(bcell)
|
||||
|
||||
/obj/item/device/defib_kit/loaded //starts with a cell
|
||||
bcell = /obj/item/weapon/cell/apc
|
||||
|
||||
@@ -30,7 +30,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard)
|
||||
//Will stop people throwing friend pAIs into the singularity so they can respawn
|
||||
if(!isnull(pai))
|
||||
pai.death(0)
|
||||
qdel_null(radio)
|
||||
QDEL_NULL(radio)
|
||||
return ..()
|
||||
|
||||
/obj/item/device/paicard/attack_self(mob/user)
|
||||
|
||||
@@ -35,7 +35,7 @@ var/global/list/active_radio_jammers = list()
|
||||
/obj/item/device/radio_jammer/Destroy()
|
||||
if(on)
|
||||
turn_off()
|
||||
qdel_null(power_source)
|
||||
QDEL_NULL(power_source)
|
||||
return ..()
|
||||
|
||||
/obj/item/device/radio_jammer/get_cell()
|
||||
|
||||
@@ -27,9 +27,9 @@
|
||||
|
||||
|
||||
/obj/item/weapon/flamethrower/Destroy()
|
||||
qdel_null(weldtool)
|
||||
qdel_null(igniter)
|
||||
qdel_null(ptank)
|
||||
QDEL_NULL(weldtool)
|
||||
QDEL_NULL(igniter)
|
||||
QDEL_NULL(ptank)
|
||||
. = ..()
|
||||
|
||||
/obj/item/weapon/flamethrower/process()
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
create_reagents(1000)
|
||||
|
||||
Destroy()
|
||||
qdel_null(detonator)
|
||||
qdel_null_list(beakers)
|
||||
QDEL_NULL(detonator)
|
||||
QDEL_NULL_LIST(beakers)
|
||||
return ..()
|
||||
|
||||
attack_self(mob/user as mob)
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
V.mechassist()
|
||||
for(var/L in need_amend)
|
||||
V.add_assistable_langs(L)
|
||||
qdel_null(src)
|
||||
QDEL_NULL(src)
|
||||
|
||||
/obj/item/weapon/implant/language/get_data()
|
||||
var/dat = {"
|
||||
|
||||
@@ -76,5 +76,5 @@
|
||||
G.epitaph = epitaph
|
||||
G.add_fingerprint(usr)
|
||||
G.dir = user.dir
|
||||
qdel_null(src)
|
||||
QDEL_NULL(src)
|
||||
return
|
||||
@@ -65,7 +65,7 @@
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/storage/laundry_basket/dropped(mob/user as mob)
|
||||
qdel_null(linked)
|
||||
QDEL_NULL(linked)
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/storage/laundry_basket/show_to(mob/user as mob)
|
||||
|
||||
@@ -40,14 +40,14 @@
|
||||
|
||||
/obj/item/weapon/storage/Destroy()
|
||||
close_all()
|
||||
qdel_null(boxes)
|
||||
qdel_null(src.storage_start)
|
||||
qdel_null(src.storage_continue)
|
||||
qdel_null(src.storage_end)
|
||||
qdel_null(src.stored_start)
|
||||
qdel_null(src.stored_continue)
|
||||
qdel_null(src.stored_end)
|
||||
qdel_null(closer)
|
||||
QDEL_NULL(boxes)
|
||||
QDEL_NULL(src.storage_start)
|
||||
QDEL_NULL(src.storage_continue)
|
||||
QDEL_NULL(src.storage_end)
|
||||
QDEL_NULL(src.stored_start)
|
||||
QDEL_NULL(src.stored_continue)
|
||||
QDEL_NULL(src.stored_end)
|
||||
QDEL_NULL(closer)
|
||||
. = ..()
|
||||
|
||||
/obj/item/weapon/storage/MouseDrop(obj/over_object as obj)
|
||||
@@ -354,7 +354,7 @@
|
||||
//such as when picking up all the items on a tile with one click.
|
||||
/obj/item/weapon/storage/proc/handle_item_insertion(obj/item/W as obj, prevent_warning = 0)
|
||||
if(!istype(W)) return 0
|
||||
|
||||
|
||||
if(usr)
|
||||
usr.remove_from_mob(W,target = src) //If given a target, handles forceMove()
|
||||
W.on_enter_storage(src)
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
ion_trail.set_up(src)
|
||||
|
||||
/obj/item/weapon/tank/jetpack/Destroy()
|
||||
qdel_null(ion_trail)
|
||||
QDEL_NULL(ion_trail)
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/tank/jetpack/examine(mob/user)
|
||||
|
||||
@@ -70,10 +70,10 @@ var/list/global/tank_gauge_cache = list()
|
||||
return
|
||||
|
||||
/obj/item/weapon/tank/Destroy()
|
||||
qdel_null(air_contents)
|
||||
QDEL_NULL(air_contents)
|
||||
|
||||
processing_objects.Remove(src)
|
||||
qdel_null(src.proxyassembly)
|
||||
QDEL_NULL(src.proxyassembly)
|
||||
|
||||
if(istype(loc, /obj/item/device/transfer_valve))
|
||||
var/obj/item/device/transfer_valve/TTV = loc
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
/obj/item/weapon/tool/crowbar/power/Destroy()
|
||||
if(counterpart)
|
||||
counterpart.counterpart = null // So it can qdel cleanly.
|
||||
qdel_null(counterpart)
|
||||
QDEL_NULL(counterpart)
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/tool/crowbar/power/attack_self(mob/user)
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
/obj/item/weapon/tool/screwdriver/power/Destroy()
|
||||
if(counterpart)
|
||||
counterpart.counterpart = null // So it can qdel cleanly.
|
||||
qdel_null(counterpart)
|
||||
QDEL_NULL(counterpart)
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/tool/screwdriver/power/attack_self(mob/user)
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
/obj/item/weapon/tool/wirecutters/power/Destroy()
|
||||
if(counterpart)
|
||||
counterpart.counterpart = null // So it can qdel cleanly.
|
||||
qdel_null(counterpart)
|
||||
QDEL_NULL(counterpart)
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/tool/wirecutters/power/attack_self(mob/user)
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
/obj/item/weapon/tool/wrench/power/Destroy()
|
||||
if(counterpart)
|
||||
counterpart.counterpart = null // So it can qdel cleanly.
|
||||
qdel_null(counterpart)
|
||||
QDEL_NULL(counterpart)
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/tool/wrench/power/attack_self(mob/user)
|
||||
|
||||
Reference in New Issue
Block a user