cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-06 07:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevented a horrible alternate reality where humans have claws

Browse Source
This commit is contained in:
misterfox
2012-03-15 15:27:29 -04:00
parent 12c3112d21
commit 225b9f4224
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,14 +86,14 @@
else
attack_verb = "punch"
if(src.type == /mob/living/carbon/human/tajaran)
if(M.type == /mob/living/carbon/human/tajaran)
attack_verb = "slash"
var/damage = rand(0, 9)
if(!damage)
if(src.type != /mob/living/carbon/human/tajaran)
if(M.type != /mob/living/carbon/human/tajaran)
playsound(loc, 'punchmiss.ogg', 25, 1, -1)
else if (src.type == /mob/living/carbon/human/tajaran)
else if (M.type == /mob/living/carbon/human/tajaran)
playsound(loc, 'slashmiss.ogg', 25, 1, -1)
visible_message("\red <B>[M] has attempted to [attack_verb] [src]!</B>")
return 0
@@ -101,9 +101,9 @@
var/armor_block = run_armor_check(affecting, "melee")
if(M.mutations & HULK) damage += 5
if(src.type != /mob/living/carbon/human/tajaran)
if(M.type != /mob/living/carbon/human/tajaran)
playsound(loc, "punch", 25, 1, -1)
else if (src.type == /mob/living/carbon/human/tajaran)
else if (M.type == /mob/living/carbon/human/tajaran)
playsound(loc, 'slice.ogg', 25, 1, -1)
visible_message("\red <B>[M] has [attack_verb]ed [src]!</B>")

10
code/modules/mob/living/carbon/monkey/monkey.dm
View File

@@ -222,7 +222,7 @@
else
attack_verb = "punch"
if(src.type == /mob/living/carbon/human/tajaran)
if(M.type == /mob/living/carbon/human/tajaran)
attack_verb = "slash"
if ((prob(75) && health > 0))
@@ -230,9 +230,9 @@
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has [attack_verb]ed [name]!</B>", M), 1)
if(src.type != /mob/living/carbon/human/tajaran)
if(M.type != /mob/living/carbon/human/tajaran)
playsound(loc, "punch", 25, 1, -1)
else if(src.type == /mob/living/carbon/human/tajaran)
else if(M.type == /mob/living/carbon/human/tajaran)
playsound(loc, 'slice.ogg', 25, 1, -1)
var/damage = rand(5, 10)
if (prob(40))
@@ -248,9 +248,9 @@
updatehealth()
react_to_attack(M)
else
if(src.type != /mob/living/carbon/human/tajaran)
if(M.type != /mob/living/carbon/human/tajaran)
playsound(loc, 'punchmiss.ogg', 25, 1, -1)
else if(src.type == /mob/living/carbon/human/tajaran)
else if(M.type == /mob/living/carbon/human/tajaran)
playsound(loc, 'slashmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))