diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 0f8e8dd570..9c09937908 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -614,9 +614,22 @@ //Heavily modified voice of god code /obj/item/organ/vocal_cords/velvet - name = "velvet chords" + name = "Velvet chords" desc = "The voice spoken from these just make you want to drift off, sleep and obey." - icon_state = "in_love" + icon_state = "velvet_chords" + +/datum/action/item_action/organ_action/velvet + name = "Velvet speech" + var/obj/item/organ/vocal_cords/velvet/cords = null + icon_icon = 'icons/mob/screen_alert.dmi' + button_icon_state = "in_love" + +/datum/action/item_action/organ_action/velvet/New() + ..() + cords = target + +/datum/action/item_action/organ_action/velvet/IsAvailable() + return TRUE /datum/action/item_action/organ_action/velvet/Trigger() . = ..() diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index 9a2d2ceb1a..c6819b770f 100755 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index d320a54fd6..8c5fbed8cb 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -522,10 +522,11 @@ cooldown = 0 if (tranceTime > 0) //custom trances only last 50 ticks. tranceTime -= 1 - else if (!tranceTime == null) //remove trance after. + else if (tranceTime <= 0) //remove trance after. M.cure_trauma_type(/datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY) M.remove_status_effect(/datum/status_effect/trance) tranceTime = null + message_admins("test") //..() //Remove all stuff @@ -597,7 +598,7 @@ C.lay_down() //strip (some) clothes - else if (lowertext(customTriggers[trigger]) == "strip")//This wasn't meant to just be a lewd thing oops, is this pref breaking? + else if (lowertext(customTriggers[trigger]) == "strip")//This wasn't meant to just be a lewd thing oops. var/mob/living/carbon/human/o = owner var/items = o.get_contents() for(var/obj/item/W in items) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm index 1cb8731092..ae70175842 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm @@ -133,7 +133,7 @@ Creating a chem with a low purity will make you permanently fall in love with so 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 = "#2C051A" // rgb: , 0, 255 + color = "#80000c" // 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