Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

2021-12-21 07:59:33 +08:00
parent fe6556f7b7 d2f3070522
commit fab4b07be5
164 changed files with 128258 additions and 912 deletions
@@ -47,6 +47,10 @@ map spookystation
 	minplayers 150
 endmap

+map festivestation
+	minplayers 150
+endmap
+
 map multiz_debug
 endmap