")]"
+ output += "
[url_encode(json_encode(flavor_text))]"
if(ooc_text)
output += "
OOC"
- output += "
[replacetext(sanitize(html_decode(ooc_text)), "#", "
")]"
+ output += "
[url_encode(json_encode(ooc_text))]"
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, msg)
. += "*---------*"
diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm
index fcf69c32..261cefcd 100644
--- a/code/modules/projectiles/ammunition/energy/stun.dm
+++ b/code/modules/projectiles/ammunition/energy/stun.dm
@@ -24,4 +24,4 @@
e_cost = 40
fire_sound = 'sound/weapons/taser2.ogg'
harmful = FALSE
- click_cooldown_override = 3.5
+ click_cooldown_override = 4
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 5065eed6..12c7dd36 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -69,7 +69,7 @@
/obj/item/projectile/beam/disabler
name = "disabler beam"
icon_state = "omnilaser"
- damage = 24 // Citadel change for balance from 36
+ damage = 35 // Citadel change for balance from 36
damage_type = STAMINA
flag = "energy"
hitsound = 'sound/weapons/tap.ogg'
diff --git a/html/statbrowser.html b/html/statbrowser.html
index 8430f9a8..c9856acc 100644
--- a/html/statbrowser.html
+++ b/html/statbrowser.html
@@ -275,6 +275,8 @@ var status_tab_parts = ["loading..."];
var current_tab = null;
var mc_tab_parts = [["loading...", ""]];
var examine_tab_parts = ["Mob Examine Text"];
+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
}
diff --git a/modular_citadel/code/game/objects/items/melee/misc.dm b/modular_citadel/code/game/objects/items/melee/misc.dm
index 6a53adcc..d922a00e 100644
--- a/modular_citadel/code/game/objects/items/melee/misc.dm
+++ b/modular_citadel/code/game/objects/items/melee/misc.dm
@@ -3,7 +3,7 @@
var/stun_stam_cost_coeff = 1.25
var/hardstun_ds = 1
var/softstun_ds = 0
- var/stam_dmg = 30
+ var/stam_dmg = 50
cooldown = 20
total_mass = 3.75
diff --git a/modular_citadel/code/modules/mob/living/living.dm b/modular_citadel/code/modules/mob/living/living.dm
index 1da32245..5ec2ab8c 100644
--- a/modular_citadel/code/modules/mob/living/living.dm
+++ b/modular_citadel/code/modules/mob/living/living.dm
@@ -19,7 +19,7 @@
/mob/living/movement_delay(ignorewalk = 0)
. = ..()
if(resting)
- . += 3
+ . += 6
/atom
var/pseudo_z_axis
From 9d16326f34a6e4d10b0e319963ebb3323c70f802 Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Sat, 20 Mar 2021 16:35:46 +0000
Subject: [PATCH 2/7] lets not rip a hole in space time.
---
code/game/objects/items/melee/misc.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index aa1f49a0..1f0c1c49 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -273,7 +273,7 @@
icon_state = "telebaton_1"
item_state = "nullrod"
w_class = WEIGHT_CLASS_BULKY //doesnt fit in backpack when its on for balance
- force = 50 //stunbaton damage
+ force = 10 //stunbaton damage
attack_verb = list("smacked", "struck", "cracked", "beaten")
else
to_chat(user, "You collapse the baton.")
From 007ea1f7de27486091b5907e37b6067bd455dfbd Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Sat, 20 Mar 2021 18:51:08 +0000
Subject: [PATCH 3/7] return to monkey
---
code/controllers/subsystem/mobs.dm | 1 -
1 file changed, 1 deletion(-)
diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm
index efc24629..1e8efff0 100644
--- a/code/controllers/subsystem/mobs.dm
+++ b/code/controllers/subsystem/mobs.dm
@@ -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[][]
From a9054be26ff5317d68bbf410a13d254d84989860 Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Sat, 20 Mar 2021 19:00:36 +0000
Subject: [PATCH 4/7] Revert "return to monkey"
This reverts commit 007ea1f7de27486091b5907e37b6067bd455dfbd.
---
code/controllers/subsystem/mobs.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm
index 1e8efff0..efc24629 100644
--- a/code/controllers/subsystem/mobs.dm
+++ b/code/controllers/subsystem/mobs.dm
@@ -3,6 +3,7 @@ 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[][]
From 5dbf439e0b3aacfed8ce2b5d01694afdc6c481dc Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Sat, 20 Mar 2021 19:00:47 +0000
Subject: [PATCH 5/7] Revert "lets not rip a hole in space time."
This reverts commit 9d16326f34a6e4d10b0e319963ebb3323c70f802.
---
code/game/objects/items/melee/misc.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 1f0c1c49..aa1f49a0 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -273,7 +273,7 @@
icon_state = "telebaton_1"
item_state = "nullrod"
w_class = WEIGHT_CLASS_BULKY //doesnt fit in backpack when its on for balance
- force = 10 //stunbaton damage
+ force = 50 //stunbaton damage
attack_verb = list("smacked", "struck", "cracked", "beaten")
else
to_chat(user, "You collapse the baton.")
From 9cf0ca814bc1a87f8f1fe7a56980d95ba597e1c3 Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Sat, 20 Mar 2021 19:01:30 +0000
Subject: [PATCH 6/7] Revert "some fixes!"
This reverts commit 0c5effbc7bb176218bfad75ce8ab1a1918903a8a.
---
code/__DEFINES/mobs.dm | 4 ++--
code/game/objects/items/melee/misc.dm | 2 +-
code/modules/mob/living/carbon/human/examine.dm | 4 ++--
code/modules/projectiles/ammunition/energy/stun.dm | 2 +-
code/modules/projectiles/projectile/beams.dm | 2 +-
html/statbrowser.html | 4 +---
modular_citadel/code/game/objects/items/melee/misc.dm | 2 +-
modular_citadel/code/modules/mob/living/living.dm | 2 +-
8 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index a4de5572..3e46a1e8 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -259,8 +259,8 @@
#define POCKET_STRIP_DELAY 40 //time taken (in deciseconds) to search somebody's pockets
#define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you
-#define HUNGER_FACTOR 0.03 //factor at which mob nutrition decreases
-#define THIRST_FACTOR 0.03 //factor at which mob thirst decreases
+#define HUNGER_FACTOR 0.08 //factor at which mob nutrition decreases
+#define THIRST_FACTOR 0.08 //factor at which mob thirst decreases
#define REAGENTS_METABOLISM 0.4 //How many units of reagent are consumed per tick, by default.
#define REAGENTS_EFFECT_MULTIPLIER (REAGENTS_METABOLISM / 0.4) // By defining the effect multiplier this way, it'll exactly adjust all effects according to how they originally were with the 0.4 metabolism
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index aa1f49a0..1f0c1c49 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -273,7 +273,7 @@
icon_state = "telebaton_1"
item_state = "nullrod"
w_class = WEIGHT_CLASS_BULKY //doesnt fit in backpack when its on for balance
- force = 50 //stunbaton damage
+ force = 10 //stunbaton damage
attack_verb = list("smacked", "struck", "cracked", "beaten")
else
to_chat(user, "You collapse the baton.")
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index dc89f8b6..ab583c70 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -427,10 +427,10 @@
output += "
...?"
else
. += "[print_flavor_text()]"
- output += "
[url_encode(json_encode(flavor_text))]"
+ output += "
[replacetext(sanitize(html_decode(flavor_text)), "#", "
")]"
if(ooc_text)
output += "
OOC"
- output += "
[url_encode(json_encode(ooc_text))]"
+ output += "
[replacetext(sanitize(html_decode(ooc_text)), "#", "
")]"
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, msg)
. += "*---------*"
diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm
index 261cefcd..fcf69c32 100644
--- a/code/modules/projectiles/ammunition/energy/stun.dm
+++ b/code/modules/projectiles/ammunition/energy/stun.dm
@@ -24,4 +24,4 @@
e_cost = 40
fire_sound = 'sound/weapons/taser2.ogg'
harmful = FALSE
- click_cooldown_override = 4
+ click_cooldown_override = 3.5
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 12c7dd36..5065eed6 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -69,7 +69,7 @@
/obj/item/projectile/beam/disabler
name = "disabler beam"
icon_state = "omnilaser"
- damage = 35 // Citadel change for balance from 36
+ damage = 24 // Citadel change for balance from 36
damage_type = STAMINA
flag = "energy"
hitsound = 'sound/weapons/tap.ogg'
diff --git a/html/statbrowser.html b/html/statbrowser.html
index c9856acc..8430f9a8 100644
--- a/html/statbrowser.html
+++ b/html/statbrowser.html
@@ -275,8 +275,6 @@ var status_tab_parts = ["loading..."];
var current_tab = null;
var mc_tab_parts = [["loading...", ""]];
var examine_tab_parts = ["Mob Examine Text"];
-var examine_flavour = [];
-var examine_ooc = [];
var href_token = null;
var spells = [];
var spell_tabs = [];
@@ -691,7 +689,7 @@ function draw_mc() {
}
-function update_examine(html,flavour,ooc) {
+function update_examine(html) {
examine_tab_parts = html
}
diff --git a/modular_citadel/code/game/objects/items/melee/misc.dm b/modular_citadel/code/game/objects/items/melee/misc.dm
index d922a00e..6a53adcc 100644
--- a/modular_citadel/code/game/objects/items/melee/misc.dm
+++ b/modular_citadel/code/game/objects/items/melee/misc.dm
@@ -3,7 +3,7 @@
var/stun_stam_cost_coeff = 1.25
var/hardstun_ds = 1
var/softstun_ds = 0
- var/stam_dmg = 50
+ var/stam_dmg = 30
cooldown = 20
total_mass = 3.75
diff --git a/modular_citadel/code/modules/mob/living/living.dm b/modular_citadel/code/modules/mob/living/living.dm
index 5ec2ab8c..1da32245 100644
--- a/modular_citadel/code/modules/mob/living/living.dm
+++ b/modular_citadel/code/modules/mob/living/living.dm
@@ -19,7 +19,7 @@
/mob/living/movement_delay(ignorewalk = 0)
. = ..()
if(resting)
- . += 6
+ . += 3
/atom
var/pseudo_z_axis
From 0d487e3eb90171b2139387ea10e4eff1cf772e15 Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Sat, 20 Mar 2021 19:16:50 +0000
Subject: [PATCH 7/7] Proper fixes and returning to monkey.
---
code/controllers/subsystem/mobs.dm | 1 -
code/modules/mob/living/carbon/human/examine.dm | 4 ++--
code/modules/mob/living/carbon/life.dm | 2 +-
html/statbrowser.html | 4 +++-
modular_citadel/code/modules/mob/living/living.dm | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm
index efc24629..1e8efff0 100644
--- a/code/controllers/subsystem/mobs.dm
+++ b/code/controllers/subsystem/mobs.dm
@@ -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[][]
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index ab583c70..dc89f8b6 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -427,10 +427,10 @@
output += "
...?"
else
. += "[print_flavor_text()]"
- output += "
[replacetext(sanitize(html_decode(flavor_text)), "#", "
")]"
+ output += "
[url_encode(json_encode(flavor_text))]"
if(ooc_text)
output += "
OOC"
- output += "
[replacetext(sanitize(html_decode(ooc_text)), "#", "
")]"
+ output += "
[url_encode(json_encode(ooc_text))]"
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, msg)
. += "*---------*"
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 04ea03c0..d9493d6f 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -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)
diff --git a/html/statbrowser.html b/html/statbrowser.html
index 8430f9a8..c9856acc 100644
--- a/html/statbrowser.html
+++ b/html/statbrowser.html
@@ -275,6 +275,8 @@ var status_tab_parts = ["loading..."];
var current_tab = null;
var mc_tab_parts = [["loading...", ""]];
var examine_tab_parts = ["Mob Examine Text"];
+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
}
diff --git a/modular_citadel/code/modules/mob/living/living.dm b/modular_citadel/code/modules/mob/living/living.dm
index 1da32245..5ec2ab8c 100644
--- a/modular_citadel/code/modules/mob/living/living.dm
+++ b/modular_citadel/code/modules/mob/living/living.dm
@@ -19,7 +19,7 @@
/mob/living/movement_delay(ignorewalk = 0)
. = ..()
if(resting)
- . += 3
+ . += 6
/atom
var/pseudo_z_axis