Underwear + setup merges (#1812)

* Manually merges 12595 and 12461.

* Moron Jon 2: Moron Boogaloo

* Makes Yosh happier
This commit is contained in:
EmperorJon
2016-05-30 19:19:45 +01:00
committed by Yoshax
parent 333603ce51
commit 741706e9e3
14 changed files with 263 additions and 399 deletions

View File

@@ -0,0 +1 @@
var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()