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

fix for mam markings

Browse Source
This commit is contained in:
timothyteakettle
2020-10-27 21:40:07 +00:00
parent a9f2b86da9
commit a987420d22
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+6 -3
View File
@@ -565,9 +565,12 @@ 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 = "[accessory.mutant_part_string]_primary"
var/secondary_feature = "[accessory.mutant_part_string]_secondary"
var/tertiary_feature = "[accessory.mutant_part_string]_tertiary"
var/mutant_string = accessory.mutant_part_string
if(!mutant_string)
mutant_string = "[accessory]"
var/primary_feature = "[mutant_string]_primary"
var/secondary_feature = "[mutant_string]_secondary"
var/tertiary_feature = "[mutant_string]_tertiary"
if(!features[primary_feature])
features[primary_feature] = features["mcolor"]
if(!features[secondary_feature])
code/modules/client/preferences_savefile.dm
+18 -9
View File
@@ -235,9 +235,12 @@ 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 = "[accessory.mutant_part_string]_primary"
var/secondary_string = "[accessory.mutant_part_string]_secondary]"
var/tertiary_string = "[accessory.mutant_part_string]_tertiary]"
var/mutant_string = accessory.mutant_part_string
if(!mutant_string)
mutant_string = "[accessory]"
var/primary_string = "[mutant_string]_primary"
var/secondary_string = "[mutant_string]_secondary]"
var/tertiary_string = "[mutant_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 +845,12 @@ 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 = "[accessory.mutant_part_string]_primary"
var/secondary_string = "[accessory.mutant_part_string]_secondary]"
var/tertiary_string = "[accessory.mutant_part_string]_tertiary]"
var/mutant_string = accessory.mutant_part_string
if(!mutant_string)
mutant_string = "[accessory]"
var/primary_string = "[mutant_string]_primary"
var/secondary_string = "[mutant_string]_secondary]"
var/tertiary_string = "[mutant_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 +994,12 @@ 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 = "[accessory.mutant_part_string]_primary"
var/secondary_string = "[accessory.mutant_part_string]_secondary]"
var/tertiary_string = "[accessory.mutant_part_string]_tertiary]"
var/mutant_string = accessory.mutant_part_string
if(!mutant_string)
mutant_string = "[accessory]"
var/primary_string = "[mutant_string]_primary"
var/secondary_string = "[mutant_string]_secondary]"
var/tertiary_string = "[mutant_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