diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 961c075f3494..8ecaa0ecb33a 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -42,6 +42,7 @@ SUBSYSTEM_DEF(ticker) var/ert_call_in_progress = FALSE //when true players can join ERT var/hacked_apcs = 0 //check the amount of hacked apcs either by a malf ai, or a traitor var/Malf_announce_stage = 0//Used for announcement + var/is_lowpop = FALSE var/force_end = FALSE // set TRUE to forse round end and show credits @@ -304,11 +305,15 @@ SUBSYSTEM_DEF(ticker) M.playsound_local(null, 'sound/AI/enjoyyourstay.ogg', VOL_EFFECTS_VOICE_ANNOUNCEMENT, vary = FALSE, frequency = null, ignore_environment = TRUE) if(length(SSholiday.holidays)) - to_chat(world, "и...") + to_chat(world, "и...") for(var/holidayname in SSholiday.holidays) var/datum/holiday/holiday = SSholiday.holidays[holidayname] to_chat(world, "

[holiday.greet()]

") + if(totalPlayersReady <= 10) + is_lowpop = TRUE + to_chat(world, "Система штрафов и бонусов от умений персонажа отключена.") + spawn(0)//Forking here so we dont have to wait for this to finish mode.PostSetup() show_blurbs() diff --git a/code/modules/skills/helpers.dm b/code/modules/skills/helpers.dm index d9fb308d68a5..6cd1a53d21ad 100644 --- a/code/modules/skills/helpers.dm +++ b/code/modules/skills/helpers.dm @@ -11,6 +11,8 @@ /proc/apply_skill_bonus(mob/user, value, required_skills, multiplier) var/result = value + if(SSticker.is_lowpop) + return result for(var/datum/skill/required_skill as anything in required_skills) var/value_with_helpers = get_skill_with_assistance(user, required_skill) result += value * multiplier * (value_with_helpers - required_skills[required_skill]) @@ -21,7 +23,7 @@ return do_after(user, delay = apply_skill_bonus(user, delay, required_skills, multiplier), target = target, extra_checks = extra_checks) /proc/handle_fumbling(mob/user, atom/target, delay, required_skills, message_self = "", text_target = null, check_busy = TRUE, can_move = FALSE) - if(is_skill_competent(user, required_skills)) + if(SSticker.is_lowpop || is_skill_competent(user, required_skills)) return TRUE if(check_busy && user.is_busy()) return FALSE