From 51c09f16bfd25a3f38d34de83ee30c4469846d3c Mon Sep 17 00:00:00 2001 From: duncathan Date: Mon, 31 Aug 2015 00:21:01 -0600 Subject: [PATCH 1/3] makes all Destroy()'s return properly --- code/ATMOSPHERICS/atmospherics.dm | 2 +- .../components/binary_devices/dp_vent_pump.dm | 2 +- .../components/binary_devices/passive_gate.dm | 2 +- code/ATMOSPHERICS/components/binary_devices/pump.dm | 2 +- .../components/binary_devices/volume_pump.dm | 2 +- code/ATMOSPHERICS/components/components_base.dm | 2 +- .../ATMOSPHERICS/components/trinary_devices/filter.dm | 2 +- code/ATMOSPHERICS/components/unary_devices/cryo.dm | 2 +- .../components/unary_devices/outlet_injector.dm | 2 +- .../components/unary_devices/portables_connector.dm | 2 +- .../components/unary_devices/vent_pump.dm | 4 ++-- .../components/unary_devices/vent_scrubber.dm | 2 +- code/ATMOSPHERICS/datum_pipeline.dm | 2 +- code/ATMOSPHERICS/pipes/manifold.dm | 2 +- code/ATMOSPHERICS/pipes/manifold4w.dm | 2 +- code/ATMOSPHERICS/pipes/pipes.dm | 2 +- code/ATMOSPHERICS/pipes/simple.dm | 2 +- code/_onclick/hud/action.dm | 1 + code/_onclick/hud/screen_objects.dm | 2 +- code/controllers/subsystem/timer.dm | 1 + code/datums/spells/ethereal_jaunt.dm | 2 +- code/datums/spells/trigger.dm | 2 +- code/game/gamemodes/blob/blobs/blob_mobs.dm | 2 +- code/game/gamemodes/blob/blobs/core.dm | 2 +- code/game/gamemodes/blob/blobs/factory.dm | 2 +- code/game/gamemodes/blob/blobs/node.dm | 2 +- code/game/gamemodes/blob/overmind.dm | 2 +- code/game/gamemodes/blob/theblob.dm | 2 +- code/game/gamemodes/changeling/changeling.dm | 1 + code/game/gamemodes/gang/dominator.dm | 2 +- code/game/gamemodes/meteor/meteors.dm | 2 +- code/game/gamemodes/nuclear/pinpointer.dm | 2 +- code/game/gamemodes/wizard/artefact.dm | 2 +- code/game/machinery/Beacon.dm | 2 +- code/game/machinery/airlock_control.dm | 4 ++-- code/game/machinery/announcement_system.dm | 2 +- code/game/machinery/atmo_control.dm | 4 ++-- code/game/machinery/atmoalter/meter.dm | 2 +- .../game/machinery/atmoalter/portable_atmospherics.dm | 2 +- code/game/machinery/atmoalter/zvent.dm | 2 +- code/game/machinery/bots/bots.dm | 2 +- code/game/machinery/camera/camera.dm | 2 +- code/game/machinery/computer/HolodeckControl.dm | 2 +- code/game/machinery/computer/atmos_alert.dm | 2 +- code/game/machinery/computer/communications.dm | 2 +- code/game/machinery/computer/shuttle.dm | 2 +- code/game/machinery/doors/alarmlock.dm | 2 +- code/game/machinery/doors/door.dm | 3 +-- code/game/machinery/doors/windowdoor.dm | 2 +- code/game/machinery/doppler_array.dm | 2 +- code/game/machinery/droneDispenser.dm | 2 +- .../embedded_controller/access_controller.dm | 2 +- .../embedded_controller/embedded_controller_base.dm | 2 +- code/game/machinery/hologram.dm | 2 +- code/game/machinery/machinery.dm | 2 +- code/game/machinery/magnet.dm | 4 ++-- code/game/machinery/navbeacon.dm | 2 +- code/game/machinery/newscaster.dm | 2 +- code/game/machinery/portable_turret.dm | 2 +- code/game/machinery/shieldgen.dm | 6 +++--- code/game/machinery/status_display.dm | 2 +- code/game/machinery/syndicatebeacon.dm | 2 +- code/game/machinery/telecomms/machines/broadcaster.dm | 2 +- code/game/machinery/telecomms/machines/server.dm | 2 +- code/game/machinery/telecomms/telecomunications.dm | 2 +- code/game/machinery/teleporter.dm | 6 +++--- code/game/machinery/vending.dm | 2 +- code/game/mecha/combat/marauder.dm | 2 +- code/game/mecha/equipment/tools/other_tools.dm | 4 ++-- code/game/objects/buckling.dm | 5 ----- code/game/objects/effects/aliens.dm | 2 +- code/game/objects/effects/bump_teleporter.dm | 2 +- code/game/objects/effects/decals/Cleanable/aliens.dm | 2 +- code/game/objects/effects/decals/Cleanable/humans.dm | 2 +- code/game/objects/effects/decals/Cleanable/misc.dm | 2 +- code/game/objects/effects/decals/Cleanable/robots.dm | 2 +- code/game/objects/effects/decals/crayon.dm | 2 +- .../objects/effects/effect_system/effect_system.dm | 2 +- .../objects/effects/effect_system/effects_foam.dm | 2 +- .../objects/effects/effect_system/effects_smoke.dm | 5 ++--- code/game/objects/effects/landmarks.dm | 4 ++-- code/game/objects/effects/spiders.dm | 2 +- code/game/objects/items/devices/PDA/PDA.dm | 2 +- code/game/objects/items/devices/PDA/radio.dm | 2 +- code/game/objects/items/devices/camera_bug.dm | 2 +- code/game/objects/items/devices/chameleonproj.dm | 2 +- code/game/objects/items/devices/flashlight.dm | 2 +- code/game/objects/items/devices/instruments.dm | 2 +- code/game/objects/items/devices/multitool.dm | 2 +- code/game/objects/items/devices/paicard.dm | 2 +- code/game/objects/items/devices/radio/electropack.dm | 2 +- code/game/objects/items/devices/radio/headset.dm | 2 +- code/game/objects/items/devices/radio/intercom.dm | 2 +- code/game/objects/items/devices/uplinks.dm | 2 +- code/game/objects/items/shooting_range.dm | 2 +- code/game/objects/items/stacks/stack.dm | 2 +- code/game/objects/items/weapons/chrono_eraser.dm | 6 +++--- code/game/objects/items/weapons/defib.dm | 3 +-- code/game/objects/items/weapons/flamethrower.dm | 2 +- code/game/objects/items/weapons/grenades/smokebomb.dm | 2 +- code/game/objects/items/weapons/implants/implant.dm | 2 +- code/game/objects/items/weapons/singularityhammer.dm | 2 +- code/game/objects/items/weapons/storage/storage.dm | 2 +- code/game/objects/items/weapons/tanks/tanks.dm | 2 +- code/game/objects/items/weapons/tanks/watertank.dm | 3 +-- code/game/objects/objs.dm | 2 +- code/game/objects/structures.dm | 2 +- code/game/objects/structures/lattice.dm | 2 +- code/game/objects/structures/mineral_doors.dm | 2 +- code/game/objects/structures/morgue.dm | 6 +++--- code/game/objects/structures/musician.dm | 4 ++-- code/game/objects/structures/statues.dm | 2 +- code/game/objects/structures/target_stake.dm | 2 +- code/game/objects/structures/transit_tubes/station.dm | 2 +- .../structures/transit_tubes/transit_tube_pod.dm | 2 +- code/game/objects/structures/windoor_assembly.dm | 2 +- code/game/objects/structures/window.dm | 2 +- code/modules/assembly/infrared.dm | 2 +- code/modules/assembly/shock_kit.dm | 3 +-- code/modules/assembly/signaler.dm | 2 +- code/modules/clothing/spacesuits/chronosuit.dm | 6 +++--- code/modules/clothing/suits/toggles.dm | 6 +++--- code/modules/events/spacevine.dm | 4 ++-- code/modules/events/wizard/greentext.dm | 2 +- code/modules/flufftext/Hallucination.dm | 3 ++- code/modules/food&drinks/food/snacks.dm | 2 +- code/modules/hydroponics/grown.dm | 4 ++-- code/modules/mob/dead/observer/observer.dm | 2 +- code/modules/mob/living/carbon/brain/MMI.dm | 2 +- code/modules/mob/living/carbon/brain/brain.dm | 2 +- code/modules/mob/living/carbon/brain/brain_item.dm | 2 +- code/modules/mob/living/silicon/ai/ai.dm | 2 +- code/modules/mob/living/silicon/ai/freelook/eye.dm | 2 +- .../mob/living/silicon/ai/freelook/update_triggers.dm | 6 +++--- .../mob/living/simple_animal/friendly/drone/_drone.dm | 2 +- code/modules/mob/mob.dm | 2 +- code/modules/mob/mob_grab.dm | 2 +- code/modules/ninja/suit/suit.dm | 2 +- code/modules/power/antimatter/control.dm | 2 +- code/modules/power/antimatter/shielding.dm | 2 +- code/modules/power/cable.dm | 2 +- code/modules/power/gravitygenerator.dm | 4 ++-- code/modules/power/lighting.dm | 2 +- code/modules/power/port_gen.dm | 2 +- code/modules/power/power.dm | 2 +- code/modules/power/powernet.dm | 1 + code/modules/power/singularity/collector.dm | 2 +- code/modules/power/singularity/containment_field.dm | 2 +- code/modules/power/singularity/emitter.dm | 2 +- code/modules/power/singularity/field_generator.dm | 2 +- .../particle_accelerator/particle_accelerator.dm | 2 +- code/modules/power/singularity/singularity.dm | 2 +- code/modules/power/smes.dm | 2 +- code/modules/power/solar.dm | 4 ++-- code/modules/power/tracker.dm | 2 +- code/modules/projectiles/guns/energy/laser.dm | 6 +++--- code/modules/projectiles/guns/energy/nuclear.dm | 2 +- code/modules/projectiles/guns/energy/special.dm | 6 +++--- code/modules/projectiles/guns/energy/stun.dm | 4 ++-- code/modules/projectiles/guns/magic.dm | 2 +- code/modules/reagents/Chemistry-Holder.dm | 2 +- code/modules/reagents/Chemistry-Reagents.dm | 2 +- code/modules/reagents/reagent_containers/borghydro.dm | 2 +- code/modules/recycling/disposal-structures.dm | 11 +++++------ code/modules/recycling/disposal-unit.dm | 2 +- code/modules/recycling/sortingmachinery.dm | 2 +- code/modules/research/message_server.dm | 5 ++--- code/modules/research/server.dm | 2 +- code/modules/surgery/organs/organ_internal.dm | 2 +- code/modules/telesci/gps.dm | 2 +- code/modules/telesci/telepad.dm | 2 +- code/modules/telesci/telesci_computer.dm | 2 +- 172 files changed, 208 insertions(+), 215 deletions(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index b0a8aedddc5..5fcd9bf7266 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -44,7 +44,7 @@ Pipelines + Other Objects -> Pipe network if(pipe_vision_img) qdel(pipe_vision_img) - ..() + return ..() //this is called just after the air controller sets up turfs /obj/machinery/atmospherics/proc/atmosinit() diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index 9cecf78413f..6b0719580ff 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -35,7 +35,7 @@ Acts like a normal vent, but has an input AND output. /obj/machinery/atmospherics/components/binary/dp_vent_pump/Destroy() if(radio_controller) radio_controller.remove_object(src, frequency) - ..() + return ..() /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume name = "large dual-port air vent" diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index d75d045a636..63697dfaad6 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -25,7 +25,7 @@ Passive gate is similar to the regular pump except: /obj/machinery/atmospherics/components/binary/passive_gate/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) - ..() + return ..() /obj/machinery/atmospherics/components/binary/passive_gate/update_icon_nopipes() if(!on) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 73482b9c864..c9a3147e482 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -29,7 +29,7 @@ Thus, the two variables affect pump operation are set in New(): /obj/machinery/atmospherics/components/binary/pump/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) - ..() + return ..() /obj/machinery/atmospherics/components/binary/pump/on on = 1 diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index a87f2964480..39160074e52 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -29,7 +29,7 @@ Thus, the two variables affect pump operation are set in New(): /obj/machinery/atmospherics/components/binary/volume_pump/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) - ..() + return ..() /obj/machinery/atmospherics/components/binary/volume_pump/on on = 1 diff --git a/code/ATMOSPHERICS/components/components_base.dm b/code/ATMOSPHERICS/components/components_base.dm index 9f63f655d34..46f5ac86d99 100644 --- a/code/ATMOSPHERICS/components/components_base.dm +++ b/code/ATMOSPHERICS/components/components_base.dm @@ -90,7 +90,7 @@ Pipenet stuff; housekeeping N.disconnect(src) nodes["n[I]"] = null nullifyPipenet(parents["p[I]"]) - ..() + return ..() /obj/machinery/atmospherics/components/atmosinit(var/list/node_connects) for(var/I = 1; I <= device_type; I++) diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index a56bdd14c0c..49029140f7e 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -47,7 +47,7 @@ Filter types: /obj/machinery/atmospherics/components/trinary/filter/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) - ..() + return ..() /obj/machinery/atmospherics/components/trinary/filter/update_icon() overlays.Cut() diff --git a/code/ATMOSPHERICS/components/unary_devices/cryo.dm b/code/ATMOSPHERICS/components/unary_devices/cryo.dm index 246716772aa..03c978cead4 100644 --- a/code/ATMOSPHERICS/components/unary_devices/cryo.dm +++ b/code/ATMOSPHERICS/components/unary_devices/cryo.dm @@ -44,7 +44,7 @@ if(beaker) beaker.loc = get_step(loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube beaker = null - ..() + return ..() /obj/machinery/atmospherics/components/unary/cryo_cell/process_atmos() ..() var/datum/gas_mixture/air_contents = airs[AIR1] diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm index 10ecdf726d9..430d8b42820 100644 --- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm @@ -19,7 +19,7 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) - ..() + return ..() /obj/machinery/atmospherics/components/unary/outlet_injector/on on = 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm b/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm index 9446c396078..d9e649c7a13 100644 --- a/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm @@ -19,7 +19,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/Destroy() if(connected_device) connected_device.disconnect() - ..() + return ..() /obj/machinery/atmospherics/components/unary/portables_connector/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 7d574f302d6..c6bc8523f43 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -59,7 +59,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) - ..() + return ..() /obj/machinery/atmospherics/components/unary/vent_pump/high_volume name = "large air vent" @@ -305,7 +305,7 @@ if(initial_loc) initial_loc.air_vent_info -= id_tag initial_loc.air_vent_names -= id_tag - ..() + return ..() /obj/machinery/atmospherics/components/unary/vent_pump/can_crawl_through() diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index 691835ed4cc..95fb33af540 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -51,7 +51,7 @@ if(initial_loc) initial_loc.air_scrub_info -= id_tag initial_loc.air_scrub_names -= id_tag - ..() + return ..() /obj/machinery/atmospherics/components/unary/vent_scrubber/auto_use_power() if(!powered(power_channel)) return 0 diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm index cf55d774602..95f95101838 100644 --- a/code/ATMOSPHERICS/datum_pipeline.dm +++ b/code/ATMOSPHERICS/datum_pipeline.dm @@ -18,7 +18,7 @@ P.parent = null for(var/obj/machinery/atmospherics/components/C in other_atmosmch) C.nullifyPipenet(src) - ..() + return ..() /datum/pipeline/process() if(update) diff --git a/code/ATMOSPHERICS/pipes/manifold.dm b/code/ATMOSPHERICS/pipes/manifold.dm index 8f6ac175080..c8ae1b45986 100644 --- a/code/ATMOSPHERICS/pipes/manifold.dm +++ b/code/ATMOSPHERICS/pipes/manifold.dm @@ -73,7 +73,7 @@ node3 = null A.build_network() releaseAirToTurf() - ..() + return ..() /obj/machinery/atmospherics/pipe/manifold/disconnect(obj/machinery/atmospherics/reference) if(reference == node1) diff --git a/code/ATMOSPHERICS/pipes/manifold4w.dm b/code/ATMOSPHERICS/pipes/manifold4w.dm index 4db873eed76..d630135caad 100644 --- a/code/ATMOSPHERICS/pipes/manifold4w.dm +++ b/code/ATMOSPHERICS/pipes/manifold4w.dm @@ -77,7 +77,7 @@ node4 = null A.build_network() releaseAirToTurf() - ..() + return ..() /obj/machinery/atmospherics/pipe/manifold4w/disconnect(obj/machinery/atmospherics/reference) if(reference == node1) diff --git a/code/ATMOSPHERICS/pipes/pipes.dm b/code/ATMOSPHERICS/pipes/pipes.dm index f0ca8f8e244..5825da05ce9 100644 --- a/code/ATMOSPHERICS/pipes/pipes.dm +++ b/code/ATMOSPHERICS/pipes/pipes.dm @@ -56,7 +56,7 @@ var/obj/item/pipe_meter/PM = new (T) meter.transfer_fingerprints_to(PM) qdel(meter) - ..() + return ..() /obj/machinery/atmospherics/pipe/proc/update_node_icon() //Used for pipe painting. Overriden in the children. diff --git a/code/ATMOSPHERICS/pipes/simple.dm b/code/ATMOSPHERICS/pipes/simple.dm index b4685c44a1d..586b6eb16d1 100644 --- a/code/ATMOSPHERICS/pipes/simple.dm +++ b/code/ATMOSPHERICS/pipes/simple.dm @@ -77,7 +77,7 @@ The regular pipe you see everywhere, including bent ones. node2 = null A.build_network() releaseAirToTurf() - ..() + return ..() /obj/machinery/atmospherics/pipe/simple/disconnect(obj/machinery/atmospherics/reference) if(reference == node1) diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm index b9c8254054b..c1442fe2e9c 100644 --- a/code/_onclick/hud/action.dm +++ b/code/_onclick/hud/action.dm @@ -30,6 +30,7 @@ /datum/action/Destroy() if(owner) Remove(owner) + return ..() /datum/action/proc/Grant(mob/living/T) if(owner) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index bc045a9923d..8c70a7825eb 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -15,7 +15,7 @@ /obj/screen/Destroy() master = null - ..() + return ..() /obj/screen/text diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index 1d9fb09f63b..67c5abe8b5c 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -43,6 +43,7 @@ var/datum/subsystem/timer/SStimer /datum/timedevent/Destroy() SStimer.processing -= src + return ..() /proc/addtimer(thingToCall, procToCall, wait, argList = list()) if (!SStimer) //can't run timers before the mc has been created diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index 6f5247e8e92..664bf001425 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -88,7 +88,7 @@ // Eject contents if deleted somehow for(var/atom/movable/AM in src) AM.loc = get_turf(src) - ..() + return ..() /obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction) if (!src.canmove || reappearing || !direction) return diff --git a/code/datums/spells/trigger.dm b/code/datums/spells/trigger.dm index 684f51159a6..3988f3bae16 100644 --- a/code/datums/spells/trigger.dm +++ b/code/datums/spells/trigger.dm @@ -17,7 +17,7 @@ qdel(spell) linked_spells = null starting_spells = null - ..() + return ..() /obj/effect/proc_holder/spell/targeted/trigger/cast(list/targets) playMagSound() diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index cad8505781d..d4d4aa5a272 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -117,7 +117,7 @@ if(contents) for(var/mob/M in contents) M.loc = src.loc - ..() + return ..() /mob/living/simple_animal/hostile/blob/blobspore/update_icons() diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index b19965f3d3e..fbf1295f811 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -39,7 +39,7 @@ overmind.blob_core = null overmind = null SSobj.processing.Remove(src) - ..() + return ..() /obj/effect/blob/core/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) return diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm index 90dab3c0fe2..dd4f83dd9ba 100644 --- a/code/game/gamemodes/blob/blobs/factory.dm +++ b/code/game/gamemodes/blob/blobs/factory.dm @@ -17,7 +17,7 @@ if(spore.factory == src) spore.factory = null spores = null - ..() + return ..() /obj/effect/blob/factory/PulseAnimation(activate = 0) if(activate) diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm index 423272ed8b6..bf756df0315 100644 --- a/code/game/gamemodes/blob/blobs/node.dm +++ b/code/game/gamemodes/blob/blobs/node.dm @@ -25,7 +25,7 @@ /obj/effect/blob/node/Destroy() blob_nodes -= src SSobj.processing.Remove(src) - ..() + return ..() /obj/effect/blob/node/Life() pulseLoop(5) diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 26ffc2d65c5..f1c9f5cc3e5 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -47,7 +47,7 @@ qdel(ghostimage) ghostimage = null; updateallghostimages() - ..() + return ..() /mob/camera/blob/Login() ..() diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 907bf7e2c68..0de202a456a 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -28,7 +28,7 @@ blobs -= src if(isturf(loc)) //Necessary because Expand() is retarded and spawns a blob and then deletes it playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) - ..() + return ..() /obj/effect/blob/CanPass(atom/movable/mover, turf/target, height=0) diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 47ca5efc699..a88707f19cc 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -454,3 +454,4 @@ var/list/slot2type = list("head" = /obj/item/clothing/head/changeling, "wear_mas /datum/changelingprofile/Destroy() qdel(dna) + return ..() \ No newline at end of file diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm index 898f558d087..c3ee3bb0c30 100644 --- a/code/game/gamemodes/gang/dominator.dm +++ b/code/game/gamemodes/gang/dominator.dm @@ -109,7 +109,7 @@ /obj/machinery/dominator/Destroy() if(operating != -1) set_broken() - ..() + return ..() /obj/machinery/dominator/emp_act(severity) healthcheck(100) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index c2293ae5c54..2ddf8698ca5 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -121,7 +121,7 @@ /obj/effect/meteor/Destroy() walk(src,0) //this cancels the walk_towards() proc - ..() + return ..() /obj/effect/meteor/New() ..() diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 2d145a525d4..4f0cf352abd 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -14,7 +14,7 @@ /obj/item/weapon/pinpointer/Destroy() active = 0 - ..() + return ..() /obj/item/weapon/pinpointer/attack_self() if(!active) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index c053983d4c0..bdb7f9b8a48 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -204,7 +204,7 @@ var/global/list/multiverse = list() /obj/item/weapon/multisword/Destroy() multiverse.Remove(src) - ..() + return ..() /obj/item/weapon/multisword/attack_self(mob/user) if(user.mind.special_role == "apprentice") diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 057bc5b6adb..77d87856371 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -24,7 +24,7 @@ if(Beacon) qdel(Beacon) Beacon = null - ..() + return ..() // update the invisibility and icon /obj/machinery/bluespace_beacon/hide(intact) diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index bc593f7fc69..ece732690c3 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -95,7 +95,7 @@ /obj/machinery/door/airlock/Destroy() if(frequency && radio_controller) radio_controller.remove_object(src,frequency) - ..() + return ..() /obj/machinery/airlock_sensor icon = 'icons/obj/airlock_machines.dmi' @@ -168,4 +168,4 @@ /obj/machinery/airlock_sensor/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) - ..() \ No newline at end of file + return ..() \ No newline at end of file diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index 8566d6c45a1..692bf7faceb 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -65,7 +65,7 @@ var/list/announcement_systems = list() /obj/machinery/announcement_system/Destroy() announcement_systems -= src //"OH GOD WHY ARE THERE 100,000 LISTED ANNOUNCEMENT SYSTEMS?!!" - ..() + return ..() /obj/machinery/announcement_system/power_change() ..() diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 38cc653cda8..1c71111943c 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -81,7 +81,7 @@ SSair.atmos_machinery -= src if(radio_controller) radio_controller.remove_object(src,frequency) - ..() + return ..() ///////////////////////////////////////////////////////////// // GENERAL AIR CONTROL (a.k.a atmos computer) @@ -180,7 +180,7 @@ /obj/machinery/computer/general_air_control/Destroy() if(radio_controller) radio_controller.remove_object(src, frequency) - ..() + return ..() /obj/machinery/computer/general_air_control/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 5f6835bff24..b6175ef1c75 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -21,7 +21,7 @@ /obj/machinery/meter/Destroy() SSair.atmos_machinery -= src src.target = null - ..() + return ..() /obj/machinery/meter/initialize() if (!target) diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index e484b42e4c3..17580deedec 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -30,7 +30,7 @@ /obj/machinery/portable_atmospherics/Destroy() qdel(air_contents) SSair.atmos_machinery -= src - ..() + return ..() /obj/machinery/portable_atmospherics/update_icon() return null diff --git a/code/game/machinery/atmoalter/zvent.dm b/code/game/machinery/atmoalter/zvent.dm index 7b3081092f1..deb83600c99 100644 --- a/code/game/machinery/atmoalter/zvent.dm +++ b/code/game/machinery/atmoalter/zvent.dm @@ -15,7 +15,7 @@ /obj/machinery/zvent/Destroy() SSair.atmos_machinery -= src - ..() + return ..() /obj/machinery/zvent/process_atmos() diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index c7d00e16013..f488793ae12 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -113,7 +113,7 @@ /obj/machinery/bot/Destroy() qdel(Radio) qdel(botcard) - ..() + return ..() /obj/machinery/bot/proc/explode() diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index da1950f171f..4eb6a9df0fa 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -56,7 +56,7 @@ bug.current = null bug = null cameranet.removeCamera(src) //Will handle removal from the camera network and the chunks, so we don't need to worry about that - ..() + return ..() /obj/machinery/camera/emp_act(severity) if(!isEmpProof()) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 6a96b8ac0fb..d1b6e806a05 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -135,7 +135,7 @@ //This could all be done better, but it works for now. /obj/machinery/computer/HolodeckControl/Destroy() emergencyShutdown() - ..() + return ..() /obj/machinery/computer/HolodeckControl/emp_act(severity) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 58f1843dacb..99d2fdfe0de 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -20,7 +20,7 @@ /obj/machinery/computer/atmos_alert/Destroy() if(radio_controller) radio_controller.remove_object(src, receive_frequency) - ..() + return ..() /obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal) if(!signal || signal.encryption) return diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index ead497ab43d..b70fd68b176 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -610,5 +610,5 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 /obj/machinery/computer/communications/Destroy() shuttle_caller_list -= src SSshuttle.autoEvac() - ..() + return ..() diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 460adf2b0d8..7ddd08684d8 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -126,7 +126,7 @@ if(T) if(istype(T, /turf/simulated/floor)) T.blocks_air = 0 - ..() + return ..() /obj/machinery/computer/supplycomp name = "supply shuttle console" diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index 0264ae95312..2f9976ed456 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -18,7 +18,7 @@ if(radio_controller) radio_controller.remove_object(src,air_frequency) air_connection = null - ..() + return ..() /obj/machinery/door/airlock/alarmlock/initialize() ..() diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 129d03039b9..3d197f1e186 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -37,8 +37,7 @@ air_update_turf(1) update_freelook_sight() airlocks -= src - ..() - return + return ..() //process() //return diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 60c5d6168f6..1e91c882e0d 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -24,7 +24,7 @@ if(health == 0) playsound(src, "shatter", 70, 1) electronics = null - ..() + return ..() diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 4d4e84cb3b2..8608c14447e 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -15,7 +15,7 @@ var/list/doppler_arrays = list() /obj/machinery/doppler_array/Destroy() doppler_arrays -= src - ..() + return ..() /obj/machinery/doppler_array/process() return PROCESS_KILL diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index 13c868ef183..e54e5254b8f 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -16,7 +16,7 @@ /obj/machinery/droneDispenser/Destroy() SSmachine.processing -= src - ..() + return ..() /obj/machinery/droneDispenser/preloaded metal = 5000 diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index bba22799b5f..e8b978c7fec 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -118,7 +118,7 @@ for(var/obj/machinery/doorButtons/access_button/A in world) if(A.controller == src) A.controller = null - ..() + return ..() /obj/machinery/doorButtons/airlock_controller/Topic(href, href_list) if(..()) diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index bde8908cf70..6acfaafc359 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -77,7 +77,7 @@ /obj/machinery/embedded_controller/radio/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) - ..() + return ..() /obj/machinery/embedded_controller/radio/initialize() set_frequency(frequency) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 39f3f01ee08..56677d12e88 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -237,7 +237,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram/holopad/Destroy() for (var/mob/living/silicon/ai/master in masters) clear_holo(master) - ..() + return ..() /* Holographic project of everything else. diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index a4cdf6f6470..cdc139e9170 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -128,7 +128,7 @@ Class Procs: SSmachine.processing -= src if(occupant) dropContents() - ..() + return ..() /obj/machinery/proc/locate_machinery() return diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 667f9735857..8a03f65b1d9 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -45,7 +45,7 @@ /obj/machinery/magnetic_module/Destroy() if(radio_controller) radio_controller.remove_object(src, freq) - ..() + . = ..() center = null // update the invisibility and icon @@ -244,7 +244,7 @@ /obj/machinery/magnetic_controller/Destroy() if(radio_controller) radio_controller.remove_object(src, frequency) - ..() + . = ..() magnets = null rpath = null diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index a49787b25c4..ee18baacda4 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -36,7 +36,7 @@ /obj/machinery/navbeacon/Destroy() navbeacons &= src //Remove from beacon list, if in one. deliverybeacons &= src - ..() + return ..() // set the transponder codes assoc list from codes_txt /obj/machinery/navbeacon/proc/set_codes() diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 2d9b7f9db45..ac06d67bf1e 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -214,7 +214,7 @@ var/list/obj/machinery/newscaster/allCasters = list() allCasters -= src viewing_channel = null photo = null - ..() + return ..() /obj/machinery/newscaster/update_icon() if(!ispowered || isbroken) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 499198a49e3..78c2f6c826f 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -144,7 +144,7 @@ //deletes its own cover with it qdel(cover) cover = null - ..() + return ..() /obj/machinery/porta_turret/attack_ai(mob/user) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index ca1fe863e3b..033219ce433 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -19,7 +19,7 @@ opacity = 0 density = 0 air_update_turf(1) - ..() + return ..() /obj/machinery/shield/Move() var/turf/T = loc @@ -141,7 +141,7 @@ for(var/obj/machinery/shield/shield_tile in deployed_shields) qdel(shield_tile) deployed_shields = null - ..() + return ..() /obj/machinery/shieldgen/proc/shields_up() @@ -500,7 +500,7 @@ src.cleanup(2) src.cleanup(4) src.cleanup(8) - ..() + return ..() /obj/machinery/shieldwallgen/bullet_act(obj/item/projectile/Proj) storedpower -= Proj.damage diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index a0110d2f25a..d3e952699f7 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -51,7 +51,7 @@ /obj/machinery/status_display/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) - ..() + return ..() // timed process diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 2c102e8695b..395f15e7cfd 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -179,7 +179,7 @@ /obj/machinery/power/singularity_beacon/Destroy() if(active) Deactivate() - ..() + return ..() //stealth direct power usage /obj/machinery/power/singularity_beacon/process() diff --git a/code/game/machinery/telecomms/machines/broadcaster.dm b/code/game/machinery/telecomms/machines/broadcaster.dm index 181d9a11bbf..91106eae92e 100644 --- a/code/game/machinery/telecomms/machines/broadcaster.dm +++ b/code/game/machinery/telecomms/machines/broadcaster.dm @@ -110,7 +110,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // In case message_delay is left on 1, otherwise it won't reset the list and people can't say the same thing twice anymore. if(message_delay) message_delay = 0 - ..() + return ..() diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm index 8613a7bdad4..2a331406060 100644 --- a/code/game/machinery/telecomms/machines/server.dm +++ b/code/game/machinery/telecomms/machines/server.dm @@ -55,7 +55,7 @@ if(Compiler) Compiler.GC() Compiler = null - ..() + return ..() /obj/machinery/telecomms/server/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) if(signal.data["message"]) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 361097145bb..37a8f60d35e 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -158,7 +158,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() for(var/obj/machinery/telecomms/comm in telecomms_list) comm.links -= src links = list() - ..() + return ..() // Used in auto linking /obj/machinery/telecomms/proc/add_link(obj/machinery/telecomms/T) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 4b0725b060c..0f1d2a3a154 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -25,7 +25,7 @@ if (power_station) power_station.teleporter_console = null power_station = null - ..() + return ..() /obj/machinery/computer/teleporter/proc/link_power_station() if(power_station) @@ -269,7 +269,7 @@ if (power_station) power_station.teleporter_hub = null power_station = null - ..() + return ..() /obj/machinery/teleport/hub/RefreshParts() var/A = 0 @@ -391,7 +391,7 @@ if (teleporter_console) teleporter_console.power_station = null teleporter_console = null - ..() + return ..() /obj/machinery/teleport/station/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/device/multitool) && !panel_open) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 6429619a503..9bcbb941b7e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -84,7 +84,7 @@ wires = null qdel(coin) coin = null - ..() + return ..() /obj/machinery/vending/snack/Destroy() for(var/obj/item/weapon/reagent_containers/food/snacks/S in contents) diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index e79e6666a7b..a179fe46635 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -30,7 +30,7 @@ /obj/mecha/combat/marauder/Destroy() qdel(smoke_system) smoke_system = null - ..() + return ..() /obj/mecha/combat/marauder/relaymove(mob/user,direction) if(zoom) diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index 9f6a67799ae..ac8c7e541d5 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -286,7 +286,7 @@ /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/detach() SSobj.processing.Remove(src) @@ -378,7 +378,7 @@ /obj/item/mecha_parts/mecha_equipment/generator/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/mecha_parts/mecha_equipment/generator/proc/generator_init() fuel = new /obj/item/stack/sheet/mineral/plasma(src) diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index e47bcec43c6..9880c1b810f 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -24,11 +24,6 @@ . = ..() unbuckle_mob() -/obj/Del() - . = ..() - unbuckle_mob() - - //procs that handle the actual buckling and unbuckling /obj/proc/buckle_mob(mob/living/M) if(!can_buckle || !istype(M) || (M.loc != loc) || M.buckled || (buckle_requires_restraints && !M.restrained())) diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 49a5cb83c4b..ba1319670bf 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -186,7 +186,7 @@ for (var/obj/structure/alien/weeds/W in range(1,T)) W.updateWeedOverlays() linked_node = null - ..() + return ..() /obj/structure/alien/weeds/proc/Life() set background = BACKGROUND_ENABLED diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index a0005e515d5..bb9a34010c9 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -17,7 +17,7 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list() /obj/effect/bump_teleporter/Destroy() BUMP_TELEPORTERS -= src - ..() + return ..() /obj/effect/bump_teleporter/Bumped(atom/user) if(!ismob(user)) diff --git a/code/game/objects/effects/decals/Cleanable/aliens.dm b/code/game/objects/effects/decals/Cleanable/aliens.dm index 1d3284d671d..35f583eddb8 100644 --- a/code/game/objects/effects/decals/Cleanable/aliens.dm +++ b/code/game/objects/effects/decals/Cleanable/aliens.dm @@ -17,7 +17,7 @@ for(var/datum/disease/D in viruses) D.cure(0) viruses = null - ..() + return ..() /obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(list/directions) spawn (0) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 376248156cb..3770ad0d8d8 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -15,7 +15,7 @@ for(var/datum/disease/D in viruses) D.cure(0) viruses = null - ..() + return ..() /obj/effect/decal/cleanable/blood/New() ..() diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index 7dc1f58688a..e819145d7c5 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -114,7 +114,7 @@ for(var/datum/disease/D in viruses) D.cure(0) viruses = null - ..() + return ..() /obj/effect/decal/cleanable/tomato_smudge name = "tomato smudge" diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm index da5d6e7b40b..c72182823a8 100644 --- a/code/game/objects/effects/decals/Cleanable/robots.dm +++ b/code/game/objects/effects/decals/Cleanable/robots.dm @@ -59,7 +59,7 @@ for(var/datum/disease/D in viruses) D.cure(0) viruses = null - ..() + return ..() /obj/effect/decal/cleanable/oil/streak random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5") \ No newline at end of file diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index f0cece9bd32..488a41be821 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -56,4 +56,4 @@ gang.territory -= territory.type gang.territory_new -= territory.type gang.territory_lost |= list(territory.type = territory.name) - ..() \ No newline at end of file + return ..() \ No newline at end of file diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm index 8953cc09c7a..ea4ec6d60fd 100644 --- a/code/game/objects/effects/effect_system/effect_system.dm +++ b/code/game/objects/effects/effect_system/effect_system.dm @@ -38,7 +38,7 @@ would spawn and follow the beaker, even if it is carried or thrown. /datum/effect/effect/system/Destroy() holder = null location = null - ..() + return ..() /datum/effect/effect/system/proc/set_up(n = 3, c = 0, turf/loc) if(n > 10) diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index a3a305541c7..966e3f15688 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -194,7 +194,7 @@ /obj/structure/foamedmetal/Destroy() density = 0 air_update_turf(1) - ..() + return ..() /obj/structure/foamedmetal/Move() diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index db7b6be9b54..4be6879fc01 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -36,7 +36,7 @@ /obj/effect/effect/smoke/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/effect/effect/smoke/proc/kill_smoke() SSobj.processing.Remove(src) @@ -192,8 +192,7 @@ /datum/effect/effect/system/smoke_spread/chem/Destroy() chemholder = null - ..() - return QDEL_HINT_PUTINPOOL + return ..() /datum/effect/effect/system/smoke_spread/chem/set_up(datum/reagents/carry = null, n = 5, c = 0, loca, direct, silent = 0) if(n > 20) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 7224805e689..30d0d6eba8a 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -68,7 +68,7 @@ /obj/effect/landmark/Destroy() landmarks_list -= src - ..() + return ..() /obj/effect/landmark/start name = "start" @@ -84,7 +84,7 @@ return 1 /obj/effect/landmark/start/Destroy() - ..() + . = ..() start_landmarks_list -= src //Costume spawner landmarks diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 3cd61feaf1f..2cabf80db63 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -255,4 +255,4 @@ src.visible_message("\The [src] splits open.") for(var/atom/movable/A in contents) A.loc = src.loc - ..() + return ..() diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 0b0080eadcf..4cbc03dd36e 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -1064,7 +1064,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/Destroy() PDAs -= src - ..() + return ..() /obj/item/device/pda/clown/Crossed(AM as mob|obj) //Clown PDA is slippery. if (istype(AM, /mob/living/carbon)) diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index e000bbfcec4..e5604c37591 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -32,7 +32,7 @@ /obj/item/radio/integrated/signal/Destroy() if(radio_controller) radio_controller.remove_object(src, frequency) - ..() + return ..() /obj/item/radio/integrated/signal/initialize() if (src.frequency < 1200 || src.frequency > 1600) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 59780eb60f0..672e2304bd9 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -59,7 +59,7 @@ bugged_cameras = list() if(tracking) tracking = null - ..() + return ..() /obj/item/device/camera_bug/interact(mob/user = usr) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 9302f773829..35f05d0f670 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -148,4 +148,4 @@ /obj/effect/dummy/chameleon/Destroy() master.disrupt(0) - ..() \ No newline at end of file + return ..() \ No newline at end of file diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index b929937aa8b..22ca50aea6a 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -291,7 +291,7 @@ obj/item/device/flashlight/lamp/bananalamp /obj/item/device/flashlight/emp/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/device/flashlight/emp/process() charge_tick++ diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm index e45b7253355..d9bb7bc4c65 100644 --- a/code/game/objects/items/devices/instruments.dm +++ b/code/game/objects/items/devices/instruments.dm @@ -14,7 +14,7 @@ /obj/item/device/instrument/Destroy() qdel(song) song = null - ..() + return ..() /obj/item/device/instrument/initialize() song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 8650cdec64e..cda6bef97a8 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -31,7 +31,7 @@ /obj/item/device/multitool/ai_detect/Destroy() SSobj.processing -= src - ..() + return ..() /obj/item/device/multitool/ai_detect/process() if(track_delay > world.time) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index e563aefc3a8..719b6491e62 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -18,7 +18,7 @@ //Will stop people throwing friend pAIs into the singularity so they can respawn if(!isnull(pai)) pai.death(0) - ..() + return ..() /obj/item/device/paicard/attack_self(mob/user) if (!in_range(src, user)) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index ce51646f6aa..ac9a3f0fe7e 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -20,7 +20,7 @@ /obj/item/device/electropack/Destroy() if(radio_controller) radio_controller.remove_object(src, frequency) - ..() + return ..() /obj/item/device/electropack/attack_hand(mob/user) if(iscarbon(user)) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index e0c98ef93e8..477464d6f3f 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -20,7 +20,7 @@ qdel(keyslot2) keyslot = null keyslot2 = null - ..() + return ..() /obj/item/device/radio/headset/talk_into(mob/living/M, message, channel, list/spans) if (!listening) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 92d7973dc72..42db3559b3c 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -16,7 +16,7 @@ /obj/item/device/radio/intercom/Destroy() SSobj.processing -= src - ..() + return ..() /obj/item/device/radio/intercom/attack_ai(mob/user) src.add_fingerprint(user) diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 64110a33877..b0cc74e33d2 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -25,7 +25,7 @@ var/list/world_uplinks = list() /obj/item/device/uplink/Destroy() world_uplinks-=src - ..() + return ..() //Let's build a menu! /obj/item/device/uplink/proc/generate_menu() diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index df964d0de4b..093911ca768 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -11,7 +11,7 @@ removeOverlays() if(pinnedLoc) pinnedLoc.nullPinnedTarget() - ..() + return ..() /obj/item/target/proc/nullPinnedLoc() pinnedLoc = null diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index a18fb047f3d..85658530ba7 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -27,7 +27,7 @@ /obj/item/stack/Destroy() if (usr && usr.machine==src) usr << browse(null, "window=stack") - ..() + return ..() /obj/item/stack/examine(mob/user) ..() diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 0deb9b99ee5..c46f1131447 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -22,7 +22,7 @@ /obj/item/weapon/chrono_eraser/Destroy() dropped() - ..() + return ..() /obj/item/weapon/chrono_eraser/ui_action_click() var/mob/living/carbon/user = src.loc @@ -74,7 +74,7 @@ TED = null if(field) field_disconnect(field) - ..() + return ..() /obj/item/weapon/gun/energy/chrono_gun/proc/field_connect(obj/effect/chrono_field/F) var/mob/living/user = src.loc @@ -181,7 +181,7 @@ /obj/effect/chrono_field/Destroy() if(gun && gun.field_check(src)) gun.field_disconnect(src) - ..() + return ..() /obj/effect/chrono_field/update_icon() var/ttk_frame = 1 - (tickstokill / initial(tickstokill)) diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 7f5e121e441..029926d3316 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -193,9 +193,8 @@ if(on) var/M = get(paddles, /mob) remove_paddles(M) - ..() + . = ..() update_icon() - return /obj/item/weapon/defibrillator/proc/deductcharge(chrgdeductamt) if(bcell) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 5f3d4d87862..9a9971a6199 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -28,7 +28,7 @@ qdel(igniter) if(ptank) qdel(ptank) - ..() + return ..() /obj/item/weapon/flamethrower/process() diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index 059fb02ae5c..f8836ee445c 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -14,7 +14,7 @@ /obj/item/weapon/grenade/smokebomb/Destroy() qdel(smoke) - ..() + return ..() /obj/item/weapon/grenade/smokebomb/prime() update_mob() diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 0e7fd19d6c9..20f83673553 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -69,7 +69,7 @@ /obj/item/weapon/implant/Destroy() if(imp_in) removed(imp_in) - ..() + return ..() /obj/item/weapon/implant/proc/get_data() diff --git a/code/game/objects/items/weapons/singularityhammer.dm b/code/game/objects/items/weapons/singularityhammer.dm index e5146fdbc1e..ad021525f0a 100644 --- a/code/game/objects/items/weapons/singularityhammer.dm +++ b/code/game/objects/items/weapons/singularityhammer.dm @@ -22,7 +22,7 @@ /obj/item/weapon/twohanded/singularityhammer/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/twohanded/singularityhammer/process() diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index fdd4aea2842..ec973ab94b0 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -463,7 +463,7 @@ close_all() qdel(boxes) qdel(closer) - ..() + return ..() /obj/item/weapon/storage/emp_act(severity) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 3bad0781ef3..c620d777376 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -37,7 +37,7 @@ SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/tank/examine(mob/user) var/obj/icon = src diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 16245572192..638a4a5a2e0 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -66,8 +66,7 @@ remove_noz() qdel(noz) noz = null - ..() - return + return ..() /obj/item/weapon/watertank/attack_hand(mob/user) if(src.loc == user) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 5ad497513cc..6ec5bc1fa2e 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -16,7 +16,7 @@ /obj/Destroy() if(!istype(src, /obj/machinery)) SSobj.processing.Remove(src) // TODO: Have a processing bitflag to reduce on unnecessary loops through the processing lists - ..() + return ..() /obj/assume_air(datum/gas_mixture/giver) if(loc) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 1e32b6d50d1..c1c19582ec1 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -18,7 +18,7 @@ UpdateAffectingLights() if(smooth) smooth_icon_neighbors(src) - ..() + return ..() /obj/structure/mech_melee_attack(obj/mecha/M) if(M.damtype == "brute") diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index d325cf514fb..c530eda3f80 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -31,7 +31,7 @@ if(locate(/obj/structure/lattice, get_step(src, dir))) L = locate(/obj/structure/lattice, get_step(src, dir)) L.updateOverlays(src.loc) - ..() + return ..() /obj/structure/lattice/blob_act() qdel(src) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index fe14690944a..f3514151722 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -29,7 +29,7 @@ /obj/structure/mineral_door/Destroy() density = 0 air_update_turf(1) - ..() + return ..() /obj/structure/mineral_door/Move() var/turf/T = loc diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index bce42638e82..4d88e548004 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -30,7 +30,7 @@ if(connected) qdel(connected) connected = null - ..() + return ..() /obj/structure/bodycontainer/on_log() update_icon() @@ -135,7 +135,7 @@ var/global/list/crematoriums = new/list() /obj/structure/bodycontainer/crematorium/Destroy() crematoriums.Remove(src) - ..() + return ..() /obj/structure/bodycontainer/crematorium/New() connected = new/obj/structure/tray/c_tray(src) @@ -214,7 +214,7 @@ var/global/list/crematoriums = new/list() connected.connected = null connected.update_icon() connected = null - ..() + return ..() /obj/structure/tray/attack_paw(mob/user) return src.attack_hand(user) diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index d0aa327980c..5969168b473 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -22,7 +22,7 @@ /datum/song/Destroy() instrumentObj = null - ..() + return ..() // note is a number from 1-7 for A-G // acc is either "b", "n", or "#" @@ -322,7 +322,7 @@ /obj/structure/piano/Destroy() qdel(song) song = null - ..() + return ..() /obj/structure/piano/initialize() song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 48bda2583fd..116bde159a4 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -14,7 +14,7 @@ /obj/structure/statue/Destroy() density = 0 - ..() + return ..() /obj/structure/statue/attackby(obj/item/weapon/W, mob/living/user, params) add_fingerprint(user) diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index 5e23a7f994f..0c931eb3b53 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -10,7 +10,7 @@ /obj/structure/target_stake/Destroy() if(pinned_target) pinned_target.nullPinnedLoc() - ..() + return ..() /obj/structure/target_stake/proc/nullPinnedTarget() pinned_target = null diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 0e8991bf7c0..aaa115bbd1b 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -23,7 +23,7 @@ /obj/structure/transit_tube/station/Destroy() SSobj.processing -= src - ..() + return ..() // Stations which will send the tube in the opposite direction after their stop. /obj/structure/transit_tube/station/reverse diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index d56b46a45c6..d330273aa50 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -23,7 +23,7 @@ for(var/atom/movable/AM in contents) AM.loc = loc - ..() + return ..() /obj/structure/transit_tube_pod/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/crowbar)) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 90007323b52..a6e28a73e1a 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -35,7 +35,7 @@ /obj/structure/windoor_assembly/Destroy() density = 0 air_update_turf(1) - ..() + return ..() /obj/structure/windoor_assembly/Move() var/turf/T = loc diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 9dc8d6631e9..bcfb5b739f4 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -364,7 +364,7 @@ if(!disassembled) playsound(src, "shatter", 70, 1) update_nearby_icons() - ..() + return ..() /obj/structure/window/Move() diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index e470324cdf3..82ef26940b9 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -212,4 +212,4 @@ if(previous) previous.next = null master.last = previous - ..() + return ..() diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index d147b5a2c6b..01251e9dba6 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -11,8 +11,7 @@ /obj/item/assembly/shock_kit/Destroy() qdel(part1) qdel(part2) - ..() - return + return ..() /obj/item/assembly/shock_kit/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 35226b7023c..57cb5d4791b 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -22,7 +22,7 @@ /obj/item/device/assembly/signaler/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) - ..() + return ..() /obj/item/device/assembly/signaler/activate() if(cooldown > 0) return 0 diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index 9e0b55df4cb..a8048ec3f6d 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -14,7 +14,7 @@ /obj/item/clothing/head/helmet/space/chronos/Destroy() dropped() - ..() + return ..() /obj/item/clothing/suit/space/chronos @@ -55,7 +55,7 @@ /obj/item/clothing/suit/space/chronos/Destroy() dropped() - ..() + return ..() /obj/item/clothing/suit/space/chronos/emp_act(severity) var/mob/living/carbon/human/user = src.loc @@ -216,5 +216,5 @@ holder.remote_control = null if(holder.client && (holder.client.eye == src)) holder.client.eye = holder - ..() + return ..() diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 9a3efc5d2ad..6d7a8390ae3 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -10,7 +10,7 @@ /obj/item/clothing/suit/hooded/Destroy() qdel(hood) - ..() + return ..() /obj/item/clothing/suit/hooded/proc/MakeHood() if(!hood) @@ -101,13 +101,13 @@ helmet.suit = null qdel(helmet) qdel(jetpack) - ..() + return ..() /obj/item/clothing/head/helmet/space/hardsuit/Destroy() if(suit) suit.helmet = null qdel(suit) - ..() + return ..() /obj/item/clothing/suit/space/hardsuit/proc/MakeHelmet() if(!helmettype) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 7f87245bf41..4b298b11009 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -323,7 +323,7 @@ SetOpacity(0) if(buckled_mob) unbuckle_mob() - ..() + return ..() /obj/effect/spacevine/proc/on_chem_effect(datum/reagent/R) var/override = 0 @@ -423,7 +423,7 @@ /obj/effect/spacevine_controller/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/effect/spacevine_controller/proc/spawn_spacevine_piece(turf/location, obj/effect/spacevine/parent, list/muts) var/obj/effect/spacevine/SV = new(location) diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm index 9222cd16304..1fbaecb1a99 100644 --- a/code/modules/events/wizard/greentext.dm +++ b/code/modules/events/wizard/greentext.dm @@ -78,4 +78,4 @@ M.color = initial(M.color) message += "..." M << message - ..() \ No newline at end of file + return ..() \ No newline at end of file diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 64a7e9fc72f..46a6f1e7429 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -107,6 +107,7 @@ Gunshots/explosions/opening doors/less rare audio (done) /obj/effect/hallucination/simple/Destroy() if(target.client) target.client.images.Remove(current_image) active = 0 + return ..() #define FAKE_FLOOD_EXPAND_TIME 30 #define FAKE_FLOOD_MAX_RADIUS 7 @@ -160,7 +161,7 @@ Gunshots/explosions/opening doors/less rare audio (done) if(target.client) target.client.images.Remove(flood_images) target = null qdel(flood_images) - return + return ..() /obj/effect/hallucination/simple/xeno image_icon = 'icons/mob/alien.dmi' diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm index 51203df2505..326387e3971 100644 --- a/code/modules/food&drinks/food/snacks.dm +++ b/code/modules/food&drinks/food/snacks.dm @@ -223,7 +223,7 @@ if(contents) for(var/atom/movable/something in contents) something.loc = get_turf(src) - ..() + return ..() /obj/item/weapon/reagent_containers/food/snacks/attack_animal(mob/M) if(isanimal(M)) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index f27866be2d2..daf06bb781f 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -305,7 +305,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow/Destroy() if(istype(loc,/mob)) loc.AddLuminosity(round(-potency / 5,1)) - ..() + return ..() /obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow/pickup(mob/user) src.SetLuminosity(0) @@ -1208,7 +1208,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/Destroy() if(istype(loc,/mob)) loc.AddLuminosity(round(-potency / 10,1)) - ..() + return ..() /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/pickup(mob/user) SetLuminosity(0) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 13ca44627a0..54d992c080a 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -69,7 +69,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi qdel(ghostimage) ghostimage = null updateallghostimages() - ..() + return ..() /mob/dead/CanPass(atom/movable/mover, turf/target, height=0) return 1 diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index a7360f8ef65..248d147de43 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -147,7 +147,7 @@ if(brainmob) qdel(brainmob) brainmob = null - ..() + return ..() /obj/item/device/mmi/examine(mob/user) ..() diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index 44594f60c67..48b71893397 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -13,7 +13,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 ..() /mob/living/carbon/brain/update_canmove() if(in_contents_of(/obj/mecha)) canmove = 1 diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 21e701b4940..981facfcc9b 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -112,7 +112,7 @@ if(brainmob) qdel(brainmob) brainmob = null - ..() + return ..() /obj/item/organ/internal/brain/alien name = "alien brain" diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 0bc233bc351..ce964e41429 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -147,7 +147,7 @@ var/list/ai_list = list() shuttle_caller_list -= src SSshuttle.autoEvac() qdel(eyeobj) // No AI, no Eye - ..() + return ..() /mob/living/silicon/ai/verb/pick_icon() diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index 30918bbcec3..c06f7c72ee0 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -38,7 +38,7 @@ /mob/camera/aiEye/Destroy() ai = null - ..() + return ..() /atom/proc/move_camera_by_click() if(istype(usr, /mob/living/silicon/ai)) diff --git a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm index 2b69c20cd65..3f9d11301a4 100644 --- a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm +++ b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm @@ -26,7 +26,7 @@ /obj/structure/Destroy() if(ticker) cameranet.updateVisibility(src) - ..() + return ..() /obj/structure/New() ..() @@ -38,7 +38,7 @@ /obj/effect/Destroy() if(ticker) cameranet.updateVisibility(src) - ..() + return ..() /obj/effect/New() ..() @@ -94,6 +94,6 @@ /obj/machinery/camera/Destroy() cameranet.cameras -= src cameranet.removeCamera(src) - ..() + return ..() #undef BORG_CAMERA_BUFFER \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index ac0bab34649..2c60049656a 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -80,7 +80,7 @@ /mob/living/simple_animal/drone/Destroy() qdel(access_card) //Otherwise it ends up on the floor! - ..() + return ..() /mob/living/simple_animal/drone/Login() ..() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index e5dd2c589dc..46dc37f5cf0 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -8,7 +8,7 @@ for(var/infection in viruses) qdel(infection) ghostize() - ..() + return ..() /mob/proc/sac_act(obj/effect/rune/R, mob/victim) return diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index fa3a9bb4bbc..e18d8be2749 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -44,7 +44,7 @@ assailant.client.screen -= hud assailant = null qdel(hud) - ..() + return ..() //Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code. /obj/item/weapon/grab/proc/get_mob_if_throwable() diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index 5fcca544ae9..d3aba358c3c 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -86,7 +86,7 @@ Contents: /obj/item/clothing/suit/space/space_ninja/Destroy() if(affecting) affecting << browse(null, "window=hack spideros") - ..() + return ..() //Simply deletes all the attachments and self, killing all related procs. diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index 41be20dc92f..dd3bd7bd464 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -38,7 +38,7 @@ /obj/machinery/power/am_control_unit/Destroy()//Perhaps damage and run stability checks rather than just del on the others for(var/obj/machinery/am_shielding/AMS in linked_shielding) qdel(AMS) - ..() + return ..() /obj/machinery/power/am_control_unit/process() diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 1631f501fa7..87392fd982f 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -68,7 +68,7 @@ if(processing) shutdown_core() visible_message("The [src.name] melts!") //Might want to have it leave a mess on the floor but no sprites for now - ..() + return ..() /obj/machinery/am_shielding/CanPass(atom/movable/mover, turf/target, height=0) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 02c9e1adfca..f1526aeab3c 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -90,7 +90,7 @@ By design, d1 is the smallest direction and d2 is the highest if(powernet) cut_cable_from_powernet() // update the powernets cable_list -= src //remove it from global cable list - ..() // then go ahead and delete the cable + return ..() // then go ahead and delete the cable /obj/structure/cable/Deconstruct() var/turf/T = loc diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index be09fdadd38..8eb7af7db8f 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -58,7 +58,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 set_broken() if(main_part) qdel(main_part) - ..() + return ..() // // Part generator which is mostly there for looks @@ -126,7 +126,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 for(var/obj/machinery/gravity_generator/part/O in parts) O.main_part = null qdel(O) - ..() + return ..() /obj/machinery/gravity_generator/main/proc/setup_parts() var/turf/our_turf = get_turf(src) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 25f1bb088c1..828f9b4e09f 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -208,7 +208,7 @@ if(A) on = 0 // A.update_lights() - ..() + return ..() /obj/machinery/light/update_icon() diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 37a75156cc8..f15b2385247 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -119,7 +119,7 @@ display round(lastgen) and plasmatank amount /obj/machinery/power/port_gen/pacman/Destroy() DropFuel() - ..() + return ..() /obj/machinery/power/port_gen/pacman/RefreshParts() var/temp_rating = 0 diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 1fbca84583c..b5a229778af 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -17,7 +17,7 @@ /obj/machinery/power/Destroy() disconnect_from_network() - ..() + return ..() /////////////////////////////// // General procedures diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm index 0ad877f987d..f8e8826294d 100644 --- a/code/modules/power/powernet.dm +++ b/code/modules/power/powernet.dm @@ -26,6 +26,7 @@ M.powernet = null SSmachine.powernets -= src + return ..() /datum/powernet/proc/is_empty() return !cables.len && !nodes.len diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 3687d237bd2..aab80c9e97f 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -22,7 +22,7 @@ var/global/list/rad_collectors = list() /obj/machinery/power/rad_collector/Destroy() rad_collectors -= src - ..() + return ..() /obj/machinery/power/rad_collector/process() if(P) diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 08278a00ea7..7fc737afb46 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -19,7 +19,7 @@ FG1.cleanup() if(FG2 && !FG2.clean_up) FG2.cleanup() - ..() + return ..() /obj/machinery/field/containment/attack_hand(mob/user) if(get_dist(src, user) > 1) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index ca08ffd7bc3..7cde13702a2 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -70,7 +70,7 @@ message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1) log_game("Emitter deleted at ([x],[y],[z])") investigate_log("deleted at ([x],[y],[z])","singulo") - ..() + return ..() /obj/machinery/power/emitter/update_icon() if (active && powernet && avail(active_power_usage)) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 8f2701a4246..857741045c9 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -172,7 +172,7 @@ field_generator power level display /obj/machinery/field/generator/Destroy() src.cleanup() - ..() + return ..() diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 18a04d16f32..8030486fcd0 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -75,7 +75,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin construction_state = 0 if(master) master.part_scan() - ..() + return ..() /obj/structure/particle_accelerator/end_cap name = "Alpha Particle Generation Array" diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index ce2e87d82da..5d5b6d42153 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -42,7 +42,7 @@ /obj/singularity/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/singularity/Move(atom/newloc, direct) if(current_size >= STAGE_FIVE || check_turfs_in(direct)) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 3bc6dbcfc36..e43f75e7b0b 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -168,7 +168,7 @@ investigate_log("deleted at ([area.name])","singulo") if(terminal) disconnect_terminal() - ..() + return ..() // create a terminal object pointing towards the SMES // wires will attach to this diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 8375b2d8d4e..cbc325ef706 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -27,7 +27,7 @@ /obj/machinery/power/solar/Destroy() unset_control() //remove from control computer - ..() + return ..() //set the control of the panel to a given computer if closer than SOLAR_MAX_DIST /obj/machinery/power/solar/proc/set_control(obj/machinery/power/solar_control/SC) @@ -308,7 +308,7 @@ M.unset_control() if(connected_tracker) connected_tracker.unset_control() - ..() + return ..() /obj/machinery/power/solar_control/disconnect_from_network() ..() diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index f85bdd99153..874b2ca1733 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -23,7 +23,7 @@ /obj/machinery/power/tracker/Destroy() unset_control() //remove from control computer - ..() + return ..() //set the control of the tracker to a given computer if closer than SOLAR_MAX_DIST /obj/machinery/power/tracker/proc/set_control(obj/machinery/power/solar_control/SC) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index f6b625d1169..3c20121b19a 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -40,7 +40,7 @@ /obj/item/weapon/gun/energy/laser/captain/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/gun/energy/laser/captain/process() @@ -122,7 +122,7 @@ /obj/item/weapon/gun/energy/laser/bluetag/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/gun/energy/laser/bluetag/process() charge_tick++ @@ -154,7 +154,7 @@ /obj/item/weapon/gun/energy/laser/redtag/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/gun/energy/laser/redtag/process() charge_tick++ diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 89c73331581..3fa2f35d76c 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -64,7 +64,7 @@ /obj/item/weapon/gun/energy/gun/nuclear/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/gun/energy/gun/nuclear/process() diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 1401c31937a..cb3c942ad25 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -61,7 +61,7 @@ /obj/item/weapon/gun/energy/floragun/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/gun/energy/floragun/process() @@ -97,7 +97,7 @@ /obj/item/weapon/gun/energy/meteorgun/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/gun/energy/meteorgun/process() charge_tick++ @@ -301,7 +301,7 @@ /obj/item/weapon/gun/energy/printer/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/gun/energy/printer/process() charge_tick++ diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 6659fe329cd..acd06b2eda3 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -38,7 +38,7 @@ /obj/item/weapon/gun/energy/gun/advtaser/cyborg/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/gun/energy/gun/advtaser/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg charge_tick++ @@ -78,7 +78,7 @@ /obj/item/weapon/gun/energy/disabler/cyborg/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/gun/energy/disabler/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg charge_tick++ diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 645d078002e..b0ba982348e 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -56,7 +56,7 @@ /obj/item/weapon/gun/magic/Destroy() if(can_charge) SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/gun/magic/process() diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 56a077bbfa0..02c818cdbf2 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -54,7 +54,7 @@ var/const/PATCH = 4 //patches break // Don't bother adding ourselves to other reagent ids, it is redundant. /datum/reagents/Destroy() - ..() + . = ..() SSobj.processing.Remove(src) for(var/datum/reagent/R in reagent_list) qdel(R) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index e3a2d4cc612..6800d140184 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -27,7 +27,7 @@ var/overdosed = 0 // You fucked up and this is now triggering its overdose effects, purge that shit quick. /datum/reagent/Destroy() // This should only be called by the holder, so it's already handled clearing its references - ..() + . = ..() holder = null /datum/reagent/proc/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index ab68ee49f79..b971a49f98a 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -43,7 +43,7 @@ Borg Hypospray /obj/item/weapon/reagent_containers/borghypo/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm index 3511e08142e..219785d1f33 100644 --- a/code/modules/recycling/disposal-structures.dm +++ b/code/modules/recycling/disposal-structures.dm @@ -17,7 +17,7 @@ /obj/structure/disposalholder/Destroy() qdel(gas) active = 0 - ..() + return ..() // initialize a holder from the contents of a disposal unit /obj/structure/disposalholder/proc/init(obj/machinery/disposal/D) @@ -194,13 +194,12 @@ AM.loc = T AM.pipe_eject(0) qdel(H) - ..() - return + return ..() // otherwise, do normal expel from turf if(H) expel(H, T, 0) - ..() + return ..() // returns the direction of the next pipe object, given the entrance dir // by default, returns the bitmask of remaining directions @@ -642,7 +641,7 @@ else if(istype(linked, /obj/machinery/disposal)) var/obj/machinery/disposal/D = linked D.trunk = null - ..() + return ..() /obj/structure/disposalpipe/trunk/proc/getlinked() linked = null @@ -783,7 +782,7 @@ /obj/structure/disposaloutlet/Destroy() if(trunk) trunk.linked = null - ..() + return ..() // expel the contents of the holder object, then delete it // called when the holder exits the outlet diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm index a348aa86165..0e0153bb26a 100644 --- a/code/modules/recycling/disposal-unit.dm +++ b/code/modules/recycling/disposal-unit.dm @@ -49,7 +49,7 @@ eject() if(trunk) trunk.linked = null - ..() + return ..() /obj/machinery/disposal/singularity_pull(S, current_size) if(current_size >= STAGE_FIVE) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index df47b62e337..94b40c801a5 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -23,7 +23,7 @@ var/turf/T = get_turf(src) for(var/atom/movable/AM in contents) AM.loc = T - ..() + return ..() /obj/structure/bigDelivery/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/device/destTagger)) diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 901d291e947..df6389820a8 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -96,8 +96,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() /obj/machinery/message_server/Destroy() message_servers -= src - ..() - return + return ..() /obj/machinery/message_server/proc/GenerateKey() //Feel free to move to Helpers. @@ -258,7 +257,7 @@ var/obj/machinery/blackbox_recorder/blackbox BR.messages_admin = messages_admin if(blackbox != BR) blackbox = BR - ..() + return ..() /obj/machinery/blackbox_recorder/proc/find_feedback_datum(variable) for (var/datum/feedback_variable/FV in feedback) diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index af580b93b83..94751720d53 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -26,7 +26,7 @@ /obj/machinery/r_n_d/server/Destroy() griefProtection() - ..() + return ..() /obj/machinery/r_n_d/server/RefreshParts() var/tot_rating = 0 diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index f37761f55a2..2876ed2b780 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -54,7 +54,7 @@ /obj/item/organ/internal/Destroy() if(owner) Remove(owner, 1) - ..() + return ..() /obj/item/organ/internal/attack(mob/living/carbon/M, mob/user) if(M == user && ishuman(user)) diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 05eaa989580..7f37811240a 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -19,7 +19,7 @@ var/list/GPS_list = list() /obj/item/device/gps/Destroy() GPS_list.Remove(src) - ..() + return ..() /obj/item/device/gps/emp_act(severity) emped = 1 diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index 4d585a48c8f..5305af689ab 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -127,7 +127,7 @@ /obj/item/weapon/rcs/Destroy() SSobj.processing.Remove(src) - ..() + return ..() /obj/item/weapon/rcs/process() if(rcharges > 10) rcharges = 10 diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 3e0a44925ea..a166eb69b0a 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -39,7 +39,7 @@ if(inserted_gps) inserted_gps.loc = loc inserted_gps = null - ..() + return ..() /obj/machinery/computer/telescience/examine(mob/user) ..() From 6d020e9fe1b77bcd5736bc8d0eaee4315b815d29 Mon Sep 17 00:00:00 2001 From: duncathan Date: Mon, 31 Aug 2015 00:44:12 -0600 Subject: [PATCH 2/3] slightly modifies find_references() and QDEL_HINT_FINDREFERENCE; adds testing() feedback message for when an object's Destroy() doesn't return a proper hint --- code/controllers/subsystem/garbage.dm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index b8d4c6c4a6f..ecd7ad159da 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -121,10 +121,13 @@ var/datum/subsystem/garbage_collector/SSgarbage PlaceInPool(A,0) if (QDEL_HINT_FINDREFERENCE)//qdel will, if TESTING is enabled, display all references to this object, then queue the object for deletion. #ifdef TESTING - A.find_references(remove_from_queue = FALSE) - #endif + A.to_be_queued = TRUE + A.find_references() + #else SSgarbage.Queue(A) + #endif else + testing("WARNING: \ref[A] \[[A.type]] is not returning a qdel hint. It is being placed in the queue.") SSgarbage.Queue(A) // Returns 1 if the object has been queued for deletion. @@ -147,8 +150,9 @@ var/datum/subsystem/garbage_collector/SSgarbage #ifdef TESTING /client/var/running_find_references /datum/var/running_find_references +/datum/var/to_be_queued = FALSE -/datum/verb/find_references(remove_from_queue = TRUE as num) +/datum/verb/find_references() set category = "Debug" set name = "Find References" set background = 1 @@ -166,7 +170,7 @@ var/datum/subsystem/garbage_collector/SSgarbage running_find_references = null return // Remove this object from the list of things to be auto-deleted. - if(remove_from_queue && SSgarbage && ("\ref[src]" in SSgarbage.queue)) + if(SSgarbage && ("\ref[src]" in SSgarbage.queue)) SSgarbage.queue -= "\ref[src]" if(usr && usr.client) usr.client.running_find_references = type @@ -192,6 +196,10 @@ var/datum/subsystem/garbage_collector/SSgarbage usr.client.running_find_references = null running_find_references = null + if(to_be_queued == TRUE) + to_be_queued = FALSE + SSgarbage.Queue(src) + /client/verb/purge_all_destroyed_objects() set category = "Debug" if(SSgarbage) @@ -210,5 +218,6 @@ var/datum/subsystem/garbage_collector/SSgarbage qdel(src) if(!running_find_references) - find_references(remove_from_queue = FALSE) + to_be_queued = TRUE //find_references removes the object from the queue; + find_references() //this ensures the object will be queued again once find_references has completed #endif \ No newline at end of file From 1f5510eb12c46b058d3f602ca682097b6b6c8f48 Mon Sep 17 00:00:00 2001 From: duncathan Date: Tue, 1 Sep 2015 02:16:12 -0600 Subject: [PATCH 3/3] hahah woops --- code/game/objects/effects/landmarks.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index b3e70dc81f7..61dbc90fc88 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -81,7 +81,8 @@ start_landmarks_list += src return 1 -/obj/effect/landmark/start/Destroy() start_landmarks_list -= src +/obj/effect/landmark/start/Destroy() + start_landmarks_list -= src return ..() //Costume spawner landmarks