From ee9c7fc56d7ea7e69c0c1a1749f545dcf8debae5 Mon Sep 17 00:00:00 2001 From: OverDriveZ <64517916+OverDriveZ@users.noreply.github.com> Date: Sun, 29 Oct 2023 22:01:54 +0100 Subject: [PATCH] stop people from punching themselves - iteration I --- code/modules/mob/living/carbon/human/species.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 52bcd65a6ff..48cff5b9574 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1470,6 +1470,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) return 1 /datum/species/proc/harm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style, attackchain_flags = NONE) + //let's stop this madness, hitting yourself is not fun and makes no sense + if(user == target) + return + //-->Pacifism Lesser Trait, most important section of it if(HAS_TRAIT(user, TRAIT_PACIFISM_LESSER) && target.last_mind) //does the firer actually has the PACIFISM_LESSER trait? And is the target sapient? trait_pacifism_lesser_consequences(user)