cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-09 14:15:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

hostile mob fix v2

Browse Source
This commit is contained in:
Ty-Omaha
2018-10-28 03:56:02 -04:00
parent 7f3791c30a
commit ffe39f4500
6 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mecha.dm
+1 -1
View File
@@ -497,7 +497,7 @@
log_message("Attack by simple animal. Attacker - [user].",1)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
if(user.a_intent == INTENT_HELP || user.melee_damage_upper == 0)
if((user.a_intent == INTENT_HELP && user.ckey) || user.melee_damage_upper == 0)
user.custom_emote(1, "[user.friendly] [src].")
else
user.do_attack_animation(src)
code/game/objects/obj_defense.dm
+1 -1
View File
@@ -104,7 +104,7 @@
playsound(loc, 'sound/weapons/slash.ogg', 100, 1)
/obj/attack_animal(mob/living/simple_animal/M)
if(M.a_intent == INTENT_HELP || (!M.melee_damage_upper && !M.obj_damage))
if((M.a_intent == INTENT_HELP && M.ckey) || (!M.melee_damage_upper && !M.obj_damage))
M.custom_emote(1, "[M.friendly] [src].")
return 0
else
code/modules/mob/living/living_defense.dm
+1 -1
View File
@@ -292,7 +292,7 @@
return
/mob/living/attack_animal(mob/living/simple_animal/M)
if(M.a_intent == INTENT_HELP || M.melee_damage_upper == 0)
if((M.a_intent == INTENT_HELP && M.ckey) || M.melee_damage_upper == 0)
M.custom_emote(1, "[M.friendly] [src].")
return 0
else
code/modules/mob/living/silicon/pai/pai.dm
+1 -1
View File
@@ -226,7 +226,7 @@
// See software.dm for Topic()
/mob/living/silicon/pai/attack_animal(mob/living/simple_animal/M)
if(M.a_intent == INTENT_HELP || M.melee_damage_upper == 0)
if((M.a_intent == INTENT_HELP && M.ckey) || M.melee_damage_upper == 0)
M.custom_emote(1, "[M.friendly] [src].")
else
M.do_attack_animation(src)
code/modules/mob/living/simple_animal/hostile/hostile.dm
-1
View File
@@ -3,7 +3,6 @@
stop_automated_movement_when_pulled = 0
obj_damage = 40
environment_smash = 1 //Set to 1 to break closets,tables,racks, etc; 2 for walls; 3 for rwalls
a_intent = INTENT_HARM
var/atom/target
var/ranged = 0
var/rapid = 0
code/modules/spacepods/spacepod.dm
+1 -1
View File
@@ -204,7 +204,7 @@
return
/obj/spacepod/attack_animal(mob/living/simple_animal/user)
if(user.a_intent == INTENT_HELP || user.melee_damage_upper == 0)
if((user.a_intent == INTENT_HELP && user.ckey) || user.melee_damage_upper == 0)
user.custom_emote(1, "[user.friendly] [src].")
else
var/damage = rand(user.melee_damage_lower, user.melee_damage_upper)