HvH testmerge tweaks [DO NOT MERGE]

code/__DEFINES/__game.dm

@@ -34,6 +34,7 @@
 #define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only
 #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
 #define MAP_CHINOOK "Chinook 91 GSO" //admin level
+#define MAP_ROSANSK "Rosansk"
 
 #define GAMEMODE_WHISKEY_OUTPOST "Whiskey Outpost"
 #define GAMEMODE_HIVE_WARS "Hive Wars"

code/__DEFINES/dcs/signals/signals_global.dm

@@ -75,3 +75,5 @@
 
 #define COMSIG_GLOB_HIJACK_IMPACTED "!hijack_impacted"
 #define COMSIG_GLOB_HIJACK_LANDED "!hijack_landed"
+
+#define COMSIG_GLOB_ANTIAIR_DESTROYED "!antiair_destroyed"

code/datums/ammo/bullet/special_ammo.dm

@@ -130,6 +130,9 @@
 /datum/ammo/bullet/machinegun/auto/set_bullet_traits()
 	return
 
+/datum/ammo/bullet/machinegun/auto/medium // for T37, UPP MMG
+	name = "medium machinegun bullet"
+
 /datum/ammo/bullet/minigun
 	name = "minigun bullet"
 	headshot_state = HEADSHOT_OVERLAY_MEDIUM

code/datums/factions/upp.dm

@@ -69,13 +69,9 @@
 		list("Type 71 Magazine (5.45x39mm)", 5, /obj/item/ammo_magazine/rifle/type71, null, VENDOR_ITEM_REGULAR),
 
 		list("SIDEARMS", 0, null, null, null),
-		list("Type 73 Pistol", 25, /obj/item/weapon/gun/pistol/t73, null, VENDOR_ITEM_REGULAR),
 		list("NP92 Pistol", 15, /obj/item/weapon/gun/pistol/np92, null, VENDOR_ITEM_REGULAR),
-		list("ZHNK-72 Revolver", 15, /obj/item/weapon/gun/revolver/upp, null, VENDOR_ITEM_REGULAR),
 
 		list("SIDEARM AMMUNITION", 0, null, null, null),
-		list("Type 73 Magazine (7.62x25mm Tokarev)", 5, /obj/item/ammo_magazine/pistol/t73, null, VENDOR_ITEM_REGULAR),
-		list("ZHNK-72 Speed Loader (7.62x38mmR)", 5, /obj/item/ammo_magazine/revolver/upp, null, VENDOR_ITEM_REGULAR),
 		list("NP92 Magazine (9x18mm Makarov)", 40, /obj/item/ammo_magazine/pistol/np92, null, VENDOR_ITEM_REGULAR),
 
 		list("ATTACHMENTS", 0, null, null, null),

code/game/gamemodes/extended/extended_clash.dm

@@ -2,7 +2,7 @@
 	name = "Faction Clash"
 	config_tag = "Faction Clash"
 	flags_round_type = MODE_THUNDERSTORM|MODE_FACTION_CLASH
-	toggleable_flags = MODE_NO_SNIPER_SENTRY|MODE_NO_ATTACK_DEAD|MODE_NO_STRIPDRAG_ENEMY|MODE_STRONG_DEFIBS|MODE_BLOOD_OPTIMIZATION|MODE_NO_COMBAT_CAS
+	toggleable_flags = MODE_NO_SNIPER_SENTRY|MODE_NO_ATTACK_DEAD|MODE_NO_STRIPDRAG_ENEMY|MODE_STRONG_DEFIBS|MODE_BLOOD_OPTIMIZATION
 	taskbar_icon = 'icons/taskbar/gml_hvh.png'
 
 /datum/game_mode/extended/faction_clash/get_roles_list()
@@ -11,3 +11,10 @@
 /datum/game_mode/extended/faction_clash/post_setup()
 	. = ..()
 	SSweather.force_weather_holder(/datum/weather_ss_map_holder/faction_clash)
