From 9b281e7c9fbe821bc101f8c96cdf0e32be38f222 Mon Sep 17 00:00:00 2001 From: Antoonij <42318445+Antoonij@users.noreply.github.com> Date: Fri, 20 Sep 2024 13:06:26 +0300 Subject: [PATCH] useless things removal --- code/__DEFINES/traits/declarations.dm | 1 - code/_globalvars/traits.dm | 1 - code/datums/components/devour.dm | 3 --- code/modules/mob/living/living.dm | 1 - 4 files changed, 6 deletions(-) diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index e1a3373a31c..9d1aed47d67 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -48,7 +48,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_JESTER "jester" #define TRAIT_ELITE_CHALLENGER "elite_challenger" #define TRAIT_MUTE "mute" -#define TRAIT_DEVOURED "devoured" #define TRAIT_DEAF "deaf" #define TRAIT_SECDEATH "secdeath" #define TRAIT_AI_UNTRACKABLE "AI_untrackable" diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index 544b9e00174..3cc5282d226 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -43,7 +43,6 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_COMIC" = TRAIT_COMIC, "TRAIT_CLUMSY" = TRAIT_CLUMSY, "TRAIT_DEAF" = TRAIT_DEAF, - "TRAIT_DEVOURED" = TRAIT_DEVOURED, "TRAIT_DWARF" = TRAIT_DWARF, "TRAIT_ELITE_CHALLENGER" = TRAIT_ELITE_CHALLENGER, "TRAIT_EMBEDIMMUNE" = TRAIT_EMBEDIMMUNE, diff --git a/code/datums/components/devour.dm b/code/datums/components/devour.dm index 195530999bb..a383e3b4e9b 100644 --- a/code/datums/components/devour.dm +++ b/code/datums/components/devour.dm @@ -62,7 +62,6 @@ var/mob/mob = parent target.extinguish_light() target.forceMove(mob) - ADD_TRAIT(target, TRAIT_DEVOURED, UNIQUE_TRAIT_SOURCE(src)) SEND_SIGNAL(mob, COMSIG_COMPONENT_DEVOURED_TARGET, target) return mob @@ -109,8 +108,6 @@ var/mob/mob = parent for(var/atom/movable/atom in mob) atom.forceMove(mob.loc) - if(HAS_TRAIT(mob, TRAIT_DEVOURED)) - REMOVE_TRAIT(mob, TRAIT_DEVOURED, UNIQUE_TRAIT_SOURCE(src)) if(prob(90)) step(atom, pick(GLOB.alldirs)) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index c816756a22b..f84772d5cfb 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1621,7 +1621,6 @@ victim.Knockdown(2 SECONDS) playsound(victim.loc, "desceration", 35, TRUE, -1) add_attack_logs(attacker, victim, "Headbutted") - if(INTENT_GRAB) if(grabber == src) target.devoured(grabber)