From ec2993289eb410ee0c90706f30383b8d5717d5dc Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Tue, 29 Aug 2017 20:07:36 -0700 Subject: [PATCH] sync --- .../chemistry/machinery/chem_dispenser.dm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index d2a3a24886..538ae996ea 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -75,9 +75,9 @@ /obj/machinery/chem_dispenser/emag_act(mob/user) if(emagged) - to_chat(user, "\The [src] has no functional safeties to emag.") + to_chat(user, "[src] has no functional safeties to emag.") return - to_chat(user, "You short out \the [src]'s safeties.") + to_chat(user, "You short out [src]'s safeties.") dispensable_reagents |= emagged_reagents//add the emagged reagents to the dispensable ones emagged = TRUE @@ -182,21 +182,20 @@ var/obj/item/reagent_containers/B = I . = 1 //no afterattack if(beaker) - to_chat(user, "A container is already loaded into the machine!") + to_chat(user, "A container is already loaded into [src]!") return - if(!user.drop_item()) // Can't let go? + if(!user.transferItemToLoc(B, src)) return beaker = B - beaker.loc = src - to_chat(user, "You add \the [B] to the machine.") + to_chat(user, "You add [B] to [src].") beaker_overlay = beaker_overlay || mutable_appearance(icon, "disp_beaker") beaker_overlay.pixel_x = rand(-10, 5)//randomize beaker overlay position. add_overlay(beaker_overlay) else if(user.a_intent != INTENT_HARM && !istype(I, /obj/item/card/emag)) - to_chat(user, "You can't load \the [I] into the machine!") + to_chat(user, "You can't load [I] into [src]!") return ..() else return ..() @@ -227,10 +226,10 @@ icon_state = "minidispenser" powerefficiency = 0.001 amount = 5 - recharge_delay = 30 + recharge_delay = 20 dispensable_reagents = list() circuit = /obj/item/circuitboard/machine/chem_dispenser - var/list/dispensable_reagent_tiers = list( + var/static/list/dispensable_reagent_tiers = list( list( "hydrogen", "oxygen", @@ -282,7 +281,7 @@ time += M.rating for(var/obj/item/stock_parts/capacitor/C in component_parts) time += C.rating - recharge_delay /= time/2 //delay between recharges, double the usual time on lowest 50% less than usual on highest + recharge_delay = 30/(time/2) //delay between recharges, double the usual time on lowest 50% less than usual on highest for(var/obj/item/stock_parts/manipulator/M in component_parts) for(i=1, i<=M.rating, i++) dispensable_reagents |= dispensable_reagent_tiers[i]