From 5e271c239fe22f8b76ee6a433b5018cf9063d2a3 Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Sat, 8 May 2021 01:31:44 +0100
Subject: [PATCH] conflict resolving caused runtimes

---
 code/modules/client/preferences_savefile.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 339d831881..05370b29cd 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -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)