+	addtimer(CALLBACK(src, PROC_REF(ares_online)), 5 SECONDS)
+	addtimer(CALLBACK(src, PROC_REF(map_announcement)), 20 SECONDS)
+
+/datum/game_mode/extended/proc/map_announcement()
+	if(SSmapping.configs[GROUND_MAP].announce_text)
+		var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].announce_text, "###SHIPNAME###", MAIN_SHIP_NAME)
+		marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]")

code/game/machinery/vending/cm_vending.dm

@@ -561,8 +561,9 @@ GLOBAL_LIST_EMPTY(vending_products)
 							var/specialist_assignment
 							switch(p_name)
 								if("Scout Set")
-									user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_SCOUT)
-									specialist_assignment = "Scout"
+									to_chat(user, SPAN_WARNING("Nuh uh. No scout on HvH."))
+									vend_fail()
+									return FALSE
 								if("Sniper Set")
 									user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_SNIPER)
 									specialist_assignment = "Sniper"

code/game/machinery/vending/vendor_types/requisitions.dm

@@ -47,6 +47,7 @@
 		list("M15 Fragmentation Grenade", round(scale * 2), /obj/item/explosive/grenade/high_explosive/m15, VENDOR_ITEM_REGULAR),
 		list("M20 Claymore Anti-Personnel Mine", round(scale * 4), /obj/item/explosive/mine, VENDOR_ITEM_REGULAR),
 		list("M40 HEDP Grenade", round(scale * 25), /obj/item/explosive/grenade/high_explosive, VENDOR_ITEM_REGULAR),
+		list("M40 HEFA Grenade", round(scale * 10), /obj/item/explosive/grenade/high_explosive/frag, VENDOR_ITEM_REGULAR),
 		list("M40 HIDP Incendiary Grenade", round(scale * 4), /obj/item/explosive/grenade/incendiary, VENDOR_ITEM_REGULAR),
 		list("M40 HPDP White Phosphorus Smoke Grenade", round(scale * 4), /obj/item/explosive/grenade/phosphorus, VENDOR_ITEM_REGULAR),
 		list("M40 HSDP Smoke Grenade", round(scale * 5), /obj/item/explosive/grenade/smokebomb, VENDOR_ITEM_REGULAR),

code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm

