From 0698fb759a23e7e1b62f01cd3faf8b5fd2224139 Mon Sep 17 00:00:00 2001 From: CIB Date: Thu, 31 May 2012 20:59:51 +0300 Subject: [PATCH 1/2] Reduce health loss in crit. (For Erthilo) --- code/modules/mob/living/carbon/human/life.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index e16ea5fe505..bb1dfe2287d 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -468,7 +468,12 @@ if(!breath || (breath.total_moles == 0)) if(reagents.has_reagent("inaprovaline")) return - adjustOxyLoss(HUMAN_MAX_OXYLOSS) + if(health < config.health_threshold_crit) + // in crit, we pretend your metabolism has become slower, which + // will reduce the rate at which you lose health + adjustOxyLoss(round(HUMAN_MAX_OXYLOSS / 2)) + else + adjustOxyLoss(HUMAN_MAX_OXYLOSS) oxygen_alert = max(oxygen_alert, 1) From 647e1c71fdb7551cd04b888c3bff5ed4f25597ba Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 14 Jun 2012 20:24:38 +0200 Subject: [PATCH 2/2] Added a separate config/moderators.txt config file --- code/game/cellautomata.dm | 20 ++++++++++++++++++++ config/moderators.txt | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 config/moderators.txt diff --git a/code/game/cellautomata.dm b/code/game/cellautomata.dm index 3210bac6526..7034c022a2b 100644 --- a/code/game/cellautomata.dm +++ b/code/game/cellautomata.dm @@ -41,6 +41,26 @@ admins[m_key] = a_lev diary << ("ADMIN: [m_key] = [a_lev]") + // look for moderators in a separate file + text = file2text("config/moderators.txt") + if (!text) + diary << "Failed to load config/moderators.txt\n" + else + var/list/lines = dd_text2list(text, "\n") + for(var/line in lines) + world.log << line + if (!line) + continue + + if (copytext(line, 1, 2) == ";") + continue + + var/m_key = copytext(line, 1, length(line)+1) + var/a_lev = "Moderator" + admins[m_key] = a_lev + world.log << ("ADMIN: [m_key] = [a_lev]") + + /world/proc/load_testers() var/text = file2text("config/testers.txt") if (!text) diff --git a/config/moderators.txt b/config/moderators.txt new file mode 100644 index 00000000000..28619a2835f --- /dev/null +++ b/config/moderators.txt @@ -0,0 +1,3 @@ +; just add the ckey (lowercase) of every moderator on a separate line +; lines starting with ; are comments and will be ignored +asanadas