From 45a2076771adaac502c76747b74f5aa95dd0ec7c Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 17 Jan 2021 03:35:49 -0700
Subject: [PATCH 1/2] Update toggles.dm

---
 code/modules/clothing/suits/toggles.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm
index f496468371..0c78f2fa42 100644
--- a/code/modules/clothing/suits/toggles.dm
+++ b/code/modules/clothing/suits/toggles.dm
@@ -68,6 +68,8 @@
 				to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
 				return
 			else if(H.equip_to_slot_if_possible(hood,SLOT_HEAD,0,0,1))
+				hood.atom_colours = atom_colours.Copy()
+				hood.update_atom_colour()
 				suittoggled = TRUE
 				update_icon()
 				H.update_inv_wear_suit()

From a917034542bc3f082a66d7957fe281bc8940e4bb Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 17 Jan 2021 03:46:20 -0700
Subject: [PATCH 2/2] Update toggles.dm

---
 code/modules/clothing/suits/toggles.dm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm
index 0c78f2fa42..16a6c06799 100644
--- a/code/modules/clothing/suits/toggles.dm
+++ b/code/modules/clothing/suits/toggles.dm
@@ -58,6 +58,11 @@
 	RemoveHood()
 
 /obj/item/clothing/suit/hooded/proc/ToggleHood()
+	if(!hood)
+		to_chat(loc, "<span class='warning'>[src] seems to be missing its hood..</span>")
+		return
+	hood.atom_colours = atom_colours.Copy()
+	hood.update_atom_colour()
 	if(!suittoggled)
 		if(ishuman(src.loc))
 			var/mob/living/carbon/human/H = src.loc
@@ -68,8 +73,6 @@
 				to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
 				return
 			else if(H.equip_to_slot_if_possible(hood,SLOT_HEAD,0,0,1))
-				hood.atom_colours = atom_colours.Copy()
-				hood.update_atom_colour()
 				suittoggled = TRUE
 				update_icon()
 				H.update_inv_wear_suit()
@@ -193,7 +196,10 @@
 	if(!helmettype)
 		return
 	if(!helmet)
+		to_chat(H, "<span class='warning'>[src] seems to be missing its helmet..</span>")
 		return
+	helmet.atom_colours = atom_colours.Copy()
+	helmet.update_atom_colour()
 	if(!suittoggled)
 		if(ishuman(src.loc))
 			if(H.wear_suit != src)