mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
[MIRROR] Fixes some bad Destroy()s (#10629)
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
d5af465245
commit
5d2435611d
@@ -213,7 +213,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
|
||||
/obj/fire/Destroy()
|
||||
RemoveFire()
|
||||
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/fire/proc/RemoveFire()
|
||||
var/turf/T = loc
|
||||
|
||||
@@ -210,7 +210,7 @@
|
||||
ability_master.update_icon()
|
||||
// qdel(ability_master)
|
||||
ability_master = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/screen/ability/update_icon()
|
||||
// if(!spell)
|
||||
|
||||
@@ -14,7 +14,7 @@ var/datum/controller/transfer_controller/transfer_controller
|
||||
|
||||
/datum/controller/transfer_controller/Destroy()
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/datum/controller/transfer_controller/process()
|
||||
currenttick = currenttick + 1
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
/obj/item/melee/changeling/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
creator = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/melee/changeling/process() //Stolen from ninja swords.
|
||||
if(!creator || loc != creator || !creator.item_is_in_hands(src))
|
||||
|
||||
@@ -81,7 +81,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
|
||||
qdel(blood_image)
|
||||
blood_image = null
|
||||
rune_list.Remove(src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/effect/rune/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -16,7 +16,7 @@ var/global/list/all_objectives = list()
|
||||
|
||||
/datum/objective/Destroy()
|
||||
all_objectives -= src
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/datum/objective/proc/check_completion()
|
||||
return completed
|
||||
|
||||
@@ -30,4 +30,4 @@
|
||||
|
||||
/obj/effect/temporary_effect/fire_blast/Destroy()
|
||||
explosion(get_turf(src), -1, 1, 2, 5, adminlog = 1)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
/obj/machinery/computer/general_air_control/Destroy()
|
||||
if(radio_controller)
|
||||
radio_controller.remove_object(src, frequency)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/machinery/computer/general_air_control/attack_hand(mob/user)
|
||||
if(..(user))
|
||||
|
||||
@@ -427,7 +427,7 @@ var/bomb_set
|
||||
var/obj/D = new /obj/item/disk/nuclear(pick(blobstart))
|
||||
message_admins("[src], the last authentication disk, has been destroyed. Spawning [D] at ([D.x], [D.y], [D.z]).")
|
||||
log_game("[src], the last authentication disk, has been destroyed. Spawning [D] at ([D.x], [D.y], [D.z]).")
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/disk/nuclear/touch_map_edge()
|
||||
qdel(src)
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
/obj/item/mecha_parts/mecha_equipment/repair_droid/Destroy()
|
||||
STOP_PROCESSING(SSfastprocess, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/process()
|
||||
if(!chassis || chassis.hasInternalDamage(MECHA_INT_SHORT_CIRCUIT))
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
my_shield.my_mecha = null
|
||||
qdel(my_shield)
|
||||
my_shield = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/mecha_parts/mecha_equipment/combat_shield/add_equip_overlay(obj/mecha/M as obj)
|
||||
..()
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
/obj/item/mecha_parts/mecha_equipment/omni_shield/Destroy()
|
||||
QDEL_NULL(shields)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/mecha_parts/mecha_equipment/omni_shield/attach(obj/mecha/M as obj)
|
||||
. = ..()
|
||||
@@ -91,7 +91,7 @@
|
||||
/obj/item/shield_projector/rectangle/mecha/Destroy()
|
||||
UnregisterSignal(my_mech, COMSIG_OBSERVER_MOVED)
|
||||
my_mech = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/shield_projector/rectangle/mecha/create_shield()
|
||||
. = ..()
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
T.Entered(A)
|
||||
step_rand(A)
|
||||
cargo.Cut()
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/mecha/working/ripley/firefighter
|
||||
desc = "Standard APLU chassis was refitted with additional thermal protection and cistern."
|
||||
|
||||
@@ -43,7 +43,7 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm
|
||||
/obj/effect/landmark/event_trigger/Destroy()
|
||||
if(event_triggers[creator_ckey])
|
||||
event_triggers[creator_ckey] -= src
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/effect/landmark/event_trigger/Crossed(var/atom/movable/AM)
|
||||
if(!isliving(AM))
|
||||
|
||||
@@ -4,34 +4,27 @@
|
||||
desc = "Oh shit!"
|
||||
icon_state = "pool"
|
||||
icon = 'icons/effects/64x64.dmi'
|
||||
time_to_die = 0.7 SECONDS
|
||||
|
||||
pixel_x = -16
|
||||
|
||||
/obj/effect/temporary_effect/eruption/New(var/turf/T, var/ttd = 10 SECONDS, var/newcolor)
|
||||
/obj/effect/temporary_effect/eruption/Initialize(mapload, var/ttd = 10 SECONDS, var/newcolor)
|
||||
if(ttd)
|
||||
time_to_die = ttd
|
||||
time_to_die += ttd
|
||||
addtimer(CALLBACK(src, PROC_REF(on_eruption), get_turf(src)), time_to_die - 0.2 SECONDS, TIMER_DELETE_ME)
|
||||
|
||||
if(newcolor)
|
||||
color = newcolor
|
||||
|
||||
..()
|
||||
|
||||
/obj/effect/temporary_effect/eruption/Initialize(mapload)
|
||||
. = ..()
|
||||
flick("[icon_state]_create",src)
|
||||
|
||||
/obj/effect/temporary_effect/eruption/Destroy()
|
||||
var/turf/T = get_turf(src)
|
||||
flick("[icon_state]_erupt",src)
|
||||
spawn(5)
|
||||
if(on_eruption(T))
|
||||
spawn(2)
|
||||
..()
|
||||
|
||||
/obj/effect/temporary_effect/eruption/proc/on_eruption(var/turf/Target) // Override for specific functions, as below.
|
||||
flick("[icon_state]_erupt",src)
|
||||
return TRUE
|
||||
|
||||
/obj/effect/temporary_effect/eruption/testing/on_eruption(var/turf/Target)
|
||||
flick("[icon_state]_erupt",src)
|
||||
if(Target)
|
||||
new /obj/effect/explosion(Target)
|
||||
return TRUE
|
||||
@@ -44,6 +37,7 @@
|
||||
desc = "A bubbling pool of fire!"
|
||||
|
||||
/obj/effect/temporary_effect/eruption/flamestrike/on_eruption(var/turf/Target)
|
||||
flick("[icon_state]_erupt",src)
|
||||
if(Target)
|
||||
Target.hotspot_expose(1000, 50, 1)
|
||||
|
||||
|
||||
@@ -156,4 +156,4 @@
|
||||
|
||||
/obj/effect/dummy/chameleon/Destroy()
|
||||
master.disrupt(0)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
/obj/item/powersink/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
STOP_PROCESSING_POWER_OBJECT(src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/powersink/attackby(var/obj/item/I, var/mob/user)
|
||||
if(I.has_tool_quality(TOOL_SCREWDRIVER))
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
if(linkedmonitor)
|
||||
linkedmonitor.unpair(src)
|
||||
linkedmonitor = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/bug_monitor
|
||||
name = "mobile camera pod monitor"
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
T.pinned_target = null
|
||||
T.density = TRUE
|
||||
break
|
||||
..() // delete target
|
||||
. = ..() // delete target
|
||||
|
||||
/obj/item/target/Moved(atom/old_loc, direction, forced = FALSE)
|
||||
. = ..()
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
/obj/item/chainsaw/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/chainsaw/proc/turnOn(mob/user as mob)
|
||||
if(on) return
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
/obj/item/tool/transforming/Destroy()
|
||||
if(welder)
|
||||
QDEL_NULL(welder)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/tool/transforming/get_welder()
|
||||
return welder
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
|
||||
/obj/structure/barricade/sandbag/Destroy()
|
||||
update_connections(1, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/barricade/sandbag/dismantle()
|
||||
update_connections(1, src)
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
if(remote_dial)
|
||||
remote_dial.my_turrets -= src
|
||||
remote_dial = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/prop/prism/proc/reset_rotation()
|
||||
var/degrees_to_rotate = -1 * degrees_from_north
|
||||
@@ -215,4 +215,4 @@
|
||||
for(var/obj/structure/prop/prism/P in my_turrets)
|
||||
P.remote_dial = null
|
||||
my_turrets = list()
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
/obj/structure/prop/nest/Destroy()
|
||||
den_mobs = null
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/prop/nest/attack_hand(mob/living/user) // Used to tell the player that this isn't useful for anything.
|
||||
..()
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
var/obj/machinery/door/blast/puzzle/P = O
|
||||
P.locks -= src
|
||||
linked_objects -= P
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/prop/lock/proc/toggle_lock()
|
||||
enabled = !enabled
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
for(var/datum/beam/B in active_beams)
|
||||
QDEL_NULL(B)
|
||||
active_beams = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/cult/pylon/swarm/pylonhit(var/damage)
|
||||
if(!isbroken)
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
for(var/atom/movable/AM in contents)
|
||||
AM.loc = loc
|
||||
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
/obj/structure/windoor_assembly/Destroy()
|
||||
density = FALSE
|
||||
update_nearby_tiles()
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/windoor_assembly/update_icon()
|
||||
icon_state = "[facing]_[secure]windoor_assembly[state]"
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
/datum/ai_holder/simple_mob/xenobio_slime/Destroy()
|
||||
grudges.Cut()
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/datum/ai_holder/simple_mob/xenobio_slime/sapphire
|
||||
always_stun = TRUE // They know that stuns are godly.
|
||||
|
||||
@@ -195,7 +195,7 @@
|
||||
/obj/effect/blob/shield/Destroy()
|
||||
density = FALSE
|
||||
update_nearby_tiles()
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/effect/blob/shield/update_icon()
|
||||
if(health > maxHealth * 2 / 3)
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
blob_type = null
|
||||
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/blobcore_chunk/proc/setup_blobtype(var/datum/blob_type/parentblob = null)
|
||||
if(!parentblob)
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
/obj/item/reagent_containers/food/snacks/csandwich/Destroy()
|
||||
for(var/obj/item/O in ingredients)
|
||||
qdel(O)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/csandwich/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -165,7 +165,7 @@ var/global/list/total_extraction_beacons = list()
|
||||
|
||||
/obj/structure/extraction_point/Destroy()
|
||||
global.total_extraction_beacons -= src
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/effect/extraction_holder
|
||||
name = "extraction holder"
|
||||
|
||||
@@ -521,7 +521,7 @@
|
||||
UnregisterSignal(src, COMSIG_OBSERVER_MOVED)
|
||||
R = null
|
||||
last_robot_loc = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/mining_scanner/robot
|
||||
name = "integrated deep scan device"
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
|
||||
/obj/item/dogborg/sleeper/Destroy()
|
||||
go_out()
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/dogborg/sleeper/Exit(atom/movable/O)
|
||||
return 0
|
||||
|
||||
@@ -75,7 +75,7 @@ var/list/mob_hat_cache = list()
|
||||
/mob/living/silicon/robot/drone/Destroy()
|
||||
if(hat)
|
||||
hat.loc = get_turf(src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/mob/living/silicon/robot/drone/is_sentient()
|
||||
return FALSE
|
||||
|
||||
@@ -137,7 +137,7 @@
|
||||
/obj/effect/temporary_effect/pulse/disintegrate/Destroy()
|
||||
if(istype(get_turf(src), /turf/simulated/wall))
|
||||
explosion(get_turf(src), -1, 1, 2, 5, adminlog = 1)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/gun/energy/xray/swarm
|
||||
name = "spectral projector"
|
||||
|
||||
@@ -140,7 +140,7 @@
|
||||
/obj/item/card/robot/Destroy()
|
||||
qdel(dummy_card)
|
||||
dummy_card = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/card/robot/GetID()
|
||||
return dummy_card
|
||||
@@ -612,7 +612,7 @@
|
||||
|
||||
/obj/item/borg/combat/shield/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/borg/combat/shield/attack_self(var/mob/living/user)
|
||||
set_shield_level()
|
||||
|
||||
@@ -44,9 +44,10 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have?
|
||||
GLOB.chicken_count += 1
|
||||
|
||||
/mob/living/simple_mob/animal/passive/chicken/Destroy()
|
||||
..()
|
||||
. = ..()
|
||||
GLOB.chicken_count -= 1
|
||||
|
||||
|
||||
/mob/living/simple_mob/animal/passive/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob)
|
||||
if(istype(O, /obj/item/reagent_containers/food/snacks/grown)) //feedin' dem chickens
|
||||
var/obj/item/reagent_containers/food/snacks/grown/G = O
|
||||
|
||||
@@ -144,7 +144,7 @@
|
||||
/mob/living/simple_mob/animal/sif/sakimm/Destroy()
|
||||
if(hat)
|
||||
drop_hat(src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/mob/living/simple_mob/animal/sif/sakimm/update_icon()
|
||||
cut_overlays()
|
||||
|
||||
@@ -198,7 +198,7 @@
|
||||
if(next)
|
||||
next.previous = null
|
||||
next = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/mob/living/simple_mob/animal/space/space_worm/Moved(atom/old_loc, direction, forced = FALSE)
|
||||
. = ..()
|
||||
|
||||
@@ -166,7 +166,7 @@ var/global/moth_amount = 0 // CHOMPEnable, Rykka waz here. *pawstamp*
|
||||
|
||||
/mob/living/simple_mob/vore/solargrub/Destroy()
|
||||
existing_solargrubs -= src
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/mob/living/simple_mob/vore/solargrub/handle_light()
|
||||
. = ..()
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
top.bottom = null
|
||||
if(middle)
|
||||
middle.bottom = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
// These are necessarily fairly similar, but because the positional relations are different, we have to copy-pasta a fair bit
|
||||
/obj/structure/stairs/bottom/check_integrity(var/obj/structure/stairs/bottom/B = null,
|
||||
@@ -256,7 +256,7 @@
|
||||
top.middle = null
|
||||
if(bottom)
|
||||
bottom.middle = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
// These are necessarily fairly similar, but because the positional relations are different, we have to copy-pasta a fair bit
|
||||
/obj/structure/stairs/middle/check_integrity(var/obj/structure/stairs/bottom/B = null,
|
||||
@@ -339,7 +339,7 @@
|
||||
middle.top = null
|
||||
if(bottom)
|
||||
bottom.top = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
// These are necessarily fairly similar, but because the positional relations are different, we have to copy-pasta a fair bit
|
||||
/obj/structure/stairs/top/check_integrity(var/obj/structure/stairs/bottom/B = null,
|
||||
|
||||
@@ -76,7 +76,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
|
||||
construction_state = 0
|
||||
if(master)
|
||||
master.part_scan()
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/particle_accelerator/end_cap
|
||||
name = "Alpha Particle Generation Array"
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
my_hose = null
|
||||
if(carrier)
|
||||
carrier = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/hose_connector/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -102,7 +102,7 @@
|
||||
|
||||
/obj/item/hose_connector/input/active/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/hose_connector/input/active/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -124,7 +124,7 @@
|
||||
|
||||
/obj/item/hose_connector/output/active/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/hose_connector/output/active/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
/obj/item/stack/hose/Destroy()
|
||||
remembered = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/stack/hose/CtrlClick(mob/user)
|
||||
if(remembered)
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
QDEL_NULL(InputSocket)
|
||||
QDEL_NULL(OutputSocket)
|
||||
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/reagent_dispensers/Initialize(mapload)
|
||||
var/datum/reagents/R = new/datum/reagents(5000)
|
||||
|
||||
@@ -835,7 +835,7 @@
|
||||
// otherwise, do normal expel from turf
|
||||
if(H)
|
||||
expel(H, T, 0)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
// returns the direction of the next pipe object, given the entrance dir
|
||||
// by default, returns the bitmask of remaining directions
|
||||
@@ -1102,7 +1102,7 @@
|
||||
// otherwise, do normal expel from turf
|
||||
if(H)
|
||||
expel(H, T, 0)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/disposalpipe/hides_under_flooring()
|
||||
return 1
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
|
||||
/obj/machinery/shieldgen/Destroy()
|
||||
collapse_shields()
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/machinery/shieldgen/proc/shields_up()
|
||||
if(active) return 0 //If it's already turned on, how did this get called?
|
||||
|
||||
@@ -258,4 +258,4 @@
|
||||
/obj/vehicle/bike/Destroy()
|
||||
qdel(ion)
|
||||
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
@@ -30,6 +30,6 @@
|
||||
new /obj/item/material/shard(src.loc)
|
||||
if(prob(25))
|
||||
new /obj/item/material/shard(src.loc)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
//todo: laser_act
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
/datum/artifact_effect/Destroy()
|
||||
master = null //Master still exists even if our effect gets destroyed. No need to qdel_null.
|
||||
qdel_null(active_effect)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/datum/artifact_effect/proc/get_master_holder() // Return the effectmaster's holder, if it is set to an effectmaster. Otherwise, master is the target object.
|
||||
if(istype(master))
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
lightning_strike(T, TRUE)
|
||||
playsound(src, 'sound/goonstation/spooky/creepyshriek.ogg', 100, 1, 75) //It plays VERY far.
|
||||
last_touched = null //Get rid of the reference to our owner.
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
|
||||
/obj/item/melee/artifact_blade/cultify()
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
. += "It currently has a charge of [stored_charge] out of [capacity]"
|
||||
/obj/item/anobattery/Destroy()
|
||||
battery_effect = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/anobattery/moderate
|
||||
name = "moderate anomaly battery"
|
||||
@@ -71,7 +71,7 @@
|
||||
inserted_battery = null
|
||||
archived_loc = null
|
||||
last_user_touched = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/anodevice/equipped(var/mob/user, var/slot)
|
||||
last_user_touched = user
|
||||
@@ -236,7 +236,7 @@
|
||||
|
||||
/obj/item/anodevice/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/anodevice/attack(mob/living/M as mob, mob/living/user as mob, def_zone)
|
||||
if (!istype(M))
|
||||
|
||||
@@ -236,7 +236,7 @@
|
||||
|
||||
/obj/item/beacon_locator/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/beacon_locator/process()
|
||||
if(target_radio)
|
||||
|
||||
@@ -103,4 +103,4 @@ Also includes Life and New
|
||||
|
||||
/mob/living/simple_mob/xeno/Destroy()
|
||||
QDEL_NULL(traitdat)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
@@ -13,4 +13,4 @@ Xenobiological product lives here as a basic type.
|
||||
|
||||
/obj/item/xenoproduct/Destroy()
|
||||
QDEL_NULL(traits)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user