Pass2

code/modules/client/preferences.dm

@@ -1204,12 +1204,12 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 							H.model = rlimb_data["head"]
 							var/datum/robolimb/robohead = all_robolimbs[H.model]
 							if(species in S.species_allowed)
-								if((!rlimb_data["head"] || robohead.is_monitor) && (robohead.company in S.models_allowed)) //If the Machine character has the default Morpheus screen head or another screen head
+								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(!rlimb_data["head"] || robohead.is_monitor) //Monitors (incl. the default morpheus head) cannot have wigs (human hairstyles).
+								if(robohead.is_monitor) //Monitors (incl. the default morpheus head) cannot have wigs (human hairstyles).
 									continue
 								else if(!robohead.is_monitor && ("Human" in S.species_allowed) || S.name == "Bald")
 									valid_hairstyles[hairstyle] = S
@@ -1268,9 +1268,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 								var/obj/item/organ/external/head/H = new()
 								H.model = rlimb_data["head"]
 								var/datum/robolimb/robohead = all_robolimbs[H.model]
-								if((!("head" in rlimb_data) || 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.
+								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(("head" in rlimb_data || !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.
+								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
 
@@ -1317,11 +1317,11 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 							H.model = rlimb_data["head"]
 							var/datum/robolimb/robohead = all_robolimbs[H.model]
 							if(species in S.species_allowed)
-								if(!rlimb_data["head"] || 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.
+								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(!rlimb_data["head"] || robohead.is_monitor) //Monitors (incl. the default morpheus head) cannot have wigs (human facial hairstyles).
+								if(robohead.is_monitor) //Monitors (incl. the default morpheus head) cannot have wigs (human facial hairstyles).
 									continue
 								else if(!robohead.is_monitor && ("Human" in S.species_allowed) || S.name == "Shaved")
 									valid_facialhairstyles[facialhairstyle] = S

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

@@ -1589,20 +1589,28 @@
 		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...
 		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 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!
+		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(robohead.is_monitor)//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]
@@ -1611,6 +1619,7 @@
 
 			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

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

@@ -365,6 +365,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)

code/modules/mob/new_player/sprite_accessories.dm

@@ -44,6 +44,7 @@
 	// 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
@@ -1911,6 +1912,7 @@
 	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"