From c322b605b3a7d983fbdc4547dd76eb54488276a3 Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Wed, 9 Feb 2011 23:01:24 +0000 Subject: [PATCH] Added a var to first-aid kits so empty kits can be added to the map. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1010 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/storage.dm | 2 ++ code/game/objects/storage/firstaid.dm | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index a5b2ce2cd12..7939a762a47 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -83,6 +83,8 @@ icon_state = "firstaid" throw_speed = 2 throw_range = 8 + var/empty = 0 + /obj/item/weapon/storage/firstaid/fire name = "Fire First Aid" icon_state = "ointment" diff --git a/code/game/objects/storage/firstaid.dm b/code/game/objects/storage/firstaid.dm index e3f9945e6a9..fdb0e6f1ad8 100644 --- a/code/game/objects/storage/firstaid.dm +++ b/code/game/objects/storage/firstaid.dm @@ -1,5 +1,7 @@ + /obj/item/weapon/storage/firstaid/fire/New() ..() + if (empty) return new /obj/item/weapon/medical/ointment( src ) new /obj/item/weapon/medical/ointment( src ) new /obj/item/device/healthanalyzer( src ) @@ -11,6 +13,7 @@ /obj/item/weapon/storage/firstaid/syringes/New() ..() + if (empty) return new /obj/item/weapon/reagent_containers/syringe( src ) new /obj/item/weapon/reagent_containers/syringe( src ) new /obj/item/weapon/reagent_containers/syringe( src ) @@ -23,6 +26,7 @@ /obj/item/weapon/storage/firstaid/regular/New() ..() + if (empty) return new /obj/item/weapon/medical/bruise_pack(src) new /obj/item/weapon/medical/bruise_pack(src) new /obj/item/weapon/medical/bruise_pack(src) @@ -35,6 +39,7 @@ /obj/item/weapon/storage/firstaid/toxin/New() ..() + if (empty) return new /obj/item/weapon/reagent_containers/syringe/antitoxin( src ) new /obj/item/weapon/reagent_containers/syringe/antitoxin( src ) new /obj/item/weapon/reagent_containers/syringe/antitoxin( src ) @@ -47,6 +52,7 @@ /obj/item/weapon/storage/firstaid/o2/New() ..() + if (empty) return new /obj/item/weapon/reagent_containers/pill/dexalin( src ) new /obj/item/weapon/reagent_containers/pill/dexalin( src ) new /obj/item/weapon/reagent_containers/pill/dexalin( src )