Merge remote-tracking branch 'upstream/master' into psych+paramedic

config/config.txt

@@ -6,6 +6,7 @@ $include comms.txt
 $include antag_rep.txt
 $include donator_groupings.txt
 $include dynamic_config.txt
+$include plushies/defines.txt
 
 # You can use the @ character at the beginning of a config option to lock it from being edited in-game
 # Example usage:
@@ -384,6 +385,15 @@ MAPROTATION
 ## When it's set to zero, the map will be randomly picked each round
 ALLOW_MAP_VOTING 1
 
+## Map voting type
+## Determines what kind of vote the map vote is
+## Options are:
+##   PLURALITY (default, only vote for one option)
+##   APPROVAL (can vote for as many as you want), I
+##   IRV (vote by ranked choice, winner determined by instant runoff algorithm)
+##   SCORE (give individual rankings of each choice, winner determined by majority judgement algorithm)
+MAP_VOTE_TYPE SCORE
+
 ## Map rotate chance delta
 ## This is the chance of map rotation factored to the round length.
 ## A value of 1 would mean the map rotation chance is the round length in minutes (hour long round == 60% rotation chance)
@@ -438,8 +448,14 @@ MINUTE_CLICK_LIMIT 400
 ##How long to wait between messaging admins about occurences of a unique error
 #ERROR_MSG_DELAY 50
 
-## Send a message to IRC when starting a new game
-#IRC_ANNOUNCE_NEW_GAME
+## Chat Announce Options
+## Various messages to be sent to game chats
+## Uncommenting these will enable them, by default they will be broadcast to Game chat channels on TGS3 or non-admin channels on TGS4
+## If using TGS4, the string option can be set as a chat channel tag to limit the message to channels of that tag type (case-sensitive)
+## i.e. CHAT_ANNOUNCE_NEW_GAME chat_channel_tag
+
+## Send a message with the station name starting a new game
+#CHAT_ANNOUNCE_NEW_GAME
 
 ## Allow admin hrefs that don't use the new token system, will eventually be removed
 DEBUG_ADMIN_HREFS
@@ -470,6 +486,8 @@ DISABLE_HIGH_POP_MC_MODE_AMOUNT 60
 ## Uncomment to set the number of /world/Reboot()s before the DreamDaemon restarts itself. 0 means restart every round. Requires tgstation server tools.
 #ROUNDS_UNTIL_HARD_RESTART 10
 
+## Number of days for an individual panic bunker passthrough entry to be wiped. Note that they're also wiped as soon as a player is in the database.
+#MAX_BUNKER_DAYS 7
 
 ##Default screen resolution, in tiles.
 ##	By default, this is 15x15, which gets simplified to 7 by BYOND, as it is a 1:1 screen ratio.
@@ -488,3 +506,5 @@ FAIL2TOPIC_MAX_FAILS 5
 ## Firewall rule name used on physical server
 FAIL2TOPIC_RULE_NAME _dd_fail2topic
 
+## Enable automatic profiling - Byond 513.1506 and newer only.
+#AUTO_PROFILE

config/dynamic_config.txt

@@ -1,3 +1,13 @@
+## Dynamic storytellers weights: how likely each storyteller is to show up. This is adjusted by voting and recency.
+STORYTELLER_WEIGHT CHAOTIC 2
+STORYTELLER_WEIGHT TEAMWORK 4
+STORYTELLER_WEIGHT CONVERSION 2
+STORYTELLER_WEIGHT RANDOM 6
+STORYTELLER_WEIGHT INTRIGUE 6
+STORYTELLER_WEIGHT STORY 6
+STORYTELLER_WEIGHT CALM 6
+STORYTELLER_WEIGHT EXTENDED 0
+
 ## Injection delays: how long (in minutes) will pass before a midround or latejoin antag is injected.
 DYNAMIC_MIDROUND_DELAY_MIN 5
 DYNAMIC_MIDROUND_DELAY_MAX 15
@@ -92,6 +102,7 @@ DYNAMIC_WEIGHT RADIATION_STORM 1
 DYNAMIC_WEIGHT LATEJOIN_TRAITOR 7
 DYNAMIC_WEIGHT LATEJOIN_REVOLUTION 2
 DYNAMIC_WEIGHT LATEJOIN_BLOODSUCKER 4
