From 9e006f157ddec3466d0b934625e1f19d7714d25d Mon Sep 17 00:00:00 2001 From: private-tristan Date: Mon, 9 Oct 2023 17:48:21 -0400 Subject: [PATCH] Squad Optics no longer built into marine helmets --- code/modules/clothing/head/helmet.dm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index da0f58088858..931463d6305e 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -379,7 +379,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( var/helmet_overlay_icon = 'icons/mob/humans/onmob/head_1.dmi' ///Any visors built into the helmet - var/list/built_in_visors = list(new /obj/item/device/helmet_visor) + var/list/built_in_visors = list() ///Any visors that have been added into the helmet var/list/inserted_visors = list() @@ -514,11 +514,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( inserted_visors = list() to_chat(user, SPAN_NOTICE("You remove the inserted visors.")) - var/datum/action/item_action/cycle_helmet_huds/cycle_action = locate() in actions - cycle_action.set_default_overlay() - if(!length(built_in_visors)) - cycle_action.remove_from(user) - return ..() @@ -718,6 +713,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( icon_state = "tech_helmet" specialty = "M10 technician" built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/welding_visor) + built_in_visors = list(new /obj/item/device/helmet_visor/welding_visor) /obj/item/clothing/head/helmet/marine/grey desc = "A standard M10 Pattern Helmet. This one has not had a camouflage pattern applied to it yet. There is a built-in camera on the right side." @@ -751,14 +747,14 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( flags_inventory = BLOCKSHARPOBJ flags_inv_hide = HIDEEARS|HIDETOPHAIR specialty = "M50 tanker" - built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/welding_visor/tanker) + built_in_visors = list(new /obj/item/device/helmet_visor/welding_visor/tanker) /obj/item/clothing/head/helmet/marine/medic name = "\improper M10 corpsman helmet" desc = "An M10 marine helmet version worn by marine hospital corpsmen. Has red cross painted on its front." icon_state = "med_helmet" specialty = "M10 pattern medic" - built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced) + built_in_visors = list(new /obj/item/device/helmet_visor/medical/advanced) start_down_visor_type = /obj/item/device/helmet_visor/medical/advanced /obj/item/clothing/head/helmet/marine/covert @@ -901,7 +897,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( armor_bio = CLOTHING_ARMOR_MEDIUMHIGH specialty = "M10 pattern captain" flags_atom = NO_SNOW_TYPE - built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced, new /obj/item/device/helmet_visor/security) + built_in_visors = list(new /obj/item/device/helmet_visor/medical/advanced, new /obj/item/device/helmet_visor/security) /obj/item/clothing/head/helmet/marine/MP name = "\improper M10 pattern MP helmet" @@ -925,7 +921,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( icon_state = "helmet" item_state = "helmet" specialty = "M10 pattern officer" - built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced) + built_in_visors = list(new /obj/item/device/helmet_visor/medical/advanced) /obj/item/clothing/head/helmet/marine/mp/provost/marshal name = "\improper Provost Marshal Cap"