shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10773 from Putnam3145/whoops-gaseous

Browse Source 
Fixes to hypno toggle
This commit is contained in:
kevinz000
2020-01-29 15:51:01 -07:00
committed by GitHub
parent cde6601c60 7626750c49
commit cff69db1c3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/datums/status_effects/chems.dm
+3 -3
View File
@@ -211,10 +211,10 @@
/mob/living/verb/toggle_hypno() /mob/living/verb/toggle_hypno()
set category = "IC" set category = "IC"
set name = "Toggle Lewd MKUltra" set name = "Toggle Lewd Hypno"
set desc = "Allows you to toggle if you'd like lewd flavour messages for MKUltra." set desc = "Allows you to toggle if you'd like lewd flavour messages for hypno features, such as MKUltra."
client.prefs.cit_toggles ^= HYPNO client.prefs.cit_toggles ^= HYPNO
to_chat(usr, "You [((client.prefs.cit_toggles & HYPNO) ?"will":"no longer")] receive lewd flavour messages for MKUltra.") to_chat(usr, "You [((client.prefs.cit_toggles & HYPNO) ?"will":"no longer")] receive lewd flavour messages for hypno.")
/datum/status_effect/chem/enthrall /datum/status_effect/chem/enthrall
id = "enthrall" id = "enthrall"
modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
+2
View File
@@ -333,6 +333,8 @@ Creating a chem with a low purity will make you permanently fall in love with so
..() ..()
/datum/reagent/fermi/proc/FallInLove(mob/living/carbon/Lover, mob/living/carbon/Love) /datum/reagent/fermi/proc/FallInLove(mob/living/carbon/Lover, mob/living/carbon/Love)
if(Lover.client?.prefs.cit_toggles & NEVER_HYPNO)
return // doesn't even give a message, it's just ignored
if(Lover.has_status_effect(STATUS_EFFECT_INLOVE)) if(Lover.has_status_effect(STATUS_EFFECT_INLOVE))
to_chat(Lover, "<span class='warning'>You are already fully devoted to someone else!</span>") to_chat(Lover, "<span class='warning'>You are already fully devoted to someone else!</span>")
return return