From b24f4a7f1f35e2ffe07588667aca23b0cfef5a9b Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 12 Mar 2018 13:12:18 -0500 Subject: [PATCH] [MIRROR] Allows medical sprays to be stored in medical belts and smartfridges (#5925) * Medical sprays can now be added to medical belts and smartfridges (#36313) * Allows medical sprays to be stored in medical belts and smartfridges --- code/game/objects/items/storage/belt.dm | 1 + code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index affbb484a6..ee74b7c84d 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -123,6 +123,7 @@ /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/pill, /obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/medspray, /obj/item/lighter, /obj/item/storage/fancy/cigarettes, /obj/item/storage/pill_bottle, diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index cfbc95d7c0..d816504bc5 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -381,7 +381,7 @@ return TRUE if(!O.reagents || !O.reagents.reagent_list.len) // other empty containers not accepted return FALSE - if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/glass/bottle) || istype(O, /obj/item/reagent_containers/glass/beaker) || istype(O, /obj/item/reagent_containers/spray)) + if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/glass/bottle) || istype(O, /obj/item/reagent_containers/glass/beaker) || istype(O, /obj/item/reagent_containers/spray) || istype(O, /obj/item/reagent_containers/medspray)) return TRUE return FALSE