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

2020-04-17 21:57:21 +02:00
parent 3dab97b62f 6e8f58d945
commit 87a6bd013c
113 changed files with 4923 additions and 6388 deletions
@@ -475,3 +475,7 @@
 /datum/config_entry/number/body_size_slowdown_multiplier
 	config_entry_value = 0.25
 	min_val = 0.1 //To encourage folks to disable the slowdown through the above config instead.
+
+//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