cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 09:03:23 +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/modules/mob/living/living_defense.dm
+2 -2
View File
@@ -292,8 +292,8 @@
return
/mob/living/attack_animal(mob/living/simple_animal/M)
if(M.melee_damage_upper == 0)
M.custom_emote(1, "[M.friendly] [src]")
if(M.a_intent == INTENT_HELP || M.melee_damage_upper == 0)
M.custom_emote(1, "[M.friendly] [src].")
return 0
else
if(M.attack_sound)
code/modules/mob/living/silicon/pai/pai.dm
+3 -3
View File
@@ -225,9 +225,9 @@
// See software.dm for Topic()
/mob/living/silicon/pai/attack_animal(mob/living/simple_animal/M as mob)
if(M.melee_damage_upper == 0)
M.custom_emote(1, "[M.friendly] [src]")
/mob/living/silicon/pai/attack_animal(mob/living/simple_animal/M)
if(M.a_intent == INTENT_HELP || M.melee_damage_upper == 0)
M.custom_emote(1, "[M.friendly] [src].")
else
M.do_attack_animation(src)
if(M.attack_sound)
code/modules/spacepods/spacepod.dm
+3 -3
View File
@@ -203,9 +203,9 @@
deal_damage(30)
return
/obj/spacepod/attack_animal(mob/living/simple_animal/user as mob)
if(user.melee_damage_upper == 0)
user.custom_emote(1, "[user.friendly] [src]")
/obj/spacepod/attack_animal(mob/living/simple_animal/user)
if(user.a_intent == INTENT_HELP || user.melee_damage_upper == 0)
user.custom_emote(1, "[user.friendly] [src].")
else
var/damage = rand(user.melee_damage_lower, user.melee_damage_upper)
deal_damage(damage)