Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarf

code/modules/events/meteor_wave.dm

@@ -22,7 +22,7 @@
 
 /datum/round_event/meteor_wave/setup()
 	announceWhen = 1
-	startWhen = rand(60, 90) //Yeah for SOME REASON this is measured in seconds and not deciseconds???
+	startWhen = rand(90, 180) // Apparently it is by 2 seconds, so 90 is actually 180 seconds, and 180 is 360 seconds. So this is 3-6 minutes
 	if(GLOB.singularity_counter)
 		startWhen *= 1 - min(GLOB.singularity_counter * SINGULO_BEACON_DISTURBANCE, SINGULO_BEACON_MAX_DISTURBANCE)
 	endWhen = startWhen + 60

config/game_options.txt

@@ -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

html/changelogs/AutoChangeLog-pr-10918.yml

@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - config: "Made dwarves into a roundstart races"

html/changelogs/AutoChangeLog-pr-10930.yml

@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - tweak: "Meteor Timer back to 3-5 minutes"