Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Убирает штрафы и бонусы от скиллов на лоупопе #13644

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+9 −2
Open

Убирает штрафы и бонусы от скиллов на лоупопе #13644

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ee3c90
1
simb11 Nov 24, 2024
333cd9a
Update ticker.dm
simb11 Nov 24, 2024
6902ff0
Update code/modules/skills/helpers.dm
simb11 Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion code/controllers/subsystem/ticker.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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, "<span clas='notice'>и...</span>")
to_chat(world, "<span class='notice'>и...</span>")
for(var/holidayname in SSholiday.holidays)
var/datum/holiday/holiday = SSholiday.holidays[holidayname]
to_chat(world, "<h4>[holiday.greet()]</h4>")

if(totalPlayersReady <= 10)
is_lowpop = TRUE
to_chat(world, "<span class='notice'>Система штрафов и бонусов от умений персонажа отключена.</span>")

spawn(0)//Forking here so we dont have to wait for this to finish
mode.PostSetup()
show_blurbs()
Expand Down
4 changes: 3 additions & 1 deletion code/modules/skills/helpers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand All @@ -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(is_skill_competent(user, required_skills) || SSticker.is_lowpop)
simb11 marked this conversation as resolved.
Show resolved Hide resolved
simb11 marked this conversation as resolved.
Show resolved Hide resolved
return TRUE
if(check_busy && user.is_busy())
return FALSE
Expand Down
Loading