From 4722932abfb0041c11d752ee7cd9e6fe6fa9f353 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon, 12 Jul 2021 22:44:59 +0200
Subject: [PATCH] [MIRROR] Syndicate Hard-Suit helmets fix (#6849)

* Syndicate Hard-Suit helmets fix (#59032)

Apparently calling updateappearance() resets hard-suit helmets to default icon_state, code has been rearranged so that the updates to the helmet icon are done last. This also fixes subtypes of the syndie hard-suit like the elite hard-suit and owl hard-suit.

fixes #57307

* Syndicate Hard-Suit helmets fix

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
---
 code/modules/clothing/spacesuits/hardsuit.dm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 49f89d883ef..d0a9b6d2313 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -353,10 +353,6 @@
 	visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT
 	visor_flags = STOPSPRESSUREDAMAGE
 
-/obj/item/clothing/head/helmet/space/hardsuit/syndi/update_icon_state()
-	icon_state = "hardsuit[on]-[hardsuit_type]"
-	return ..()
-
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/Initialize()
 	. = ..()
 	if(istype(loc, /obj/item/clothing/suit/space/hardsuit/syndi))
@@ -388,13 +384,14 @@
 	update_appearance()
 	playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, TRUE)
 	toggle_hardsuit_mode(user)
-	user.update_inv_head()
 	if(iscarbon(user))
 		var/mob/living/carbon/C = user
 		C.head_update(src, forced = 1)
 	for(var/X in actions)
 		var/datum/action/A = X
 		A.UpdateButtonIcon()
+	icon_state = "hardsuit[on]-[hardsuit_type]"
+	user.update_inv_head()
 
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/proc/toggle_hardsuit_mode(mob/user) //Helmet Toggles Suit Mode
 	if(linkedsuit)