cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-03-31 00:21:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Proper fixes and returning to monkey.

Browse Source
This commit is contained in:
QuoteFox
2021-03-20 19:16:50 +00:00
parent 9cf0ca814b
commit 0d487e3eb9
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/carbon/human/examine.dm
View File

@@ -427,10 +427,10 @@
output += "<br>...?"
else
. += "[print_flavor_text()]"
output += "<br>[replacetext(sanitize(html_decode(flavor_text)), "#", "<p>")]"
output += "<br>[url_encode(json_encode(flavor_text))]"
if(ooc_text)
output += "<br><br><i><b>OOC</b>"
output += "<br>[replacetext(sanitize(html_decode(ooc_text)), "#", "<p>")]"
output += "<br>[url_encode(json_encode(ooc_text))]"
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, msg)
. += "*---------*</span>"

2
code/modules/mob/living/carbon/life.dm
View File

@@ -541,7 +541,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
/mob/living/carbon/handle_status_effects()
..()
if(getStaminaLoss() && !combatmode)//CIT CHANGE - prevents stamina regen while combat mode is active
adjustStaminaLoss(resting ? (recoveringstam ? -3 : -2) : -1.5)//CIT CHANGE - decreases adjuststaminaloss to stop stamina damage from being such a joke
adjustStaminaLoss(resting ? (recoveringstam ? -7.5 : -3) : -1.5)
if(!recoveringstam && incomingstammult != 1)
incomingstammult = max(0.01, incomingstammult)