diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 70fc16d0bc..061fdead02 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -372,7 +372,7 @@ /datum/reagent/fermi/secretcatchem //Should I hide this from code divers? A secret cit chem? name = "secretcatchem" //an attempt at hiding it id = "secretcatchem" - description = "An illegal and hidden chem that turns people into cats/catgirls. It's said that it's so rare and unstable that having it means you've been blessed." + description = "An illegal and hidden chem that turns people into cats. It's said that it's so rare and unstable that having it means you've been blessed." taste_description = "hairballs and cream" color = "#ffc224" var/catshift = FALSE diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index d567334998..2e6908ea30 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -456,6 +456,17 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING +/datum/design/pHmeter + name = "pH meter" + desc = "A a electrode attached to a small circuit box that will tell you the pH of a solution." + id = "pHmeter" + build_type = PROTOLATHE + materials = list(MAT_METAL = 1000, MAT_SILVER = 100, MAT_DIAMOND = 100) + build_path = /obj/item/pHmeter + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + + ///////////////////////////////////////// ////////////Armour////////////// ///////////////////////////////////////// diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index e25dced31c..de9dd4b71f 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -69,7 +69,7 @@ display_name = "Advanced Biotechnology" description = "Advanced Biotechnology" prereq_ids = list("biotech") - design_ids = list("piercesyringe", "crewpinpointer", "smoke_machine", "plasmarefiller", "limbgrower", "defibrillator", "meta_beaker", "healthanalyzer_advanced","harvester","holobarrier_med") + design_ids = list("piercesyringe", "crewpinpointer", "smoke_machine", "plasmarefiller", "limbgrower", "defibrillator", "meta_beaker", "healthanalyzer_advanced","harvester","holobarrier_med", "pHmeter") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 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 1481ee85a6..d8a6e87391 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -1564,6 +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)) + 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) holder.remove_reagent(src.id, 1000) ..() @@ -1586,5 +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)) + 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) 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 26636f049a..1b78ce2ec2 100644 --- a/modular_citadel/code/modules/reagents/objects/items.dm +++ b/modular_citadel/code/modules/reagents/objects/items.dm @@ -9,6 +9,7 @@ w_class = WEIGHT_CLASS_TINY //set flammable somehow +//A little janky with pockets /obj/item/pHbooklet/attack_hand(mob/user) if(user.get_held_index_of_item(src)) if(numberOfPages >= 1) @@ -84,3 +85,17 @@ color = "#c6040c" desc += " The paper looks to be around a pH of [round(cont.reagents.pH, 1)]" used = TRUE + +/obj/item/pHmeter + name = "pH meter" + desc = "A a electrode attached to a small circuit box that will tell you the pH of a solution. The screen currently displays nothing." + icon_state = "pHmeter" + icon = 'modular_citadel/icons/obj/FermiChem.dmi' + resistance_flags = FLAMMABLE + w_class = WEIGHT_CLASS_TINY + +/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)]") + 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)]." diff --git a/modular_citadel/icons/obj/FermiChem.dmi b/modular_citadel/icons/obj/FermiChem.dmi index b11bf83f68..e470b9638f 100644 Binary files a/modular_citadel/icons/obj/FermiChem.dmi and b/modular_citadel/icons/obj/FermiChem.dmi differ diff --git a/sound/FermiChem/SoundSources.txt b/sound/FermiChem/SoundSources.txt index 15b25ccd05..bd45f866f5 100644 --- a/sound/FermiChem/SoundSources.txt +++ b/sound/FermiChem/SoundSources.txt @@ -5,5 +5,6 @@ heatmelt.ogg - from https://freesound.org/people/toiletrolltube/sounds/181483/ heatacid.ogg - from https://freesound.org/people/klankbeeld/sounds/233697/ from bubbles2.ogg from fuse.ogg +bufferadd.ogg- https://freesound.org/people/toiletrolltube/sounds/181483/ Work is licensed under the Creative Commons and Attribution License. \ No newline at end of file diff --git a/sound/FermiChem/bufferadd.ogg b/sound/FermiChem/bufferadd.ogg new file mode 100644 index 0000000000..31bc440425 Binary files /dev/null and b/sound/FermiChem/bufferadd.ogg differ