From ce34afa14cfdbc9d775728729c6cb2c5f76daf53 Mon Sep 17 00:00:00 2001 From: militaires Date: Fri, 24 Feb 2017 12:03:06 +0300 Subject: [PATCH] fixes kommisar konflikts and the final hopefully commit to the purge of non-3/4 boxes --- code/game/machinery/cloning.dm | 14 -------------- code/game/objects/items/weapons/storage/boxes.dm | 5 +++-- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 81de98c0aa2..e330a597a34 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -431,20 +431,6 @@ if(occupant.reagents.get_reagent_amount(bt) < 1) occupant.reagents.add_reagent(bt, 1) - -/* - * Diskette Box - */ - -/obj/item/weapon/storage/box/disks - name = "diskette box" - icon_state = "disk_kit" - -/obj/item/weapon/storage/box/disks/New() - ..() - for(var/i in 1 to 7) - new /obj/item/weapon/disk/data(src) - /* * Manual -- A big ol' manual. */ diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 8332811c65e..599f92b72cb 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -36,8 +36,9 @@ /obj/item/weapon/storage/box/update_icon() . = ..() - cut_overlays() - add_overlay(image('icons/obj/storage.dmi', "[illustration]")) + if(illustration) + cut_overlays() + add_overlay(image('icons/obj/storage.dmi', "[illustration]")) /obj/item/weapon/storage/box/attack_self(mob/user) ..()