shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes pacifist zombo

Browse Source
This commit is contained in:
qweq12yt
2021-02-26 18:13:12 -03:00
parent 54eb4bd318
commit d3ea3ee4f1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/item_attack.dm
+1 -1
View File
@@ -82,7 +82,7 @@
SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user) SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user)
if(item_flags & NOBLUDGEON) if(item_flags & NOBLUDGEON)
return return
if(force && damtype != STAMINA && HAS_TRAIT(user, TRAIT_PACIFISM)) if(force && damtype != STAMINA && HAS_TRAIT(user, TRAIT_PACIFISM) && !is_species(user, /datum/species/zombie/infectious)) // probably it's here
to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>") to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
return return