From a0452f34234af5ea9e1dad6baa9d97006742413a Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 28 Feb 2015 17:08:30 +1030 Subject: [PATCH] Alternative fix for golem damage. --- code/modules/mob/living/carbon/human/species/species.dm | 4 ++-- code/modules/organs/organ_external.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 943f90bcca2..ea4f9f9d41d 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -35,8 +35,8 @@ /datum/unarmed_attack/bite ) var/list/unarmed_attacks = null // For empty hand harm-intent attack - var/brute_mod = null // Physical damage reduction/malus. - var/burn_mod = null // Burn damage reduction/malus. + var/brute_mod = 1 // Physical damage multiplier. + var/burn_mod = 1 // Burn damage multiplier. // Death vars. var/gibber_type = /obj/effect/gibspawner/human diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 5aeb4c8bd7c..4dcc006df6d 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -84,8 +84,8 @@ if(istype(owner,/mob/living/carbon/human)) var/mob/living/carbon/human/H = owner if(H.species && H.species.flags & IS_SYNTHETIC) - brmod = (!isnull(H.species.brute_mod) ? H.species.brute_mod : 1) - bumod = (!isnull(H.species.burn_mod) ? H.species.burn_mod : 1) + brmod = H.species.brute_mod + bumod = H.species.burn_mod brute *= brmod //~2/3 damage for ROBOLIMBS burn *= bumod //~2/3 damage for ROBOLIMBS