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 #592 from Fox-McCloud/mindslave-loyalties

Browse Source 
Mindslave, Loyalty, and Knockdown fixes.
This commit is contained in:
ZomgPonies
2015-03-19 01:41:51 -04:00
parent ab619f66ee d0a09c8126
commit bfb1969279
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_defense.dm
+6 -5
View File
@@ -287,11 +287,11 @@ emp_act
switch(hit_area)
if("head")//Harder to score a stun but if you do it lasts a bit longer
if(prob(I.force))
apply_effect(5, WEAKEN, armor)
confused += 15
if(stat == CONSCIOUS && prob(I.force) && armor < 50)
visible_message("<span class='danger'>[src] has been knocked down!</span>", \
"<span class='userdanger'>[src] has been knocked down!</span>")
apply_effect(5, WEAKEN, armor)
confused += 15
if(src != user && I.damtype == BRUTE)
ticker.mode.remove_revolutionary(mind)
@@ -307,9 +307,10 @@ emp_act
update_inv_glasses(0)
if("chest")//Easier to score a stun but lasts less time
if(prob((I.force + 10)))
if(stat == CONSCIOUS && I.force && prob(I.force + 10))
visible_message("<span class='danger'>[src] has been knocked down!</span>", \
"<span class='userdanger'>[src] has been knocked down!</span>")
apply_effect(5, WEAKEN, armor)
visible_message("\red <B>[src] has been knocked down!</B>")
if(bloody)
bloody_body(src)