From 023ab1c5ec6e9a7ac06327070d67a996f10b4df6 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Fri, 9 Feb 2018 10:26:13 +0200 Subject: [PATCH 1/2] Merge pull request #35476 from AutomaticFrenzy/patch/goliath-hide Fix goliath hide plates not applying to suits correctly --- code/modules/mining/equipment/goliath_hide.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mining/equipment/goliath_hide.dm b/code/modules/mining/equipment/goliath_hide.dm index 5950541fe7..b266b92584 100644 --- a/code/modules/mining/equipment/goliath_hide.dm +++ b/code/modules/mining/equipment/goliath_hide.dm @@ -21,8 +21,8 @@ return if(is_type_in_typecache(target, goliath_platable_armor_typecache)) var/obj/item/clothing/C = target - if(armor.melee < 60) - armor = armor.setRating(melee = min(armor.melee + 10, 60)) + if(C.armor.melee < 60) + C.armor = C.armor.setRating(melee = min(C.armor.melee + 10, 60)) to_chat(user, "You strengthen [target], improving its resistance against melee attacks.") use(1) else @@ -33,7 +33,7 @@ D.hides++ D.armor = D.armor.setRating(\ melee = min(D.armor.melee + 10, 70),\ - bullet = min(D.armor.laser + 5, 50),\ + bullet = min(D.armor.bullet + 5, 50),\ laser = min(D.armor.laser + 5, 50)) to_chat(user, "You strengthen [target], improving its resistance against melee attacks.") D.update_icon()