From ce390fb595e019ccd44e81f0751a5a6651bf4f9a Mon Sep 17 00:00:00 2001 From: Fermi Date: Tue, 9 Jul 2019 23:27:37 +0100 Subject: [PATCH] Tweaks to MK --- code/datums/looping_sounds/_looping_sound.dm | 2 +- code/game/objects/items/devices/scanners.dm | 3 +++ code/modules/mob/living/living.dm | 7 +++++-- code/modules/surgery/organs/vocal_cords.dm | 6 +++--- modular_citadel/code/datums/status_effects/chems.dm | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index 1b7a304494..49942976ce 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -96,4 +96,4 @@ /datum/looping_sound/proc/on_stop() if(end_sound) - play(end_sound) \ No newline at end of file + play(end_sound) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 61c67a9fbf..637ec327ff 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -200,6 +200,9 @@ SLIME SCANNER if(advanced && M.hallucinating()) msg += "\tSubject is hallucinating.\n" + if(src.has_status_effect(/datum/status_effect/chem/enthrall)) + msg += "\tSubject has abnormal brain fuctions.\n" + //Eyes and ears if(advanced) if(iscarbon(M)) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 362b547733..532316259f 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -326,8 +326,11 @@ 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.") + else if(src.mind.assigned_role in GLOB.command_positions) + to_chat(src, "Your dedication to your department prevents you from giving in!") + else + E.enthrallTally += 20 + to_chat(src, "You give into [E.master]'s influence.") if (InCritical()) log_message("Has succumbed to death while in [InFullCritical() ? "hard":"soft"] critical with [round(health, 0.1)] points of health!", LOG_ATTACK) adjustOxyLoss(health - HEALTH_THRESHOLD_DEAD) diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 54621f71a3..b6f09bcd77 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -1105,7 +1105,7 @@ //teir 2 - + /* removed for now //ORGASM else if((findtext(message, orgasm_words))) for(var/V in listeners) @@ -1122,7 +1122,7 @@ E.cooldown += 6 else H.throw_at(get_step_towards(user,H), 3 * power_multiplier, 1 * power_multiplier) - + */ //awoo @@ -1166,7 +1166,7 @@ if(2 to INFINITY) var/items = H.get_contents() for(var/obj/item/W in items) - if(W == H.w_uniform || W == H.wear_suit) + if(W == H.wear_suit) H.dropItemToGround(W, TRUE) addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "Before you can even think about it, you quickly remove your clothes in response to [(H.client?.prefs.lewdchem?"your [E.enthrallGender]'s command'":"[E.master]'s directive'")]."), 5) E.cooldown += 10 diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index cce569c656..c3c68cfa1e 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -299,7 +299,7 @@ if(owner.client?.prefs.lewdchem) to_chat(owner, "[pick("It feels so good to listen to [master].", "You can't keep your eyes off [master].", "[master]'s voice is making you feel so sleepy.", "You feel so comfortable with [master]", "[master] is so dominant, it feels right to obey them.")].") if (2) //partially enthralled - if (enthrallTally > 200) + if(enthrallTally > 200) phase += 1 mental_capacity -= resistanceTally//leftover resistance per step is taken away from mental_capacity. enthrallTally = 0