@@ -26,6 +26,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list(
 
 		list("EXPLOSIVES", 0, null, null, null),
 		list("M40 HEDP High Explosive Packet (x3 grenades)", 18, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR),
+		list("M40 HEFA Frag Packet (x3 grenades)", 18, /obj/item/storage/box/packet/hefa, null, VENDOR_ITEM_REGULAR),
 		list("M40 HIDP Incendiary Packet (x3 grenades)", 18, /obj/item/storage/box/packet/incendiary, null, VENDOR_ITEM_REGULAR),
 		list("M40 HPDP White Phosphorus Packet (x3 grenades)", 18, /obj/item/storage/box/packet/phosphorus, null, VENDOR_ITEM_REGULAR),
 		list("M40 HSDP Smoke Packet (x3 grenades)", 9, /obj/item/storage/box/packet/smoke, null, VENDOR_ITEM_REGULAR),

code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm

@@ -52,6 +52,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list(
 
 		list("EXPLOSIVES", 0, null, null, null),
 		list("M40 HEDP High Explosive Packet (x3 grenades)", 18, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR),
+		list("M40 HEFA Frag Packet (x3 grenades)", 18, /obj/item/storage/box/packet/hefa, null, VENDOR_ITEM_REGULAR),
 		list("M40 HIDP Incendiary Packet (x3 grenades)", 18, /obj/item/storage/box/packet/incendiary, null, VENDOR_ITEM_REGULAR),
 		list("M40 HPDP White Phosphorus Packet (x3 grenades)", 18, /obj/item/storage/box/packet/phosphorus, null, VENDOR_ITEM_REGULAR),
 		list("M40 HSDP Smoke Packet (x3 grenades)", 9, /obj/item/storage/box/packet/smoke, null, VENDOR_ITEM_REGULAR),

code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm

@@ -49,6 +49,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list(
 
 		list("EXPLOSIVES", 0, null, null, null),
 		list("M40 HEDP High Explosive Packet (x3 grenades)", 18, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR),
+		list("M40 HEFA Frag Packet (x3 grenades)", 18, /obj/item/storage/box/packet/hefa, null, VENDOR_ITEM_REGULAR),
 		list("M40 HIDP Incendiary Packet (x3 grenades)", 18, /obj/item/storage/box/packet/incendiary, null, VENDOR_ITEM_REGULAR),
 		list("M40 HPDP White Phosphorus Packet (x3 grenades)", 18, /obj/item/storage/box/packet/phosphorus, null, VENDOR_ITEM_REGULAR),
 		list("M40 HSDP Smoke Packet (x3 grenades)", 9, /obj/item/storage/box/packet/smoke, null, VENDOR_ITEM_REGULAR),

code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm

@@ -58,6 +58,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list(
 
 		list("EXPLOSIVES", 0, null, null, null),
 		list("M40 HEDP High Explosive Packet (x3 grenades)", 20, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR),
+		list("M40 HEFA Frag Packet (x3 grenades)", 20, /obj/item/storage/box/packet/hefa, null, VENDOR_ITEM_REGULAR),
 		list("M40 HIDP Incendiary Packet (x3 grenades)", 20, /obj/item/storage/box/packet/incendiary, null, VENDOR_ITEM_REGULAR),
 		list("M40 HPDP White Phosphorus Packet (x3 grenades)", 20, /obj/item/storage/box/packet/phosphorus, null, VENDOR_ITEM_REGULAR),
 		list("M40 HSDP Smoke Packet (x3 grenades)", 10, /obj/item/storage/box/packet/smoke, null, VENDOR_ITEM_REGULAR),

code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm

@@ -11,6 +11,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_smartgun, list(
 
 		list("EXPLOSIVES", 0, null, null, null),
 		list("M40 HEDP High Explosive Packet (x3 grenades)", 30, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR),
+		list("M40 HEFA Frag Packet (x3 grenades)", 30, /obj/item/storage/box/packet/hefa, null, VENDOR_ITEM_REGULAR),
 		list("M40 HIDP Incendiary Packet (x3 grenades)", 30, /obj/item/storage/box/packet/incendiary, null, VENDOR_ITEM_REGULAR),
 		list("M40 HPDP White Phosphorus Packet (x3 grenades)", 30, /obj/item/storage/box/packet/phosphorus, null, VENDOR_ITEM_REGULAR),
 		list("M40 HSDP Smoke Packet (x3 grenades)", 15, /obj/item/storage/box/packet/smoke, null, VENDOR_ITEM_REGULAR),

code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm

@@ -3,6 +3,7 @@
 GLOBAL_LIST_INIT(cm_vending_gear_tl, list(
 		list("EXPLOSIVES", 0, null, null, null),
 		list("M40 HEDP High Explosive Packet (x3 grenades)", 18, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR),
+		list("M40 HEFA Frag Packet (x3 grenades)", 18, /obj/item/storage/box/packet/hefa, null, VENDOR_ITEM_REGULAR),
 		list("M40 HIDP Incendiary Packet (x3 grenades)", 18, /obj/item/storage/box/packet/incendiary, null, VENDOR_ITEM_REGULAR),
 		list("M40 HPDP White Phosphorus Packet (x3 grenades)", 18, /obj/item/storage/box/packet/phosphorus, null, VENDOR_ITEM_REGULAR),
 		list("M40 HSDP Smoke Packet (x3 grenades)", 9, /obj/item/storage/box/packet/smoke, null, VENDOR_ITEM_REGULAR),

code/game/objects/items/explosives/grenades/marines.dm

@@ -414,7 +414,7 @@
 
 /obj/item/explosive/grenade/smokebomb/prime()
 	playsound(src.loc, 'sound/effects/smoke.ogg', 25, 1, 4)
-	smoke.set_up(smoke_radius, 0, get_turf(src), null, 6)
+	smoke.set_up(smoke_radius, 0, get_turf(src), null, 30)
 	smoke.start()
 	qdel(src)
 
@@ -449,7 +449,7 @@
 
 /obj/item/explosive/grenade/phosphorus/prime()
 	playsound(src.loc, 'sound/effects/smoke.ogg', 25, 1, 4)
-	smoke.set_up(smoke_radius, 0, get_turf(src))
+	smoke.set_up(smoke_radius, 0, get_turf(src), null, 18)
 	smoke.start()
 	qdel(src)
 

code/game/objects/items/tools/surgery_tools.dm

@@ -206,7 +206,7 @@
 	///percent of gel remaining in container
 	var/remaining_gel = 100
 	///If gel is used when doing bone surgery
-	var/unlimited_gel = FALSE
+	var/unlimited_gel = TRUE
 	///Time it takes per 10% of gel refilled
 	var/time_per_refill = 1 SECONDS
 	///if the bone gel is actively being refilled

code/game/objects/structures/desertdam.dm

@@ -24,3 +24,8 @@
 	name = "road"
 	icon_state = "stop_decal1"
 	layer = TURF_LAYER
+
+/obj/structure/desertdam/decals/road_stop_ru
+	name = "road"
+	icon_state = "stop_decal1_ru"
+	layer = TURF_LAYER

code/game/objects/structures/landing_signs.dm

@@ -59,3 +59,8 @@
 	name = "Chigusa Shipyard Sign"
 	desc = "A large sign that reads 'Chigusa Shipyard - Subsidary of Weyland-Yutani Corporation'. Acid burns checker the sign like buckshot."
 	icon_state = "laz_sign" //TODO make unique icon.
+
+/obj/structure/lz_sign/rodansk_sign
+	name = "Rosansk Sign"
+	desc = "A large sign that reads 'Rosansk - Naseleniye. 174' The Union of Progressive People's flag is proudly emblazoned in the bottom-right corner of the sign. Parts of the sign have been consumed by rust and the paint have mostly decayed. In the back of the sign exists some kind of memorial, mostly written in russian, dedicated to Dmitri Rosanov."
+	icon_state = "rosansk_sign"

code/game/objects/structures/props.dm

@@ -67,6 +67,16 @@
 	desc = "An old cargo truck, seems to be broken down."
 	icon_state = "truck_cargo"
 
+/obj/structure/prop/dam/truck/upp
+	name = "UPP truck"
+	desc = "An old truck used by the UPP. You don't have the keys for it."
+	icon_state = "truck_upp"
+
+/obj/structure/prop/dam/truck/upp/mining
+	name = "UPP mining truck"
+	desc = "AN old truck used by the UPP. This one is carrying various mining equipment for fluid extraction. You don't have the keys for it."
+	icon_state = "truck_upp_mining"
+
 /obj/structure/prop/dam/van
 	name = "van"
 	desc = "An old van, seems to be broken down."
@@ -80,6 +90,11 @@
 /obj/structure/prop/dam/van/damaged
 	icon_state = "van_damaged"
 
+/obj/structure/prop/dam/van/ambulance
+	name = "Ambulance truck"
+	desc = "An ambulance, probably used by some hospital nearby. You don't have the keys for it."
+	icon_state = "van_ambulance"
+
 /obj/structure/prop/dam/crane
 	name = "cargo crane"
 	icon = 'icons/obj/structures/props/vehicles.dmi'

code/game/objects/structures/signs.dm

@@ -107,6 +107,18 @@
 	desc = "This banner depicts Delta Squad's motto. The Marines of Delta Squad adopted it after picking an old bomber movie for movie night a while back."
 	icon_state = "maximumeffort"
 
+//============//
+//  Flags    //
+//==========//
+
+/obj/structure/sign/flag
+	icon = 'icons/obj/structures/props/flags.dmi'
+
+/obj/structure/sign/flag/upp
+	name = "\improper Union of Progressive Peoples Flag"
+	desc = "Unity through Strength, Freedom through Unity"
+	icon_state = "upp_flag"
+
 //=====================//
 // SEMIOTIC STANDARD  //
 //===================//

code/game/supplyshuttle.dm

@@ -435,7 +435,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
 		)
 
 	//dropship part fabricator's points, so we can reference them globally (mostly for DEFCON)
-	var/dropship_points = 10000 //gains roughly 18 points per minute | Original points of 5k doubled due to removal of prespawned ammo.
+	var/dropship_points = 1075 //gains roughly 18 points per minute | Original points of 5k doubled due to removal of prespawned ammo.
 	var/tank_points = 0
 
 /datum/controller/supply/New()

code/modules/almayer/machinery.dm

@@ -334,3 +334,25 @@
 	new /obj/item/clothing/under/shorts/red(src)
 	new /obj/item/clothing/under/shorts/blue(src)
 	new /obj/item/clothing/under/shorts/green(src)
+
+/obj/structure/machinery/prop/antiair_mainframe
+	name = "SSDC Mainframe"
+	desc = "The mainframe controlling the Sputnik Stratospheric Defense Cannon. Destroying this would enable ships to land on the western and eastern landing pads. You must use a C4 brick."
+	desc_lore = "The Sputnik Stratospheric Defense Cannon is a state-of-the-art UPP airspace defense solution. It utilizes adaptive optics and AI-targeting algorithms to intercept even the smallest of targets in the stratosphere."
+	icon_state = "processor"
+	density = TRUE
+	unacidable = FALSE
+	var/destroy_title = "SSDC Destroyed"
+	var/destroy_announcement = "The SSDC covering the airspace above Rosansk has been destroyed.\n\nIt is now possible to utilize the Western and Eastern landing pads in front of the city."
+
+/obj/structure/machinery/prop/antiair_mainframe/Destroy(force)
+	if(!force)
+		new /obj/item/stack/rods(loc)
+		new /obj/item/stack/cable_coil/cut(loc)
+		new /obj/effect/spawner/gibspawner/robot(loc)
+		new /obj/effect/decal/cleanable/blood/oil(loc)
+		marine_announcement(destroy_announcement, destroy_title)
+		marine_announcement(destroy_announcement, destroy_title, "sound/AI/commandreport.ogg", FACTION_UPP)
+		message_admins(FONT_SIZE_XL("The AA mainframe has been destroyed."))
+		SEND_GLOBAL_SIGNAL(COMSIG_GLOB_ANTIAIR_DESTROYED)
+	return ..()

code/modules/clothing/suits/marine_armor/_marine_armor.dm

@@ -48,13 +48,13 @@
 	max_heat_protection_temperature = HELMET_MAX_HEAT_PROT
 	blood_overlay_type = "armor"
 	armor_melee = CLOTHING_ARMOR_MEDIUM
-	armor_bullet = CLOTHING_ARMOR_MEDIUM
+	armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
 	armor_laser = CLOTHING_ARMOR_MEDIUMLOW
 	armor_energy = CLOTHING_ARMOR_NONE
-	armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
+	armor_bomb = CLOTHING_ARMOR_MEDIUM
 	armor_bio = CLOTHING_ARMOR_MEDIUM
 	armor_rad = CLOTHING_ARMOR_MEDIUMLOW
-	armor_internaldamage = CLOTHING_ARMOR_MEDIUM
+	armor_internaldamage = CLOTHING_ARMOR_HIGH
 	movement_compensation = SLOWDOWN_ARMOR_LIGHT
 	storage_slots = 3
 	siemens_coefficient = 0.7
@@ -425,11 +425,11 @@
 	armor_variation = 6
 	slowdown = SLOWDOWN_ARMOR_LIGHT
 	armor_melee = CLOTHING_ARMOR_MEDIUMLOW
-	armor_bullet = CLOTHING_ARMOR_MEDIUMLOW
-	armor_bomb = CLOTHING_ARMOR_MEDIUM
+	armor_bullet = CLOTHING_ARMOR_MEDIUM
+	armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
 	armor_bio = CLOTHING_ARMOR_MEDIUMLOW
 	armor_rad = CLOTHING_ARMOR_MEDIUMHIGH
-	armor_internaldamage = CLOTHING_ARMOR_LOW
+	armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
 	storage_slots = 2
 
 /obj/item/clothing/suit/storage/marine/light/padded
@@ -530,11 +530,11 @@
 	icon_state = "H1"
 	armor_variation = 6
 	armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
-	armor_bullet = CLOTHING_ARMOR_HIGHPLUS
-	armor_bomb = CLOTHING_ARMOR_HIGHPLUS
+	armor_bullet = CLOTHING_ARMOR_HIGH
+	armor_bomb = CLOTHING_ARMOR_HIGH
 	armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
 	armor_rad = CLOTHING_ARMOR_MEDIUM
-	armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
+	armor_internaldamage = CLOTHING_ARMOR_HIGH
 	storage_slots = 2
 	slowdown = SLOWDOWN_ARMOR_LOWHEAVY
 	movement_compensation = SLOWDOWN_ARMOR_MEDIUM

code/modules/clothing/suits/marine_armor/ert.dm

@@ -268,7 +268,7 @@
 	name = "\improper UM5 personal armor"
 	desc = "Standard body armor of the UPP military, the UM5 (Union Medium MK5) is a medium body armor, roughly on par with the M3 pattern body armor in service with the USCM, specialized towards ballistics protection. Unlike the M3, however, the plate has a heavier neckplate. This has earned many UA members to refer to UPP soldiers as 'tin men'."
 	icon_state = "upp_armor"
-	armor_bullet = CLOTHING_ARMOR_HIGH
+	armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
 	armor_energy = CLOTHING_ARMOR_MEDIUM
 	armor_bio = CLOTHING_ARMOR_MEDIUMLOW
 	armor_rad = CLOTHING_ARMOR_MEDIUMLOW
@@ -284,9 +284,10 @@
 	slowdown = SLOWDOWN_ARMOR_LIGHT
 	armor_melee = CLOTHING_ARMOR_HIGH
 	armor_energy = CLOTHING_ARMOR_MEDIUM
+	armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
 	armor_bio = CLOTHING_ARMOR_MEDIUMLOW
 	armor_rad = CLOTHING_ARMOR_MEDIUMLOW
-	armor_internaldamage = CLOTHING_ARMOR_HIGH
+	armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
 
 /obj/item/clothing/suit/storage/marine/faction/UPP/commando
 	name = "\improper UM5CU personal armor"
@@ -310,7 +311,7 @@
 	armor_bomb = CLOTHING_ARMOR_HIGH
 	armor_bio = CLOTHING_ARMOR_MEDIUM
 	armor_rad = CLOTHING_ARMOR_MEDIUMLOW
-	armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS
+	armor_internaldamage = CLOTHING_ARMOR_HIGH
 
 /obj/item/clothing/suit/storage/marine/faction/UPP/heavy/Initialize()
 	. = ..()

code/modules/cm_marines/Donator_Items.dm

@@ -17,7 +17,7 @@
 	flags_inv_hide = HIDEEARS
 	flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE|NO_SNOW_TYPE
 	min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
-	flags_marine_helmet = NO_FLAGS
+	flags_marine_helmet = HELMET_GARB_OVERLAY
 
 /obj/item/clothing/head/helmet/marine/fluff/verb/toggle_squad_markings()
 	set src in usr