From 868167d84cb3b2465ae15dee0371aea1219680b8 Mon Sep 17 00:00:00 2001 From: MINIMAN10000 Date: Tue, 19 Jun 2018 13:38:02 -0700 Subject: [PATCH] Fix cardboard drop count --- code/game/objects/items/weapons/storage/boxes.dm | 4 +++- .../objects/structures/crates_lockers/closets/cardboardbox.dm | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index e0e43bfbda6..a78bc40dd3a 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -26,6 +26,7 @@ item_state = "syringe_kit" burn_state = FLAMMABLE var/foldable = /obj/item/stack/sheet/cardboard + var/amt = 1 /obj/item/storage/box/attack_self(mob/user) ..() @@ -49,7 +50,7 @@ return to_chat(user, "You fold [src] flat.") - var/obj/item/I = new foldable(get_turf(src)) + var/obj/item/stack/I = new foldable(get_turf(src), amt) user.put_in_hands(I) qdel(src) @@ -59,6 +60,7 @@ icon_state = "largebox" w_class = 42 // Big, bulky. foldable = /obj/item/stack/sheet/cardboard + amt = 4 storage_slots = 21 max_combined_w_class = 42 // 21*2 diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 37ab3977755..19e08c15bde 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -10,6 +10,7 @@ burntime = 20 sound = 'sound/effects/rustle2.ogg' material_drop = /obj/item/stack/sheet/cardboard + var/amt = 4 cutting_sound = 'sound/items/poster_ripped.ogg' var/move_delay = 0 var/egged = 0 @@ -60,7 +61,7 @@ return if(istype(W, /obj/item/wirecutters)) var/obj/item/wirecutters/WC = W - new /obj/item/stack/sheet/cardboard(src.loc) + new /obj/item/stack/sheet/cardboard(src.loc, amt) for(var/mob/M in viewers(src)) M.show_message("\The [src] has been cut apart by [user] with \the [WC].", 3, "You hear cutting.", 2) qdel(src)