diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 327af25c33..e0998b6980 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -140,7 +140,7 @@ list("M1A1 Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/v2, VENDOR_ITEM_REGULAR), list("Prescription ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR), list("Marine RPG glasses", round(scale * 10), /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR), - list("M5 Integrated Gas Mask", round(scale * 10), /obj/item/prop/helmetgarb/helmet_gasmask, VENDOR_ITEM_REGULAR), + list("M10 Helmet Camouflage Wrap", round(scale * 10), /obj/item/prop/helmetgarb/camocover, VENDOR_ITEM_REGULAR), list("M10 Helmet Netting", round(scale * 10), /obj/item/prop/helmetgarb/netting, VENDOR_ITEM_REGULAR), list("M10 Helmet Rain Cover", round(scale * 10), /obj/item/prop/helmetgarb/raincover, VENDOR_ITEM_REGULAR), list("Firearm Lubricant", round(scale * 15), /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index 2c83f5beee..558c8b235c 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/code/game/objects/items/props/helmetgarb.dm @@ -52,6 +52,15 @@ desc = "The standard M10 combat helmet is already water-resistant at depths of up to 10 meters. This makes the top potentially water-proof. At least it's something." icon_state = "raincover" +/obj/item/prop/helmetgarb/camocover + name = "camocover" + desc = "A cover that goes over the top of an M10 pattern helmet to camoflauge it without needing the use of paints." + icon_state = "camocover" + +/obj/item/prop/helmetgarb/camocover/Initialize(mapload, ...) + . = ..() + select_gamemode_skin(/obj/item/prop/helmetgarb/camocover) + /obj/item/prop/helmetgarb/rabbitsfoot name = "Rabbit's Foot" desc = "Lucky for you, but not the rabbit, didn't really do it much good." diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index f3519dbf00..92d9830ba4 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -283,6 +283,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/prop/helmetgarb/cartridge = "cartridge", /obj/item/prop/helmetgarb/prescription_bottle = "prescription_bottle", /obj/item/prop/helmetgarb/raincover = "raincover", + /obj/item/prop/helmetgarb/camocover = "camocover", /obj/item/prop/helmetgarb/rabbitsfoot = "rabbitsfoot", /obj/item/prop/helmetgarb/rosary = "helmet_rosary", // This one was already in the game for some reason, but never had an object /obj/item/prop/helmetgarb/lucky_feather = "lucky_feather", diff --git a/icons/mob/humans/onmob/helmet_garb.dmi b/icons/mob/humans/onmob/helmet_garb.dmi index 31ce025b09..22d81ce063 100644 Binary files a/icons/mob/humans/onmob/helmet_garb.dmi and b/icons/mob/humans/onmob/helmet_garb.dmi differ diff --git a/icons/obj/items/helmet_garb.dmi b/icons/obj/items/helmet_garb.dmi index 6886ec3556..5403ae28b7 100644 Binary files a/icons/obj/items/helmet_garb.dmi and b/icons/obj/items/helmet_garb.dmi differ