mirror of
https://github.com/KabKebab/GS13.git
synced 2026-02-09 15:17:41 +00:00
Proper fixes and returning to monkey.
This commit is contained in:
@@ -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[][]
|
||||
|
||||
@@ -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>"
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
/mob/living/movement_delay(ignorewalk = 0)
|
||||
. = ..()
|
||||
if(resting)
|
||||
. += 3
|
||||
. += 6
|
||||
|
||||
/atom
|
||||
var/pseudo_z_axis
|
||||
|
||||
Reference in New Issue
Block a user