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

Merge pull request #15663 from deathride58/blockquotes

Browse Source 
Blockquotes for chat; Prettier examine text and more!
This commit is contained in:
silicons
2022-06-10 22:09:12 -07:00
committed by GitHub
parent db575e46cd b14c534b37
commit 9a17ef3bf2
24 changed files with 196 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/embedded.dm
+2 -2
View File
@@ -346,9 +346,9 @@
/datum/component/embedded/proc/examineTurf(datum/source, mob/user, list/examine_list)
if(harmful)
examine_list += "\t <a href='?src=[REF(src)];embedded_object=[REF(weapon)]' class='warning'>There is \a [weapon] embedded in [parent]!</a>"
examine_list += "<a href='?src=[REF(src)];embedded_object=[REF(weapon)]' class='warning'>There is \a [weapon] embedded in [parent]!</a>"
else
examine_list += "\t <a href='?src=[REF(src)];embedded_object=[REF(weapon)]' class='warning'>There is \a [weapon] stuck to [parent]!</a>"
examine_list += "<a href='?src=[REF(src)];embedded_object=[REF(weapon)]' class='warning'>There is \a [weapon] stuck to [parent]!</a>"
/// Someone is ripping out the item from the turf by hand
code/datums/components/mood.dm
+12 -11
View File
@@ -50,7 +50,7 @@
STOP_PROCESSING(SSobj, src)
/datum/component/mood/proc/print_mood(mob/user)
var/msg = "<span class='info'>*---------*\n<EM>Your current mood</EM>\n"
var/msg = "<blockquote class='[sanity > SANITY_DISTURBED ? "nicegreen" : "warning"]'><span class='info'><EM>Your current mood</EM></span>\n"
msg += "<span class='notice'>My mental status: </span>" //Long term
switch(sanity)
if(SANITY_GREAT to INFINITY)
@@ -69,23 +69,23 @@
msg += "<span class='notice'>My current mood: </span>" //Short term
switch(mood_level)
if(1)
msg += "<span class='boldwarning'>I wish I was dead!<span>\n"
msg += "<span class='boldwarning'>I wish I was dead!</span>\n"
if(2)
msg += "<span class='boldwarning'>I feel terrible...<span>\n"
msg += "<span class='boldwarning'>I feel terrible...</span>\n"
if(3)
msg += "<span class='boldwarning'>I feel very upset.<span>\n"
msg += "<span class='boldwarning'>I feel very upset.</span>\n"
if(4)
msg += "<span class='boldwarning'>I'm a bit sad.<span>\n"
msg += "<span class='boldwarning'>I'm a bit sad.</span>\n"
if(5)
msg += "<span class='nicegreen'>I'm alright.<span>\n"
msg += "<span class='nicegreen'>I'm alright.</span>\n"
if(6)
msg += "<span class='nicegreen'>I feel pretty okay.<span>\n"
msg += "<span class='nicegreen'>I feel pretty okay.</span>\n"
if(7)
msg += "<span class='nicegreen'>I feel pretty good.<span>\n"
msg += "<span class='nicegreen'>I feel pretty good.</span>\n"
if(8)
msg += "<span class='nicegreen'>I feel amazing!<span>\n"
msg += "<span class='nicegreen'>I feel amazing!</span>\n"
if(9)
msg += "<span class='nicegreen'>I love life!<span>\n"
msg += "<span class='nicegreen'>I love life!</span>\n"
msg += "<span class='notice'>Moodlets:\n</span>"//All moodlets
if(mood_events.len)
@@ -93,7 +93,8 @@
var/datum/mood_event/event = mood_events[i]
msg += event.description
else
msg += "<span class='nicegreen'>I don't have much of a reaction to anything right now.<span>\n"
msg += "<span class='nicegreen'>I don't have much of a reaction to anything right now.</span>\n"
msg += "</blockquote>"
to_chat(user || parent, msg)
///Called after moodevent/s have been added/removed.
code/datums/wounds/_scars.dm
+1 -1
View File
@@ -118,7 +118,7 @@
if(WOUND_SEVERITY_LOSS)
msg = "[victim.p_their(TRUE)] [limb.name] [description]." // different format
msg = "<span class='notice'><i><b>[msg]</b></i></span>"
return "\t[msg]"
return "[msg]"
/// Whether a scar can currently be seen by the viewer
/datum/scar/proc/is_visible(mob/viewer)
code/datums/wounds/burns.dm
+1 -1
View File
@@ -167,7 +167,7 @@
if(WOUND_INFECTION_SEPTIC to INFINITY)
. += "Infection Level: <span class='deadsay'>LOSS IMMINENT</span>\n"
if(infestation > sanitization)
. += "\tSurgical debridement, antiobiotics/sterilizers, or regenerative mesh will rid infection. Paramedic UV penlights are also effective.\n"
. += "Surgical debridement, antiobiotics/sterilizers, or regenerative mesh will rid infection. Paramedic UV penlights are also effective.\n"
if(flesh_damage > 0)
. += "Flesh damage detected: Please apply ointment or regenerative mesh to allow recovery.\n"