shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5389 from Citadel-Station-13/upstream-merge-35476

Browse Source 
[MIRROR] Fix goliath hide plates not applying to suits correctly
This commit is contained in:
deathride58
2018-02-10 03:59:54 +00:00
committed by GitHub
parent 7595d0ef91 adc9fd52c0
commit 935f070368
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mining/equipment/goliath_hide.dm
View File

@@ -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, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
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, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
D.update_icon()