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

Makes whiskey outpost rarer + adds pop lock #5062

Merged
merged 9 commits into from
Dec 3, 2023
Merged

Makes whiskey outpost rarer + adds pop lock #5062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8d9e436
init
ihatethisengine Nov 29, 2023
1df0895
make us free
ihatethisengine Nov 29, 2023
cfb0375
Update code/game/gamemodes/colonialmarines/whiskey_outpost.dm
ihatethisengine Dec 2, 2023
0c0fae2
aaaaaaaaaaa
ihatethisengine Dec 2, 2023
2238c75
l
ihatethisengine Dec 2, 2023
9597d69
oof
ihatethisengine Dec 3, 2023
36ed6f7
test
ihatethisengine Dec 3, 2023
8d9e493
lets go
ihatethisengine Dec 3, 2023
50c3a8b
oops
ihatethisengine Dec 3, 2023
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
5 changes: 5 additions & 0 deletions code/controllers/configuration/entries/game_options.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,8 @@
min_val = 1
config_entry_value = 450
integer = TRUE

/datum/config_entry/number/whiskey_required_players
min_val = 0
config_entry_value = 140
integer = TRUE
3 changes: 2 additions & 1 deletion code/controllers/subsystem/vote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,8 @@ SUBSYSTEM_DEF(vote)
var/datum/game_mode/M = mode_type
if(initial(M.config_tag))
var/vote_cycle_met = !initial(M.vote_cycle) || (text2num(SSperf_logging?.round?.id) % initial(M.vote_cycle) == 0)
if(initial(M.votable) && vote_cycle_met)
var/min_players_met = length(GLOB.clients) >= M.required_players
if(initial(M.votable) && vote_cycle_met && min_players_met)
choices += initial(M.config_tag)
if("groundmap")
question = "Ground map vote"
Expand Down
8 changes: 6 additions & 2 deletions code/game/gamemodes/colonialmarines/whiskey_outpost.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/datum/game_mode/whiskey_outpost
name = GAMEMODE_WHISKEY_OUTPOST
config_tag = GAMEMODE_WHISKEY_OUTPOST
required_players = 0
required_players = 140
xeno_bypass_timer = 1
flags_round_type = MODE_NEW_SPAWN
role_mappings = list(
Expand Down Expand Up @@ -76,10 +76,14 @@
hardcore = TRUE

votable = TRUE
vote_cycle = 25 // approx. once every 5 days, if it wins the vote
vote_cycle = 75 // approx. once every 5 days, if it wins the vote

taskbar_icon = 'icons/taskbar/gml_wo.png'

/datum/game_mode/whiskey_outpost/New()
. = ..()
required_players = CONFIG_GET(number/whiskey_required_players)

/datum/game_mode/whiskey_outpost/get_roles_list()
return ROLES_WO

Expand Down