From 75d6768ba7ccc119e8d007d004f4ab2c1e213e61 Mon Sep 17 00:00:00 2001 From: Fermi Date: Fri, 19 Jul 2019 22:12:05 +0100 Subject: [PATCH] Changed how the box works so it's not a storage. --- code/game/objects/items/storage/boxes.dm | 12 +++++++++--- code/modules/vending/security.dm | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 94d91af5a9..f97f52fbd5 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1197,13 +1197,19 @@ new /obj/item/reagent_containers/food/drinks/coffee/type2(src) new /obj/item/tank/internals/emergency_oxygen(src) -/obj/item/storage/box/secbat +//Where do I put this? +/obj/item/secbat name = "Secbat box" desc = "Contained inside is a secbat for use with law enforcement." + icon = 'icons/obj/storage.dmi' + icon_state = "box" + item_state = "syringe_kit" + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' -/obj/item/storage/box/attack_self(mob/user) +/obj/item/secbat/attack_self(mob/user) new /mob/living/simple_animal/bat/secbat(user.loc) to_chat(user, "You open the box, releasing the secbat!") - var/obj/item/I = new foldable + var/obj/item/I = new /obj/item/stack/sheet/cardboard qdel(src) user.put_in_hands(I) diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index a55668d448..b3b21fe375 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -13,7 +13,7 @@ /obj/item/storage/box/evidence = 6, /obj/item/flashlight/seclite = 4, /obj/item/restraints/legcuffs/bola/energy = 7, - /obj/item/storage/box/secbat = 5) + /obj/item/secbat = 5) contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/storage/fancy/donut_box = 2, /obj/item/ssword_kit = 1)