Skip to content

Commit

Permalink
Merge pull request #3635 from OverDriveZ/stop-people-from-punching-th…
Browse files Browse the repository at this point in the history
…emselves

stop people from punching themselves - iteration I [ready to merge]
  • Loading branch information
TalkingCactus authored Oct 29, 2023
2 parents 36ea074 + ee9c7fc commit 67bc612
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 67bc612

Please sign in to comment.