From af061dbd15969ed6fdb1a541640f5325c398c712 Mon Sep 17 00:00:00 2001 From: Staykeu Date: Fri, 26 Jan 2024 12:59:40 -0500 Subject: [PATCH 1/4] base --- code/game/objects/items/props/helmetgarb.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index bdf140ff11c3..cc33ca28ded6 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/code/game/objects/items/props/helmetgarb.dm @@ -5,6 +5,7 @@ icon_state = null w_class = SIZE_TINY garbage = TRUE + slot = ACCESSORY_SLOT_HELM_C /obj/item/prop/helmetgarb/Initialize(mapload, ...) . = ..() From 12371da4606aff732f7414e15b794798989150ac Mon Sep 17 00:00:00 2001 From: Staykeu Date: Fri, 26 Jan 2024 13:02:41 -0500 Subject: [PATCH 2/4] fucks --- code/game/objects/items/props/helmetgarb.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index cc33ca28ded6..bdf140ff11c3 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/code/game/objects/items/props/helmetgarb.dm @@ -5,7 +5,6 @@ icon_state = null w_class = SIZE_TINY garbage = TRUE - slot = ACCESSORY_SLOT_HELM_C /obj/item/prop/helmetgarb/Initialize(mapload, ...) . = ..() From 851902e63804adf3dc3d147b240d12821fb0b04c Mon Sep 17 00:00:00 2001 From: Staykeu Date: Sun, 28 Jan 2024 14:52:39 -0500 Subject: [PATCH 3/4] base --- code/modules/clothing/head/helmet.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 3d7d774bd1ed..adbdf6095343 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -385,7 +385,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() @@ -723,7 +723,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( desc = "A modified M10 marine helmet for ComTechs. Features a toggleable welding screen for eye protection." 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." @@ -757,14 +757,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 @@ -907,7 +907,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" @@ -931,7 +931,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" From ae85849b8236b77e23e6dc986d7403f0e74fb76b Mon Sep 17 00:00:00 2001 From: Staykeu Date: Tue, 30 Jan 2024 10:43:23 -0500 Subject: [PATCH 4/4] added squad optic to req for survs --- code/game/machinery/vending/vendor_types/requisitions.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index 24f58c8f6ae3..bcb686292edb 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -385,6 +385,7 @@ list("M10 Pattern Marine Helmet", 20, /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR), list("M10 Pattern Technician Helmet", 20, /obj/item/clothing/head/helmet/marine/tech, VENDOR_ITEM_REGULAR), list("M10 Pattern Corpman Helmet", 20, /obj/item/clothing/head/helmet/marine/medic, VENDOR_ITEM_REGULAR), + list("Squad Optic", 10, /obj/item/device/helmet_visor, VENDOR_ITEM_REGULAR), list("M3 Pattern Carrier Marine Armor", 20, /obj/item/clothing/suit/storage/marine/medium/carrier, VENDOR_ITEM_REGULAR), list("M3 Pattern Padded Marine Armor", 20, /obj/item/clothing/suit/storage/marine/medium/padded, VENDOR_ITEM_REGULAR), list("M3 Pattern Padless Marine Armor", 20, /obj/item/clothing/suit/storage/marine/medium/padless, VENDOR_ITEM_REGULAR),