shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WHAT IF WE FIXED EVERYTHING IN ONE COMMIT

Browse Source
This commit is contained in:
timothyteakettle
2020-10-21 23:59:15 +01:00
parent 06bbddd248
commit 4a3afae9d1
8 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+3 -3
View File
@@ -565,9 +565,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/datum/sprite_accessory/accessory = find_part_list[find_part]
if(accessory)
if(accessory.color_src == MATRIXED || accessory.color_src == MUTCOLORS || accessory.color_src == MUTCOLORS2 || accessory.color_src == MUTCOLORS3) //mutcolors1-3 are deprecated now, please don't rely on these in the future
var/primary_feature = "[mutant_part]_primary"
var/secondary_feature = "[mutant_part]_secondary"
var/tertiary_feature = "[mutant_part]_tertiary"
var/primary_feature = "[accessory.mutant_part_string]_primary"
var/secondary_feature = "[accessory.mutant_part_string]_secondary"
var/tertiary_feature = "[accessory.mutant_part_string]_tertiary"
var/matrixed_sections = accessory.matrixed_sections
if(accessory.color_src == MATRIXED && !matrixed_sections)
message_admins("Sprite Accessory Failure (customization): Accessory [accessory.type] is a matrixed item without any matrixed sections set!")
code/modules/client/preferences_savefile.dm
+11 -11
View File
@@ -5,7 +5,7 @@
// You do not need to raise this if you are adding new values that have sane defaults.
// Only raise this value when changing the meaning/format/name/layout of an existing value
// where you would want the updater procs below to run
#define SAVEFILE_VERSION_MAX 40
#define SAVEFILE_VERSION_MAX 41
/*
SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -226,7 +226,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
left_eye_color = "#BAB99E"
right_eye_color = "#BAB99E"
if(current_version < 40) //extreme changes to how things are coloured (the introduction of the advanced coloring system)
if(current_version < 41) //extreme changes to how things are coloured (the introduction of the advanced coloring system)
features["color_scheme"] = OLD_CHARACTER_COLORING //disable advanced coloring system by default
for(var/feature in features)
var/feature_value = features[feature]
@@ -235,9 +235,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(ref_list)
var/datum/sprite_accessory/accessory = ref_list[feature_value]
if(accessory)
var/primary_string = "[feature]_primary"
var/secondary_string = "[feature]_secondary]"
var/tertiary_string = "[feature]_tertiary]"
var/primary_string = "[accessory.mutant_part_string]_primary"
var/secondary_string = "[accessory.mutant_part_string]_secondary]"
var/tertiary_string = "[accessory.mutant_part_string]_tertiary]"
if(accessory.color_src == MATRIXED && !accessory.matrixed_sections && feature_value != "None")
message_admins("Sprite Accessory Failure (migration from [current_version] to 39): Accessory [accessory.type] is a matrixed item without any matrixed sections set!")
continue
@@ -842,9 +842,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(ref_list)
var/datum/sprite_accessory/accessory = ref_list[feature_value]
if(accessory)
var/primary_string = "[feature]_primary"
var/secondary_string = "[feature]_secondary]"
var/tertiary_string = "[feature]_tertiary]"
var/primary_string = "[accessory.mutant_part_string]_primary"
var/secondary_string = "[accessory.mutant_part_string]_secondary]"
var/tertiary_string = "[accessory.mutant_part_string]_tertiary]"
if(accessory.color_src == MATRIXED && !accessory.matrixed_sections && feature_value != "None")
message_admins("Sprite Accessory Failure (loading data): Accessory [accessory.type] is a matrixed item without any matrixed sections set!")
continue
@@ -988,9 +988,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(ref_list)
var/datum/sprite_accessory/accessory = ref_list[feature_value]
if(accessory)
var/primary_string = "[feature]_primary"
var/secondary_string = "[feature]_secondary]"
var/tertiary_string = "[feature]_tertiary]"
var/primary_string = "[accessory.mutant_part_string]_primary"
var/secondary_string = "[accessory.mutant_part_string]_secondary]"
var/tertiary_string = "[accessory.mutant_part_string]_tertiary]"
if(accessory.color_src == MATRIXED && !accessory.matrixed_sections && feature_value != "None")
message_admins("Sprite Accessory Failure (saving data): Accessory [accessory.type] is a matrixed item without any matrixed sections set!")
continue