From 0777f9c9982ad18817e9559b44ff9c6c72af1467 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 2 Jun 2015 21:40:30 -0400 Subject: [PATCH 1/2] Fixes #9648 Robotic limbs are no longer able to mutate. --- code/modules/organs/organ_external.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 065b38fc499..a92219c7339 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -877,11 +877,14 @@ Note that amputating the affected organ does in fact remove the infection from t dislocated = -1 //TODO, make robotic limbs a separate type, remove snowflake cannot_break = 1 get_icon() + unmutate() for (var/obj/item/organ/external/T in children) if(T) T.robotize() /obj/item/organ/external/proc/mutate() + if(src.status & ORGAN_ROBOT) + return src.status |= ORGAN_MUTATED owner.update_body() From 45d60ab5513201514e37a1563b5b5dda4061ee75 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 2 Jun 2015 21:53:07 -0400 Subject: [PATCH 2/2] Fixes #9640 --- code/game/objects/items/weapons/storage/boxes.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 0f8cbcc10fe..e98ac5fc5b6 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -24,7 +24,7 @@ desc = "It's just an ordinary box." icon_state = "box" item_state = "syringe_kit" - var/foldable = null // BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard + var/foldable = /obj/item/stack/material/cardboard // BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard // BubbleWrap - A box can be folded up to make card /obj/item/weapon/storage/box/attack_self(mob/user as mob) @@ -598,7 +598,6 @@ icon_state = "light" desc = "This box is shaped on the inside so that only light tubes and bulbs fit." item_state = "syringe_kit" - foldable = /obj/item/stack/material/cardboard //BubbleWrap storage_slots=21 can_hold = list(/obj/item/weapon/light/tube, /obj/item/weapon/light/bulb) max_storage_space = 42 //holds 21 items of w_class 2