Proper fixes and returning to monkey.

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

View File

@@ -3,7 +3,6 @@ SUBSYSTEM_DEF(mobs)
priority = FIRE_PRIORITY_MOBS
flags = SS_KEEP_TIMING | SS_NO_INIT
runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
wait = 5
var/list/currentrun = list()
var/static/list/clients_by_zlevel[][]

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>"

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)

View File

@@ -275,6 +275,8 @@ var status_tab_parts = ["loading..."];
var current_tab = null;
var mc_tab_parts = [["loading...", ""]];
var examine_tab_parts = ["<b>Mob Examine Text</b>"];
var examine_flavour = [];
var examine_ooc = [];
var href_token = null;
var spells = [];
var spell_tabs = [];
@@ -689,7 +691,7 @@ function draw_mc() {
}
function update_examine(html) {
function update_examine(html,flavour,ooc) {
examine_tab_parts = html
}

View File

@@ -19,7 +19,7 @@
/mob/living/movement_delay(ignorewalk = 0)
. = ..()
if(resting)
. += 3
. += 6
/atom
var/pseudo_z_axis