overdue refractor on layering code

also probably fixes missing sprites

cfg/admin.txt

@@ -1,125 +0,0 @@
-jayehh role=admin
-optimumtact role=admin
-newsta role=admin
-expletives role=admin
-kingofkosmos role=admin
-mrstonedone role=admin
-microscopics role=admin
-gunhog role=admin
-korphaeron role=admin
-razharas role=admin
-lordpidey role=admin
-niknakflak role=admin
-rolan7 role=admin
-quarxink role=admin
-adrix89 role=admin
-tle role=admin
-xsi role=admin
-scaredofshadows role=admin
-neofite role=admin
-trubblebass role=admin
-mport2004 role=admin
-deuryn role=admin
-agouri role=admin
-errorage role=admin
-superxpdude role=admin
-petethegoat role=admin
-nodrak role=admin
-carnwennan role=admin
-ikarrus role=admin
-cheridan role=admin
-giacomand role=admin
-rockdtben role=admin
-sieve role=admin
-aranclanos role=admin
-intigracy role=admin
-dumpdavidson role=admin
-kazeespada role=admin
-malkevin role=admin
-incoming role=admin
-demas role=admin
-fleure role=admin
-ricotez role=admin
-misterperson role=admin
-crimsonvision role=admin
-iamgoofball role=admin
-zelacks role=admin
-androidsfv role=admin
-miggles role=admin
-jordie0608 role=admin
-s0ldi3rkr4s0 role=admin
-ergovisavi role=admin
-vistapowa role=admin
-miauw62 role=admin
-rumia29 role=admin
-bobylein role=admin
-sirbayer role=admin
-hornygranny role=admin
-yota role=admin
-firecage role=admin
-donkieyo role=admin
-argoneus role=admin
-paprka role=admin
-cookingboy3 role=admin
-limeliz role=admin
-steelpoint role=admin
-phil235 role=admin
-corruptcomputer role=admin
-xxnoob role=admin
-tkdrg role=admin
-cuboos role=admin
-thunder12345 role=admin
-wjohnston role=admin
-mandurrh role=admin
-thurgatar role=admin
-xerux role=admin
-dannno role=admin
-lo6a4evskiy role=admin
-vekter role=admin
-ahammer18 role=admin
-account12 role=admin
-fayrik role=admin
-shadowlight213 role=admin
-drovidicorv role=admin
-dunc role=admin
-mmmiracles role=admin
-bear1ake role=admin
-coreoverload role=admin
-jalleo role=admin
-changelingrain role=admin
-foxpmccloud role=admin
-xhuis role=admin
-astralenigma role=admin
-tokiko1 role=admin
-supersayu role=admin
-lzimann role=admin
-as334 role=admin
-neersighted role=admin
-swankcookie role=admin
-ressler role=admin
-folix role=admin
-bawhoppennn role=admin
-anturke role=admin
-lumipharon role=admin
-bgobandit role=admin
-coiax role=admin
-randommarine role=admin
-pkpenguin321 role=admin
-technoalchemist role=admin
-aloraydrel role=admin
-quiltyquilty role=admin
-snipedragon role=admin
-fjeld role=admin
-kevinz000 role=admin
-tacolizard role=admin
-trustygun role=admin
-cyberboss role=admin
-pjb3005 role=admin
-sweaterkittens role=admin
-feemjmeem role=admin
-jstheguy role=admin
-excessiveuseofcobby role=admin
-plizzard role=admin
-octareenroon91 role=admin
-serpentarium role=admin
-cebutris role=admin

code/modules/mob/living/carbon/human/species.dm

@@ -643,8 +643,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 
 	var/g = (H.gender == FEMALE) ? "f" : "m"
 
-	var/image/I
-
 	for(var/layer in relevent_layers)
 		var/layertext = mutant_bodyparts_layertext(layer)
 
@@ -717,15 +715,10 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			if(bodypart == "xenohead")
 				bodypart = "xhead"
 
-			var/icon_string
-
 			if(S.gender_specific)
 				accessory_overlay.icon_state = "[g]_[bodypart]_[S.icon_state]_[layertext]"
 			else
 				accessory_overlay.icon_state = "m_[bodypart]_[S.icon_state]_[layertext]"
-
-			I = image("icon" = S.icon, "icon_state" = icon_string, "layer" =- layer)
-
 			if(S.center)
 				accessory_overlay = center_image(accessory_overlay, S.dimension_x, S.dimension_y)
 
@@ -773,76 +766,74 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 				standing += inner_accessory_overlay
 
 			if(S.extra) //apply the extra overlay, if there is one
+				var/mutable_appearance/extra_accessory_overlay = mutable_appearance(S.icon, layer = -layer)
 				if(S.gender_specific)
-					icon_string = "[g]_[bodypart]_extra_[S.icon_state]_[layertext]"
+					extra_accessory_overlay.icon_state = "[g]_[bodypart]_extra_[S.icon_state]_[layertext]"
 				else