+DYNAMIC_WEIGHT LATEJOIN_COLLECTOR 5
 
 ## Threat cost. This is decreased from the mode's threat when the rule is executed.
 DYNAMIC_COST TRAITOR 10
@@ -153,6 +164,7 @@ DYNAMIC_COST RADIATION_STORM 3
 DYNAMIC_COST LATEJOIN_TRAITOR 5
 DYNAMIC_COST LATEJOIN_REVOLUTION 20
 DYNAMIC_COST LATEJOIN_BLOODSUCKER 10
+DYNAMIC_COST LATEJOIN_COLLECTOR 1
 
 ## Rule will not be generated with threat levels below requirement at a pop value. Pop values are determined by dynamic's pop-per-requirement. 
 ## By default  it's 0-8, 9-17, 18-26, 27-35, 36-44, 45-53, 54-60, 61-69, 70-78, 79+. 
@@ -210,6 +222,7 @@ DYNAMIC_REQUIREMENTS RADIATION_STORM 5 5 5 5 5 5 5 5 5 5
 DYNAMIC_REQUIREMENTS LATEJOIN_TRAITOR 40 30 20 15 15 15 15 15 15 15
 DYNAMIC_REQUIREMENTS LATEJOIN_REVOLUTION 101 101 70 40 40 40 40 40 40 40
 DYNAMIC_REQUIREMENTS LATEJOIN_BLOODSUCKER 40 30 20 15 15 15 15 15 15 15
+DYNAMIC_REQUIREMENTS LATEJOIN_COLLECTOR 10 10 10 10 10 10 10 10 10 10
 
 ## An alternative, static requirement used instead when pop is over mode's high_pop_limit.
 DYNAMIC_HIGH_POPULATION_REQUIREMENT TRAITOR 50
@@ -267,6 +280,7 @@ DYNAMIC_HIGH_POPULATION_REQUIREMENT RADIATION_STORM 5
 DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_TRAITOR 15
 DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_REVOLUTION 50
 DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_BLOODSUCKER 15
+DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_COLLECTOR 10
 
 ## Dynamic traitor stuff
 

config/game_options.txt

@@ -39,7 +39,7 @@ WALK_DELAY 4
 ## Entries completely override all subtypes. Later entries have precedence over earlier entries.
 ## This means if you put /mob 0 on the last entry, it will null out all changes, while if you put /mob as the first entry and
 ## /mob/living/carbon/human on the last entry, the last entry will override the first.
-##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/human 0
+MULTIPLICATIVE_MOVESPEED /mob/living/carbon/human 1
 ##MULTIPLICATIVE_MOVESPEED /mob/living/silicon/robot 0
 ##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/monkey 0
 ##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/alien 0
@@ -426,6 +426,7 @@ ROUNDSTART_RACES lizard
 ROUNDSTART_RACES plasmaman
 #ROUNDSTART_RACES shadow
 ROUNDSTART_RACES felinid
+ROUNDSTART_RACES dwarf
 
 ## Races that are better than humans in some ways, but worse in others
 #ROUNDSTART_RACES jelly
@@ -591,6 +592,10 @@ BOX_RANDOM_ENGINE Box Singulo,3
 BOX_RANDOM_ENGINE Box SM 1x3,1
 BOX_RANDOM_ENGINE Box SM 5x5,1
 BOX_RANDOM_ENGINE Box SM 3x,0
+BOX_RANDOM_ENGINE Box TEG,3
+BOX_RANDOM_ENGINE Box Empty,0
+BOX_RANDOM_ENGINE Box Antimatter,1
+BOX_RANDOM_ENGINE Box P.A.C.M.A.N,1
 
 ## Whether or not there's a mode tier list vote after the secret/extended vote.
 MODETIER_VOTING

config/plushies/plushie_config.txt

@@ -0,0 +1,2 @@
+# EXAMPLE
+# SNOWFLAKE_PLUSHIES example {"name":"example","desc":"thanks, coders.","icon_state":"","attack_verb":["thumped","whomped","bumped"],"squeak_override":{"sound/weapons/magout.ogg":1}}