diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm
index 89deed5dedd..6d72ec2221c 100644
--- a/code/modules/reagents/reagent_containers/food/cans.dm
+++ b/code/modules/reagents/reagent_containers/food/cans.dm
@@ -9,7 +9,7 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/attack_self(mob/user)
if(canopened == 0)
- playsound(loc,'sound/effects/canopen.ogg', rand(10,50), 1)
+ playsound(src.loc,'sound/effects/canopen.ogg', rand(10,50), 1)
to_chat(user, "You open the drink with an audible pop!")
canopened = 1
flags |= OPENCONTAINER
@@ -32,7 +32,7 @@
if(canopened == 0)
to_chat(user, "You need to open the drink!")
return
- else if(M == user && !reagents.total_volume && user.a_intent == "harm" && user.zone_sel.selecting == "head")
+ else if(M == user && !src.reagents.total_volume && user.a_intent == "harm" && user.zone_sel.selecting == "head")
user.visible_message("[user] crushes ["\the [src]"] on \his forehead!", "You crush \the [src] on your forehead.")
crush(user)
return
diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm
index d4b6046a980..85cd8c05a87 100644
--- a/code/modules/reagents/reagent_containers/food/condiment.dm
+++ b/code/modules/reagents/reagent_containers/food/condiment.dm
@@ -82,7 +82,7 @@
if(target.reagents.total_volume >= target.reagents.maximum_volume)
to_chat(user, "you can't add anymore to [target]!")
return
- var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
+ var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, "You transfer [trans] units of the condiment to [target].")
/obj/item/weapon/reagent_containers/food/condiment/on_reagent_change()
@@ -223,7 +223,7 @@
return
else
to_chat(user, "You tear open [src] above [target] and the condiments drip onto it.")
- reagents.trans_to(target, amount_per_transfer_from_this)
+ src.reagents.trans_to(target, amount_per_transfer_from_this)
qdel(src)
/obj/item/weapon/reagent_containers/food/condiment/pack/on_reagent_change()
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 53aed22a3b9..41486497be2 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -80,7 +80,7 @@
refill = reagents.get_master_reagent_id()
refillName = reagents.get_master_reagent_name()
- var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
+ var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, " You transfer [trans] units of the solution to [target].")
if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
@@ -101,22 +101,22 @@
if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird
return
if(is_hot(I))
- if(reagents)
- reagents.chem_temp += 15
+ if(src.reagents)
+ src.reagents.chem_temp += 15
to_chat(user, "You heat [src] with [I].")
- reagents.handle_reactions()
+ src.reagents.handle_reactions()
/obj/item/weapon/reagent_containers/food/drinks/examine(mob/user)
if(!..(user, 1))
return
if(!reagents || reagents.total_volume==0)
to_chat(user, " \The [src] is empty!")
- else if(reagents.total_volume <= volume/4)
+ else if(reagents.total_volume<=src.volume/4)
to_chat(user, " \The [src] is almost empty!")
- else if(reagents.total_volume <= volume*0.66)
+ else if(reagents.total_volume<=src.volume*0.66)
to_chat(user, " \The [src] is half full!")// We're all optimistic, right?!
- else if(reagents.total_volume <= volume*0.90)
+ else if(reagents.total_volume<=src.volume*0.90)
to_chat(user, " \The [src] is almost full!")
else
to_chat(user, " \The [src] is full!")
diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index ff2a3ee50c0..678078bc7fd 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -22,9 +22,9 @@
else
user.drop_item()
user.put_in_active_hand(B)
- B.icon_state = icon_state
+ B.icon_state = src.icon_state
- var/icon/I = new('icons/obj/drinks.dmi', icon_state)
+ var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
B.icon = I
@@ -99,11 +99,11 @@
//Display an attack message.
if(target != user)
- target.visible_message("[user] has hit [target][head_attack_message] with a bottle of [name]!", \
- "[user] has hit [target][head_attack_message] with a bottle of [name]!")
+ target.visible_message("[user] has hit [target][head_attack_message] with a bottle of [src.name]!", \
+ "[user] has hit [target][head_attack_message] with a bottle of [src.name]!")
else
- user.visible_message("[target] hits \himself with a bottle of [name][head_attack_message]!", \
- "[target] hits \himself with a bottle of [name][head_attack_message]!")
+ user.visible_message("[target] hits \himself with a bottle of [src.name][head_attack_message]!", \
+ "[target] hits \himself with a bottle of [src.name][head_attack_message]!")
//Attack logs
add_logs(target, user, "attacked", src)