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

Merge pull request #1778 from Citadel-Station-13/upstream-merge-28766

Browse Source 
[MIRROR] Robotic legs are not weak to glass shards
This commit is contained in:
LetterJay
2017-06-26 06:26:46 -05:00
committed by GitHub
parent ec966f6814 1982321419
commit d3c2f5aee6
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/glass.dm
+2
View File
@@ -197,6 +197,8 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
var/obj/item/bodypart/O = H.get_bodypart(picked_def_zone) var/obj/item/bodypart/O = H.get_bodypart(picked_def_zone)
if(!istype(O)) if(!istype(O))
return return
if(O.status == BODYPART_ROBOTIC)
return
var/feetCover = (H.wear_suit && H.wear_suit.body_parts_covered & FEET) || (H.w_uniform && H.w_uniform.body_parts_covered & FEET) var/feetCover = (H.wear_suit && H.wear_suit.body_parts_covered & FEET) || (H.w_uniform && H.w_uniform.body_parts_covered & FEET)
if(H.shoes || feetCover || H.movement_type & FLYING || H.buckled) if(H.shoes || feetCover || H.movement_type & FLYING || H.buckled)
return return