cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SEMI-MODULAR] Ports the alexithymia trait (#1849)

Browse Source 
* Ports Alexithymia

* Update modular_skyrat/master_files/code/datums/traits/negative.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* Update code/datums/components/mood.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* Update code/datums/components/mood.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* Update code/datums/components/mood.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* Update code/datums/components/mood.dm

Co-authored-by: Azarak <azarak10@gmail.com>

Co-authored-by: Ranged <nickvanderkroon@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
This commit is contained in:
NotRanged
2020-11-27 07:50:25 +00:00
committed by GitHub
co-authored by Azarak Ranged
parent 43eb1b67a4
commit 2877e068a0
3 changed files with 66 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/mood.dm
+57 -3
View File
@@ -48,6 +48,8 @@
/datum/component/mood/proc/print_mood(mob/user)
var/msg = "<span class='info'>*---------*\n<EM>My current mental status:</EM></span>\n"
msg += "<span class='notice'>My current sanity: </span>" //Long term
//ORIGINAL
/*
switch(sanity)
if(SANITY_GREAT to INFINITY)
msg += "<span class='nicegreen'>My mind feels like a temple!</span>\n"
@@ -61,8 +63,29 @@
msg += "<span class='boldwarning'>I'm freaking out!!</span>\n"
if(SANITY_INSANE to SANITY_CRAZY)
msg += "<span class='boldwarning'>AHAHAHAHAHAHAHAHAHAH!!</span>\n"
*/
//SKYRAT EDIT CHANGE BEGIN - ALEXITHYMIA
if(!HAS_TRAIT(user, TRAIT_MOOD_NOEXAMINE))
switch(sanity)
if(SANITY_GREAT to INFINITY)
msg += "<span class='nicegreen'>My mind feels like a temple!</span>\n"
if(SANITY_NEUTRAL to SANITY_GREAT)
msg += "<span class='nicegreen'>I have been feeling great lately!</span>\n"
if(SANITY_DISTURBED to SANITY_NEUTRAL)
msg += "<span class='nicegreen'>I have felt quite decent lately.</span>\n"
if(SANITY_UNSTABLE to SANITY_DISTURBED)
msg += "<span class='warning'>I'm feeling a little bit unhinged...</span>\n"
if(SANITY_CRAZY to SANITY_UNSTABLE)
msg += "<span class='boldwarning'>I'm freaking out!!</span>\n"
if(SANITY_INSANE to SANITY_CRAZY)
msg += "<span class='boldwarning'>AHAHAHAHAHAHAHAHAHAH!!</span>\n"
else
msg += "<span class='notice'>I don't really know.</span>\n"
//SKYRAT EDIT CHANGE END
msg += "<span class='notice'>My current mood: </span>" //Short term
//ORIGINAL
/*
switch(mood_level)
if(1)
msg += "<span class='boldwarning'>I wish I was dead!</span>\n"
@@ -82,9 +105,35 @@
msg += "<span class='nicegreen'>I feel amazing!</span>\n"
if(9)
msg += "<span class='nicegreen'>I love life!</span>\n"
*/
//SKYRAT EDIT CHANGE BEGIN - ALEXITHYMIA
if(!HAS_TRAIT(user, TRAIT_MOOD_NOEXAMINE))
switch(mood_level)
if(1)
msg += "<span class='boldwarning'>I wish I was dead!</span>\n"
if(2)
msg += "<span class='boldwarning'>I feel terrible...</span>\n"
if(3)
msg += "<span class='boldwarning'>I feel very upset.</span>\n"
if(4)
msg += "<span class='boldwarning'>I'm a bit sad.</span>\n"
if(5)
msg += "<span class='nicegreen'>I'm alright.</span>\n"
if(6)
msg += "<span class='nicegreen'>I feel pretty okay.</span>\n"
if(7)
msg += "<span class='nicegreen'>I feel pretty good.</span>\n"
if(8)
msg += "<span class='nicegreen'>I feel amazing!</span>\n"
if(9)
msg += "<span class='nicegreen'>I love life!</span>\n"
else
msg += "<span class='notice'>No clue.</span>\n"
//SKYRAT EDIT CHANGE END
msg += "<span class='notice'>Moodlets:\n</span>"//All moodlets
if(mood_events.len)
//if(mood_events.len) //ORIGINAL
if(mood_events.len && !HAS_TRAIT(user, TRAIT_MOOD_NOEXAMINE)) //SKYRAT EDIT CHANGE - ALEXITHYMIA
for(var/i in mood_events)
var/datum/mood_event/event = mood_events[i]
msg += event.description
@@ -162,6 +211,12 @@
screen_obj.color = "#f15d36"
if(!conflicting_moodies.len) //no special icons- go to the normal icon states
//SKYRAT EDIT ADDITION BEGIN - ALEXITHYMIA
if(HAS_TRAIT(owner, TRAIT_MOOD_NOEXAMINE))
screen_obj.icon_state = "mood5"
screen_obj.color = "#4b96c4"
return
//SKYRAT EDIT ADDITION END
screen_obj.icon_state = "mood[mood_level]"
return
@@ -417,4 +472,3 @@
#undef MINOR_INSANITY_PEN
#undef MAJOR_INSANITY_PEN