From 32d14b8307e8279a678d48015f6104be2d44b11a Mon Sep 17 00:00:00 2001 From: Artorp Date: Sat, 9 Aug 2014 03:18:31 +0200 Subject: [PATCH] Medical belt can load into fridge - Fixed compiling error with glass.dm - Medical belt will load apropriate items into the medical fridge when used on the fridge --- code/game/machinery/kitchen/smartfridge.dm | 5 +++-- code/modules/reagents/reagent_containers/glass.dm | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index e51b11aafa4..f5c5e474cfb 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -96,7 +96,7 @@ nanomanager.update_uis(src) - else if(istype(O, /obj/item/weapon/storage/bag/plants)) + else if(istype(O, /obj/item/weapon/storage/bag/plants) || istype(O, /obj/item/weapon/storage/belt/medical)) var/obj/item/weapon/storage/bag/plants/P = O var/plants_loaded = 0 for(var/obj/G in P.contents) @@ -120,7 +120,8 @@ user << "Some items are refused." nanomanager.update_uis(src) - + + else user << "\The [src] smartly refuses [O]." return 1 diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 9bb38723a8f..6f95851c7a7 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -152,9 +152,8 @@ return attackby(obj/item/weapon/W as obj, mob/user as mob) - - ..() - if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen)) + ..() + if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen)) var/tmp_label = sanitize(input(user, "Enter a label for [src.name]","Label",src.label_text)) if(length(tmp_label) > 10) user << "\red The label can be at most 10 characters long."