cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10007 from Certhic/animal-attack

Browse Source 
fixes animals attacking while on help intent
This commit is contained in:
variableundefined
2018-10-27 22:52:51 +08:00
committed by GitHub
parent 3e8d9f2d6e a082e76838
commit dc30c2e202
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/obj_defense.dm
+2 -2
View File
@@ -104,8 +104,8 @@
playsound(loc, 'sound/weapons/slash.ogg', 100, 1)
/obj/attack_animal(mob/living/simple_animal/M)
if(!M.melee_damage_upper && !M.obj_damage)
M.custom_emote(1, "[M.friendly] [src]")
if(M.a_intent == INTENT_HELP || (!M.melee_damage_upper && !M.obj_damage))
M.custom_emote(1, "[M.friendly] [src].")
return 0
else
var/play_soundeffect = 1