cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3575 from LorenLuke/simple-derobusto

Browse Source 
De-robusts simple animal attacks
This commit is contained in:
Anewbe
2017-07-10 16:49:08 -05:00
committed by GitHub
parent a47584fdb0 8ee79ec299
commit 2d39010c3d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/living/simple_animal/simple_animal.dm
View File

@@ -105,6 +105,7 @@
var/friendly = "nuzzles" // What mobs do to people when they aren't really hostile
var/attack_sound = null // Sound to play when I attack
var/environment_smash = 0 // How much environment damage do I do when I hit stuff?
var/melee_miss_chance = 25 // percent chance to miss a melee attack.
//Special attacks
var/spattack_prob = 0 // Chance of the mob doing a special attack (0 for never)
@@ -1117,9 +1118,18 @@
/mob/living/simple_animal/proc/PunchTarget()
if(!Adjacent(target_mob))
return
sleep(rand(8) + 8)
if(isliving(target_mob))
var/mob/living/L = target_mob
L.attack_generic(src,rand(melee_damage_lower,melee_damage_upper),attacktext)
if(prob(melee_miss_chance))
src.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [L.name] ([L.ckey])</font>")
L.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [src.name] ([src.ckey])</font>")
src.visible_message("<span class='danger'>[src] misses [L]!</span>")
src.do_attack_animation(src)
return L
else
L.attack_generic(src,rand(melee_damage_lower,melee_damage_upper),attacktext)
return L
if(istype(target_mob,/obj/mecha))
var/obj/mecha/M = target_mob