-					icon_string = "m_[bodypart]_extra_[S.icon_state]_[layertext]"
-
-				I = image("icon" = S.icon, "icon_state" = icon_string, "layer" =- layer)
-
+					extra_accessory_overlay.icon_state = "m_[bodypart]_extra_[S.icon_state]_[layertext]"
 				if(S.center)
-					I = center_image(I,S.dimension_x,S.dimension_y)
+					extra_accessory_overlay = center_image(extra_accessory_overlay, S.dimension_x, S.dimension_y)
+
 
 				switch(S.extra_color_src) //change the color of the extra overlay
 					if(MUTCOLORS)
 						if(fixed_mut_color)
-							I.color = "#[fixed_mut_color]"
+							extra_accessory_overlay.color = "#[fixed_mut_color]"
 						else
-							I.color = "#[H.dna.features["mcolor"]]"
+							extra_accessory_overlay.color = "#[H.dna.features["mcolor"]]"
 					if(MUTCOLORS2)
 						if(fixed_mut_color2)
-							I.color = "#[fixed_mut_color2]"
+							extra_accessory_overlay.color = "#[fixed_mut_color2]"
 						else
-							I.color = "#[H.dna.features["mcolor2"]]"
+							extra_accessory_overlay.color = "#[H.dna.features["mcolor2"]]"
 					if(MUTCOLORS3)
 						if(fixed_mut_color3)
-							I.color = "#[fixed_mut_color3]"
+							extra_accessory_overlay.color = "#[fixed_mut_color3]"
 						else
-							I.color = "#[H.dna.features["mcolor3"]]"
+							extra_accessory_overlay.color = "#[H.dna.features["mcolor3"]]"
 					if(HAIR)
 						if(hair_color == "mutcolor")
-							I.color = "#[H.dna.features["mcolor3"]]"
+							extra_accessory_overlay.color = "#[H.dna.features["mcolor3"]]"
 						else
-							I.color = "#[H.hair_color]"
+							extra_accessory_overlay.color = "#[H.hair_color]"
 					if(FACEHAIR)
-						I.color = "#[H.facial_hair_color]"
+						extra_accessory_overlay.color = "#[H.facial_hair_color]"
 					if(EYECOLOR)
-						I.color = "#[H.eye_color]"
-				standing += I
+						extra_accessory_overlay.color = "#[H.eye_color]"
+				standing += extra_accessory_overlay
 
 			if(S.extra2) //apply the extra overlay, if there is one
+				var/mutable_appearance/extra2_accessory_overlay = mutable_appearance(S.icon, layer = -layer)
 				if(S.gender_specific)
-					icon_string = "[g]_[bodypart]_extra2_[S.icon_state]_[layertext]"
+					extra2_accessory_overlay.icon_state = "[g]_[bodypart]_extra2_[S.icon_state]_[layertext]"
 				else
-					icon_string = "m_[bodypart]_extra2_[S.icon_state]_[layertext]"
-
-				I = image("icon" = S.icon, "icon_state" = icon_string, "layer" =- layer)
-
+					extra2_accessory_overlay.icon_state = "m_[bodypart]_extra2_[S.icon_state]_[layertext]"
 				if(S.center)
-					I = center_image(I,S.dimension_x,S.dimension_y)
+					extra2_accessory_overlay = center_image(extra2_accessory_overlay, S.dimension_x, S.dimension_y)
 
 				switch(S.extra2_color_src) //change the color of the extra overlay
 					if(MUTCOLORS)
 						if(fixed_mut_color)
-							I.color = "#[fixed_mut_color]"
+							extra2_accessory_overlay.color = "#[fixed_mut_color]"
 						else
-							I.color = "#[H.dna.features["mcolor"]]"
+							extra2_accessory_overlay.color = "#[H.dna.features["mcolor"]]"
 					if(MUTCOLORS2)
 						if(fixed_mut_color2)
-							I.color = "#[fixed_mut_color2]"
+							extra2_accessory_overlay.color = "#[fixed_mut_color2]"
 						else
-							I.color = "#[H.dna.features["mcolor2"]]"
+							extra2_accessory_overlay.color = "#[H.dna.features["mcolor2"]]"
 					if(MUTCOLORS3)
 						if(fixed_mut_color3)
-							I.color = "#[fixed_mut_color3]"
+							extra2_accessory_overlay.color = "#[fixed_mut_color3]"
 						else
-							I.color = "#[H.dna.features["mcolor3"]]"
+							extra2_accessory_overlay.color = "#[H.dna.features["mcolor3"]]"
 					if(HAIR)
 						if(hair_color == "mutcolor3")
-							I.color = "#[H.dna.features["mcolor"]]"
+							extra2_accessory_overlay.color = "#[H.dna.features["mcolor"]]"
 						else
-							I.color = "#[H.hair_color]"
-				standing += I
+							extra2_accessory_overlay.color = "#[H.hair_color]"
+				standing += extra2_accessory_overlay
+
 		H.overlays_standing[layer] = standing.Copy()
 		standing = list()