cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tgstation/master' into upstream-feb12-2026

Browse Source 
# Conflicts:
#	code/game/objects/items/storage/belt.dm
#	code/modules/jobs/job_types/chief_engineer.dm
This commit is contained in:
nevimer
2026-02-12 23:54:07 -05:00
parent 00ccf0c6b5 0398651991
commit 4dc38c0ad6
7 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration/entries/general.dm
-5
View File
@@ -188,11 +188,6 @@
/// allow votes to change map
/datum/config_entry/flag/allow_vote_map
/// the number of times we allow players to rock the vote
/datum/config_entry/number/max_rocking_votes
default = 1
min_val = 1
/// minimum time between voting sessions (deciseconds, 10 minute default)
/datum/config_entry/number/vote_delay
default = 10 MINUTES