cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 12:36:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Underwear + setup merges (#1812)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/gear_tweaks.dm
+3 -5
View File
@@ -17,8 +17,6 @@
* Color adjustment
*/
var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
/datum/gear_tweak/color
var/list/valid_colors
@@ -32,10 +30,10 @@ var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
/datum/gear_tweak/color/get_default()
return valid_colors ? valid_colors[1] : COLOR_GRAY
/datum/gear_tweak/color/get_metadata(var/user, var/metadata)
/datum/gear_tweak/color/get_metadata(var/user, var/metadata, var/title = "Character Preference")
if(valid_colors)
return input(user, "Choose an item color.", "Character Preference", metadata) as null|anything in valid_colors
return input(user, "Choose an item color.", "Global Preference", metadata) as color|null
return input(user, "Choose a color.", title, metadata) as null|anything in valid_colors
return input(user, "Choose a color.", title, metadata) as color|null
/datum/gear_tweak/color/tweak_item(var/obj/item/I, var/metadata)
if(valid_colors && !(metadata in valid_colors))