diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 0022594ce6..36b3eee656 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -155,6 +155,7 @@ verbs += /client/proc/cmd_admin_create_centcom_report verbs += /client/proc/toggle_hear_deadcast verbs += /client/proc/toggle_hear_radio + verbs += /client/proc/toggle_hear_atklog verbs += /client/proc/deadmin_self //verbs += /client/proc/cmd_admin_attack_log --Merged with view variables else return @@ -397,6 +398,7 @@ verbs -= /client/proc/toggle_clickproc //TODO ERRORAGE (Temporary proc while the enw clickproc is being tested) verbs -= /client/proc/toggle_hear_deadcast verbs -= /client/proc/toggle_hear_radio + verbs -= /client/proc/toggle_hear_atklog verbs -= /client/proc/player_panel_new verbs -= /client/proc/toggle_gravity_on verbs -= /client/proc/toggle_gravity_off diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 2ec678d6ab..717fa7da42 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -161,7 +161,7 @@ if(HULK in M.mutations) damage += 5 if(SUPRSTR in M.augmentations) damage += 5 - if(attack_verb == "scratch") damage += 5 + switch(attack_verb) if("slash") @@ -172,12 +172,15 @@ playsound(loc, "punch", 25, 1, -1) visible_message("\red [M] has [attack_verb]ed [src]!") - - apply_damage(damage, BRUTE, affecting, armor_block) +//Rearranged, so claws don't increase weaken chance. if(damage >= 5 && prob(50)) visible_message("\red [M] has weakened [src]!") apply_effect(2, WEAKEN, armor_block) + if(attack_verb == "scratch") damage += 5 + apply_damage(damage, BRUTE, affecting, armor_block) + + if("disarm") M.attack_log += text("\[[time_stamp()]\] Disarmed [src.name] ([src.ckey])") src.attack_log += text("\[[time_stamp()]\] Has been disarmed by [M.name] ([M.ckey])")