diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 55ead3b5b4..c6c40de31a 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -2,6 +2,10 @@
#define COOLDOWN_DAMAGE 600
#define COOLDOWN_MEME 300
#define COOLDOWN_NONE 100
+#define COOLDOWN_VSTUN 800
+#define COOLDOWN_VDAMAGE 300
+#define COOLDOWN_VTHRAL 200
+#define COOLDOWN_VNONE 100
/obj/item/organ/vocal_cords //organs that are activated through speech with the :x channel
name = "vocal cords"
@@ -608,6 +612,596 @@
return cooldown
+//////////////////////////////////////
+///////ENTHRAL SILVER TONGUE//////////
+//////////////////////////////////////
+
+//Heavily modified voice of god code
+/obj/item/organ/vocal_cords/velvet
+ name = "velvet chords"
+ desc = "The voice spoken from these just make you want to drift off, sleep and obey."
+ icon_state = "voice_of_god"
+ actions_types = list(/datum/action/item_action/organ_action/colossus)
+ var/next_command = 0
+ var/cooldown_mod = 1
+ var/base_multiplier = 1
+ //spans = list("say","yell")
+
+/*
+/datum/action/item_action/organ_action/colossus
+ name = "Voice of God"
+ var/obj/item/organ/vocal_cords/colossus/cords = null
+
+/datum/action/item_action/organ_action/colossus/New()
+ ..()
+ cords = target
+
+/datum/action/item_action/organ_action/colossus/IsAvailable()
+ if(world.time < cords.next_command)
+ return FALSE
+ if(!owner)
+ return FALSE
+ if(!owner.can_speak())
+ return FALSE
+ if(check_flags & AB_CHECK_CONSCIOUS)
+ if(owner.stat)
+ return FALSE
+ return TRUE
+
+/datum/action/item_action/organ_action/colossus/Trigger()
+ . = ..()
+ if(!IsAvailable())
+ if(world.time < cords.next_command)
+ to_chat(owner, "You must wait [DisplayTimeText(cords.next_command - world.time)] before Speaking again.")
+ return
+ var/command = input(owner, "Speak with the Voice of God", "Command")
+ if(QDELETED(src) || QDELETED(owner))
+ return
+ if(!command)
+ return
+ owner.say(".x[command]")
+
+/obj/item/organ/vocal_cords/colossus/can_speak_with()
+ if(world.time < next_command)
+ to_chat(owner, "You must wait [DisplayTimeText(next_command - world.time)] before Speaking again.")
+ return FALSE
+ if(!owner)
+ return FALSE
+ if(!owner.can_speak())
+ to_chat(owner, "You are unable to speak!")
+ return FALSE
+ return TRUE
+*/
+
+/obj/item/organ/vocal_cords/velvet/handle_speech(message)
+ var/cooldown = velvetspeec(hmessage, owner, spans, base_multiplier)
+ return //voice of god speaks for us
+
+
+
+/obj/item/organ/vocal_cords/velvet/speak_with(message)
+ var/cooldown = voice_of_god(message, owner, spans, base_multiplier)
+ next_command = world.time + (cooldown * cooldown_mod)
+
+//////////////////////////////////////
+///////////FermiChem//////////////////
+//////////////////////////////////////
+
+/proc/velvetspeech(message, mob/living/user, list/span_list, base_multiplier = 1, include_speaker = FALSE, message_admins = TRUE)
+ var/cooldown = 0
+
+ if(!user || !user.can_speak() || user.stat)
+ return 0 //no cooldown
+
+ var/log_message = message
+ if(!span_list || !span_list.len) //Not too sure what this does, I think it changes your output message depending if you're a cultist or not? I.e. font
+ if(iscultist(user))
+ span_list = list("narsiesmall")
+ else if (is_servant_of_ratvar(user))
+ span_list = list("ratvar")
+ else
+ span_list = list()
+
+ user.say(message, sanitize = FALSE)//Removed spans = span_list, It should just augment normal speech
+
+ message = lowertext(message)
+ var/mob/living/list/listeners = list()
+ for(var/mob/living/L in get_hearers_in_view(8, user))
+ if(L.can_hear() && !L.anti_magic_check(FALSE, TRUE) && L.stat != DEAD)
+ if(L.has_status_effect(/datum/status_effect/chem/enthral))//Check to see if they have the status
+ if(L == user && !include_speaker)
+ continue
+ if(ishuman(L))
+ var/mob/living/carbon/human/H = L
+ if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
+ continue
+ if(istype(H.neck, /obj/item/clothing/neck/petcollar))
+ power_multiplier *= 1.5 //Collaring players makes them more docile and accepting of their place as a pet
+ if(H.has_trait(TRAIT_CROCRIN_IMMUNE) || !M.canbearoused)
+ power_multiplier *= 1.5//Immune/asexual players are immune to the arousal based multiplier, this is to offset that so they can still be affected.
+ listeners += L
+
+ if(!listeners.len)
+ cooldown = COOLDOWN_NONE
+ return cooldown
+
+ var/power_multiplier = base_multiplier
+
+ // Not sure I want to give extra power to anyone at the moment...? We'll see how it turns out
+ if(user.mind)
+ //Chaplains are very good at indoctrinating
+ if(user.mind.assigned_role == "Chaplain")
+ power_multiplier *= 2
+ //Command staff has authority
+ if(user.mind.assigned_role in GLOB.command_positions)
+ power_multiplier *= 1.4
+ //Why are you speaking
+ if(user.mind.assigned_role == "Mime")
+ power_multiplier *= 0.5
+
+ //Cultists are closer to their gods and are more better at indoctrinating
+ if(iscultist(user))
+ power_multiplier *= 2
+ else if (is_servant_of_ratvar(user))
+ power_multiplier *= 2
+ else if (is_devil(user))//The devil is supposed to be seductive, right?
+ power_multiplier *= 2
+
+ //range = 0.5 - 4.2~
+ //most cases = 1-2
+
+ //Try to check if the speaker specified a name or a job to focus on
+ var/list/specific_listeners = list()
+ var/found_string = null
+
+ //Get the proper job titles
+ message = get_full_job_name(message)
+
+ for(var/V in listeners)
+ if(dd_hasprefix(message, L.real_name))
+ specific_listeners += L //focus on those with the specified name
+ //Cut out the name so it doesn't trigger commands
+ found_string = L.real_name
+ power_multiplier *= 2
+
+ else if(dd_hasprefix(message, L.first_name()))
+ specific_listeners += L //focus on those with the specified name
+ //Cut out the name so it doesn't trigger commands
+ found_string = L.first_name()
+ power_multiplier *= 2
+
+ else if(L.mind && L.mind.assigned_role && dd_hasprefix(message, L.mind.assigned_role))
+ specific_listeners += L //focus on those with the specified job
+ //Cut out the job so it doesn't trigger commands
+ found_string = L.mind.assigned_role
+ power_multiplier *= 2
+
+ if(specific_listeners.len)
+ listeners = specific_listeners
+ //power_multiplier *= (1 + (1/specific_listeners.len)) //Put this is if it becomes OP
+ message = copytext(message, 0, 1)+copytext(message, 1 + length(found_string), length(message) + 1)
+
+ //phase 1
+ var/static/regex/enthral_words = regex("relax|obey|give in|love|serve|docile")
+ var/static/regex/reward_words = regex("good boy|good girl|good pet")
+ var/static/regex/silence_words = regex("shut up|silence|be silent|ssh|quiet|hush")
+ var/static/regex/attract_words = regex("come here|come to me|get over here|attract")
+ var/static/regex/punish_words = regex("bad boy|bad girl|bad pet")
+ var/static/regex/desire_words = regex("good boy|good girl|good pet")
+ var/static/regex/resist_words = regex("resist|snap out of it|fight")//useful if two enthrallers are fighting
+ var/static/regex/forget_words = regex("forget|muddled|")
+ //phase 2
+ var/static/regex/stun_words = regex("stop|wait|stand still|hold on|halt")
+ var/static/regex/knockdown_words = regex("drop|fall|trip|knockdown")
+ var/static/regex/sleep_words = regex("sleep|slumber|rest")
+ var/static/regex/vomit_words = regex("vomit|throw up|sick")
+ //phase 3
+ //var/static/regex/hallucinate_words = regex("see the truth|hallucinate")
+ var/static/regex/wakeup_words = regex("wake up|awaken")
+ var/static/regex/heal_words = regex("live|heal|survive|mend|life|heroes never die")
+ var/static/regex/hurt_words = regex("die|suffer|hurt|pain|death")
+ var/static/regex/bleed_words = regex("bleed|there will be blood")
+ var/static/regex/burn_words = regex("burn|ignite")
+ var/static/regex/hot_words = regex("heat|hot|hell")
+ var/static/regex/cold_words = regex("cold|cool down|chill|freeze")
+ var/static/regex/repulse_words = regex("shoo|go away|leave me alone|begone|flee|fus ro dah|get away|repulse")
+ var/static/regex/whoareyou_words = regex("who are you|say your name|state your name|identify")
+ var/static/regex/saymyname_words = regex("say my name|who am i|whoami")
+ var/static/regex/knockknock_words = regex("knock knock")
+ var/static/regex/statelaws_words = regex("state laws|state your laws")
+ var/static/regex/move_words = regex("move|walk")
+ var/static/regex/left_words = regex("left|west|port")
+ var/static/regex/right_words = regex("right|east|starboard")
+ var/static/regex/up_words = regex("up|north|fore")
+ var/static/regex/down_words = regex("down|south|aft")
+ var/static/regex/walk_words = regex("slow down")
+ var/static/regex/run_words = regex("run")
+ var/static/regex/helpintent_words = regex("help|hug")
+ var/static/regex/disarmintent_words = regex("disarm")
+ var/static/regex/grabintent_words = regex("grab")
+ var/static/regex/harmintent_words = regex("harm|fight|punch")
+ var/static/regex/throwmode_words = regex("throw|catch")
+ var/static/regex/flip_words = regex("flip|rotate|revolve|roll|somersault")
+ var/static/regex/speak_words = regex("speak|say something")
+ var/static/regex/getup_words = regex("get up")
+ var/static/regex/sit_words = regex("sit")
+ var/static/regex/stand_words = regex("stand")
+ var/static/regex/dance_words = regex("dance")
+ var/static/regex/jump_words = regex("jump")
+ var/static/regex/salute_words = regex("salute")
+ var/static/regex/deathgasp_words = regex("play dead")
+ var/static/regex/clap_words = regex("clap|applaud")
+ var/static/regex/honk_words = regex("ho+nk") //hooooooonk
+ var/static/regex/multispin_words = regex("like a record baby|right round")
+ var/static/regex/orgasm_words = regex("cum|orgasm|climax|squirt|heyo") //CITADEL CHANGE
+ var/static/regex/dab_words = regex("dab|mood") //CITADEL CHANGE
+ var/static/regex/snap_words = regex("snap") //CITADEL CHANGE
+ //var/static/regex/bwoink_words = regex("what the fuck are you doing|bwoink|hey you got a moment?") //CITADEL CHANGE
+
+
+
+ //enthral_words, reward_words, silence_words attract_words punish_words desire_words resist_words forget_words
+ //ENTHRAL
+ if(findtext(message, enthral_words))
+ cooldown = COOLDOWN_VTHRAL
+ for(var/V in listeners)
+ var/mob/living/L = V
+ var/datum/status_effect/chem/enthral/E = L.has_status_effect(/datum/status_effect/chem/enthral)
+ E.enthralTally += power_multiplier
+
+ var/i = 0
+ //STUN
+ if(findtext(message, stun_words))
+ cooldown = COOLDOWN_STUN
+ for(var/V in listeners)
+ var/mob/living/L = V
+ var/datum/status_effect/chem/enthral/E = has_status_effect(/datum/status_effect/chem/enthral)
+ L.Stun(60 * power_multiplier)
+
+ //KNOCKDOWN
+ else if(findtext(message, knockdown_words))
+ cooldown = COOLDOWN_STUN
+ for(var/V in listeners)
+ var/mob/living/L = V
+ L.Knockdown(60 * power_multiplier)
+
+ //SLEEP
+ else if((findtext(message, sleep_words)))
+ cooldown = COOLDOWN_STUN
+ for(var/mob/living/carbon/C in listeners)
+ C.Sleeping(40 * power_multiplier)
+
+ //VOMIT
+ else if((findtext(message, vomit_words)))
+ cooldown = COOLDOWN_STUN
+ for(var/mob/living/carbon/C in listeners)
+ C.vomit(10 * power_multiplier, distance = power_multiplier)
+
+ //SILENCE
+ else if((findtext(message, silence_words)))
+ cooldown = COOLDOWN_STUN
+ for(var/mob/living/carbon/C in listeners)
+ if(user.mind && (user.mind.assigned_role == "Curator" || user.mind.assigned_role == "Mime"))
+ power_multiplier *= 3
+ C.silent += (10 * power_multiplier)
+
+ //HALLUCINATE
+ else if((findtext(message, hallucinate_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/mob/living/carbon/C in listeners)
+ new /datum/hallucination/delusion(C, TRUE, null,150 * power_multiplier,0)
+
+ //WAKE UP
+ else if((findtext(message, wakeup_words)))
+ cooldown = COOLDOWN_DAMAGE
+ for(var/V in listeners)
+ var/mob/living/L = V
+ L.SetSleeping(0)
+
+ //HEAL
+ else if((findtext(message, heal_words)))
+ cooldown = COOLDOWN_DAMAGE
+ for(var/V in listeners)
+ var/mob/living/L = V
+ L.heal_overall_damage(10 * power_multiplier, 10 * power_multiplier, 0, FALSE, FALSE)
+
+ //BRUTE DAMAGE
+ else if((findtext(message, hurt_words)))
+ cooldown = COOLDOWN_DAMAGE
+ for(var/V in listeners)
+ var/mob/living/L = V
+ L.apply_damage(15 * power_multiplier, def_zone = BODY_ZONE_CHEST)
+
+ //BLEED
+ else if((findtext(message, bleed_words)))
+ cooldown = COOLDOWN_DAMAGE
+ for(var/mob/living/carbon/human/H in listeners)
+ H.bleed_rate += (5 * power_multiplier)
+
+ //FIRE
+ else if((findtext(message, burn_words)))
+ cooldown = COOLDOWN_DAMAGE
+ for(var/V in listeners)
+ var/mob/living/L = V
+ L.adjust_fire_stacks(1 * power_multiplier)
+ L.IgniteMob()
+
+ //HOT
+ else if((findtext(message, hot_words)))
+ cooldown = COOLDOWN_DAMAGE
+ for(var/V in listeners)
+ var/mob/living/L = V
+ L.adjust_bodytemperature(50 * power_multiplier)
+
+ //COLD
+ else if((findtext(message, cold_words)))
+ cooldown = COOLDOWN_DAMAGE
+ for(var/V in listeners)
+ var/mob/living/L = V
+ L.adjust_bodytemperature(-50 * power_multiplier)
+
+ //REPULSE
+ else if((findtext(message, repulse_words)))
+ cooldown = COOLDOWN_DAMAGE
+ for(var/V in listeners)
+ var/mob/living/L = V
+ var/throwtarget = get_edge_target_turf(user, get_dir(user, get_step_away(L, user)))
+ L.throw_at(throwtarget, 3 * power_multiplier, 1 * power_multiplier)
+
+ //ATTRACT
+ else if((findtext(message, attract_words)))
+ cooldown = COOLDOWN_DAMAGE
+ for(var/V in listeners)
+ var/mob/living/L = V
+ L.throw_at(get_step_towards(user,L), 3 * power_multiplier, 1 * power_multiplier)
+
+ //WHO ARE YOU?
+ else if((findtext(message, whoareyou_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ var/text = ""
+ if(is_devil(L))
+ var/datum/antagonist/devil/devilinfo = is_devil(L)
+ text = devilinfo.truename
+ else
+ text = L.real_name
+ addtimer(CALLBACK(L, /atom/movable/proc/say, text), 5 * i)
+ i++
+
+ //SAY MY NAME
+ else if((findtext(message, saymyname_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ addtimer(CALLBACK(L, /atom/movable/proc/say, user.name), 5 * i)
+ i++
+
+ //KNOCK KNOCK
+ else if((findtext(message, knockknock_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ addtimer(CALLBACK(L, /atom/movable/proc/say, "Who's there?"), 5 * i)
+ i++
+
+ //STATE LAWS
+ else if((findtext(message, statelaws_words)))
+ cooldown = COOLDOWN_STUN
+ for(var/mob/living/silicon/S in listeners)
+ S.statelaws(force = 1)
+
+ //MOVE
+ else if((findtext(message, move_words)))
+ cooldown = COOLDOWN_MEME
+ var/direction
+ if(findtext(message, up_words))
+ direction = NORTH
+ else if(findtext(message, down_words))
+ direction = SOUTH
+ else if(findtext(message, left_words))
+ direction = WEST
+ else if(findtext(message, right_words))
+ direction = EAST
+ for(var/iter in 1 to 5 * power_multiplier)
+ for(var/V in listeners)
+ var/mob/living/L = V
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/_step, L, direction? direction : pick(GLOB.cardinals)), 10 * (iter - 1))
+
+ //WALK
+ else if((findtext(message, walk_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ if(L.m_intent != MOVE_INTENT_WALK)
+ L.toggle_move_intent()
+
+ //RUN
+ else if((findtext(message, run_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ if(L.m_intent != MOVE_INTENT_RUN)
+ L.toggle_move_intent()
+
+ //HELP INTENT
+ else if((findtext(message, helpintent_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/mob/living/carbon/human/H in listeners)
+ addtimer(CALLBACK(H, /mob/verb/a_intent_change, INTENT_HELP), i * 2)
+ addtimer(CALLBACK(H, /mob/proc/click_random_mob), i * 2)
+ i++
+
+ //DISARM INTENT
+ else if((findtext(message, disarmintent_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/mob/living/carbon/human/H in listeners)
+ addtimer(CALLBACK(H, /mob/verb/a_intent_change, INTENT_DISARM), i * 2)
+ addtimer(CALLBACK(H, /mob/proc/click_random_mob), i * 2)
+ i++
+
+ //GRAB INTENT
+ else if((findtext(message, grabintent_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/mob/living/carbon/human/H in listeners)
+ addtimer(CALLBACK(H, /mob/verb/a_intent_change, INTENT_GRAB), i * 2)
+ addtimer(CALLBACK(H, /mob/proc/click_random_mob), i * 2)
+ i++
+
+ //HARM INTENT
+ else if((findtext(message, harmintent_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/mob/living/carbon/human/H in listeners)
+ addtimer(CALLBACK(H, /mob/verb/a_intent_change, INTENT_HARM), i * 2)
+ addtimer(CALLBACK(H, /mob/proc/click_random_mob), i * 2)
+ i++
+
+ //THROW/CATCH
+ else if((findtext(message, throwmode_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/mob/living/carbon/C in listeners)
+ C.throw_mode_on()
+
+ //FLIP
+ else if((findtext(message, flip_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ L.emote("flip")
+
+ //SPEAK
+ else if((findtext(message, speak_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ addtimer(CALLBACK(L, /atom/movable/proc/say, pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage")), 5 * i)
+ i++
+
+ //GET UP
+ else if((findtext(message, getup_words)))
+ cooldown = COOLDOWN_DAMAGE //because stun removal
+ for(var/V in listeners)
+ var/mob/living/L = V
+ if(L.resting)
+ L.lay_down() //aka get up
+ L.SetStun(0)
+ L.SetKnockdown(0)
+ L.SetUnconscious(0) //i said get up i don't care if you're being tased
+
+ //SIT
+ else if((findtext(message, sit_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ for(var/obj/structure/chair/chair in get_turf(L))
+ chair.buckle_mob(L)
+ break
+
+ //STAND UP
+ else if((findtext(message, stand_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ if(L.buckled && istype(L.buckled, /obj/structure/chair))
+ L.buckled.unbuckle_mob(L)
+
+ //DANCE
+ else if((findtext(message, dance_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ addtimer(CALLBACK(L, /mob/living/.proc/emote, "dance"), 5 * i)
+ i++
+
+ //JUMP
+ else if((findtext(message, jump_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ if(prob(25))
+ addtimer(CALLBACK(L, /atom/movable/proc/say, "HOW HIGH?!!"), 5 * i)
+ addtimer(CALLBACK(L, /mob/living/.proc/emote, "jump"), 5 * i)
+ i++
+
+ //SALUTE
+ else if((findtext(message, salute_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ addtimer(CALLBACK(L, /mob/living/.proc/emote, "salute"), 5 * i)
+ i++
+
+ //PLAY DEAD
+ else if((findtext(message, deathgasp_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ addtimer(CALLBACK(L, /mob/living/.proc/emote, "deathgasp"), 5 * i)
+ i++
+
+ //PLEASE CLAP
+ else if((findtext(message, clap_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ addtimer(CALLBACK(L, /mob/living/.proc/emote, "clap"), 5 * i)
+ i++
+
+ //HONK
+ else if((findtext(message, honk_words)))
+ cooldown = COOLDOWN_MEME
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, get_turf(user), 'sound/items/bikehorn.ogg', 300, 1), 25)
+ if(user.mind && user.mind.assigned_role == "Clown")
+ for(var/mob/living/carbon/C in listeners)
+ C.slip(140 * power_multiplier)
+ cooldown = COOLDOWN_MEME
+
+ //RIGHT ROUND
+ else if((findtext(message, multispin_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/L = V
+ L.SpinAnimation(speed = 10, loops = 5)
+
+ //CITADEL CHANGES
+ //ORGASM
+ else if((findtext(message, orgasm_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/carbon/human/H = V
+ if(H.canbearoused && H.has_dna()) // probably a redundant check but for good measure
+ H.mob_climax(forced_climax=TRUE)
+
+ //DAB
+ else if((findtext(message, dab_words)))
+ cooldown = COOLDOWN_DAMAGE
+ for(var/V in listeners)
+ var/mob/living/M = V
+ M.say("*dab")
+
+ //SNAP
+ else if((findtext(message, snap_words)))
+ cooldown = COOLDOWN_MEME
+ for(var/V in listeners)
+ var/mob/living/M = V
+ M.say("*snap")
+
+ //BWOINK
+ else if((findtext(message, bwoink_words)))
+ cooldown = COOLDOWN_MEME
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, get_turf(user), 'sound/effects/adminhelp.ogg', 300, 1), 25)
+ //END CITADEL CHANGES
+
+ else
+ cooldown = COOLDOWN_NONE
+
+ if(message_admins)
+ message_admins("[ADMIN_LOOKUPFLW(user)] has said '[log_message]' with a Velvet Voice, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")
+ log_game("[key_name(user)] has said '[log_message]' with a Velvet Voice, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")
+ SSblackbox.record_feedback("tally", "voice_of_god", 1, log_message)
+
+ return cooldown
+
#undef COOLDOWN_STUN
#undef COOLDOWN_DAMAGE
diff --git a/modular_citadel/code/datums/mood_events/chem_events.dm b/modular_citadel/code/datums/mood_events/chem_events.dm
index b1280c3559..78a4c28375 100644
--- a/modular_citadel/code/datums/mood_events/chem_events.dm
+++ b/modular_citadel/code/datums/mood_events/chem_events.dm
@@ -1,3 +1,21 @@
/datum/mood_event/eigenstate
mood_change = -1
description = "Where the hell am I? Is this an alternative dimension ?\n"
+
+/datum/mood_event/enthrall
+ mood_change = 2
+ description = "I am a good pet for master.\n"
+
+/datum/mood_event/enthrallpraise
+ mood_change = 5
+ description = "Master praised me!!\n"
+ timeout = 1200
+
+/datum/mood_event/enthrallscold
+ mood_change = -5
+ description = "I have let master down.\n"//aaa I'm not kinky enough for this
+ timeout = 1200
+
+/datum/mood_event/enthrallmissing1
+ mood_change = -5
+ description = "\n"
diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm
index 54fbea8ba1..801938d721 100644
--- a/modular_citadel/code/datums/status_effects/chems.dm
+++ b/modular_citadel/code/datums/status_effects/chems.dm
@@ -154,7 +154,8 @@
id = "enthral"
var/mob/living/E //E for enchanter
//var/mob/living/V = list() //V for victims
- var/resistance = 0
+ var/enthralTally = 10
+ var/resistanceTally = 0
var/phase = 0
var/enthralID
@@ -168,16 +169,16 @@
if(0)
return
if(1)
-
+
/datum/status_effect/chem/enthral/proc/owner_resist(mob/living/carbon/M)
to_chat(owner, "You attempt to shake the mental cobwebs from your mind!")
if (M.canbearoused)
- resistance += ((100 - M.arousalloss/100)/100)
+ resistance *= ((100 - M.arousalloss/100)/100)
else
- resistance += 0.2
+ resistance *= 0.2
/*
/datum/status_effect/chem/OwO
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 b296bd293a..5855574d76 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -739,12 +739,13 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
/datum/reagent/fermi/enthral/on_mob_life(mob/living/carbon/M)
if(!creatorID)
CRASH("Something went wrong in enthral creation")
- if(M.ID == creatorID)
+ else if(M.ID == creatorID)
var/obj/item/organ/tongue/T = M.getorganslot(ORGAN_SLOT_TONGUE)
var/obj/item/organ/tongue/nT = new /obj/item/organ/tongue/silver
T.Remove(M)
nT.Insert(M)
qdel(T)
+ else
//Requires player to be within vicinity of creator
//bonuses to mood