Kills Marine icons folder. (#16041)

code/game/objects/machinery/mortar.dm

@@ -426,7 +426,7 @@
 /obj/item/mortar_kit
 	name = "\improper TA-50S mortar"
 	desc = "A manual, crew-operated mortar system intended to rain down 80mm goodness on anything it's aimed at. Needs to be set down first to fire. Ctrl+Click on a tile to deploy, drag the mortar's sprites to mob's sprite to undeploy."
-	icon = 'icons/Marine/mortar.dmi'
+	icon = 'icons/obj/machines/deployable/mortar.dmi'
 	icon_state = "mortar"
 	max_integrity = 200
 	soft_armor = list(MELEE = 0, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 15, BIO = 100, FIRE = 0, ACID = 0)
@@ -477,7 +477,7 @@
 /obj/item/mortar_kit/howitzer
 	name = "\improper TA-100Y howitzer"
 	desc = "A manual, crew-operated and towable howitzer, will rain down 150mm laserguided and accurate shells on any of your foes."
-	icon = 'icons/Marine/howitzer.dmi'
+	icon = 'icons/obj/machines/deployable/howitzer.dmi'
 	icon_state = "howitzer"
 	max_integrity = 400
 	item_flags = IS_DEPLOYABLE|TWOHANDED|DEPLOYED_NO_PICKUP|DEPLOY_ON_INITIALIZE
@@ -650,13 +650,12 @@
 		rocketsloaded++
 	user.balloon_alert(user, "Right click to fire")
 
-
 // Shells themselves //
 
 /obj/item/mortal_shell
 	name = "\improper 80mm mortar shell"
 	desc = "An unlabeled 80mm mortar shell, probably a casing."
-	icon = 'icons/Marine/mortar.dmi'
+	icon = 'icons/obj/items/ammo.dmi'
 	worn_icon_list = list(
 		slot_l_hand_str = 'icons/mob/inhands/weapons/ammo_left.dmi',
 		slot_r_hand_str = 'icons/mob/inhands/weapons/ammo_right.dmi',
@@ -700,7 +699,6 @@
 /obj/item/mortal_shell/howitzer
 	name = "\improper 150mm artillery shell"
 	desc = "An unlabeled 150mm shell, probably a casing."
-	icon = 'icons/Marine/howitzer.dmi'
 	icon_state = "howitzer_ammo"
 	w_class = WEIGHT_CLASS_BULKY
 
@@ -712,7 +710,7 @@
 /obj/item/mortal_shell/howitzer/plasmaloss
 	name = "\improper 150mm 'Tanglefoot' artillery shell"
 	desc = "An 150mm artillery shell, loaded with a toxic intoxicating gas, whatever is hit by this will have their abilities sapped slowly. Acommpanied by a small moderate explosion."
-	icon_state = "howitzer_ammo_purp"
+	icon_state = "howitzer_ammo_plasmaloss"
 	ammo_type = /datum/ammo/mortar/smoke/howi/plasmaloss
 
 /obj/item/mortal_shell/howitzer/incendiary
@@ -763,10 +761,9 @@
 /obj/structure/closet/crate/mortar_ammo
 	name = "\improper T-50S mortar ammo crate"
 	desc = "A crate containing live mortar shells with various payloads. DO NOT DROP. KEEP AWAY FROM FIRE SOURCES."
-	icon = 'icons/Marine/mortar.dmi'
-	icon_state = "closed_mortar_crate"
-	icon_opened = "open_mortar_crate"
-	icon_closed = "closed_mortar_crate"
+	icon_state = "closed_mortar"
+	icon_opened = "open_mortar"
+	icon_closed = "closed_mortar"
 
 /obj/structure/closet/crate/mortar_ammo/full/PopulateContents()
 	new /obj/item/mortal_shell/he(src)

code/game/objects/structures/campaign_structures/destroy_objectives.dm

@@ -24,15 +24,15 @@
 //Howitzer
 /obj/effect/landmark/campaign_structure/howitzer_objective
 	name = "howitzer objective"
-	icon = 'icons/Marine/howitzer.dmi'
+	icon = 'icons/obj/machines/deployable/howitzer.dmi'
 	icon_state = "howitzer_deployed"
 	mission_types = list(/datum/campaign_mission/destroy_mission/fire_support_raid)
 	spawn_object = /obj/structure/campaign_objective/destruction_objective/howitzer
 
 /obj/structure/campaign_objective/destruction_objective/howitzer
 	name = "\improper TA-100Y howitzer"
 	desc = "A manual, crew-operated and towable howitzer, will rain down 150mm laserguided and accurate shells on any of your foes."
-	icon = 'icons/Marine/howitzer.dmi'
+	icon = 'icons/obj/machines/deployable/howitzer.dmi'
 	icon_state = "howitzer_deployed"
 	pixel_x = -16
 	faction = FACTION_SOM
@@ -148,7 +148,7 @@
 //Supply depot objectives
 /obj/structure/campaign_objective/destruction_objective/supply_objective
 	name = "SUPPLY_OBJECTIVE"
-	icon = 'icons/Marine/howitzer.dmi'
+	icon = 'icons/obj/machines/deployable/howitzer.dmi'
 	icon_state = "howitzer_deployed"
 
 //Train

code/modules/projectiles/gun_attachables/rail.dm

@@ -124,7 +124,7 @@
 
 /obj/item/attachable/buildasentry
 	name = "\improper Build-A-Sentry Attachment System"
-	icon = 'icons/Marine/sentry.dmi'
+	icon = 'icons/obj/machines/deployable/sentry/build_a_sentry.dmi'
 	icon_state = "build_a_sentry_attachment"
 	desc = "The Build-A-Sentry is the latest design in cheap, automated, defense. Simple attach it to the rail of a gun and deploy. Its that easy!"
 	slot = ATTACHMENT_SLOT_RAIL

code/modules/projectiles/gun_attachables/stock.dm

@@ -25,8 +25,7 @@
 /obj/item/attachable/stock/t27
 	name = "MG-27 Body"
 	desc = "A stock for a MG-27 MMG."
-	icon = 'icons/Marine/marine-mmg.dmi'
-	icon_state = "t27body"
+	icon_state = "t27"
 	pixel_shift_x = 15
 	pixel_shift_y = 0
 
@@ -127,8 +126,7 @@
 /obj/item/attachable/stock/clf_heavyrifle
 	name = "PTR-41/1785 body"
 	desc = "A stock for a PTR-41/1785 A-MR."
-	icon = 'icons/Marine/clf_heavyrifle.dmi'
-	icon_state = "ptrs_stock"
+	icon_state = "ptrs"
 	pixel_shift_x = 15
 	pixel_shift_y = 0
 

code/modules/projectiles/guns/mounted.dm

@@ -2,7 +2,7 @@
 /obj/item/storage/box/hsg_102
 	name = "\improper HSG-102 crate"
 	desc = "A large and rusted metal case. It has not seen much use. Written in faded letters on its top, it says, \"This is a HSG-102 heavy smartgun\". There are many other warning labels atop that are too faded to read."
-	icon = 'icons/Marine/marine-hmg.dmi'
+	icon = 'icons/obj/items/ammo.dmi'
 	icon_state = "crate"
 	w_class = WEIGHT_CLASS_HUGE
 
@@ -25,7 +25,7 @@
 
 	w_class = WEIGHT_CLASS_HUGE
 	equip_slot_flags = ITEM_SLOT_BACK
-	icon = 'icons/Marine/marine-hmg.dmi'
+	icon = 'icons/obj/machines/deployable/heavy_smartgun.dmi'
 	icon_state = "turret"
 	worn_icon_list = list(
 		slot_l_hand_str = 'icons/mob/inhands/guns/misc_left_1.dmi',
@@ -75,7 +75,6 @@
 /obj/item/weapon/gun/hsg_102/hsg_nest
 	name = "\improper HSG-102 heavy smartgun nest"
 	desc = "A HSG-102 heavy smartgun mounted upon a small reinforced post with sandbags to provide a small machinegun nest for all your defense purpose needs.</span>"
-	icon = 'icons/Marine/marine-hmg.dmi'
 	icon_state = "entrenched"
 
 	default_ammo_type = /obj/item/ammo_magazine/hsg_102/hsg_nest
@@ -104,7 +103,7 @@
 
 	w_class = WEIGHT_CLASS_HUGE
 	equip_slot_flags = ITEM_SLOT_BACK
-	icon = 'icons/Marine/marine-hmg.dmi'
+	icon = 'icons/obj/machines/deployable/minigun.dmi'
 	icon_state = "minigun"
 	caliber = CALIBER_762X51
 
@@ -143,7 +142,7 @@
 /obj/item/weapon/gun/standard_minigun/nest
 	name = "\improper MG-2005 mounted minigun nest"
 	desc = "A MG-2005 mounted minigun mounted upon a small reinforced post with sandbags."
-	icon = 'icons/Marine/marine-hmg.dmi'
+	icon = 'icons/obj/machines/deployable/minigun.dmi'
 	icon_state = "minigun_nest"
 
 	item_flags = IS_DEPLOYABLE|TWOHANDED|DEPLOYED_NO_PICKUP|DEPLOY_ON_INITIALIZE
@@ -162,8 +161,8 @@
 	desc = "The ATR-22 is a recoiling barrel 20mm autocannon, created to be used against low flying targets, it is however able to engage ground targets at medium ranges with extreme efficency even if the recoil makes it near impossible to hit anything close by, its bullets will shred hard targets such as armored foes or walls. Both barrels can be fired at the same time rather than in sequence, but will incur large scatter penalties do so."
 	w_class = WEIGHT_CLASS_HUGE
 	equip_slot_flags = ITEM_SLOT_BACK
-	icon = 'icons/Marine/marine-ac.dmi'
-	icon_state = "autocannon"
+	icon = 'icons/obj/machines/deployable/atr22.dmi'
+	icon_state = "atr22"
 	worn_icon_list = list(
 		slot_l_hand_str = 'icons/mob/inhands/guns/misc_left_1.dmi',
 		slot_r_hand_str = 'icons/mob/inhands/guns/misc_right_1.dmi',
@@ -213,8 +212,8 @@
 
 	w_class = WEIGHT_CLASS_HUGE
 	equip_slot_flags = ITEM_SLOT_BACK
-	icon = 'icons/Marine/marine-hmg.dmi'
-	icon_state = "heavylaser_deployed"
+	icon = 'icons/obj/machines/deployable/heavy_laser.dmi'
+	icon_state = "heavylaser"
 
 	fire_sound = 'sound/weapons/guns/fire/tank_flamethrower.ogg'
 	reload_sound = 'sound/weapons/guns/interact/minigun_cocked.ogg'
@@ -282,7 +281,6 @@
 	radial_icon_state = "laser_ricochet"
 	description = "Fires an experiment laser pulse capable of bouncing off many wall surfaces. The laser increases in potency when bouncing, before collapsing entirely after exceeding its threshold."
 
-
 /obj/item/weapon/gun/energy/lasgun/lasrifle/heavy_laser/deployable
 	icon_state = "heavylaser_deployable"
 	item_flags = IS_DEPLOYABLE|TWOHANDED
@@ -296,7 +294,7 @@
 
 	w_class = WEIGHT_CLASS_HUGE
 	equip_slot_flags = ITEM_SLOT_BACK
-	icon = 'icons/Marine/marine-fkgun.dmi'
+	icon = 'icons/obj/machines/deployable/fk88.dmi'
 	icon_state = "isg"
 	fire_sound = 'sound/weapons/guns/fire/tank_cannon1.ogg'
 	reload_sound = 'sound/weapons/guns/interact/tat36_reload.ogg'
@@ -341,7 +339,6 @@
 /obj/item/weapon/gun/hsg_102/death
 	name = "\improper \"Death incarnate\" heavy machine gun"
 	desc = "It looks like a regular HSG-102, however glowing archaeic writing glows faintly on its sides and top. It beckons for blood."
-	icon = 'icons/Marine/marine-hmg.dmi'
 
 	aim_slowdown = 3
 	scatter = 30
@@ -363,7 +360,7 @@
 	desc = "An absolute monster of a weapon, this is a watercooled heavy machinegun modernized by some crazy armorer with a wheeling kit included. Considering the mish mash of parts for the wheeling kit, you think its from another model of the gun. The pinnacle at holding a chokepoint. Holds 500 rounds of 10x28mm caseless in a box case. IS NOT IFF CAPABLE. Aiming carefully recommended. Can be repaired with a blowtorch once deployed. Alt Right click to unanchor and reanchor it."
 	w_class = WEIGHT_CLASS_HUGE
 	equip_slot_flags = ITEM_SLOT_BACK
-	icon = 'icons/Marine/marine-hmg.dmi'
+	icon = 'icons/obj/machines/deployable/mg08.dmi'
 	icon_state = "mg08"
 	worn_icon_list = list(
 		slot_l_hand_str = 'icons/mob/inhands/guns/misc_left_1.dmi',
@@ -413,7 +410,7 @@
 	desc = "The MG-27 is the SG-29s aging IFF-less cousin, made for rapid accurate machinegun fire in a short amount of time, you could use it while standing, not a great idea. Use the tripod for actual combat. It uses 10x27mm boxes."
 	equip_slot_flags = ITEM_SLOT_BACK
 	w_class = WEIGHT_CLASS_BULKY
-	icon = 'icons/Marine/marine-mmg.dmi'
+	icon = 'icons/obj/machines/deployable/mounted_machinegun.dmi'
 	icon_state = "t27"
 	worn_icon_state = "t27"
 	worn_icon_list = list(
@@ -480,7 +477,7 @@
 	name = "\improper PTR-41/1785 anti-mech gun"
 	desc = "The PTR-41/1785 is a bottom shelf solution modernized for dealing with armor, while one could use it while standing it is obviously not a great idea. It is recommended to be used while the bipod is deployed. It uses 14.5mm high velocity rounds that will certainly leave a hole in whatever unfortunate soul is hit by it."
 	w_class = WEIGHT_CLASS_BULKY
-	icon = 'icons/Marine/clf_heavyrifle.dmi'
+	icon = 'icons/obj/machines/deployable/clf_heavyrifle.dmi'
 	icon_state = "ptrs"
 	worn_icon_state = "ptrs"
 	worn_icon_list = list(
@@ -542,9 +539,9 @@
 	name = "\improper AT-36 anti tank gun"
 	desc = "The AT-36 is a light dual purpose anti tank and anti personnel weapon used by the TGMC. Used for light vehicle or bunker busting on a short notice. Best used by two people. It can move around with wheels, and has an ammo rack intergral to the weapon. CANNOT BE UNDEPLOYED ONCE DEPLOYED! It uses several types of 37mm shells boxes. Alt-right click on it to anchor it so that it cannot be moved by anyone, then alt-right click again to move it."
 	w_class = WEIGHT_CLASS_BULKY
-	icon = 'icons/Marine/marine-atgun.dmi'
-	icon_state = "tat36"
-	worn_icon_state = "tat36"
+	icon = 'icons/obj/machines/deployable/at36.dmi'
+	icon_state = "at36"
+	worn_icon_state = "at36"
 	caliber = CALIBER_37MM // codex
 	max_shells = 1 //codex
 	fire_sound = 'sound/weapons/guns/fire/tat36.ogg'
@@ -644,9 +641,9 @@
 	w_class = WEIGHT_CLASS_HUGE
 	equip_slot_flags = ITEM_SLOT_BACK
 	caliber = CALIBER_40MM
-	icon = 'icons/Marine/marine-hmg.dmi'
-	icon_state = "ags"
-	fire_sound = 'sound/weapons/guns/fire/ags.ogg'
+	icon = 'icons/obj/machines/deployable/agls.dmi'
+	icon_state = "agls"
+	fire_sound = 'sound/weapons/guns/fire/agls.ogg'
 	reload_sound = 'sound/weapons/guns/interact/minigun_cocked.ogg'
 	default_ammo_type = /obj/item/ammo_magazine/standard_agls
 	scatter = 0
@@ -689,13 +686,12 @@
 	if(istype(in_chamber, /obj/item/ammo_magazine/standard_agls/incendiary))
 		gun_user?.record_war_crime()
 
-
 // Non-TGMC HMG
 
 /obj/item/weapon/gun/icc_hmg
 	name = "\improper KRD-61ES mounted heavy machinegun"
 	desc = "The KRD-61ES machinegun is the export variant of the ML-91 HMG. It's too heavy to be wielded or operated without the tripod. No extra work required, just deploy it with Ctrl-Click. Can be repaired with a blowtorch once deployed."
-	icon = 'icons/Marine/marine-mmg.dmi'
+	icon = 'icons/obj/machines/deployable/mounted_machinegun.dmi'
 	icon_state = "kord"
 	worn_icon_list = list(
 		slot_l_hand_str = 'icons/mob/inhands/guns/misc_left_1.dmi',

code/modules/projectiles/guns/sentries.dm

@@ -1,7 +1,7 @@
 /obj/item/weapon/gun/sentry
 	name = "sentry"
 	desc = "sentry"
-	icon = 'icons/Marine/sentry.dmi'
+	icon = 'icons/obj/machines/deployable/sentry/sentry.dmi'
 
 	fire_sound = 'sound/weapons/guns/fire/smg_heavy.ogg'
 	reload_sound = 'sound/weapons/guns/interact/smartgun_unload.ogg'
@@ -68,7 +68,7 @@
 /obj/item/weapon/gun/sentry/pod_sentry
 	name = "\improper ST-583 sentry gun"
 	desc = "A fully automatic turret with AI targeting capabilities, designed specifically for deploying inside a paired drop pod shell. Armed with a M30 autocannon and a 500-round drum magazine. Designed to sweeping a landing area to support orbital assaults."
-	icon_state = "podsentry"
+	icon_state = "pod_sentry"
 	turret_flags = TURRET_HAS_CAMERA|TURRET_ALERTS|TURRET_RADIAL
 	item_flags = IS_DEPLOYABLE|DEPLOY_ON_INITIALIZE|DEPLOYED_NO_PICKUP
 	sentry_iff_signal = TGMC_LOYALIST_IFF
@@ -89,7 +89,7 @@
 	name = "\improper COPE sentry"
 	desc = "The Centurion Omnidirectional Point-defense Energy sentry is a man portable, automated weapon system utilised by the SOM. It is activated in hand then thrown into place before it deploys, where it's ground hugging profile makes it a difficult target to accurately hit. Equipped with a compact volkite weapon system, and a recharging battery to allow for prolonged use, but can take normal volkite cells in a pinch."
 	icon_state = "cope"
-	icon = 'icons/Marine/sentry.dmi'
+	icon = 'icons/obj/machines/deployable/sentry/cope.dmi'
 	worn_icon_list = list(
 		slot_l_hand_str = 'icons/mob/inhands/guns/misc_left_1.dmi',
 		slot_r_hand_str = 'icons/mob/inhands/guns/misc_right_1.dmi',
@@ -233,7 +233,8 @@
 /obj/item/weapon/gun/sentry/mini
 	name = "\improper ST-580 point defense sentry"
 	desc = "A deployable, automated turret with AI targeting capabilities. This is a lightweight portable model meant for rapid deployment and point defense. Armed with an light, high velocity machine gun and a 300-round drum magazine."
-	icon_state = "minisentry"
+	icon_state = "mini_sentry"
+	icon = 'icons/obj/machines/deployable/sentry/mini.dmi'
 
 	max_shells = 300
 	knockdown_threshold = 80
@@ -295,7 +296,8 @@
 /obj/item/weapon/gun/sentry/sniper_sentry
 	name = "\improper SRT-574 sentry gun"
 	desc = "A deployable, fully automatic turret with AI targeting capabilities. Armed with a heavy caliber AM-5 antimaterial rifle and a 75-round drum magazine."
-	icon_state = "snipersentry"
+	icon_state = "sniper_sentry"
+	icon = 'icons/obj/machines/deployable/sentry/sniper.dmi'
 
 	turret_range = 12
 	deploy_time = 10 SECONDS
@@ -347,7 +349,8 @@
 /obj/item/weapon/gun/sentry/shotgun_sentry
 	name = "\improper SHT-573 sentry gun"
 	desc = "A deployable, fully automatic turret with AI targeting capabilities. Armed with a heavy caliber SM-10 shotgun and a 100-round drum magazine."
-	icon_state = "shotgunsentry"
+	icon_state = "shotgun_sentry"
+	icon = 'icons/obj/machines/deployable/sentry/shotgun.dmi'
 
 	turret_range = 8
 	deploy_time = 5 SECONDS
@@ -399,7 +402,8 @@
 /obj/item/weapon/gun/sentry/flamer_sentry
 	name = "\improper SFT-573 sentry gun"
 	desc = "A deployable, fully automatic turret with AI targeting capabilities. Armed with a heavy flamethrower and a 200-round drum magazine."
-	icon_state = "flamersentry"
+	icon_state = "flamer_sentry"
+	icon = 'icons/obj/machines/deployable/sentry/flamer.dmi'
 
 	turret_range = 8
 	deploy_time = 5 SECONDS