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

Forgot to comment out hypnoquirk.

Browse Source
This commit is contained in:
Fermi
2019-06-23 13:06:45 +01:00
parent f7696041ca
commit 7c19f5e0fa
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/vocal_cords.dm
+8 -8
View File
@@ -919,7 +919,7 @@
GET_COMPONENT_FROM(mood, /datum/component/mood, H) GET_COMPONENT_FROM(mood, /datum/component/mood, H)
switch(mood.sanity) switch(mood.sanity)
if(SANITY_GREAT to INFINITY) if(SANITY_GREAT to INFINITY)
speaktrigger += "I'm beyond elated!! " speaktrigger += "I'm beyond elated!! " //did you mean byond elated? hohoho
if(SANITY_NEUTRAL to SANITY_GREAT) if(SANITY_NEUTRAL to SANITY_GREAT)
speaktrigger += "I'm really happy! " speaktrigger += "I'm really happy! "
if(SANITY_DISTURBED to SANITY_NEUTRAL) if(SANITY_DISTURBED to SANITY_NEUTRAL)
@@ -933,15 +933,15 @@
//Withdrawal //Withdrawal
switch(E.withdrawalTick) switch(E.withdrawalTick)
if(10 to 36) if(10 to 36) //denial
speaktrigger += "I missed you, " speaktrigger += "I missed you, "
if(36 to 66) if(36 to 66) //barganing
speaktrigger += "I missed you, but I knew you'd come back for me! " speaktrigger += "I missed you, but I knew you'd come back for me! "
if(66 to 90) if(66 to 90) //anger
speaktrigger += "I couldn't take being away from you like that, " speaktrigger += "I couldn't take being away from you like that, "
if(90 to 140) if(90 to 140) //depression
speaktrigger += "I was so scared you'd never come back, " speaktrigger += "I was so scared you'd never come back, "
if(140 to INFINITY) if(140 to INFINITY) //acceptance
speaktrigger += "I'm hurt that you left me like that... I felt so alone... " speaktrigger += "I'm hurt that you left me like that... I felt so alone... "
//hunger //hunger
@@ -997,7 +997,7 @@
if(80 to 120) if(80 to 120)
speaktrigger += "My head feels like it's about to explode, " speaktrigger += "My head feels like it's about to explode, "
if(120 to 160) if(120 to 160)
speaktrigger += "You are the only thing keeping my brain sane, " speaktrigger += "You are the only thing keeping my mind sane, "
if(160 to INFINITY) if(160 to INFINITY)
speaktrigger += "I feel like I'm on the brink of losing my mind, " speaktrigger += "I feel like I'm on the brink of losing my mind, "
@@ -1013,7 +1013,7 @@
//collar //collar
if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar)) if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
speaktrigger += "and thank you for the collar, " speaktrigger += "I love the collar you gave me, "
//End //End
if(H.lewd) if(H.lewd)
speaktrigger += "[E.enthrallGender]!" speaktrigger += "[E.enthrallGender]!"
modular_citadel/code/datums/status_effects/chems.dm
+2 -2
View File
@@ -364,7 +364,7 @@
M.hallucination = max(0, M.hallucination - 5) M.hallucination = max(0, M.hallucination - 5)
M.stuttering = max(0, M.stuttering - 5) M.stuttering = max(0, M.stuttering - 5)
M.jitteriness = max(0, M.jitteriness - 5) M.jitteriness = max(0, M.jitteriness - 5)
if(owner.getBrainLoss() >=60) if(owner.getBrainLoss() >=50)
owner.adjustBrainLoss(-0.1) owner.adjustBrainLoss(-0.1)
if(withdrawal == TRUE) if(withdrawal == TRUE)
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "EnthMissing1") SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "EnthMissing1")
@@ -396,7 +396,7 @@
if(prob(10)) if(prob(10))
if(owner.lewd) if(owner.lewd)
to_chat(owner, "<i>I just need to be a good pet for [enthrallGender], they'll surely return if I'm a good pet.</i>") to_chat(owner, "<i>I just need to be a good pet for [enthrallGender], they'll surely return if I'm a good pet.</i>")
owner.adjustBrainLoss(-1) owner.adjustBrainLoss(-1.5)
if(66) if(66)
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "EnthMissing1") SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "EnthMissing1")
var/message = "[(owner.lewd?"I feel so lost in this complicated world without [enthrallGender]..":"I have to return to [master]!")]" var/message = "[(owner.lewd?"I feel so lost in this complicated world without [enthrallGender]..":"I have to return to [master]!")]"