diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm
index 99619f22b0..e23071b5d4 100644
--- a/modular_citadel/code/datums/status_effects/chems.dm
+++ b/modular_citadel/code/datums/status_effects/chems.dm
@@ -249,8 +249,6 @@
var/customEcho //Custom looping text in owner
var/customSpan //Custom spans for looping text
- var/political = TRUE // if source is from politi-aid
-
/datum/status_effect/chem/enthrall/on_apply()
var/mob/living/carbon/M = owner
var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in M.reagents.reagent_list
@@ -259,7 +257,6 @@
owner.remove_status_effect(src)
enthrallID = E.creatorID
enthrallGender = E.creatorGender
- political = E.political
master = get_mob_by_key(enthrallID)
//if(M.ckey == enthrallID)
// owner.remove_status_effect(src)//At the moment, a user can enthrall themselves, toggle this back in if that should be removed.
@@ -282,7 +279,7 @@
var/mob/living/carbon/M = owner
//chem calculations
- if(!owner.reagents.has_reagent("enthrall") && !owner.reagents.has_reagent("enthrallTest") && !owner.reagents.has_reagent("politic-aid"))
+ if(!owner.reagents.has_reagent("enthrall") && !owner.reagents.has_reagent("enthrallTest"))
if (phase < 3 && phase != 0)
deltaResist += 3//If you've no chem, then you break out quickly
if(prob(5))
@@ -722,10 +719,6 @@
deltaResist = 1.8 + resistGrowth
resistGrowth += 0.05
- //MKUltra easy break, if you have prefs off and ended up with it, then you break extra easy
- if(!political && !owner.client?.prefs.lewdchem)
- deltaResist += 10
-
//distance modifer
switch(DistApart)
if(0)
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
index e90ad2f667..8db223bbfe 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
@@ -130,11 +130,11 @@ Creating a chem with a low purity will make you permanently fall in love with so
*/
/datum/reagent/fermi/enthrall
- name = "enthrall"
- id = "enthrall_base"
- description = "A forbidden deep purple mixture that aids the political influence of creator upon the subject. When taken by the creator, it will enhance the power of their words to those affected by it."
- color = "#660055"
- taste_description = "politics"
+ name = "MKUltra"
+ id = "enthrall"
+ description = "A forbidden deep red mixture that increases a person's succeptability to another's words. When taken by the creator, it will enhance the draw of their voice to those affected by it."
+ color = "#660015" // rgb: , 0, 255
+ taste_description = "synthetic chocolate, a base tone of alcohol, and high notes of roses"
overdose_threshold = 100 //If this is too easy to get 100u of this, then double it please.
DoNotSplit = TRUE
metabolization_rate = 0.1//It has to be slow, so there's time for the effect.
@@ -143,7 +143,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
var/creatorGender
var/creatorName
var/mob/living/creator
- var/political = TRUE
pH = 10
OnMobMergeCheck = TRUE //Procs on_mob_add when merging into a human
can_synth = FALSE
@@ -159,7 +158,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
creatorName = "Fermis Yakumo"
purity = 1
DoNotSplit = TRUE
- political = FALSE
/datum/reagent/fermi/enthrall/test/on_new()
id = "enthrall"
@@ -172,27 +170,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
creatorName = data.["creatorName"]
creator = get_mob_by_key(creatorID)
-/datum/reagent/fermi/enthrall/mkultra
- name = "MKUltra"
- id = "enthrall"
- description = "A forbidden deep red mixture that overwhelms a foreign body with waves of pleasure, intoxicating them into servitude. When taken by the creator, it will enhance the draw of their voice to those affected by it."
- color = "#660015" // rgb: , 0, 255
- taste_description = "synthetic chocolate, a base tone of alcohol, and high notes of roses"
- political = FALSE
-
-
-/datum/reagent/fermi/enthrall/mkultra/on_mob_add(mob/living/carbon/M)
- if(M.client?.prefs.lewdchem)
- ..()
-
-/datum/reagent/fermi/enthrall/mkultra/on_mob_life(mob/living/carbon/M)
- if(M.client?.prefs.lewdchem)
- ..()
-
-/datum/reagent/fermi/enthrall/politi
- name = "Politic-aid"
- id = "politic-aid"
-
/datum/reagent/fermi/enthrall/on_mob_add(mob/living/carbon/M)
. = ..()
if(!ishuman(M))//Just to make sure screwy stuff doesn't happen.
@@ -210,7 +187,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
E.master = get_mob_by_key(creatorID)
to_chat(M, to_chat(M, "Your aldled, plastic, mind bends under the chemical influence of a new [(M.client?.prefs.lewdchem?"master":"leader")]. Your highest priority is now to stay by [creatorName]'s side, following and aiding them at all costs.")) //THIS SHOULD ONLY EVER APPEAR IF YOU MINDBREAK YOURSELF AND THEN GET INJECTED FROM SOMEONE ELSE.
log_game("FERMICHEM: Narcissist [M] ckey: [M.key] been rebound to [creatorName], ID: [creatorID]")
- E.political = political
return
if((M.ckey == creatorID) && (creatorName == M.real_name)) //same name AND same player - same instance of the player. (should work for clones?)
log_game("FERMICHEM: [M] ckey: [M.key] has been given velvetspeech")
@@ -220,7 +196,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
Vc.Remove(M)
nVc.Insert(M)
qdel(Vc)
- to_chat(M, "[(political?"You feel your vocal chords tingle as your voice turns more charasmatic.":" comes out in a more sultry tone.")]")
+ to_chat(M, "You feel your vocal chords tingle as you speak with a charasmatic tone.)]")
else
log_game("FERMICHEM: MKUltra: [creatorName], [creatorID], is enthralling [M.name], [M.ckey]")
M.apply_status_effect(/datum/status_effect/chem/enthrall)
@@ -288,7 +264,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
E.enthrallID = creatorID
E.enthrallGender = creatorGender
E.master = creator
- E.political = political
else
E = M.has_status_effect(/datum/status_effect/chem/enthrall)
if(M.client?.prefs.lewdchem)
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index 77a24ad335..26d0afb19b 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -295,23 +295,10 @@
E.data.["creatorID"] = B.data.["ckey"]
E.creatorID = B.data.["ckey"]
-//Politic-aid split
-/datum/chemical_reaction/fermi/enthrall/politi
- name = "Politic-aid"
- id = "politic-aid"
- required_reagents = list("cocoa" = 0.1, "astral" = 0.1, "mindbreaker" = 0.1, "psicodine" = 0.1, "happiness" = 0.1)
- results = list("politic-aid" = 0.5)
-
//So slimes can play too.
/datum/chemical_reaction/fermi/enthrall/slime
required_catalysts = list("slimejelly" = 1)
-/datum/chemical_reaction/fermi/enthrall/slime/politi
- name = "Politic-aid"
- id = "politic-aid"
- required_reagents = list("cocoa" = 0.1, "astral" = 0.1, "mindbreaker" = 0.1, "psicodine" = 0.1, "happiness" = 0.1)
- results = list("politic-aid" = 0.5)
-
/datum/chemical_reaction/fermi/enthrall/slime/FermiFinish(datum/reagents/holder, var/atom/my_atom)
var/datum/reagent/toxin/slimejelly/B = locate(/datum/reagent/toxin/slimejelly) in my_atom.reagents.reagent_list//The one line change.
var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in my_atom.reagents.reagent_list