From b9b3cffad78e5b0726a0a15a8c83154bc7e4024d Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 5 May 2020 19:36:14 +0100 Subject: [PATCH] removing some duplicated proc definitions (#50812) * remove duplicate definition of '/datum/component/plumbing/reaction_chamber/can_give' * remove duplicate proc definitions for '/datum/status_effect/pacify/' * syndicate holster correctly sets storage component's silent var * singularity_act no longer deletes fulton 'extraction holder' * singularity_act no longer deletes rend tears * remove duplicate singularity_pull method from /obj/effect/cult_turf/overlay * remove no longer used 'dir_map_to_angle' proc from reflectors * remove duplicate /mob/living/simple_animal/bot/hygienebot/Crossed --- code/datums/components/plumbing/reaction_chamber.dm | 12 +----------- code/datums/status_effects/debuffs.dm | 13 ------------- code/game/objects/items/storage/holsters.dm | 2 +- code/game/objects/structures/reflector.dm | 6 ------ code/modules/antagonists/cult/cult_turf_overlay.dm | 4 +--- .../antagonists/wizard/equipment/artefact.dm | 2 +- code/modules/mining/fulton.dm | 2 +- .../mob/living/simple_animal/bot/hygienebot.dm | 6 ------ 8 files changed, 5 insertions(+), 42 deletions(-) diff --git a/code/datums/components/plumbing/reaction_chamber.dm b/code/datums/components/plumbing/reaction_chamber.dm index 675c3c3719b..3345eb0e76d 100644 --- a/code/datums/components/plumbing/reaction_chamber.dm +++ b/code/datums/components/plumbing/reaction_chamber.dm @@ -7,7 +7,7 @@ if(!istype(parent, /obj/machinery/plumbing/reaction_chamber)) return COMPONENT_INCOMPATIBLE -/datum/component/plumbing/reaction_chamber/can_give(amount, reagent) +/datum/component/plumbing/reaction_chamber/can_give(amount, reagent, datum/ductnet/net) . = ..() var/obj/machinery/plumbing/reaction_chamber/RC = parent if(!. || !RC.emptying) @@ -36,13 +36,3 @@ RC.emptying = TRUE //If we move this up, it'll instantly get turned off since any reaction always sets the reagent_total to zero. Other option is make the reaction update //everything for every chemical removed, wich isn't a good option either. RC.on_reagent_change() //We need to check it now, because some reactions leave nothing left. - -/datum/component/plumbing/reaction_chamber/can_give(amount, reagent, datum/ductnet/net) - . = ..() - var/obj/machinery/plumbing/reaction_chamber/RC = parent - if(!. || !RC.emptying) - return FALSE - - - - diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index d4cdaeeac84..d01febf9044 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -201,19 +201,6 @@ to_chat(owner, "You succesfuly remove the durathread strand.") L.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) - -/datum/status_effect/pacify/on_creation(mob/living/new_owner, set_duration) - if(isnum(set_duration)) - duration = set_duration - . = ..() - -/datum/status_effect/pacify/on_apply() - ADD_TRAIT(owner, TRAIT_PACIFISM, "status_effect") - return ..() - -/datum/status_effect/pacify/on_remove() - REMOVE_TRAIT(owner, TRAIT_PACIFISM, "status_effect") - //OTHER DEBUFFS /datum/status_effect/pacify id = "pacify" diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index 39bd034a156..0bb4c32f7ab 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -66,7 +66,7 @@ chameleon_action.chameleon_name = "Belt" chameleon_action.initialize_disguises() -/obj/item/storage/belt/chameleon/ComponentInitialize() +/obj/item/storage/belt/holster/chameleon/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.silent = TRUE diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index 16c954d0465..1b009ee6e4a 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -55,9 +55,6 @@ /obj/structure/reflector/setDir(new_dir) return ..(NORTH) -/obj/structure/reflector/proc/dir_map_to_angle(dir) - return 0 - /obj/structure/reflector/bullet_act(obj/projectile/P) var/pdir = P.dir var/pangle = P.Angle @@ -253,9 +250,6 @@ else return ..() -/obj/structure/reflector/dir_map_to_angle(dir) - return dir2angle(dir) - /obj/structure/reflector/singularity_act() if(admin) return diff --git a/code/modules/antagonists/cult/cult_turf_overlay.dm b/code/modules/antagonists/cult/cult_turf_overlay.dm index 2e950326bf8..de238d8a388 100644 --- a/code/modules/antagonists/cult/cult_turf_overlay.dm +++ b/code/modules/antagonists/cult/cult_turf_overlay.dm @@ -12,10 +12,8 @@ /obj/effect/cult_turf/overlay/singularity_act() return -/obj/effect/cult_turf/overlay/singularity_pull() - return -/obj/effect/cult_turf/overlay/singularity_pull(S, current_size) +/obj/effect/cult_turf/overlay/singularity_pull() return /obj/effect/cult_turf/overlay/Destroy() diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index c5833963262..71f44e3ec0a 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -66,7 +66,7 @@ else return ..() -/obj/effect/rend/singularity_pull() +/obj/effect/rend/singularity_act() return /obj/effect/rend/singularity_pull() diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index df04e4bba27..71e8a42e90e 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -188,7 +188,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) return 1 return 0 -/obj/effect/extraction_holder/singularity_pull() +/obj/effect/extraction_holder/singularity_act() return /obj/effect/extraction_holder/singularity_pull() diff --git a/code/modules/mob/living/simple_animal/bot/hygienebot.dm b/code/modules/mob/living/simple_animal/bot/hygienebot.dm index 321d4828ce6..d1ff292e94d 100644 --- a/code/modules/mob/living/simple_animal/bot/hygienebot.dm +++ b/code/modules/mob/living/simple_animal/bot/hygienebot.dm @@ -87,12 +87,6 @@ walk_to(src,0) last_found = world.time - -/mob/living/simple_animal/bot/hygienebot/Crossed(atom/movable/AM) - . = ..() - if(washing) - do_wash(AM) - /mob/living/simple_animal/bot/hygienebot/Moved() . = ..() if(washing && isturf(loc) && !emagged)