diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 7b0fb74f44..959df182da 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -281,11 +281,11 @@ msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n" if(reagents.has_reagent("astral")) - msg += "[t_He] have wild, spacey eyes" + msg += "[t_He] has wild, spacey eyes" if(mind) - msg += " and have a strange, abnormal look to them.\n" + msg += " and they have a strange, abnormal look to them.\n" else - msg += " and don't look like they're all there.\n" + msg += " and they don't look like they're all there.\n" if(isliving(user)) var/mob/living/L = user diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm index ac92f4f241..35d13b3aa6 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm @@ -194,7 +194,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, "You feel your vocal chords tingle as your voice comes out in a more sultry tone.)]") + to_chat(M, "You feel your vocal chords tingle you speak in a more charasmatic and sultry tone.)]") else log_game("FERMICHEM: MKUltra: [creatorName], [creatorID], is enthralling [M.name], [M.ckey]") M.apply_status_effect(/datum/status_effect/chem/enthrall) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm index b9ce8cede2..d7ff42a9eb 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm @@ -38,16 +38,17 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die var/datum/mind/originalmind /datum/action/chem/astral/Trigger() - if(origin.mind) - to_chat(origin, "There's a foreign presence in your body blocking your return!") + if(origin.mind && origin.mind != originalmind) + to_chat(originalmind.current, "There's a foreign presence in your body blocking your return!") return ..() if(origin.reagents.has_reagent("astral") ) var/datum/reagent/fermi/astral/As = locate(/datum/reagent/fermi/astral) in origin.reagents.reagent_list if(As.current_cycle < 10) - to_chat(origin, "The intensity of the astrogen in your body is too much allow you to return to yourself yet!") + to_chat(originalmind.current, "The intensity of the astrogen in your body is too much allow you to return to yourself yet!") return ..() originalmind.transfer_to(origin) - qdel(src) + if(origin.mind == originalmind) + qdel(src) /datum/reagent/fermi/astral/reaction_turf(turf/T, reac_volume) @@ -120,7 +121,7 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die log_game("FERMICHEM: [M] has astrally returned to their body!") if(M.mind && M.mind == originalmind) M.remove_status_effect(/datum/status_effect/chem/astral_insurance) - AS.Remove(M) + //AS.Remove(M) ..() //Okay so, this might seem a bit too good, but my counterargument is that it'll likely take all round to eventually kill you this way, then you have to be revived without a body. It takes approximately 50-80 minutes to die from this.