From 53e005d2a12c0559b9411d9c8e8d0e07669e2cb9 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Sat, 5 Oct 2013 07:19:26 -0400 Subject: [PATCH] Glass HasEntered runtime fix --- code/game/objects/items/stacks/sheets/glass.dm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index a7e6d57bb37..d382b14b804 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -283,13 +283,14 @@ playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) if(ishuman(M)) var/mob/living/carbon/human/H = M - if(!H.shoes && !(H.wear_suit.body_parts_covered & FEET)) - var/datum/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot")) - if(affecting.status & ORGAN_ROBOT) - return + if(!H.shoes) + if((!H.wear_suit) || !(H.wear_suit.body_parts_covered & FEET)) + var/datum/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot")) + if(affecting.status & ORGAN_ROBOT) + return - H.Weaken(3) - if(affecting.take_damage(5, 0)) - H.UpdateDamageIcon() - H.updatehealth() + H.Weaken(3) + if(affecting.take_damage(5, 0)) + H.UpdateDamageIcon() + H.updatehealth() ..()