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

conflict resolving caused runtimes

Browse Source
This commit is contained in:
Timothy Teakettle
2021-05-08 01:31:44 +01:00
parent 5bc33c222a
commit 5e271c239f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/client/preferences_savefile.dm
View File

@@ -322,9 +322,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
var/list/marking_list = list()
for(var/part in list(ARM_LEFT, ARM_RIGHT, LEG_LEFT, LEG_RIGHT, CHEST, HEAD))
var/list/copied_color_list = color_list.Copy()
var/datum/sprite_accessory/mam_body_markings/S = GLOB.mam_body_markings_list[old_marking_value]
if(length(S.covered_limbs) && S.covered_limbs[part])
var/matrixed_sections = S.covered_limbs[part]
var/datum/sprite_accessory/mam_body_markings/mam_marking = GLOB.mam_body_markings_list[old_marking_value]
if(length(mam_marking.covered_limbs) && mam_marking.covered_limbs[part])
var/matrixed_sections = mam_marking.covered_limbs[part]
// just trust me this is fine
switch(matrixed_sections)
if(MATRIX_GREEN)