From 152c3fe29e77e2cab3fe1d2c0b155030360be30d Mon Sep 17 00:00:00 2001
From: ShadowLarkens <shadowlarkens@gmail.com>
Date: Wed, 30 Oct 2024 18:41:21 -0700
Subject: [PATCH] Revert "Add support for deploying space helmets over top of
 other helmets (#16475)" (#16545)

This reverts commit a046ae1fa74a8d5f49fce1393b520f85d8d030b1.
---
 code/modules/clothing/clothing.dm             |  1 -
 code/modules/clothing/head/helmet.dm          |  1 -
 .../modules/clothing/spacesuits/spacesuits.dm | 38 -------------------
 code/modules/clothing/spacesuits/void/void.dm | 11 +++---
 4 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 3875442cbd9..f45481622aa 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -460,7 +460,6 @@
 
 	var/light_overlay = "helmet_light"
 	var/image/helmet_light
-	var/overhead = 0			//Used by spacesuit helmets
 
 	sprite_sheets = list(
 		SPECIES_TESHARI = 'icons/inventory/head/mob_teshari.dmi',
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 7af35979289..4106d577af7 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -16,7 +16,6 @@
 	ear_protection = 1
 	drop_sound = 'sound/items/drop/helm.ogg'
 	pickup_sound = 'sound/items/pickup/helm.ogg'
-	overhead = TRUE
 
 /obj/item/clothing/head/helmet/solgov
 	name = "\improper Solar Confederate Government helmet"
diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm
index 0a434e3b65c..b70ddc6a571 100644
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -31,44 +31,6 @@
 	light_overlay = "helmet_light"
 	light_range = 4
 
-	overhead = TRUE // prevents stacking helmets indefinitely
-	var/obj/item/clothing/head/stored_under_head = null // under head
-	var/mob/living/carbon/human/wearer = null	// Used to restore our under when we're dropped
-
-/obj/item/clothing/head/helmet/space/mob_can_equip(mob/user, slot, disable_warning = FALSE)
-	var/mob/living/carbon/human/H = user
-	if(H.head)
-		stored_under_head = H.head
-		if(!istype(stored_under_head))
-			to_chat(user, "You are unable to wear \the [src] as \the [H.head] is in the way.")
-			stored_under_head = null
-			return 0
-		if(stored_under_head.overhead)
-			to_chat(user, "You are unable to wear \the [src] as \the [H.head] is in the way.")
-			stored_under_head = null
-			return 0
-		H.drop_from_inventory(stored_under_head)
-		stored_under_head.forceMove(src)
-
-	if(!..())
-		if(stored_under_head)
-			if(H.equip_to_slot_if_possible(stored_under_head, slot_head))
-				stored_under_head = null
-			return 0
-	if(stored_under_head)
-		to_chat(user, "You slip \the [src] on over \the [stored_under_head].")
-	wearer = H
-	return 1
-
-/obj/item/clothing/head/helmet/space/dropped()
-	..()
-	var/mob/living/carbon/human/H = wearer
-	if(stored_under_head)
-		if(!H.equip_to_slot_if_possible(stored_under_head, slot_head))
-			stored_under_head.forceMove(get_turf(src))
-		src.stored_under_head = null
-	wearer = null
-
 /obj/item/clothing/head/helmet/space/Initialize()
 	. = ..()
 	if(camera_networks)
diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm
index ce32a5cddb3..a8c4c0f53d7 100644
--- a/code/modules/clothing/spacesuits/void/void.dm
+++ b/code/modules/clothing/spacesuits/void/void.dm
@@ -91,11 +91,11 @@
 			boots.canremove = FALSE
 
 	if(helmet)
-		if(H.equip_to_slot_if_possible(helmet, slot_head))
+		if(H.head)
+			to_chat(M, "You are unable to deploy your suit's helmet as \the [H.head] is in the way.")
+		else if (H.equip_to_slot_if_possible(helmet, slot_head))
 			to_chat(M, "Your suit's helmet deploys with a hiss.")
 			helmet.canremove = FALSE
-		else
-			to_chat(M, "You are unable to deploy your suit's helmet[H.head ? " because [H.head] is in the way." : ""].")
 
 	if(tank)
 		if(H.s_store) //In case someone finds a way.
@@ -190,12 +190,13 @@
 		helmet.forceMove(src)
 		playsound(src.loc, 'sound/machines/click2.ogg', 75, 1)
 	else
+		if(H.head)
+			to_chat(H, span_danger("You cannot deploy your helmet while wearing \the [H.head]."))
+			return
 		if(H.equip_to_slot_if_possible(helmet, slot_head))
 			helmet.canremove = FALSE
 			to_chat(H, span_info("You deploy your suit helmet, sealing you off from the world."))
 			playsound(src.loc, 'sound/machines/click2.ogg', 75, 1)
-		else
-			to_chat(H, span_danger("You cannot deploy your helmet[H.head ? " while wearing \the [H.head]." : ""]"))
 
 /obj/item/clothing/suit/space/void/AltClick(mob/living/user)
 	eject_tank()