Revert all mob-code changes

This commit is contained in:
tigercat2000
2018-04-25 16:41:58 -07:00
parent df26483e67
commit 5fd9b42163
3 changed files with 7 additions and 6 deletions
-1
View File
@@ -201,7 +201,6 @@
swap_hand()
/mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
add_attack_logs(M, src, "Shaked", admin_notify = FALSE)
if(src.health >= config.health_threshold_crit)
if(src == M && istype(src, /mob/living/carbon/human))
var/mob/living/carbon/human/H = src
@@ -19,7 +19,7 @@
..()
if((M != src) && M.a_intent != INTENT_HELP && check_shields(0, M.name, attack_type = UNARMED_ATTACK))
add_attack_logs(M, src, "Melee attacked with fists (miss/block)", admin_notify = FALSE)
add_attack_logs(M, src, "Melee attacked with fists (miss/block)")
visible_message("<span class='warning'>[M] attempted to touch [src]!</span>")
return 0
@@ -38,9 +38,11 @@
if(S.next_step(M, src))
return 1
help_shake_act(M)
add_attack_logs(M, src, "Shaked")
return 1
if(health >= config.health_threshold_crit)
help_shake_act(M)
add_attack_logs(M, src, "Shaked")
return 1
if(!H.check_has_mouth())
to_chat(H, "<span class='danger'>You don't have a mouth, you cannot perform CPR!</span>")
@@ -105,7 +107,7 @@
var/datum/unarmed_attack/attack = M.species.unarmed
M.do_attack_animation(src)
add_attack_logs(M, src, "Melee attacked with fists", admin_notify = ckey ? TRUE : FALSE)
add_attack_logs(M, src, "Melee attacked with fists")
if(!iscarbon(M))
LAssailant = null
@@ -144,7 +146,7 @@
if(attacker_style && attacker_style.disarm_act(H, src))
return 1
else
add_attack_logs(M, src, "Disarmed", admin_notify = FALSE)
add_attack_logs(M, src, "Disarmed")
if(w_uniform)
w_uniform.add_fingerprint(M)
@@ -154,7 +156,7 @@
apply_effect(2, WEAKEN, run_armor_check(affecting, "melee"))
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
visible_message("<span class='danger'>[M] has pushed [src]!</span>")
add_attack_logs(M, src, "Pushed over", admin_notify = FALSE)
add_attack_logs(M, src, "Pushed over")
if(!iscarbon(M))
LAssailant = null
else
+1 -1
View File
@@ -240,7 +240,7 @@
to_chat(user, "<span class='notice'>You already grabbed [src].</span>")
return
add_attack_logs(user, src, "Grabbed passively", admin_notify = FALSE)
add_attack_logs(user, src, "Grabbed passively")
var/obj/item/grab/G = new /obj/item/grab(user, src)
if(buckled)