cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Claws no longer affect weakening chance. Forgot to add toggle verb to admin lists.

Browse Source
This commit is contained in:
Erthilo
2012-08-23 16:38:03 +01:00
parent dd09c46595
commit 22a42ad272
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/admin_verbs.dm
View File

@@ -155,6 +155,7 @@
verbs += /client/proc/cmd_admin_create_centcom_report verbs += /client/proc/cmd_admin_create_centcom_report
verbs += /client/proc/toggle_hear_deadcast verbs += /client/proc/toggle_hear_deadcast
verbs += /client/proc/toggle_hear_radio verbs += /client/proc/toggle_hear_radio
verbs += /client/proc/toggle_hear_atklog
verbs += /client/proc/deadmin_self verbs += /client/proc/deadmin_self
//verbs += /client/proc/cmd_admin_attack_log --Merged with view variables //verbs += /client/proc/cmd_admin_attack_log --Merged with view variables
else return 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_clickproc //TODO ERRORAGE (Temporary proc while the enw clickproc is being tested)
verbs -= /client/proc/toggle_hear_deadcast verbs -= /client/proc/toggle_hear_deadcast
verbs -= /client/proc/toggle_hear_radio verbs -= /client/proc/toggle_hear_radio
verbs -= /client/proc/toggle_hear_atklog
verbs -= /client/proc/player_panel_new verbs -= /client/proc/player_panel_new
verbs -= /client/proc/toggle_gravity_on verbs -= /client/proc/toggle_gravity_on
verbs -= /client/proc/toggle_gravity_off verbs -= /client/proc/toggle_gravity_off

9
code/modules/mob/living/carbon/human/human_attackhand.dm
View File

@@ -161,7 +161,7 @@
if(HULK in M.mutations) damage += 5 if(HULK in M.mutations) damage += 5
if(SUPRSTR in M.augmentations) damage += 5 if(SUPRSTR in M.augmentations) damage += 5
if(attack_verb == "scratch") damage += 5
switch(attack_verb) switch(attack_verb)
if("slash") if("slash")
@@ -172,12 +172,15 @@
playsound(loc, "punch", 25, 1, -1) playsound(loc, "punch", 25, 1, -1)
visible_message("\red <B>[M] has [attack_verb]ed [src]!</B>") visible_message("\red <B>[M] has [attack_verb]ed [src]!</B>")
//Rearranged, so claws don't increase weaken chance.
apply_damage(damage, BRUTE, affecting, armor_block)
if(damage >= 5 && prob(50)) if(damage >= 5 && prob(50))
visible_message("\red <B>[M] has weakened [src]!</B>") visible_message("\red <B>[M] has weakened [src]!</B>")
apply_effect(2, WEAKEN, armor_block) apply_effect(2, WEAKEN, armor_block)
if(attack_verb == "scratch") damage += 5
apply_damage(damage, BRUTE, affecting, armor_block)
if("disarm") if("disarm")
M.attack_log += text("\[[time_stamp()]\] <font color='red'>Disarmed [src.name] ([src.ckey])</font>") M.attack_log += text("\[[time_stamp()]\] <font color='red'>Disarmed [src.name] ([src.ckey])</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been disarmed by [M.name] ([M.ckey])</font>") src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been disarmed by [M.name] ([M.ckey])</font>")