diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index d3f244b0c3..362b547733 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -324,6 +324,8 @@ if(src.has_status_effect(/datum/status_effect/chem/enthrall)) var/datum/status_effect/chem/enthrall/E = src.has_status_effect(/datum/status_effect/chem/enthrall) if(E.phase < 3) + if(HAS_TRAIT(src, TRAIT_MINDSHIELD)) + to_chat(src, "Your mindshield prevents your mind from giving in!") E.enthrallTally += 50 to_chat(src, "You give into [E.master]'s influence.") if (InCritical()) diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 4e2226a99e..cce569c656 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -288,7 +288,7 @@ else to_chat(owner, "Your conciousness slips, as you feel more drawn to following [master].") - else if (resistanceTally > 150) + else if (resistanceTally > 125) phase = -1 to_chat(owner, "You break free of the influence in your mind, your thoughts suddenly turning lucid!") if(DistApart < 10) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm index f32c6b6431..7006918aa1 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm @@ -200,6 +200,8 @@ Creating a chem with a low purity will make you permanently fall in love with so qdel(Vc) to_chat(M, "You feel your vocal chords tingle as your voice comes out in a more sultry tone.") else + if(M.mind.assigned_role == "Captain") + return log_game("FERMICHEM: MKUltra: [creatorName], [creatorID], is enthralling [M.name], [M.ckey]") M.apply_status_effect(/datum/status_effect/chem/enthrall) log_game("FERMICHEM: [M] ckey: [M.key] has taken MKUltra") 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 c056fec66e..5a4dd2df0a 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -75,6 +75,7 @@ description = "A strange substance that draws in a hat from the hat dimention." color = "#7c311a" // rgb: , 0, 255 taste_description = "like jerky, whiskey and an off aftertaste of a crypt." + metabolization_rate = 0.2 overdose_threshold = 25 DoNotSplit = TRUE pH = 4