From a92fdde30ee16e06415977662fb4e8d288f3c17a Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 28 Nov 2020 12:59:11 +0100 Subject: [PATCH] [MIRROR] Remove duplicate definitions of /obj/effect/ex_act, explicitly noop it (#1904) * Remove duplicate definitions of /obj/effect/ex_act, explicitly noop it (#55076) /obj/effect/ex_act had several different re-definitions to make it a noop. The original definition would randomly delete it, which is bad news when a lot of /obj/effects are just that--effects, that shouldn't be blown up. The ones that actually do want to be blown up (like decals) already have their own implementations. The one in place was never ran, and nobody had problems with it. * Remove duplicate definitions of /obj/effect/ex_act, explicitly noop it Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com> --- code/game/gamemodes/meteor/meteors.dm | 3 --- code/game/objects/effects/countdown.dm | 3 --- code/game/objects/effects/effects.dm | 16 +--------------- code/game/objects/effects/landmarks.dm | 4 ---- .../temporary_visuals/temporary_visual.dm | 3 --- code/game/objects/items/crab17.dm | 3 --- .../antagonists/cult/cult_turf_overlay.dm | 3 --- code/modules/cargo/supplypod.dm | 3 --- code/modules/events/immovable_rod.dm | 3 --- .../modules/mining/lavaland/necropolis_chests.dm | 6 ------ .../simple_animal/hostile/megafauna/drake.dm | 6 ------ .../hostile/megafauna/hierophant.dm | 3 --- 12 files changed, 1 insertion(+), 55 deletions(-) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 4331cd2e939..7e9b638b997 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -177,9 +177,6 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event meteor_effect() qdel(src) -/obj/effect/meteor/ex_act() - return - /obj/effect/meteor/examine(mob/user) . = ..() if(!(flags_1 & ADMIN_SPAWNED_1) && isliving(user)) diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm index 54a9c2ee1ca..0cbac95e5a2 100644 --- a/code/game/objects/effects/countdown.dm +++ b/code/game/objects/effects/countdown.dm @@ -60,9 +60,6 @@ STOP_PROCESSING(SSfastprocess, src) . = ..() -/obj/effect/countdown/ex_act(severity, target) //immune to explosions - return - /obj/effect/countdown/singularity_pull() return diff --git a/code/game/objects/effects/effects.dm b/code/game/objects/effects/effects.dm index e3cbbaf642d..839fb8fcebd 100644 --- a/code/game/objects/effects/effects.dm +++ b/code/game/objects/effects/effects.dm @@ -27,25 +27,11 @@ return /obj/effect/ex_act(severity, target) - if(target == src) - qdel(src) - else - switch(severity) - if(1) - qdel(src) - if(2) - if(prob(60)) - qdel(src) - if(3) - if(prob(25)) - qdel(src) + return /obj/effect/singularity_act() qdel(src) -/obj/effect/abstract/ex_act(severity, target) - return - /obj/effect/abstract/singularity_pull() return diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 1c4642a2734..ebbb213e87a 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -10,10 +10,6 @@ /obj/effect/landmark/singularity_act() return -// Please stop bombing the Observer-Start landmark. -/obj/effect/landmark/ex_act() - return - /obj/effect/landmark/singularity_pull() return diff --git a/code/game/objects/effects/temporary_visuals/temporary_visual.dm b/code/game/objects/effects/temporary_visuals/temporary_visual.dm index 615f392a861..ee6ef355dd0 100644 --- a/code/game/objects/effects/temporary_visuals/temporary_visual.dm +++ b/code/game/objects/effects/temporary_visuals/temporary_visual.dm @@ -25,9 +25,6 @@ /obj/effect/temp_visual/singularity_pull() return -/obj/effect/temp_visual/ex_act() - return - /obj/effect/temp_visual/dir_setting randomdir = FALSE diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index ca80a8a437c..d2740389fd7 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -214,9 +214,6 @@ var/obj/structure/checkoutmachine/dump var/mob/living/bogdanoff -/obj/effect/ex_act() - return - /obj/effect/dumpeet_target/Initialize(mapload, user) . = ..() bogdanoff = user diff --git a/code/modules/antagonists/cult/cult_turf_overlay.dm b/code/modules/antagonists/cult/cult_turf_overlay.dm index 9605a1d8e8e..5bc4474c880 100644 --- a/code/modules/antagonists/cult/cult_turf_overlay.dm +++ b/code/modules/antagonists/cult/cult_turf_overlay.dm @@ -8,9 +8,6 @@ if(linked) linked.examine(user) -/obj/effect/cult_turf/overlay/ex_act() - return FALSE - /obj/effect/cult_turf/overlay/singularity_act() return diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 19532b35571..866a904ad81 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -551,9 +551,6 @@ var/obj/effect/pod_landingzone_effect/helper var/list/smoke_effects = new /list(13) -/obj/effect/ex_act() - return - /obj/effect/pod_landingzone/Initialize(mapload, podParam, single_order = null, clientman) . = ..() if (ispath(podParam)) //We can pass either a path for a pod (as expressconsoles do), or a reference to an instantiated pod (as the centcom_podlauncher does) diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index 6d42056cd26..c39ec8e61e2 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -122,9 +122,6 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 walk(src,0) walk_towards(src, destination, 1) -/obj/effect/immovablerod/ex_act(severity, target) - return - /obj/effect/immovablerod/singularity_act() return diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index cd0a7fd0c0b..d76012130ee 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -377,9 +377,6 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT anchored = TRUE -/obj/effect/warp_cube/ex_act(severity, target) - return - //Meat Hook /obj/item/gun/magic/hook name = "meat hook" @@ -518,9 +515,6 @@ /obj/effect/immortality_talisman/attackby() return -/obj/effect/immortality_talisman/ex_act() - return - /obj/effect/immortality_talisman/singularity_pull() return diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 96aadcd5a18..89f539e12d7 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -423,9 +423,6 @@ Difficulty: Medium light_range = 2 duration = 13 -/obj/effect/temp_visual/lava_warning/ex_act() - return - /obj/effect/temp_visual/lava_warning/Initialize(mapload, reset_time = 10) . = ..() INVOKE_ASYNC(src, .proc/fall, reset_time) @@ -542,9 +539,6 @@ Difficulty: Medium light_range = 2 duration = 9 -/obj/effect/temp_visual/target/ex_act() - return - /obj/effect/temp_visual/target/Initialize(mapload, list/flame_hit) . = ..() INVOKE_ASYNC(src, .proc/fall, flame_hit) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 90d3a3ca2a0..67b73064173 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -731,9 +731,6 @@ Difficulty: Hard layer = LOW_OBJ_LAYER anchored = TRUE -/obj/effect/hierophant/ex_act() - return - /obj/effect/hierophant/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/hierophant_club)) var/obj/item/hierophant_club/H = I