Merge branch 'master' into Ghommie-patch-1

2020-04-18 01:27:00 +02:00
parent b7b9fc55f5 77af88da8c
commit 7a47debe9e
274 changed files with 32380 additions and 33505 deletions
@@ -477,3 +477,7 @@
 	config_entry_value = 0.25
 	min_val = 0.1 //To encourage folks to disable the slowdown through the above config instead.
 	integer = FALSE
+
+//Allows players to set a hexadecimal color of their choice as skin tone, on top of the standard ones.
+/datum/config_entry/number/allow_custom_skintones
+	config_entry_value = 1