diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 6c3c7e89c6..a1469ad629 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -1241,10 +1241,12 @@ if (trigger2 == "speak" || trigger2 == "echo") var/trigger3 = html_decode(stripped_input(user, "Enter the phrase spoken. Abusing this to self antag is bannable.", MAX_MESSAGE_LEN)) E.customTriggers[trigger] = list(trigger2, trigger3) - message_admins("[H] has been implanted by [user] with [trigger], triggering [trigger2], to send [trigger3].") + log_game("FERMICHEM: [H] has been implanted by [user] with [trigger], triggering [trigger2], to send [trigger3].") + if(findtext(trigger3, "admin")) + message_admins("FERMICHEM: [user] maybe be trying to abuse MKUltra by implanting by [H] with [trigger], triggering [trigger2], to send [trigger3].") else E.customTriggers[trigger] = trigger2 - message_admins("[H] has been implanted by [user] with [trigger], triggering [trigger2].") + log_game("FERMICHEM: [H] has been implanted by [user] with [trigger], triggering [trigger2].") E.mental_capacity -= 5 addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(H.lewd?"your [E.enthrallGender]":"[E.master]")] whispers you a new trigger."), 5) else @@ -1302,6 +1304,7 @@ objective = replacetext(lowertext(objective), "strangle", "meow at") objective = replacetext(lowertext(objective), "suicide", "self-love") message_admins("[H] has been implanted by [user] with the objective [objective].") + log_game("FERMICHEM: [H] has been implanted by [user] with the objective [objective] via MKUltra.") addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(H.lewd?"Your [E.enthrallGender]":"[E.master]")] whispers you a new objective."), 5) brainwash(H, objective) E.mental_capacity -= 200 @@ -1413,10 +1416,9 @@ E.status = "charge" E.cooldown += 10 - if(message_admins)//Do you want this in? + if(message_admins || debug)//Do you want this in? message_admins("[ADMIN_LOOKUPFLW(user)] has said '[log_message]' with a Velvet Voice, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].") - if(debug == TRUE) - log_game("FERMICHEM: [key_name(user)] has said '[log_message]' with a Velvet Voice, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].") + log_game("FERMICHEM: [key_name(user)] ckey: [user.key] has said '[log_message]' with a Velvet Voice, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].") //SSblackbox.record_feedback("tally", "Velvet_voice", 1, log_message) If this is on, it fills the thing up and OOFs the server return diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 7cdc809f46..1a65dfa796 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -219,7 +219,7 @@ var/mob/living/carbon/M = owner var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in M.reagents.reagent_list if(!E) - message_admins("WARNING: FermiChem: No master found in thrall, did you bus in the chem? You need to set up the vars manually if it's not reacted/bussed. Someone set up the reaction incorrectly if not (Don't use donor blood). Console them with a fermiplush maybe?") + message_admins("WARNING: FermiChem: No master found in thrall, did you bus in the status? You need to set up the vars manually in the chem if it's not reacted/bussed. Someone set up the reaction/status proc incorrectly if not (Don't use donor blood). Console them with a chemcat plush maybe?") owner.remove_status_effect(src) enthrallID = E.creatorID enthrallGender = E.creatorGender 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 ecf081168f..6511773731 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -336,16 +336,16 @@ C.adjustToxLoss(2) ..() -/datum/reagent/fermi/fermiABuffer +/datum/reagent/fermi/acidic_buffer name = "Acidic buffer" - id = "fermiABuffer" + id = "acidic_buffer" description = "This reagent will consume itself and move the pH of a beaker towards 3 when added to another." taste_description = "an acidy sort of taste, blech." color = "#fbc314" pH = 3 //Consumes self on addition and shifts pH -/datum/reagent/fermi/fermiABuffer/on_new(datapH) +/datum/reagent/fermi/acidic_buffer/on_new(datapH) data = datapH if(LAZYLEN(holder.reagent_list) == 1) return @@ -357,15 +357,15 @@ holder.remove_reagent(id, volume) ..() -/datum/reagent/fermi/fermiBBuffer +/datum/reagent/fermi/basic_buffer name = "Basic buffer" - id = "fermiBBuffer" + id = "basic_buffer" description = "This reagent will consume itself and move the pH of a beaker towards 11 when added to another." taste_description = "an soapy sort of taste, blech." color = "#3853a4" pH = 11 -/datum/reagent/fermi/fermiBBuffer/on_new(datapH) +/datum/reagent/fermi/basic_buffer/on_new(datapH) data = datapH if(LAZYLEN(holder.reagent_list) == 1) return diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index ac6fcc4799..6c090b9b71 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -376,10 +376,10 @@ RateUpLim = 1 FermiChem = TRUE -/datum/chemical_reaction/fermi/fermiABuffer//done test +/datum/chemical_reaction/fermi/acidic_buffer//done test name = "Acetic acid buffer" - id = "fermiABuffer" - results = list("fermiABuffer" = 2) //acetic acid + id = "acidic_buffer" + results = list("acidic_buffer" = 2) //acetic acid required_reagents = list("salglu_solution" = 0.2, "ethanol" = 0.6, "oxygen" = 0.6, "water" = 0.6) //FermiChem vars: OptimalTempMin = 250 @@ -397,17 +397,17 @@ FermiChem = TRUE -/datum/chemical_reaction/fermi/fermiABuffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this - if(!locate(/datum/reagent/fermi/fermiABuffer) in my_atom.reagents.reagent_list) +/datum/chemical_reaction/fermi/acidic_buffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this + if(!locate(/datum/reagent/fermi/acidic_buffer) in my_atom.reagents.reagent_list) return - var/datum/reagent/fermi/fermiABuffer/Fa = locate(/datum/reagent/fermi/fermiABuffer) in my_atom.reagents.reagent_list + var/datum/reagent/fermi/acidic_buffer/Fa = locate(/datum/reagent/fermi/acidic_buffer) in my_atom.reagents.reagent_list Fa.data = 3 -/datum/chemical_reaction/fermi/fermiBBuffer//done test +/datum/chemical_reaction/fermi/basic_buffer//done test name = "Ethyl Ethanoate buffer" - id = "fermiBBuffer" - results = list("fermiBBuffer" = 1.5) - required_reagents = list("fermiABuffer" = 0.5, "ethanol" = 0.5, "salglu_solution" = 0.1, "water" = 0.5) + id = "basic_buffer" + results = list("basic_buffer" = 1.5) + required_reagents = list("acidic_buffer" = 0.5, "ethanol" = 0.5, "salglu_solution" = 0.1, "water" = 0.5) required_catalysts = list("sacid" = 1) //vagely acetic //FermiChem vars: OptimalTempMin = 250 @@ -425,10 +425,10 @@ FermiChem = TRUE -/datum/chemical_reaction/fermi/fermiBBuffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this - if(!locate(/datum/reagent/fermi/fermiBBuffer) in my_atom.reagents.reagent_list) +/datum/chemical_reaction/fermi/basic_buffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this + if(!locate(/datum/reagent/fermi/basic_buffer) in my_atom.reagents.reagent_list) return - var/datum/reagent/fermi/fermiBBuffer/Fb = locate(/datum/reagent/fermi/fermiBBuffer) in my_atom.reagents.reagent_list + var/datum/reagent/fermi/basic_buffer/Fb = locate(/datum/reagent/fermi/basic_buffer) in my_atom.reagents.reagent_list Fb.data = 11 //secretcatchemcode, shh!! Of couse I hide it amongst cats. Though, I moved it with your requests.