From c531e6afa6bd9a7a1c9f65cf69cd73c0aa0ccbd1 Mon Sep 17 00:00:00 2001 From: Fermi Date: Mon, 27 May 2019 15:03:29 +0100 Subject: [PATCH] Okay, forgot to stage changes. Now compile safe. --- .../modules/reagents/chemistry/reagents/fermi_reagents.dm | 8 ++++---- modular_citadel/code/modules/reagents/objects/items.dm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index d8a6e87391..66f7f5fe45 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -1564,10 +1564,10 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y else if (pH >= 7) pH = 7 holder.pH = ((holder.pH * holder.total_volume)+(pH * src.volume))/(holder.total_volume + src.volume) //Shouldn't be required - var/list/seen = viewers(5, get_turf(my_atom)) + var/list/seen = viewers(5, get_turf(holder)) for(var/mob/M in seen) to_chat(M, "The beaker fizzes as the buffer's pH changes!") - playsound(get_turf(holder), 'modular_citadel/sound/FermiChem/bufferadd.ogg', 50, 1, -1) + playsound(get_turf(holder), 'sound/FermiChem/bufferadd.ogg', 50, 1, -1) holder.remove_reagent(src.id, 1000) ..() @@ -1590,9 +1590,9 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y else if (pH <= 7) pH = 7 holder.pH = ((holder.pH * holder.total_volume)+(pH * src.volume))/(holder.total_volume + src.volume) //Shouldn't be required Might be..? - var/list/seen = viewers(5, get_turf(my_atom)) + var/list/seen = viewers(5, get_turf(holder)) for(var/mob/M in seen) to_chat(M, "The beaker froths as the buffer's pH changes!") - playsound(get_turf(holder), 'modular_citadel/sound/FermiChem/bufferadd.ogg', 50, 1, -1) + playsound(get_turf(holder), 'sound/FermiChem/bufferadd.ogg', 50, 1, -1) holder.remove_reagent(src.id, 1000) ..() diff --git a/modular_citadel/code/modules/reagents/objects/items.dm b/modular_citadel/code/modules/reagents/objects/items.dm index 1b78ce2ec2..457514df88 100644 --- a/modular_citadel/code/modules/reagents/objects/items.dm +++ b/modular_citadel/code/modules/reagents/objects/items.dm @@ -97,5 +97,5 @@ /obj/item/pHmeter/afterattack(obj/item/reagent_containers/cont, mob/user, proximity) if(!istype(cont)) return - to_chat(M, "gives a beep and displays [round(cont.reagents.pH, 0.1)]") + to_chat(src, "gives a beep and displays [round(cont.reagents.pH, 0.1)]") desc = "An electrode attached to a small circuit box that will tell you the pH of a solution. The screen currently displays [round(cont.reagents.pH, 0.1)]."