Fixed being able to remove canremove = 0 items by trying to place an object on a person.

Fixed more adamantine golem icons.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5499 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Kortgstation@gmail.com
2013-01-08 23:15:28 +00:00
parent 61098e961b
commit 3cb3c1ea0d
2 changed files with 6 additions and 6 deletions
@@ -425,11 +425,11 @@ It can still be worn/put on as normal.
switch(place) //here we go again...
if("mask")
slot_to_process = slot_wear_mask
if (target.wear_mask)
if (target.wear_mask && target.wear_mask.canremove)
strip_item = target.wear_mask
if("gloves")
slot_to_process = slot_gloves
if (target.gloves)
if (target.gloves && target.gloves.canremove)
strip_item = target.gloves
if("eyes")
slot_to_process = slot_glasses
@@ -445,7 +445,7 @@ It can still be worn/put on as normal.
strip_item = target.s_store
if("head")
slot_to_process = slot_head
if (target.head)
if (target.head && target.head.canremove)
strip_item = target.head
if("ears")
slot_to_process = slot_ears
@@ -453,7 +453,7 @@ It can still be worn/put on as normal.
strip_item = target.ears
if("shoes")
slot_to_process = slot_shoes
if (target.shoes)
if (target.shoes && target.shoes.canremove)
strip_item = target.shoes
if("l_hand")
if (istype(target, /obj/item/clothing/suit/straight_jacket))
@@ -469,11 +469,11 @@ It can still be worn/put on as normal.
strip_item = target.r_hand
if("uniform")
slot_to_process = slot_w_uniform
if (target.w_uniform)
if(target.w_uniform && target.w_uniform.canremove)
strip_item = target.w_uniform
if("suit")
slot_to_process = slot_wear_suit
if (target.wear_suit)
if (target.wear_suit && target.wear_suit.canremove)
strip_item = target.wear_suit
if("id")
slot_to_process = slot_wear_id