From 5eafd4852576f314297f42b2eb9bfc3530a142d8 Mon Sep 17 00:00:00 2001 From: AffectedArc07 Date: Sat, 23 May 2020 14:04:06 +0100 Subject: [PATCH 1/3] IPCs can now change their monitors while lay down --- code/modules/mob/living/carbon/human/species/machine.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm index fdc7c6c4c46..8009f4cde0a 100644 --- a/code/modules/mob/living/carbon/human/species/machine.dm +++ b/code/modules/mob/living/carbon/human/species/machine.dm @@ -121,9 +121,6 @@ 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(H, "Select optic colour", H.m_colours["head"]) as color|null - if(H.incapacitated()) - to_chat(H, "You were interrupted while changing the colour of your optics.") - return if(optic_colour) H.change_markings(optic_colour, "head") @@ -149,10 +146,6 @@ var/new_style = input(H, "Select a monitor display", "Monitor Display", head_organ.h_style) as null|anything in hair var/new_color = input("Please select hair color.", "Monitor Color", head_organ.hair_colour) as null|color - if(H.incapacitated()) - to_chat(H, "You were interrupted while changing your monitor display.") - return - if(new_style) H.change_hair(new_style, 1) // The 1 is to enable custom sprites if(new_color) From a943dc45c19f4412ec03208247a3005d51b066d6 Mon Sep 17 00:00:00 2001 From: AffectedArc07 Date: Sat, 23 May 2020 18:58:40 +0100 Subject: [PATCH 2/3] *sigh* --- code/modules/mob/living/carbon/human/species/machine.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm index 8009f4cde0a..87d33ca5112 100644 --- a/code/modules/mob/living/carbon/human/species/machine.dm +++ b/code/modules/mob/living/carbon/human/species/machine.dm @@ -121,6 +121,9 @@ 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(H, "Select optic colour", H.m_colours["head"]) as color|null + if(H.incapacitated(TRUE, TRUE, TRUE, use_default_checks=FALSE)) + to_chat(H, "You were interrupted while changing the colour of your optics.") + return if(optic_colour) H.change_markings(optic_colour, "head") @@ -146,6 +149,10 @@ var/new_style = input(H, "Select a monitor display", "Monitor Display", head_organ.h_style) as null|anything in hair var/new_color = input("Please select hair color.", "Monitor Color", head_organ.hair_colour) as null|color + if(H.incapacitated(TRUE, TRUE, TRUE, use_default_checks=FALSE)) + to_chat(H, "You were interrupted while changing your monitor display.") + return + if(new_style) H.change_hair(new_style, 1) // The 1 is to enable custom sprites if(new_color) From e42b16c63862eade854dd1bdc2e8103c12fb32bd Mon Sep 17 00:00:00 2001 From: AffectedArc07 Date: Sat, 23 May 2020 19:14:30 +0100 Subject: [PATCH 3/3] THIS. IS A WEBEDIT. --- code/modules/mob/living/carbon/human/species/machine.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm index 87d33ca5112..ec37d3c6c9f 100644 --- a/code/modules/mob/living/carbon/human/species/machine.dm +++ b/code/modules/mob/living/carbon/human/species/machine.dm @@ -121,7 +121,7 @@ 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(H, "Select optic colour", H.m_colours["head"]) as color|null - if(H.incapacitated(TRUE, TRUE, TRUE, use_default_checks=FALSE)) + if(H.incapacitated(TRUE, TRUE, TRUE)) to_chat(H, "You were interrupted while changing the colour of your optics.") return if(optic_colour) @@ -149,7 +149,7 @@ var/new_style = input(H, "Select a monitor display", "Monitor Display", head_organ.h_style) as null|anything in hair var/new_color = input("Please select hair color.", "Monitor Color", head_organ.hair_colour) as null|color - if(H.incapacitated(TRUE, TRUE, TRUE, use_default_checks=FALSE)) + if(H.incapacitated(TRUE, TRUE, TRUE)) to_chat(H, "You were interrupted while changing your monitor display.") return