diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm index faa6c403355..62ae8c78d66 100644 --- a/code/modules/surgery/organs/subtypes/standard.dm +++ b/code/modules/surgery/organs/subtypes/standard.dm @@ -103,7 +103,7 @@ can_stand = 1 /obj/item/organ/external/foot/remove() - if(owner.shoes) owner.unEquip(owner.shoes) + if(owner && owner.shoes) owner.unEquip(owner.shoes) . = ..() /obj/item/organ/external/foot/right @@ -128,12 +128,13 @@ can_grasp = 1 /obj/item/organ/external/hand/remove() - if(owner.gloves) - owner.unEquip(owner.gloves) - if(owner.l_hand) - owner.unEquip(owner.l_hand,1) - if(owner.r_hand) - owner.unEquip(owner.r_hand,1) + if(owner) + if(owner.gloves) + owner.unEquip(owner.gloves) + if(owner.l_hand) + owner.unEquip(owner.l_hand,1) + if(owner.r_hand) + owner.unEquip(owner.r_hand,1) . = ..()