Merge pull request #4262 from KasparoVy/IPC-EXTRA-STUFF-REFACTOR

Refactor FBP Parts & Adds Prosthetic Brand Models & More Antennae & Continued....
2026-07-11 23:23:28 +01:00 · 2016-04-26 19:15:19 -04:00
parent 98aa16d572 5b39f2fcc5
commit 8488c976e8
28 changed files with 369 additions and 96 deletions
@@ -91,14 +91,15 @@
 /obj/item/weapon/razor/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
+		var/obj/item/organ/external/head/C = H.organs_by_name["head"]
+		var/datum/robolimb/robohead = all_robolimbs[C.model]
 		if(user.zone_sel.selecting == "mouth")
 			if(!get_location_accessible(H, "mouth"))
 				to_chat(user, "<span class='warning'>The mask is in the way.</span>")
 				return
-			if(H.species && H.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, but doesn't have one...
-				if(!H.client.prefs.rlimb_data["head"])
-					to_chat(user, "<span class='warning'>You find yourself disappointed at the appalling lack of facial hair.</span>")
-					return
+			if((H.species && H.species.flags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
+				to_chat(user, "<span class='warning'>You find yourself disappointed at the appalling lack of facial hair.</span>")
+				return
 			if(H.f_style == "Shaved")
 				to_chat(user, "<span class='notice'>Already clean-shaven.</span>")
 				return
@@ -127,10 +128,9 @@
 			if(!get_location_accessible(H, "head"))
 				to_chat(user, "<span class='warning'>The headgear is in the way.</span>")
 				return
-			if(H.species && H.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, but doesn't have one...
-				if(!H.client.prefs.rlimb_data["head"])
-					to_chat(user, "<span class='warning'>You find yourself disappointed at the appalling lack of hair.</span>")
-					return
+			if((H.species && H.species.flags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
+				to_chat(user, "<span class='warning'>You find yourself disappointed at the appalling lack of hair.</span>")
+				return
 			if(H.h_style == "Bald" || H.h_style == "Balding Hair" || H.h_style == "Skinhead")
 				to_chat(user, "<span class='notice'>There is not enough hair left to shave...</span>")
 				return
@@ -30,17 +30,26 @@
 		//this is largely copypasted from there.
 		//handle facial hair (if necessary)
 		var/list/species_facial_hair = list()
+		var/obj/item/organ/external/head/C = H.organs_by_name["head"]
+		var/datum/robolimb/robohead = all_robolimbs[C.model]
 		if(H.gender == MALE || H.get_species() == "Vulpkanin")
 			if(H.species)
 				for(var/i in facial_hair_styles_list)
 					var/datum/sprite_accessory/facial_hair/tmp_facial = facial_hair_styles_list[i]
 					if(H.species.name in tmp_facial.species_allowed)  //If the species is allowed to have the style, add the style to the list. Or, if the character has a prosthetic head, give them the human hair styles.
+						if(H.species.flags & ALL_RPARTS) //If the character is of a species that can have full body prosthetics and their head doesn't suport human hair 'wigs', don't add the style to the list.
+							if(robohead.is_monitor)
+								to_chat(user, "<span class='warning'>You are unable to find anything on [H]'s face worth cutting. How disappointing.</span>")
+								return
+							continue //If the head DOES support human hair wigs, make sure they don't get monitor-oriented styles.
 						species_facial_hair += i
 					else
-						if(H.species.flags & ALL_RPARTS)
-							if(("head" in H.client.prefs.rlimb_data) && ("Human" in tmp_facial.species_allowed))
-								species_facial_hair += i
-							else
+						if(H.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, and the head supports human hair 'wigs' AND the hair-style is human-suitable, add it to the list.
+							if(!robohead.is_monitor)
+								if("Human" in tmp_facial.species_allowed)
+									species_facial_hair += i
+							else //Otherwise, they won't be getting any hairstyles.
+								to_chat(user, "<span class='warning'>You are unable to find anything on [H]'s face worth cutting. How disappointing.</span>")
 								return
 			else
 				species_facial_hair = facial_hair_styles_list
@@ -51,14 +60,19 @@
 			for(var/i in hair_styles_list)
 				var/datum/sprite_accessory/hair/tmp_hair = hair_styles_list[i]
 				if(H.species.name in tmp_hair.species_allowed) //If the species is allowed to have the style, add the style to the list. Or, if the character has a prosthetic head, give them the human facial hair styles.
-					if((H.species.flags & ALL_RPARTS) && !("head" in H.client.prefs.rlimb_data))
-						return
+					if(H.species.flags & ALL_RPARTS) //If the character is of a species that can have full body prosthetics and their head doesn't suport human hair 'wigs', don't add the style to the list.
+						if(robohead.is_monitor)
+							to_chat(user, "<span class='warning'>You are unable to find anything on [H]'s head worth cutting. How disappointing.</span>")
+							return
+						continue //If the head DOES support human hair wigs, make sure they don't get monitor-oriented styles.
 					species_hair += i
 				else
-					if(H.species.flags & ALL_RPARTS)
-						if(("head" in H.client.prefs.rlimb_data) && ("Human" in tmp_hair.species_allowed))
-							species_facial_hair += i
-						else
+					if(H.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, and the head supports human hair 'wigs' AND the hair-style is human-suitable, add it to the list.
+						if(!robohead.is_monitor)
+							if("Human" in tmp_hair.species_allowed)
+								species_hair += i
+						else //Otherwise, they won't be getting any hairstyles.
+							to_chat(user, "<span class='warning'>You are unable to find anything on [H]'s head worth cutting. How disappointing.</span>")
 							return
 		else
 			species_hair = hair_styles_list
@@ -103,7 +117,7 @@
 				playsound(loc, "sound/items/Wirecutter.ogg", 50, 1, -1)
 			if(do_after(user, 50, target = H))
 				playsound(loc, "sound/weapons/bladeslice.ogg", 50, 1, -1)
-				user.visible_message("<span class='danger'>[user] abruptly stops cutting [M]'s hair and slices their throat!</span>", "<span class='danger'>You stop cutting [M]'s hair and slice their throat!</span>")
+				user.visible_message("<span class='danger'>[user] abruptly stops cutting [M]'s hair and slices their throat!</span>", "<span class='danger'>You stop cutting [M]'s hair and slice their throat!</span>") //Just a little off the top.
 				H.losebreath += 10 //30 Oxy damage over time
 				H.apply_damage(18, BRUTE, "head", sharp =1, edge =1, used_weapon = "scissors")
 				var/turf/location = get_turf(H)
@@ -1189,8 +1189,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 				if("hair")
 					if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Machine" || species == "Vulpkanin")
 						var/input = "Choose your character's hair colour:"
-						if(species == "Machine" && !("head" in rlimb_data))
-							input = "Choose your character's frame colour:"
 						var/new_hair = input(user, input, "Character Preference", rgb(r_hair, g_hair, b_hair)) as color|null
 						if(new_hair)
 							r_hair = hex2num(copytext(new_hair, 2, 4))
@@ -1202,18 +1200,25 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 					for(var/hairstyle in hair_styles_list)
 						var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
 						if(species == "Machine") //Species that can use prosthetic heads.
-							if(species in S.species_allowed)
-								if(!rlimb_data["head"])
-									valid_hairstyles[hairstyle] = S
-									continue
-								else
-									continue
+							var/obj/item/organ/external/head/H = new()
+							if(S.name == "Bald")
+								valid_hairstyles[hairstyle] = S
+							if(!rlimb_data["head"]) //Handle situations where the head is default.
+								H.model = "Morpheus Cyberkinetics"
 							else
-								if(!rlimb_data["head"])
+								H.model = rlimb_data["head"]
+							var/datum/robolimb/robohead = all_robolimbs[H.model]
+							if(species in S.species_allowed)
+								if(robohead.is_monitor && (robohead.company in S.models_allowed)) //If the Machine character has the default Morpheus screen head or another screen head
+																														   //and said head is in the hair style's allowed models list...
+									valid_hairstyles[hairstyle] = S //Allow them to select the hairstyle.
+								continue
+							else
+								if(robohead.is_monitor) //Monitors (incl. the default morpheus head) cannot have wigs (human hairstyles).
 									continue
-								else if("Human" in S.species_allowed)
+								else if(!robohead.is_monitor && ("Human" in S.species_allowed))
 									valid_hairstyles[hairstyle] = S
-									continue
+								continue
 						else
 							if(!(species in S.species_allowed))
 								continue
@@ -1225,7 +1230,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 						h_style = new_h_style

 				if("headaccessory")
-					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) // Species with head accessories
+					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with head accessories.
 						var/input = "Choose the colour of your your character's head accessory:"
 						var/new_head_accessory = input(user, input, "Character Preference", rgb(r_headacc, g_headacc, b_headacc)) as color|null
 						if(new_head_accessory)
@@ -1234,7 +1239,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 							b_headacc = hex2num(copytext(new_head_accessory, 6, 8))

 				if("ha_style")
-					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) // Species with head accessories
+					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with head accessories.
 						var/list/valid_head_accessory_styles = list()
 						for(var/head_accessory_style in head_accessory_styles_list)
 							var/datum/sprite_accessory/H = head_accessory_styles_list[head_accessory_style]
@@ -1248,7 +1253,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 							ha_style = new_head_accessory_style

 				if("markings")
-					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) // Species with markings
+					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with markings.
 						var/input = "Choose the colour of your your character's markings:"
 						var/new_markings = input(user, input, "Character Preference", rgb(r_markings, g_markings, b_markings)) as color|null
 						if(new_markings)
@@ -1257,7 +1262,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 							b_markings = hex2num(copytext(new_markings, 6, 8))

 				if("m_style")
-					if(species in list("Unathi", "Vulpkanin", "Tajaran")) // Species with markings
+					if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with markings.
 						var/list/valid_markings = list()
 						for(var/markingstyle in marking_styles_list)
 							var/datum/sprite_accessory/M = marking_styles_list[markingstyle]
@@ -1265,10 +1270,17 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 								continue

 							if(species == "Machine") //Species that can use prosthetic heads.
-								if(!("head" in rlimb_data) && M.name != "None") //If the character can have prosthetic heads and they have the default head (with screen), no optic markings.
-									continue
-								else if(("head" in rlimb_data) && M.name == "None") //Otherwise, if they DON'T have the default head and since they must have optics, give them a list of styles excluding the "None" option.
+								var/obj/item/organ/external/head/H = new()
+								if(!rlimb_data["head"]) //Handle situations where the head is default.
+									H.model = "Morpheus Cyberkinetics"
+								else
+									H.model = rlimb_data["head"]
+								var/datum/robolimb/robohead = all_robolimbs[H.model]
+								if(robohead.is_monitor && M.name != "None") //If the character can have prosthetic heads and they have the default Morpheus head (or another monitor-head), no optic markings.
 									continue
+								else if(!robohead.is_monitor && M.name != "None") //Otherwise, if they DON'T have the default head and the head's not a monitor but the head's not in the style's list of allowed models, skip.
+									if(!(robohead.company in M.models_allowed))
+										continue

 							valid_markings[markingstyle] = marking_styles_list[markingstyle]

@@ -1304,25 +1316,29 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 					var/list/valid_facialhairstyles = list()
 					for(var/facialhairstyle in facial_hair_styles_list)
 						var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
+						if(S.name == "Shaved")
+							valid_facialhairstyles[facialhairstyle] = S
 						if(gender == MALE && S.gender == FEMALE)
 							continue
 						if(gender == FEMALE && S.gender == MALE)
 							continue
 						if(species == "Machine") //Species that can use prosthetic heads.
-							if(species in S.species_allowed)
-								if(!rlimb_data["head"])
-									valid_facialhairstyles[facialhairstyle] = S
-									continue
-								else
-									continue
+							var/obj/item/organ/external/head/H = new()
+							if(!rlimb_data["head"]) //Handle situations where the head is default.
+								H.model = "Morpheus Cyberkinetics"
 							else
-								if(!rlimb_data["head"])
-									continue
-								else if("Human" in S.species_allowed)
+								H.model = rlimb_data["head"]
+							var/datum/robolimb/robohead = all_robolimbs[H.model]
+							if(species in S.species_allowed)
+								if(robohead.is_monitor) //If the Machine character has the default Morpheus screen head or another screen head and they're allowed to have the style, let them have it.
 									valid_facialhairstyles[facialhairstyle] = S
+								continue
+							else
+								if(robohead.is_monitor) //Monitors (incl. the default morpheus head) cannot have wigs (human facial hairstyles).
 									continue
-								else
-									continue
+								else if(!robohead.is_monitor && ("Human" in S.species_allowed))
+									valid_facialhairstyles[facialhairstyle] = S
+								continue
 						else
 							if(!(species in S.species_allowed))
 								continue
@@ -1493,18 +1509,51 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 									organ_data[second_limb] = "amputated"
 									rlimb_data[second_limb] = null
 						if("Prosthesis")
-							var/choice = input(user, "Which manufacturer do you wish to use for this limb?") as null|anything in chargen_robolimbs
+							var/choice
+							var/subchoice
+							var/datum/robolimb/R = new()
+							var/in_model
+							var/robolimb_companies = list()
+							for(var/limb_type in typesof(/datum/robolimb)) //This loop populates a list of companies that offer the limb the user selected previously as one of their cybernetic products.
+								R = new limb_type()
+								if(!R.unavailable_at_chargen && (limb in R.parts) && R.has_subtypes) //Ensures users can only choose companies that offer the parts they want, that singular models get added to the list as well companies that offer more than one model, and...
+									robolimb_companies[R.company] = R //List only main brands that have the parts we're looking for.
+							R = new() //Re-initialize R.
+
+							choice = input(user, "Which manufacturer do you wish to use for this limb?") as null|anything in robolimb_companies //Choose from a list of companies that offer the part the user wants.
 							if(!choice)
 								return
+							R.company = choice
+							R = all_robolimbs[R.company]
+							if(R.has_subtypes == 1) //If the company the user selected provides more than just one base model, lets handle it.
+								var/list/robolimb_models = list()
+								for(var/limb_type in typesof(R)) //Handling the different models of parts that manufacturers can provide.
+									var/datum/robolimb/L = new limb_type()
+									if(limb in L.parts) //Make sure that only models that provide the parts the user needs populate the list.
+										robolimb_models[L.company] = L
+										if(robolimb_models.len == 1) //If there's only one model available in the list, autoselect it to avoid having to bother the user with a dialog that provides only one option.
+											subchoice = L.company //If there ends up being more than one model populating the list, subchoice will be overwritten later anyway, so this isn't a problem.
+										if(second_limb in L.parts) //If the child limb of the limb the user selected is also present in the model's parts list, state it's been found so the second limb can be set later.
+											in_model = 1
+								if(robolimb_models.len > 1) //If there's more than one model in the list that can provide the part the user wants, let them choose.
+									subchoice = input(user, "Which model of [choice] [limb_name] do you wish to use?") as null|anything in robolimb_models
+								if(subchoice)
+									choice = subchoice
 							if(limb == "head")
-								m_style = "Humanoid Optics"
 								ha_style = "None"
 								h_style = hair_styles_list["Bald"]
+								f_style = facial_hair_styles_list["Shaved"]
+								m_style = "None"
 							rlimb_data[limb] = choice
 							organ_data[limb] = "cyborg"
 							if(second_limb)
-								rlimb_data[second_limb] = choice
-								organ_data[second_limb] = "cyborg"
+								if(subchoice)
+									if(in_model)
+										rlimb_data[second_limb] = choice
+										organ_data[second_limb] = "cyborg"
+								else
+									rlimb_data[second_limb] = choice
+									organ_data[second_limb] = "cyborg"

 				if("organs")
 					var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes")
@@ -179,16 +179,17 @@
 			continue
 		if(species.flags & ALL_RPARTS) //If the user is a species who can have a robotic head...
 			var/obj/item/organ/external/head/H = organs_by_name["head"]
+			var/datum/robolimb/robohead = all_robolimbs[H.model]
 			if(!H)
 				return
 			if(species.name in S.species_allowed) //If this is a hairstyle native to the user's species...
-				if(H.model == "Morpheus Cyberkinetics") //Check to see if they have the default head.
+				if(robohead.is_monitor && (robohead.company in S.models_allowed)) //Check to see if they have a head with an ipc-style screen and that the head's company is in the screen style's allowed models list.
 					valid_hairstyles += hairstyle //Give them their hairstyles if they do.
 					continue
 				else //If they don't have the default head, they shouldn't be getting any hairstyles they wouldn't normally.
 					continue
 			else
-				if(H.model == "Morpheus Cyberkinetics") //If the hairstyle is not native to the user's species, and they're using the default head, don't let them access it.
+				if(robohead.is_monitor) //If the hair style is not native to the user's species and they're using a head with an ipc-style screen, don't let them access it.
 					continue
 				else
 					if("Human" in S.species_allowed) //If the user has a robotic head and the hairstyle can fit humans, let them use it as a wig for their humanoid robot head.
@@ -212,17 +213,18 @@
 			continue
 		if(species.flags & ALL_RPARTS) //If the user is a species who can have a robotic head...
 			var/obj/item/organ/external/head/H = organs_by_name["head"]
+			var/datum/robolimb/robohead = all_robolimbs[H.model]
 			if(!H)
 				continue // No head, no hair
 			if(species.name in S.species_allowed) //If this is a facial hair style native to the user's species...
-				if(H.model == "Morpheus Cyberkinetics") //Check to see if they have the default head.
+				if(robohead.is_monitor && (robohead.company in S.models_allowed)) //Check to see if they have a head with an ipc-style screen and that the head's company is in the screen style's allowed models list.
 					valid_facial_hairstyles += facialhairstyle //Give them their facial hair styles if they do.
 					continue
 				else //If they don't have the default head, they shouldn't be getting any facial hair styles they wouldn't normally.
 					continue
 			else

-				if(H.model == "Morpheus Cyberkinetics") //If the facial hair style is not native to the user's species, and they're using the default head, don't let them access it.
+				if(robohead.is_monitor) //If the facial hair style is not native to the user's species and they're using a head with an ipc-style screen, don't let them access it.
 					continue
 				else
 					if("Human" in S.species_allowed) //If the user has a robotic head and the facial hair style can fit humans, let them use it as a postiche for their humanoid robot head.
@@ -1591,24 +1591,37 @@
 		to_chat(src, "<span class='warning'>You cannot change your monitor or optical display in your current state.</span>")
 		return

+	var/obj/item/organ/external/head/head_organ = get_organ("head")
+	if(!head_organ || head_organ.is_stump() || (head_organ.status & ORGAN_DESTROYED)) //If the rock'em-sock'em robot's head came off during a fight, they shouldn't be able to change their screen/optics.
+		to_chat(src, "<span class='warning'>Where's your head at? Can't change your monitor/display without one.</span>")
+		return
+
 	if(species.flags & ALL_RPARTS) //If they can have a fully cybernetic body...
-		if(client.prefs.rlimb_data["head"]) //If head is present here, that means it's not the default Morpheus. Thus, no screen to adjust. Instead, let them change the colour of their optics!
+		var/obj/item/organ/external/head/H = organs_by_name["head"]
+		var/datum/robolimb/robohead = all_robolimbs[H.model]
+		if(!H)
+			return
+		if(!robohead.is_monitor) //If they've got a prosthetic head and it isn't a monitor, they've no screen to adjust. Instead, let them change the colour of their optics!
 			var/optic_colour = input(src, "Select optic colour", rgb(r_markings, g_markings, b_markings)) as color|null
+			if(incapacitated())
+				to_chat(src, "<span class='warning'>You were interrupted while changing the colour of your optics.</span>")
+				return
 			if(optic_colour)
 				r_markings = hex2num(copytext(optic_colour, 2, 4))
 				g_markings = hex2num(copytext(optic_colour, 4, 6))
 				b_markings = hex2num(copytext(optic_colour, 6, 8))

 			update_markings()
-		else if(!client.prefs.rlimb_data["head"])//Means that the character has the default Morpheus head, which has a screen. Time to customize.
+		else if(robohead.is_monitor) //Means that the character's head is a monitor (has a screen). Time to customize.
 			var/list/hair = list()
 			for(var/i in hair_styles_list)
 				var/datum/sprite_accessory/hair/tmp_hair = hair_styles_list[i]
-				if(species.name in tmp_hair.species_allowed)
+				if((species.name in tmp_hair.species_allowed) && (robohead.company in tmp_hair.models_allowed)) //Populate the list of available monitor styles only with styles that the monitor-head is allowed to use.
 					hair += i

 			var/new_style = input(src, "Select a monitor display", "Monitor Display", h_style)  as null|anything in hair
 			if(incapacitated())
+				to_chat(src, "<span class='warning'>You were interrupted while changing your monitor display.</span>")
 				return
 			if(new_style)
 				h_style = new_style
@@ -361,6 +361,9 @@ var/global/list/damage_icon_parts = list()
 	if(m_style && m_style != "None")
 		var/datum/sprite_accessory/marking_style = marking_styles_list[m_style]
 		if(marking_style)
+			var/obj/item/organ/external/head/head_organ = get_organ("head")
+			if((!head_organ || head_organ.is_stump() || (head_organ.status & ORGAN_DESTROYED)) && marking_style.marking_location == "head")
+				return //If the head is destroyed and it is the organ the marking is located on, get us out of here. This prevents floating optical markings on decapitated IPCs, for example.
 			var/icon/markings_s = new/icon("icon" = marking_style.icon, "icon_state" = "[marking_style.icon_state]_s")
 			if(marking_style.do_colouration)
 				markings_s.Blend(rgb(r_markings, g_markings, b_markings), ICON_ADD)
@@ -397,7 +400,8 @@ var/global/list/damage_icon_parts = list()
 				var/icon/head_accessory_s = new/icon("icon" = head_accessory_style.icon, "icon_state" = "[head_accessory_style.icon_state]_s")
 				if(head_accessory_style.do_colouration)
 					head_accessory_s.Blend(rgb(r_headacc, g_headacc, b_headacc), ICON_ADD)
-				head_accessory_standing.Blend(head_accessory_s, ICON_OVERLAY)
+				head_accessory_standing = head_accessory_s //head_accessory_standing.Blend(head_accessory_s, ICON_OVERLAY)
+														   //Having it this way preserves animations. Useful for animated antennae.
 		else
 			//warning("Invalid ha_style for [species.name]: [ha_style]")

@@ -437,7 +441,8 @@ var/global/list/damage_icon_parts = list()
 				else if(hair_style.do_colouration)
 					hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)

-				hair_standing.Blend(hair_s, ICON_OVERLAY)
+				hair_standing = hair_s //hair_standing.Blend(hair_s, ICON_OVERLAY)
+									   //Having it this way preserves animations. Useful for IPC screens.
 		else
 			//warning("Invalid h_style for [species.name]: [h_style]")
 		//hair_standing.Blend(debrained_s, ICON_OVERLAY)//how does i overlay for fish?
@@ -43,6 +43,8 @@

 	// Restrict some styles to specific species
 	var/list/species_allowed = list("Human", "Slime People")
+	var/models_allowed = list() //Specifies which, if any, hairstyles can be accessed by which prosthetics. Should equal the manufacturing company name in robolimbs.dm.
+	var/marking_location //Specifies which bodypart a body marking is located on.

 	// Whether or not the accessory can be affected by colouration
 	var/do_colouration = 1
@@ -57,7 +59,6 @@
 */

 /datum/sprite_accessory/hair
-
 	icon = 'icons/mob/human_face.dmi'	  // default icon for all hairs

 	bald
@@ -379,105 +380,169 @@
 //////END VG HAIRSTYLES///////
 //////////////////////////////

+
 	ipc_screen_pink
-		name = "pink IPC screen"
+		name = "Pink IPC Screen"
 		icon_state = "ipc_pink"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_red
-		name = "red IPC screen"
+		name = "Red IPC Screen"
 		icon_state = "ipc_red"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_green
-		name = "green IPC screen"
+		name = "Green IPC Screen"
 		icon_state = "ipc_green"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_blue
-		name = "blue IPC screen"
+		name = "Blue IPC Screen"
 		icon_state = "ipc_blue"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_breakout
-		name = "breakout IPC screen"
+		name = "Breakout IPC Screen"
 		icon_state = "ipc_breakout"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_eight
-		name = "eight IPC screen"
+		name = "Eight IPC Screen"
 		icon_state = "ipc_eight"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_rainbow
-		name = "rainbow IPC screen"
+		name = "Rainbow IPC Screen"
 		icon_state = "ipc_rainbow"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_goggles
-		name = "goggles IPC screen"
+		name = "Goggles IPC Screen"
 		icon_state = "ipc_goggles"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_heart
-		name = "heart IPC screen"
+		name = "Heart IPC Screen"
 		icon_state = "ipc_heart"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_monoeye
-		name = "monoeye IPC screen"
+		name = "Monoeye IPC Screen"
 		icon_state = "ipc_monoeye"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_nature
-		name = "nature IPC screen"
+		name = "Nature IPC Screen"
 		icon_state = "ipc_nature"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_orange
-		name = "orange IPC screen"
+		name = "Orange IPC Screen"
 		icon_state = "ipc_orange"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_purple
-		name = "purple IPC screen"
+		name = "Purple IPC Screen"
 		icon_state = "ipc_purple"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_shower
-		name = "shower IPC screen"
+		name = "Shower IPC Screen"
 		icon_state = "ipc_shower"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_static
-		name = "static IPC screen"
+		name = "Static IPC Screen"
 		icon_state = "ipc_static"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_yellow
-		name = "yellow IPC screen"
+		name = "Yellow IPC Screen"
 		icon_state = "ipc_yellow"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_scrolling
-		name = "scanline IPC screen"
+		name = "Scanline IPC Screen"
 		icon_state = "ipc_scroll"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_console
-		name = "console IPC screen"
+		name = "Console IPC Screen"
 		icon_state = "ipc_console"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_rgb
-		name = "rgb IPC screen"
+		name = "RGB IPC Screen"
 		icon_state = "ipc_rgb"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")

 	ipc_screen_glider
-		name = "glider IPC screen"
+		name = "Glider IPC Screen"
 		icon_state = "ipc_gol_glider"
 		species_allowed = list("Machine")
+		models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
+
+	hesphiastos_alt_off
+		name = "Dark Hesphiastos Screen"
+		icon_state = "hesphiastos_alt_off"
+		species_allowed = list("Machine")
+		models_allowed = list("Hesphiastos Industries alt.")
+
+	hesphiastos_alt_pink
+		name = "Pink Hesphiastos Screen"
+		icon_state = "hesphiastos_alt_pink"
+		species_allowed = list("Machine")
+		models_allowed = list("Hesphiastos Industries alt.")
+
+	hesphiastos_alt_orange
+		name = "Orange Hesphiastos Screen"
+		icon_state = "hesphiastos_alt_orange"
+		species_allowed = list("Machine")
+		models_allowed = list("Hesphiastos Industries alt.")
+
+	hesphiastos_alt_goggle
+		name = "Goggles Hesphiastos Screen"
+		icon_state = "hesphiastos_alt_goggles"
+		species_allowed = list("Machine")
+		models_allowed = list("Hesphiastos Industries alt.")
+
+	hesphiastos_alt_scroll
+		name = "Scrolling Hesphiastos Screen"
+		icon_state = "hesphiastos_alt_scroll"
+		species_allowed = list("Machine")
+		models_allowed = list("Hesphiastos Industries alt.")
+
+	hesphiastos_alt_rgb
+		name = "RGB Hesphiastos Screen"
+		icon_state = "hesphiastos_alt_rgb"
+		species_allowed = list("Machine")
+		models_allowed = list("Hesphiastos Industries alt.")
+
+	hesphiastos_alt_rainbow
+		name = "Rainbow Hesphiastos Screen"
+		icon_state = "hesphiastos_alt_rainbow"
+		species_allowed = list("Machine")
+		models_allowed = list("Hesphiastos Industries alt.")
+

 /*
 ///////////////////////////////////
@@ -496,8 +561,7 @@
 		name = "Shaved"
 		icon_state = "bald"
 		gender = NEUTER
-		species_allowed = list("Human", "Unathi", "Tajaran", "Skrell", "Vox", "Diona", "Kidan", "Greys", "Machine", "Vulpkanin", "Slime People")
-
+		species_allowed = list("Human", "Unathi", "Tajaran", "Skrell", "Vox", "Diona", "Kidan", "Greys", "Vulpkanin", "Slime People")

 	watson
 		name = "Watson Mustache"
@@ -1785,6 +1849,21 @@
 	icon_state = "antennae"
 	species_allowed = list("Machine")

+/datum/sprite_accessory/head_accessory/ipc_tv_antennae
+	name = "T.V. Antennae"
+	icon_state = "tvantennae"
+	species_allowed = list("Machine")
+
+/datum/sprite_accessory/head_accessory/ipc_tesla_antennae
+	name = "Tesla Antennae"
+	icon_state = "tesla"
+	species_allowed = list("Machine")
+
+/datum/sprite_accessory/head_accessory/ipc_light
+	name = "Head Light"
+	icon_state = "light"
+	species_allowed = list("Machine")
+

 /* BODY MARKINGS */

@@ -1832,6 +1911,32 @@
 	name = "Humanoid Optics"
 	species_allowed = list("Machine")
 	icon_state = "optics"
+	models_allowed = list("Bishop Cybernetics", "Hesphiastos Industries", "Ward-Takahashi", "Xion Manufacturing Group", "Zeng-Hu Pharmaceuticals") //Should be the same as the manufacturing company of the limb in robolimbs.dm
+	marking_location = "head"
+
+/datum/sprite_accessory/body_markings/optics/bishop_alt
+	name = "Bishop Alt. Optics"
+	species_allowed = list("Machine")
+	icon_state = "bishop_alt_optics"
+	models_allowed = list("Bishop Cybernetics alt.")
+
+/datum/sprite_accessory/body_markings/optics/morpheus_alt
+	name = "Morpheus Alt. Optics"
+	species_allowed = list("Machine")
+	icon_state = "morpheus_alt_optics"
+	models_allowed = list("Morpheus Cyberkinetics alt.")
+
+/datum/sprite_accessory/body_markings/optics/wardtakahashi_alt
+	name = "Ward-Takahashi Alt. Optics"
+	species_allowed = list("Machine")
+	icon_state = "wardtakahashi_alt_optics"
+	models_allowed = list("Ward-Takahashi alt.")
+
+/datum/sprite_accessory/body_markings/optics/xion_alt
+	name = "Xion Alt. Optics"
+	species_allowed = list("Machine")
+	icon_state = "xion_alt_optics"
+	models_allowed = list("Xion Manufacturing Group alt.")

 /datum/sprite_accessory/body_markings/tattoo // Tattoos applied post-round startup with tattoo guns in item_defines.dm
 	name = "base tattoo"
@@ -97,7 +97,10 @@
 	E.forceMove(target)
 	if(target.get_species() == "Machine")//as this is the only step needed for ipc put togethers
 		if(target_zone == "head")
-			target.h_style = ""
+			var/obj/item/organ/external/head/H = target.organs_by_name["head"]
+			var/datum/robolimb/robohead = all_robolimbs[H.model]
+			if(robohead.is_monitor) //Ensures that if an IPC gets a head that's got a human hair wig attached to their body, the hair won't wipe.
+				target.h_style = ""
 		E.status &= ~ORGAN_DESTROYED
 		if(E.children)
 			for(var/obj/item/organ/external/C in E.children)
@@ -71,6 +71,14 @@ var/global/list/limb_icon_cache = list()
 		overlays |= lip_icon
 		mob_icon.Blend(lip_icon, ICON_OVERLAY)

+	if(owner.m_style)
+		var/datum/sprite_accessory/marking_style = marking_styles_list[owner.m_style]
+		if(marking_style && marking_style.species_allowed && (species.name in marking_style.species_allowed) && marking_style.marking_location == "head")
+			var/icon/markings_s = new/icon("icon" = marking_style.icon, "icon_state" = "[marking_style.icon_state]_s")
+			if(marking_style.do_colouration)
+				markings_s.Blend(rgb(owner.r_markings, owner.g_markings, owner.b_markings), ICON_ADD)
+			overlays |= markings_s
+
 	if(owner.ha_style)
 		var/datum/sprite_accessory/head_accessory_style = head_accessory_styles_list[owner.ha_style]
 		if(head_accessory_style && head_accessory_style.species_allowed && (species.name in head_accessory_style.species_allowed))
@@ -81,7 +89,7 @@ var/global/list/limb_icon_cache = list()

 	if(owner.f_style)
 		var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[owner.f_style]
-		if(facial_hair_style && facial_hair_style.species_allowed && (species.name in facial_hair_style.species_allowed))
+		if(facial_hair_style && ((facial_hair_style.species_allowed && (species.name in facial_hair_style.species_allowed)) || (src.species.flags & ALL_RPARTS)))
 			var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
 			if(species.name == "Slime People") // I am el worstos
 				facial_s.Blend(rgb(owner.r_skin, owner.g_skin, owner.b_skin, 160), ICON_AND)
@@ -91,7 +99,7 @@ var/global/list/limb_icon_cache = list()

 	if(owner.h_style && !(owner.head && (owner.head.flags & BLOCKHEADHAIR)))
 		var/datum/sprite_accessory/hair_style = hair_styles_list[owner.h_style]
-		if(hair_style && (species.name in hair_style.species_allowed))
+		if(hair_style && ((species.name in hair_style.species_allowed) || (src.species.flags & ALL_RPARTS)))
 			var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
 			if(species.name == "Slime People") // I am el worstos
 				hair_s.Blend(rgb(owner.r_skin, owner.g_skin, owner.b_skin, 160), ICON_AND)
@@ -1,4 +1,5 @@
 var/global/list/all_robolimbs = list()
+var/global/list/robolimb_data = list()
 var/global/list/chargen_robolimbs = list()
 var/global/datum/robolimb/basic_robolimb

@@ -9,41 +10,114 @@ var/global/datum/robolimb/basic_robolimb
 		all_robolimbs[R.company] = R
 		if(!R.unavailable_at_chargen)
 			if(R != "head" && R != "chest" && R != "groin" ) //Part of the method that ensures only IPCs can access head, chest and groin prosthetics.
-				chargen_robolimbs[R.company] = R
+				if(R.has_subtypes) //Ensures solos get added to the list as well be incorporating has_subtypes == 1 and has_subtypes == 2.
+					chargen_robolimbs[R.company] = R //List only main brands and solo parts.

 /datum/robolimb
 	var/company = "Unbranded"                            // Shown when selecting the limb.
 	var/desc = "A generic unbranded robotic prosthesis." // Seen when examining a limb.
 	var/icon = 'icons/mob/human_races/robotic.dmi'       // Icon base to draw from.
 	var/unavailable_at_chargen                           // If set, not available at chargen.
+	var/is_monitor										 // If set, limb is a monitor and should be getting monitor styles.
+	var/has_subtypes = 2								 // If null, object is a model. If 1, object is a brand (that serves as the default model) with child models. If 2, object is a brand that has no child models and thus also serves as the model..
+	var/parts = list("chest", "groin", "head", "r_arm", "r_hand", "r_leg", "r_foot", "l_leg", "l_foot", "l_arm", "l_hand")	//Defines what parts said brand can replace on a body.

 /datum/robolimb/bishop
 	company = "Bishop Cybernetics"
 	desc = "This limb has a white polymer casing with blue holo-displays."
-	icon = 'icons/mob/human_races/cyberlimbs/bishop.dmi'
+	icon = 'icons/mob/human_races/cyberlimbs/bishop/bishop_main.dmi'
+	has_subtypes = 1

-/datum/robolimb/hesphaistos
+/datum/robolimb/bishop/alt1
+	company = "Bishop Cybernetics alt."
+	icon = 'icons/mob/human_races/cyberlimbs/bishop/bishop_alt1.dmi'
+	parts = list("head")
+	has_subtypes = null
+
+/datum/robolimb/bishop/monitor
+	company = "Bishop Cybernetics mtr."
+	icon = 'icons/mob/human_races/cyberlimbs/bishop/bishop_monitor.dmi'
+	parts = list("head")
+	is_monitor = 1
+	has_subtypes = null
+
+/datum/robolimb/hesphiastos
 	company = "Hesphiastos Industries"
 	desc = "This limb has a militaristic black and green casing with gold stripes."
-	icon = 'icons/mob/human_races/cyberlimbs/hesphaistos.dmi'
+	icon = 'icons/mob/human_races/cyberlimbs/hesphiastos/hesphiastos_main.dmi'
+	has_subtypes = 1

-/datum/robolimb/ipc
+/datum/robolimb/hesphiastos/alt1
+	company = "Hesphiastos Industries alt."
+	icon = 'icons/mob/human_races/cyberlimbs/hesphiastos/hesphiastos_alt1.dmi'
+	parts = list("head")
+	is_monitor = 1
+	has_subtypes = null
+
+/datum/robolimb/hesphiastos/monitor
+	company = "Hesphiastos Industries mtr."
+	icon = 'icons/mob/human_races/cyberlimbs/hesphiastos/hesphiastos_monitor.dmi'
+	parts = list("head")
+	is_monitor = 1
+	has_subtypes = null
+
+/datum/robolimb/morpheus
 	company = "Morpheus Cyberkinetics"
 	desc = "This limb is simple and functional; no effort has been made to make it look human."
-	icon = 'icons/mob/human_races/cyberlimbs/ipc.dmi'
+	icon = 'icons/mob/human_races/cyberlimbs/morpheus/morpheus_main.dmi'
 	unavailable_at_chargen = 1
+	is_monitor = 1
+	has_subtypes = 1
+
+/datum/robolimb/morpheus/alt1
+	company = "Morpheus Cyberkinetics alt."
+	icon = 'icons/mob/human_races/cyberlimbs/morpheus/morpheus_alt1.dmi'
+	parts = list("head")
+	unavailable_at_chargen = null
+	is_monitor = null
+	has_subtypes = 2 //Edge case. We want to be able to pick this one, and if we had it left as null for has_subtypes we'd be assuming it'll be chosen as a child model,
+					 //and since the parent is unavailable at chargen, we wouldn't be able to see it in the list anyway. Now, we'll be able to select the Morpheus Ckt. Alt. head as a solo-model.

 /datum/robolimb/wardtakahashi
 	company = "Ward-Takahashi"
 	desc = "This limb features sleek black and white polymers."
-	icon = 'icons/mob/human_races/cyberlimbs/wardtakahashi.dmi'
+	icon = 'icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_main.dmi'
+	has_subtypes = 1
+
+/datum/robolimb/wardtakahashi/alt1
+	company = "Ward-Takahashi alt."
+	icon = 'icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_alt1.dmi'
+	parts = list("head")
+	has_subtypes = null
+
+/datum/robolimb/wardtakahashi/monitor
+	company = "Ward-Takahashi mtr."
+	icon = 'icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_monitor.dmi'
+	parts = list("head")
+	is_monitor = 1
+	has_subtypes = null

 /datum/robolimb/xion
 	company = "Xion Manufacturing Group"
 	desc = "This limb has a minimalist black and red casing."
-	icon = 'icons/mob/human_races/cyberlimbs/xion.dmi'
+	icon = 'icons/mob/human_races/cyberlimbs/xion/xion_main.dmi'
+	has_subtypes = 1
+
+/datum/robolimb/xion/alt1
+	company = "Xion Manufacturing Group alt."
+	icon = 'icons/mob/human_races/cyberlimbs/xion/xion_alt1.dmi'
+	parts = list("head")
+	has_subtypes = null
+
+/datum/robolimb/xion/monitor
+	company = "Xion Manufacturing Group mtr."
+	icon = 'icons/mob/human_races/cyberlimbs/xion/xion_monitor.dmi'
+	parts = list("head")
+	is_monitor = 1
+	has_subtypes = null

 /datum/robolimb/zenghu
 	company = "Zeng-Hu Pharmaceuticals"
 	desc = "This limb has a rubbery fleshtone covering with visible seams."
-	icon = 'icons/mob/human_races/cyberlimbs/zenghu.dmi'
+	icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_main.dmi'
+	has_subtypes = 2