Merge remote-tracking branch 'origin/master' into rustsql

config/config.txt

@@ -11,6 +11,7 @@ $include dynamic_config.txt
 $include plushies/defines.txt
 $include job_threats.txt
 $include policy.txt
+$include persistence.txt
 $include respawns.txt
 
 # You can use the @ character at the beginning of a config option to lock it from being edited in-game

config/game_options.txt

@@ -668,4 +668,10 @@ ALLOW_CUSTOM_SKINTONES
 
 ## Enables the FoV component, which hides objects and mobs behind the parent from their sight, unless they turn around, duh.
 ## Camera mobs, AIs, ghosts and some other are of course exempt from this. This also doesn't influence simplemob AI, for the best.
-#USE_FIELD_OF_VISION
+#USE_FIELD_OF_VISION
+
+## Default turf threshold to get dirt
+TURF_DIRT_THRESHOLD 100
+
+## Default alpha of dirt on spawn
+DIRT_ALPHA_STARTING 127

config/persistence.txt

@@ -0,0 +1,14 @@
+### Whether or not cleanable object persistence is on
+PERSISTENT_DEBRIS
+
+### Whether or not ONLY persistent cleanable objects should be spawned, for supported objects
+PERSISTENT_DEBRIS_ONLY
+
+### Max objects to store, total
+PERSISTENT_DEBRIS_GLOBAL_MAX 10000
+
+### Max objects to store per type, total
+PERSISTENT_DEBRIS_TYPE_MAX 2000
+
+### Wipe objects on nuke for the above
+PERSISTENT_DEBRIS_WIPE_ON_NUKE

config/respawns.txt

@@ -25,5 +25,5 @@ RESPAWN_MINIMUM_DELAY_ROUNDSTART 30.0
 ## Gamemode (config tags!) banlist for respawn
 RESPAWN_CHAOS_GAMEMODES WIZARD
 RESPAWN_CHAOS_GAMEMODES NUCLEAR
-RESPAWN_CHAOS_GAMEMODES CLONWOPS
-RESPAWN_CHOAS_GAMEMODES REVOLUTION
+RESPAWN_CHAOS_GAMEMODES CLOWNOPS
+RESPAWN_CHAOS_GAMEMODES REVOLUTION