Skip to content

Commit

Permalink
Biting/Kicking in the cube doesn't do any damage.
Browse files Browse the repository at this point in the history
  • Loading branch information
ShiftyRail committed Feb 18, 2018
1 parent ac6aaed commit 53349d1
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions code/modules/mob/living/carbon/human/human_attackhand.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
//BITES
/mob/living/carbon/human/bite_act(mob/living/carbon/human/M as mob)

var/dam_check = !(istype(loc, /turf) && istype(loc.loc, /area/start)) // 0 or 1

if(M == src)
return //Can't bite yourself

Expand All @@ -20,11 +23,11 @@
//end vampire codes

var/armor_modifier = 30
var/damage = rand(1, 5)
var/damage = rand(1, 5)*dam_check

if(M.organ_has_mutation(LIMB_HEAD, M_BEAK)) //Beaks = stronger bites
armor_modifier = 5
damage += 4
damage += 4*dam_check

var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))

Expand All @@ -35,7 +38,7 @@
if(2) //Full block
damage = 0

if(!damage)
if(!damage && dam_check)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
visible_message("<span class='danger'>\The [M] has attempted to bite \the [src]!</span>")
return 0
Expand All @@ -61,6 +64,9 @@

//KICKS
/mob/living/carbon/human/kick_act(mob/living/carbon/human/M)

var/dam_check = !(istype(loc, /turf) && istype(loc.loc, /area/start)) // 0 or 1

//Pick a random usable foot to perform the kick with
var/datum/organ/external/foot_organ = pick_usable_organ(LIMB_RIGHT_FOOT, LIMB_LEFT_FOOT)

Expand All @@ -78,19 +84,19 @@
stomping = 1

var/armor_modifier = 1
var/damage = rand(0,7)
var/damage = rand(0,7)*dam_check
var/knockout = damage

if(stomping) //Stomps = more damage and armor bypassing
armor_modifier = 0.5
damage += rand(0,7)
damage += rand(0,7)*dam_check
attack_verb = "stomps on"
else if(M.reagents && M.reagents.has_reagent(GYRO))
damage += rand(0,4)
damage += rand(0,4)*dam_check
knockout += rand(0,3)
attack_verb = "roundhouse kicks"

if(!damage)
if(!damage && dam_check) // So that people still think they are biting each other
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
visible_message("<span class='danger'>\The [M] attempts to kick \the [src]!</span>")
return 0
Expand Down

0 comments on commit 53349d1

Please sign in to comment.