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

Porting "Personal interaction messages to simple animals" and more. (#12268)

Browse Source 
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
This commit is contained in:
Ghom
2020-05-18 13:46:57 +02:00
committed by GitHub
parent 75dec8ce2c
commit 9eccef2836
118 changed files with 1024 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mecha_defense.dm
+1 -1
View File
@@ -77,7 +77,7 @@
/obj/mecha/attack_animal(mob/living/simple_animal/user)
mecha_log_message("Attack by simple animal. Attacker - [user].", color="red")
if(!user.melee_damage_upper && !user.obj_damage)
user.emote("custom", message = "[user.friendly] [src].")
user.emote("custom", message = "[user.friendly_verb_continuous] [src].")
return 0
else
var/play_soundeffect = 1
code/game/objects/obj_defense.dm
+1 -1
View File
@@ -112,7 +112,7 @@
/obj/attack_animal(mob/living/simple_animal/M)
if(!M.melee_damage_upper && !M.obj_damage)
M.emote("custom", message = "[M.friendly] [src].")
M.emote("custom", message = "[M.friendly_verb_continuous] [src].")
return 0
else
var/play_soundeffect = 1