diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index 44ba6f5e6b3..e78074107ad 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -202,7 +202,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin /obj/fire/Destroy() RemoveFire() - ..() + . = ..() /obj/fire/proc/RemoveFire() var/turf/T = loc diff --git a/code/_onclick/hud/ability_screen_objects.dm b/code/_onclick/hud/ability_screen_objects.dm index 79851e764f1..5f4bbec8a24 100644 --- a/code/_onclick/hud/ability_screen_objects.dm +++ b/code/_onclick/hud/ability_screen_objects.dm @@ -210,7 +210,7 @@ ability_master.update_icon() // qdel(ability_master) ability_master = null - ..() + . = ..() /obj/screen/ability/update_icon() // if(!spell) diff --git a/code/controllers/autotransfer.dm b/code/controllers/autotransfer.dm index b40fd1e2ef3..2ca16bf6248 100644 --- a/code/controllers/autotransfer.dm +++ b/code/controllers/autotransfer.dm @@ -14,7 +14,7 @@ var/datum/controller/transfer_controller/transfer_controller /datum/controller/transfer_controller/Destroy() STOP_PROCESSING(SSprocessing, src) - ..() + . = ..() /datum/controller/transfer_controller/process() currenttick = currenttick + 1 diff --git a/code/game/gamemodes/changeling/powers/armblade.dm b/code/game/gamemodes/changeling/powers/armblade.dm index 7e65d9c2557..fba95bbcacc 100644 --- a/code/game/gamemodes/changeling/powers/armblade.dm +++ b/code/game/gamemodes/changeling/powers/armblade.dm @@ -87,7 +87,7 @@ /obj/item/melee/changeling/Destroy() STOP_PROCESSING(SSobj, src) creator = null - ..() + . = ..() /obj/item/melee/changeling/process() //Stolen from ninja swords. if(!creator || loc != creator || !creator.item_is_in_hands(src)) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 231b284a491..6bf37a4f466 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -81,7 +81,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," qdel(blood_image) blood_image = null rune_list.Remove(src) - ..() + . = ..() /obj/effect/rune/examine(mob/user) . = ..() diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 86bb8176f89..a6ba347f942 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -16,7 +16,7 @@ var/global/list/all_objectives = list() /datum/objective/Destroy() all_objectives -= src - ..() + . = ..() /datum/objective/proc/check_completion() return completed diff --git a/code/game/gamemodes/technomancer/spells/spawner/fire_blast.dm b/code/game/gamemodes/technomancer/spells/spawner/fire_blast.dm index 62230fc27dc..1be8820bec5 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/fire_blast.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/fire_blast.dm @@ -30,4 +30,4 @@ /obj/effect/temporary_effect/fire_blast/Destroy() explosion(get_turf(src), -1, 1, 2, 5, adminlog = 1) - ..() + . = ..() diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 7e062ae9430..49125fd1782 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -88,7 +88,7 @@ /obj/machinery/computer/general_air_control/Destroy() if(radio_controller) radio_controller.remove_object(src, frequency) - ..() + . = ..() /obj/machinery/computer/general_air_control/attack_hand(mob/user) if(..(user)) diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index f8914af2888..f1544b13016 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -421,7 +421,7 @@ var/bomb_set var/obj/D = new /obj/item/disk/nuclear(pick(blobstart)) message_admins("[src], the last authentication disk, has been destroyed. Spawning [D] at ([D.x], [D.y], [D.z]).") log_game("[src], the last authentication disk, has been destroyed. Spawning [D] at ([D.x], [D.y], [D.z]).") - ..() + . = ..() /obj/item/disk/nuclear/touch_map_edge() qdel(src) diff --git a/code/game/mecha/equipment/tools/energy_relay.dm b/code/game/mecha/equipment/tools/energy_relay.dm index 8996dd4c587..0f645319837 100644 --- a/code/game/mecha/equipment/tools/energy_relay.dm +++ b/code/game/mecha/equipment/tools/energy_relay.dm @@ -12,7 +12,7 @@ /obj/item/mecha_parts/mecha_equipment/repair_droid/Destroy() STOP_PROCESSING(SSfastprocess, src) - ..() + . = ..() /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/process() if(!chassis || chassis.hasInternalDamage(MECHA_INT_SHORT_CIRCUIT)) diff --git a/code/game/mecha/equipment/tools/shield.dm b/code/game/mecha/equipment/tools/shield.dm index 73529c6d5f7..74859e8e20c 100644 --- a/code/game/mecha/equipment/tools/shield.dm +++ b/code/game/mecha/equipment/tools/shield.dm @@ -34,7 +34,7 @@ my_shield.my_mecha = null qdel(my_shield) my_shield = null - ..() + . = ..() /obj/item/mecha_parts/mecha_equipment/combat_shield/add_equip_overlay(obj/mecha/M as obj) ..() diff --git a/code/game/mecha/equipment/tools/shield_omni.dm b/code/game/mecha/equipment/tools/shield_omni.dm index 8159a98e2cf..c7f8b674982 100644 --- a/code/game/mecha/equipment/tools/shield_omni.dm +++ b/code/game/mecha/equipment/tools/shield_omni.dm @@ -22,7 +22,7 @@ /obj/item/mecha_parts/mecha_equipment/omni_shield/Destroy() QDEL_NULL(shields) - ..() + . = ..() /obj/item/mecha_parts/mecha_equipment/omni_shield/attach(obj/mecha/M as obj) . = ..() @@ -91,7 +91,7 @@ /obj/item/shield_projector/rectangle/mecha/Destroy() UnregisterSignal(my_mech, COMSIG_OBSERVER_MOVED) my_mech = null - ..() + . = ..() /obj/item/shield_projector/rectangle/mecha/create_shield() . = ..() diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 318bc957939..39d8fcaeb81 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -49,7 +49,7 @@ T.Entered(A) step_rand(A) cargo.Cut() - ..() + . = ..() /obj/mecha/working/ripley/firefighter desc = "Standard APLU chassis was refitted with additional thermal protection and cistern." diff --git a/code/game/objects/effects/landmarks_events.dm b/code/game/objects/effects/landmarks_events.dm index 8e4b0ca25b6..a8111a018e2 100644 --- a/code/game/objects/effects/landmarks_events.dm +++ b/code/game/objects/effects/landmarks_events.dm @@ -43,7 +43,7 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm /obj/effect/landmark/event_trigger/Destroy() if(event_triggers[creator_ckey]) event_triggers[creator_ckey] -= src - ..() + . = ..() /obj/effect/landmark/event_trigger/Crossed(var/atom/movable/AM) if(!isliving(AM)) diff --git a/code/game/objects/effects/prop/columnblast.dm b/code/game/objects/effects/prop/columnblast.dm index 15a755b0518..daae3610a57 100644 --- a/code/game/objects/effects/prop/columnblast.dm +++ b/code/game/objects/effects/prop/columnblast.dm @@ -4,34 +4,27 @@ desc = "Oh shit!" icon_state = "pool" icon = 'icons/effects/64x64.dmi' + time_to_die = 0.7 SECONDS pixel_x = -16 -/obj/effect/temporary_effect/eruption/New(var/turf/T, var/ttd = 10 SECONDS, var/newcolor) +/obj/effect/temporary_effect/eruption/Initialize(mapload, var/ttd = 10 SECONDS, var/newcolor) if(ttd) - time_to_die = ttd + time_to_die += ttd + addtimer(CALLBACK(src, PROC_REF(on_eruption), get_turf(src)), time_to_die - 0.2 SECONDS, TIMER_DELETE_ME) if(newcolor) color = newcolor - ..() - -/obj/effect/temporary_effect/eruption/Initialize(mapload) . = ..() flick("[icon_state]_create",src) -/obj/effect/temporary_effect/eruption/Destroy() - var/turf/T = get_turf(src) - flick("[icon_state]_erupt",src) - spawn(5) - if(on_eruption(T)) - spawn(2) - ..() - /obj/effect/temporary_effect/eruption/proc/on_eruption(var/turf/Target) // Override for specific functions, as below. + flick("[icon_state]_erupt",src) return TRUE /obj/effect/temporary_effect/eruption/testing/on_eruption(var/turf/Target) + flick("[icon_state]_erupt",src) if(Target) new /obj/effect/explosion(Target) return TRUE @@ -44,6 +37,7 @@ desc = "A bubbling pool of fire!" /obj/effect/temporary_effect/eruption/flamestrike/on_eruption(var/turf/Target) + flick("[icon_state]_erupt",src) if(Target) Target.hotspot_expose(1000, 50, 1) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index ae3b767bc64..7136c6edc75 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -156,4 +156,4 @@ /obj/effect/dummy/chameleon/Destroy() master.disrupt(0) - ..() + . = ..() diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 1bfa370e585..214854ed44c 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -30,7 +30,7 @@ /obj/item/powersink/Destroy() STOP_PROCESSING(SSobj, src) STOP_PROCESSING_POWER_OBJECT(src) - ..() + . = ..() /obj/item/powersink/attackby(var/obj/item/I, var/mob/user) if(I.has_tool_quality(TOOL_SCREWDRIVER)) diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index e77c654a181..295c7d7019f 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -148,7 +148,7 @@ if(linkedmonitor) linkedmonitor.unpair(src) linkedmonitor = null - ..() + . = ..() /obj/item/bug_monitor name = "mobile camera pod monitor" diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 66f3ce09d19..c1cd4717914 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -16,7 +16,7 @@ T.pinned_target = null T.density = TRUE break - ..() // delete target + . = ..() // delete target /obj/item/target/Moved(atom/old_loc, direction, forced = FALSE) . = ..() diff --git a/code/game/objects/items/weapons/material/chainsaw.dm b/code/game/objects/items/weapons/material/chainsaw.dm index 1fa756c8e6d..1d463348d7c 100644 --- a/code/game/objects/items/weapons/material/chainsaw.dm +++ b/code/game/objects/items/weapons/material/chainsaw.dm @@ -22,7 +22,7 @@ /obj/item/chainsaw/Destroy() STOP_PROCESSING(SSobj, src) - ..() + . = ..() /obj/item/chainsaw/proc/turnOn(mob/user as mob) if(on) return diff --git a/code/game/objects/items/weapons/tools/transforming.dm b/code/game/objects/items/weapons/tools/transforming.dm index 6526e6f4303..b4d8c2a4299 100644 --- a/code/game/objects/items/weapons/tools/transforming.dm +++ b/code/game/objects/items/weapons/tools/transforming.dm @@ -15,7 +15,7 @@ /obj/item/tool/transforming/Destroy() if(welder) QDEL_NULL(welder) - ..() + . = ..() /obj/item/tool/transforming/get_welder() return welder diff --git a/code/game/objects/structures/barricades.dm b/code/game/objects/structures/barricades.dm index 01b9e67cb98..0883fd26ad2 100644 --- a/code/game/objects/structures/barricades.dm +++ b/code/game/objects/structures/barricades.dm @@ -133,7 +133,7 @@ /obj/structure/barricade/sandbag/Destroy() update_connections(1, src) - ..() + . = ..() /obj/structure/barricade/sandbag/dismantle() update_connections(1, src) diff --git a/code/game/objects/structures/props/beam_prism.dm b/code/game/objects/structures/props/beam_prism.dm index c87a58bc0ce..8ea0a8db8e9 100644 --- a/code/game/objects/structures/props/beam_prism.dm +++ b/code/game/objects/structures/props/beam_prism.dm @@ -35,7 +35,7 @@ if(remote_dial) remote_dial.my_turrets -= src remote_dial = null - ..() + . = ..() /obj/structure/prop/prism/proc/reset_rotation() var/degrees_to_rotate = -1 * degrees_from_north @@ -215,4 +215,4 @@ for(var/obj/structure/prop/prism/P in my_turrets) P.remote_dial = null my_turrets = list() - ..() + . = ..() diff --git a/code/game/objects/structures/props/nest.dm b/code/game/objects/structures/props/nest.dm index a6541732a42..5df8e3b7fe6 100644 --- a/code/game/objects/structures/props/nest.dm +++ b/code/game/objects/structures/props/nest.dm @@ -32,7 +32,7 @@ /obj/structure/prop/nest/Destroy() den_mobs = null STOP_PROCESSING(SSobj, src) - ..() + . = ..() /obj/structure/prop/nest/attack_hand(mob/living/user) // Used to tell the player that this isn't useful for anything. ..() diff --git a/code/game/objects/structures/props/projectile_lock.dm b/code/game/objects/structures/props/projectile_lock.dm index ecde254c437..5b729760571 100644 --- a/code/game/objects/structures/props/projectile_lock.dm +++ b/code/game/objects/structures/props/projectile_lock.dm @@ -18,7 +18,7 @@ var/obj/machinery/door/blast/puzzle/P = O P.locks -= src linked_objects -= P - ..() + . = ..() /obj/structure/prop/lock/proc/toggle_lock() enabled = !enabled diff --git a/code/game/objects/structures/props/swarm.dm b/code/game/objects/structures/props/swarm.dm index 4cd812a28fc..e2ad805fb21 100644 --- a/code/game/objects/structures/props/swarm.dm +++ b/code/game/objects/structures/props/swarm.dm @@ -30,7 +30,7 @@ for(var/datum/beam/B in active_beams) QDEL_NULL(B) active_beams = null - ..() + . = ..() /obj/structure/cult/pylon/swarm/pylonhit(var/damage) if(!isbroken) diff --git a/code/game/objects/structures/transit_tubes.dm b/code/game/objects/structures/transit_tubes.dm index ded7775e843..f2e4811eb02 100644 --- a/code/game/objects/structures/transit_tubes.dm +++ b/code/game/objects/structures/transit_tubes.dm @@ -51,7 +51,7 @@ for(var/atom/movable/AM in contents) AM.loc = loc - ..() + . = ..() diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index eb30553d685..702146f13a2 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -49,7 +49,7 @@ /obj/structure/windoor_assembly/Destroy() density = FALSE update_nearby_tiles() - ..() + . = ..() /obj/structure/windoor_assembly/update_icon() icon_state = "[facing]_[secure]windoor_assembly[state]" diff --git a/code/modules/ai/ai_holder_subtypes/slime_xenobio_ai.dm b/code/modules/ai/ai_holder_subtypes/slime_xenobio_ai.dm index 2ad50089b91..5d254a5e482 100644 --- a/code/modules/ai/ai_holder_subtypes/slime_xenobio_ai.dm +++ b/code/modules/ai/ai_holder_subtypes/slime_xenobio_ai.dm @@ -20,7 +20,7 @@ /datum/ai_holder/simple_mob/xenobio_slime/Destroy() grudges.Cut() - ..() + . = ..() /datum/ai_holder/simple_mob/xenobio_slime/sapphire always_stun = TRUE // They know that stuns are godly. diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm index 1fe57589eda..52d786b27cd 100644 --- a/code/modules/blob/blob.dm +++ b/code/modules/blob/blob.dm @@ -195,7 +195,7 @@ /obj/effect/blob/shield/Destroy() density = FALSE update_nearby_tiles() - ..() + . = ..() /obj/effect/blob/shield/update_icon() if(health > maxHealth * 2 / 3) diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm index a2680c9cff4..3caac3d45c1 100644 --- a/code/modules/blob2/core_chunk.dm +++ b/code/modules/blob2/core_chunk.dm @@ -34,7 +34,7 @@ blob_type = null - ..() + . = ..() /obj/item/blobcore_chunk/proc/setup_blobtype(var/datum/blob_type/parentblob = null) if(!parentblob) diff --git a/code/modules/food/food/sandwich.dm b/code/modules/food/food/sandwich.dm index 0b3dc967f7d..8132b8930c0 100644 --- a/code/modules/food/food/sandwich.dm +++ b/code/modules/food/food/sandwich.dm @@ -76,7 +76,7 @@ /obj/item/reagent_containers/food/snacks/csandwich/Destroy() for(var/obj/item/O in ingredients) qdel(O) - ..() + . = ..() /obj/item/reagent_containers/food/snacks/csandwich/examine(mob/user) . = ..() diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index bca3bbc1145..c997512dae3 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -166,7 +166,7 @@ var/global/list/total_extraction_beacons = list() /obj/structure/extraction_point/Destroy() global.total_extraction_beacons -= src - ..() + . = ..() /obj/effect/extraction_holder name = "extraction holder" diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index 0ac52fd3993..5cc43a26d33 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -443,7 +443,7 @@ UnregisterSignal(src, COMSIG_OBSERVER_MOVED) R = null last_robot_loc = null - ..() + . = ..() /obj/item/mining_scanner/robot name = "integrated deep scan device" diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 3cc70c3ecae..c48c3fdc08e 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -52,7 +52,7 @@ /obj/item/dogborg/sleeper/Destroy() go_out() - ..() + . = ..() /obj/item/dogborg/sleeper/Exit(atom/movable/O) return 0 diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 48152b22a23..241ce186f6c 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -75,7 +75,7 @@ var/list/mob_hat_cache = list() /mob/living/silicon/robot/drone/Destroy() if(hat) hat.loc = get_turf(src) - ..() + . = ..() /mob/living/silicon/robot/drone/is_sentient() return FALSE diff --git a/code/modules/mob/living/silicon/robot/drone/swarm_items.dm b/code/modules/mob/living/silicon/robot/drone/swarm_items.dm index 39769098ad0..e1b98dd1ade 100644 --- a/code/modules/mob/living/silicon/robot/drone/swarm_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/swarm_items.dm @@ -137,7 +137,7 @@ /obj/effect/temporary_effect/pulse/disintegrate/Destroy() if(istype(get_turf(src), /turf/simulated/wall)) explosion(get_turf(src), -1, 1, 2, 5, adminlog = 1) - ..() + . = ..() /obj/item/gun/energy/xray/swarm name = "spectral projector" diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index dbd57990958..181bd148fc0 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -140,7 +140,7 @@ /obj/item/card/robot/Destroy() qdel(dummy_card) dummy_card = null - ..() + . = ..() /obj/item/card/robot/GetID() return dummy_card @@ -612,7 +612,7 @@ /obj/item/borg/combat/shield/Destroy() STOP_PROCESSING(SSobj, src) - ..() + . = ..() /obj/item/borg/combat/shield/attack_self(var/mob/living/user) set_shield_level() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm index 6438e28c190..c4ccbac387e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm @@ -44,9 +44,10 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? GLOB.chicken_count += 1 /mob/living/simple_mob/animal/passive/chicken/Destroy() - ..() + . = ..() GLOB.chicken_count -= 1 + /mob/living/simple_mob/animal/passive/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob) if(istype(O, /obj/item/reagent_containers/food/snacks/grown)) //feedin' dem chickens var/obj/item/reagent_containers/food/snacks/grown/G = O diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm index 480d05a87e3..32df5fc739f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm @@ -138,7 +138,7 @@ /mob/living/simple_mob/animal/sif/sakimm/Destroy() if(hat) drop_hat(src) - ..() + . = ..() /mob/living/simple_mob/animal/sif/sakimm/update_icon() cut_overlays() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm index 955d4504ed1..bd7e0beab27 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm @@ -196,7 +196,7 @@ if(next) next.previous = null next = null - ..() + . = ..() /mob/living/simple_mob/animal/space/space_worm/Moved(atom/old_loc, direction, forced = FALSE) . = ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm index 851c6a58e44..b21f6afb92b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm @@ -161,7 +161,7 @@ List of things solar grubs should be able to do: /mob/living/simple_mob/vore/solargrub/Destroy() existing_solargrubs -= src - ..() + . = ..() /mob/living/simple_mob/vore/solargrub/handle_light() . = ..() diff --git a/code/modules/multiz/stairs.dm b/code/modules/multiz/stairs.dm index ba9a40bf56d..08b55ad0043 100644 --- a/code/modules/multiz/stairs.dm +++ b/code/modules/multiz/stairs.dm @@ -82,7 +82,7 @@ top.bottom = null if(middle) middle.bottom = null - ..() + . = ..() // These are necessarily fairly similar, but because the positional relations are different, we have to copy-pasta a fair bit /obj/structure/stairs/bottom/check_integrity(var/obj/structure/stairs/bottom/B = null, @@ -256,7 +256,7 @@ top.middle = null if(bottom) bottom.middle = null - ..() + . = ..() // These are necessarily fairly similar, but because the positional relations are different, we have to copy-pasta a fair bit /obj/structure/stairs/middle/check_integrity(var/obj/structure/stairs/bottom/B = null, @@ -339,7 +339,7 @@ middle.top = null if(bottom) bottom.top = null - ..() + . = ..() // These are necessarily fairly similar, but because the positional relations are different, we have to copy-pasta a fair bit /obj/structure/stairs/top/check_integrity(var/obj/structure/stairs/bottom/B = null, diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index fd4550ea73e..453bb569908 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -76,7 +76,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin construction_state = 0 if(master) master.part_scan() - ..() + . = ..() /obj/structure/particle_accelerator/end_cap name = "Alpha Particle Generation Array" diff --git a/code/modules/reagents/hoses/connector.dm b/code/modules/reagents/hoses/connector.dm index 6a5c26add0c..42c57d62076 100644 --- a/code/modules/reagents/hoses/connector.dm +++ b/code/modules/reagents/hoses/connector.dm @@ -50,7 +50,7 @@ my_hose = null if(carrier) carrier = null - ..() + . = ..() /obj/item/hose_connector/Initialize(mapload) . = ..() @@ -102,7 +102,7 @@ /obj/item/hose_connector/input/active/Destroy() STOP_PROCESSING(SSobj, src) - ..() + . = ..() /obj/item/hose_connector/input/active/Initialize(mapload) . = ..() @@ -124,7 +124,7 @@ /obj/item/hose_connector/output/active/Destroy() STOP_PROCESSING(SSobj, src) - ..() + . = ..() /obj/item/hose_connector/output/active/Initialize(mapload) . = ..() diff --git a/code/modules/reagents/hoses/hose_connector.dm b/code/modules/reagents/hoses/hose_connector.dm index c259e23bc80..fedd8256086 100644 --- a/code/modules/reagents/hoses/hose_connector.dm +++ b/code/modules/reagents/hoses/hose_connector.dm @@ -21,7 +21,7 @@ /obj/item/stack/hose/Destroy() remembered = null - ..() + . = ..() /obj/item/stack/hose/CtrlClick(mob/user) if(remembered) diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 49d6bca3ca5..9e6e058e2b7 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -26,7 +26,7 @@ QDEL_NULL(InputSocket) QDEL_NULL(OutputSocket) - ..() + . = ..() /obj/structure/reagent_dispensers/Initialize(mapload) var/datum/reagents/R = new/datum/reagents(5000) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 37bb9b8a436..6ee44a15480 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -819,7 +819,7 @@ // otherwise, do normal expel from turf if(H) expel(H, T, 0) - ..() + . = ..() // returns the direction of the next pipe object, given the entrance dir // by default, returns the bitmask of remaining directions @@ -1082,7 +1082,7 @@ // otherwise, do normal expel from turf if(H) expel(H, T, 0) - ..() + . = ..() /obj/structure/disposalpipe/hides_under_flooring() return 1 diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index e655d00b2d5..7f5b5fab7fa 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -143,7 +143,7 @@ /obj/machinery/shieldgen/Destroy() collapse_shields() - ..() + . = ..() /obj/machinery/shieldgen/proc/shields_up() if(active) return 0 //If it's already turned on, how did this get called? diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index 98b5151311a..d90c26d04db 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -258,4 +258,4 @@ /obj/vehicle/bike/Destroy() qdel(ion) - ..() + . = ..() diff --git a/code/modules/xenoarcheaology/artifacts/crystal.dm b/code/modules/xenoarcheaology/artifacts/crystal.dm index dde32e05c10..161d06d234b 100644 --- a/code/modules/xenoarcheaology/artifacts/crystal.dm +++ b/code/modules/xenoarcheaology/artifacts/crystal.dm @@ -30,6 +30,6 @@ new /obj/item/material/shard(src.loc) if(prob(25)) new /obj/item/material/shard(src.loc) - ..() + . = ..() //todo: laser_act diff --git a/code/modules/xenoarcheaology/effect.dm b/code/modules/xenoarcheaology/effect.dm index 2b6a0a86fa0..66572c858ff 100644 --- a/code/modules/xenoarcheaology/effect.dm +++ b/code/modules/xenoarcheaology/effect.dm @@ -26,7 +26,7 @@ /datum/artifact_effect/Destroy() master = null //Master still exists even if our effect gets destroyed. No need to qdel_null. qdel_null(active_effect) - ..() + . = ..() /datum/artifact_effect/proc/get_master_holder() // Return the effectmaster's holder, if it is set to an effectmaster. Otherwise, master is the target object. if(istype(master)) diff --git a/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm b/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm index 6dcbca169ec..d5529bb0cf9 100644 --- a/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm +++ b/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm @@ -80,7 +80,7 @@ lightning_strike(T, TRUE) playsound(src, 'sound/goonstation/spooky/creepyshriek.ogg', 100, 1, 75) //It plays VERY far. last_touched = null //Get rid of the reference to our owner. - ..() + . = ..() /obj/item/melee/artifact_blade/cultify() diff --git a/code/modules/xenoarcheaology/tools/ano_device_battery.dm b/code/modules/xenoarcheaology/tools/ano_device_battery.dm index 7186b2a3518..8f9c6a01226 100644 --- a/code/modules/xenoarcheaology/tools/ano_device_battery.dm +++ b/code/modules/xenoarcheaology/tools/ano_device_battery.dm @@ -17,7 +17,7 @@ . += "It currently has a charge of [stored_charge] out of [capacity]" /obj/item/anobattery/Destroy() battery_effect = null - ..() + . = ..() /obj/item/anobattery/moderate name = "moderate anomaly battery" @@ -71,7 +71,7 @@ inserted_battery = null archived_loc = null last_user_touched = null - ..() + . = ..() /obj/item/anodevice/equipped(var/mob/user, var/slot) last_user_touched = user @@ -236,7 +236,7 @@ /obj/item/anodevice/Destroy() STOP_PROCESSING(SSobj, src) - ..() + . = ..() /obj/item/anodevice/attack(mob/living/M as mob, mob/living/user as mob, def_zone) if (!istype(M)) diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm index ed131e2bd26..d20ea475645 100644 --- a/code/modules/xenoarcheaology/tools/tools.dm +++ b/code/modules/xenoarcheaology/tools/tools.dm @@ -236,7 +236,7 @@ /obj/item/beacon_locator/Destroy() STOP_PROCESSING(SSobj, src) - ..() + . = ..() /obj/item/beacon_locator/process() if(target_radio) diff --git a/code/modules/xenobio2/mob/xeno.dm b/code/modules/xenobio2/mob/xeno.dm index 840f17d848a..645eeb4d267 100644 --- a/code/modules/xenobio2/mob/xeno.dm +++ b/code/modules/xenobio2/mob/xeno.dm @@ -103,4 +103,4 @@ Also includes Life and New /mob/living/simple_mob/xeno/Destroy() QDEL_NULL(traitdat) - ..() + . = ..() diff --git a/code/modules/xenobio2/mob/xeno_product.dm b/code/modules/xenobio2/mob/xeno_product.dm index 7c384b89680..0be8b4ba5c8 100644 --- a/code/modules/xenobio2/mob/xeno_product.dm +++ b/code/modules/xenobio2/mob/xeno_product.dm @@ -13,4 +13,4 @@ Xenobiological product lives here as a basic type. /obj/item/xenoproduct/Destroy() QDEL_NULL(traits) - ..() + . = ..()