diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index f562da2df0..ce1f469f8d 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 14adaa5fd7..802e4c70ca 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/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index c08e56dad6..311efd0140 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