From a6dd2a380fd59cc39e007015ea48e6cc9a89edf5 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Wed, 23 Aug 2017 21:35:23 +0300 Subject: [PATCH] Minor cleanup to chemistry/bar/virology machinery * replace drop_item() patterns with transferItemToLoc() * grammar consistency fixes * replace "that", "the machine", "the beaker" etc. with the name of the actual object in question in chat messages * replace the portable chem dispenser reagent tier list with a static one, it's immutable between instances and only used to fill dispensable_reagents --- .../chemistry/machinery/chem_dispenser.dm | 15 +++++++-------- .../reagents/chemistry/machinery/chem_heater.dm | 7 +++---- .../reagents/chemistry/machinery/chem_master.dm | 14 ++++++-------- .../reagents/chemistry/machinery/pandemic.dm | 7 +++---- .../chemistry/machinery/reagentgrinder.dm | 14 ++++++-------- 5 files changed, 25 insertions(+), 32 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index d2a3a24886b..951596922e5 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 ..() @@ -230,7 +229,7 @@ recharge_delay = 30 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", diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index f562da2df0f..ce1f469f8d7 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -45,14 +45,13 @@ if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1)) . = 1 //no afterattack if(beaker) - to_chat(user, "A beaker is already loaded into the machine!") + to_chat(user, "A container is already loaded into [src]!") return - if(!user.drop_item()) + if(!user.transferItemToLoc(I, src)) return beaker = I - I.loc = src - to_chat(user, "You add the beaker to the machine.") + to_chat(user, "You add [I] to [src].") icon_state = "mixer1b" return return ..() diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 14adaa5fd78..802e4c70ca6 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -85,27 +85,25 @@ to_chat(user, "You can't use the [src.name] while its panel is opened!") return if(beaker) - to_chat(user, "A container is already loaded in the machine!") + to_chat(user, "A container is already loaded into [src]!") return - if(!user.drop_item()) + if(!user.transferItemToLoc(I, src)) return beaker = I - beaker.loc = src - to_chat(user, "You add the beaker to the machine.") + to_chat(user, "You add [I] to [src].") src.updateUsrDialog() icon_state = "mixer1" else if(!condi && istype(I, /obj/item/storage/pill_bottle)) if(bottle) - to_chat(user, "A pill bottle is already loaded into the machine!") + to_chat(user, "A pill bottle is already loaded into [src]!") return - if(!user.drop_item()) + if(!user.transferItemToLoc(I, src)) return bottle = I - bottle.loc = src - to_chat(user, "You add the pill bottle into the dispenser slot.") + to_chat(user, "You add [I] into the dispenser slot.") src.updateUsrDialog() else return ..() diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index b6ead8aace1..64f0eae5643 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -221,14 +221,13 @@ if(stat & (NOPOWER|BROKEN)) return if(beaker) - to_chat(user, "A beaker is already loaded into the machine!") + to_chat(user, "A container is already loaded into [src]!") return - if(!user.drop_item()) + if(!user.transferItemToLoc(I, src)) return beaker = I - beaker.forceMove(src) - to_chat(user, "You add the beaker to the machine.") + to_chat(user, "You insert [I] into [src].") update_icon() else return ..() diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index c08e56dad6b..311efd01403 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -118,21 +118,20 @@ if (istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1) ) if (!beaker) - if(!user.drop_item()) + if(!user.transferItemToLoc(I, src)) return 1 beaker = I - beaker.loc = src update_icon() src.updateUsrDialog() else - to_chat(user, "There's already a container inside.") + to_chat(user, "There's already a container inside [src].") return 1 //no afterattack if(is_type_in_list(I, dried_items)) if(istype(I, /obj/item/reagent_containers/food/snacks/grown)) var/obj/item/reagent_containers/food/snacks/grown/G = I if(!G.dry) - to_chat(user, "You must dry that first!") + to_chat(user, "You must dry [G] first!") return 1 if(holdingitems && holdingitems.len >= limit) @@ -146,11 +145,11 @@ B.remove_from_storage(G, src) holdingitems += G if(holdingitems && holdingitems.len >= limit) //Sanity checking so the blender doesn't overfill - to_chat(user, "You fill the All-In-One grinder to the brim.") + to_chat(user, "You fill [src] to the brim.") break if(!I.contents.len) - to_chat(user, "You empty the plant bag into the All-In-One grinder.") + to_chat(user, "You empty [I] into [src].") src.updateUsrDialog() return 1 @@ -162,8 +161,7 @@ to_chat(user, "Cannot refine into a reagent!") return 1 - if(user.drop_item()) - I.loc = src + if(user.transferItemToLoc(I, src)) holdingitems += I src.updateUsrDialog() return 0