Reorganizes marine icon folder

code/__DEFINES/atom_hud.dm

@@ -18,7 +18,6 @@
 #define PAIN_HUD "pain_hud" //displays human pain / preceived health.
 #define ARMOR_SUNDER_HUD "armor_sunder_hud" //displays how much sunder has been applied.
 #define XENO_REAGENT_HUD "xeno_reagent_hud" // displays sign based on reagent in human
-#define XENO_TACTICAL_HUD "xeno_tactical_hud" // displays xeno tactical elements such as tunnels and rally hive pings
 #define MACHINE_HEALTH_HUD "machine_health_hud" // displays machine health; part of /datum/atom_hud/squad
 #define MACHINE_AMMO_HUD "machine_ammo_hud" // displays machine ammo; part of /datum/atom_hud/squad
 #define XENO_DEBUFF_HUD "xeno_debuff_hud" // displays xeno debuffs; part of /datum/atom_hud/xeno_debuff
@@ -48,11 +47,10 @@
 #define DATA_HUD_SQUAD_TERRAGOV 10
 #define DATA_HUD_ORDER 11
 #define DATA_HUD_MEDICAL_PAIN 12
-#define DATA_HUD_XENO_TACTICAL 13
-#define DATA_HUD_XENO_DEBUFF 14
-#define DATA_HUD_XENO_HEART 15
-#define DATA_HUD_HUNTER 16
-#define DATA_HUD_HUNTER_CLAN 17
+#define DATA_HUD_XENO_DEBUFF 13
+#define DATA_HUD_XENO_HEART 14
+#define DATA_HUD_HUNTER 15
+#define DATA_HUD_HUNTER_CLAN 16
 
 
 // Notification action types

code/_onclick/hud/screen_objects/screen_objects.dm

@@ -511,7 +511,7 @@
 
 /atom/movable/screen/SL_locator
 	name = "sl locator"
-	icon = 'icons/Marine/marine-items.dmi'
+	icon = 'icons/effects/blips.dmi'
 	icon_state = "Blue_arrow"
 	alpha = 0 //invisible
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
@@ -723,7 +723,7 @@
 #undef AMMO_HUD_ICON_EMPTY
 
 /atom/movable/screen/arrow
-	icon = 'icons/Marine/marine-items.dmi'
+	icon = 'icons/effects/blips.dmi'
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	screen_loc = ui_sl_dir
 	alpha = 128 //translucent

code/datums/atom_hud.dm

@@ -15,7 +15,6 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/atom_hud, list(
 	DATA_HUD_SQUAD_TERRAGOV = new /datum/atom_hud/squad,
 	DATA_HUD_ORDER = new /datum/atom_hud/order,
 	DATA_HUD_MEDICAL_PAIN = new /datum/atom_hud/medical/pain,
-	DATA_HUD_XENO_TACTICAL = new /datum/atom_hud/xeno_tactical,
 	DATA_HUD_XENO_DEBUFF = new /datum/atom_hud/xeno_debuff,
 	DATA_HUD_XENO_HEART = new /datum/atom_hud/xeno_heart,
 	DATA_HUD_HUNTER = new /datum/atom_hud/hunter_hud,

code/game/data_huds/atom_hud.dm

@@ -48,10 +48,6 @@
 /datum/atom_hud/xeno_reagents
 	hud_icons = list(XENO_REAGENT_HUD)
 
-///hud component for revealing tactical elements to xenos
-/datum/atom_hud/xeno_tactical
-	hud_icons = list(XENO_TACTICAL_HUD)
-
 ///hud component for revealing xeno specific status effect debuffs to xenos
 /datum/atom_hud/xeno_debuff
 	hud_icons = list(XENO_DEBUFF_HUD)

code/game/objects/effects/landmarks/landmarks.dm

@@ -513,7 +513,7 @@
 
 /obj/effect/landmark/xenoden_docking_port
 	name = "xenoden docking port"
-	icon = 'icons/Marine/marine-navigation.dmi'
+	icon = 'icons/obj/items/pinpointer.dmi'
 	icon_state = "pinonfar"
 
 /obj/effect/landmark/xenoden_docking_port/Initialize(mapload)

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -152,7 +152,7 @@ GLOBAL_LIST_EMPTY(blood_particles)
 	flick("heavyimpact", src)
 
 /obj/effect/temp_visual/order
-	icon = 'icons/Marine/marine-items.dmi'
+	icon = 'icons/effects/blips.dmi'
 	var/icon_state_on
 	hud_possible = list(SQUAD_HUD_TERRAGOV, SQUAD_HUD_SOM)
 	duration = CIC_ORDER_DURATION
@@ -196,7 +196,7 @@ GLOBAL_LIST_EMPTY(blood_particles)
 	var/image/holder = hud_list[hud_type]
 	if(!holder)
 		return
-	holder.icon = 'icons/Marine/marine-items.dmi'
+	holder.icon = 'icons/effects/blips.dmi'
 	holder.icon_state = icon_state_on
 	hud_list[hud_type] = holder
 

code/game/objects/effects/temporary_visuals/temporary_visual.dm

@@ -30,46 +30,6 @@
 		setDir(set_dir)
 	return ..()
 
-
-///Image that appears at the Xeno Rally target; only Xenos can see it
-/obj/effect/temp_visual/xenomorph/xeno_tracker_target
-	name = "xeno tracker target"
-	icon_state = "nothing"
-	duration = XENO_HEALTH_ALERT_POINTER_DURATION
-	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-	color = COLOR_RED
-	hud_possible = list(XENO_TACTICAL_HUD)
-	///The target we're pinging and adding this effect to
-	var/atom/tracker_target
-	///The visual effect we're attaching
-	var/image/holder
-
-/obj/effect/temp_visual/xenomorph/xeno_tracker_target/Initialize(mapload, atom/target)
-	. = ..()
-	prepare_huds()
-	for(var/datum/atom_hud/xeno_tactical/xeno_tac_hud in GLOB.huds) //Add to the xeno tachud
-		xeno_tac_hud.add_to_hud(src)
-	hud_set_xeno_tracker_target(target)
-
-/obj/effect/temp_visual/xenomorph/xeno_tracker_target/Destroy()
-	if(tracker_target && holder) //Check to avoid runtimes
-		tracker_target.overlays -= holder //remove the overlay
-	for(var/datum/atom_hud/xeno_tactical/xeno_tac_hud in GLOB.huds)
-		xeno_tac_hud.remove_from_hud(src)
-	tracker_target = null //null the target var
-	QDEL_NULL(holder) //remove the holder and null the var
-	return ..()
-
-/obj/effect/temp_visual/xenomorph/xeno_tracker_target/proc/hud_set_xeno_tracker_target(atom/target)
-	holder = hud_list[XENO_TACTICAL_HUD]
-	if(!holder)
-		return
-	holder.icon = 'icons/Marine/marine-items.dmi'
-	holder.icon_state = "detector_blip"
-	tracker_target = target
-	tracker_target.overlays += holder
-	hud_list[XENO_TACTICAL_HUD] = holder
-
 GLOBAL_DATUM_INIT(flare_particles, /particles/flare_smoke, new)
 /particles/flare_smoke
 	icon = 'icons/effects/effects.dmi'
@@ -108,7 +68,7 @@ GLOBAL_DATUM_INIT(flare_particles, /particles/flare_smoke, new)
 	animate(src, time = duration, pixel_y = 0)
 
 /obj/effect/temp_visual/dropship_flyby
-	icon = 'icons/Marine/dropship_prop.dmi'
+	icon = 'icons/obj/structures/dropship_prop.dmi'
 	icon_state = "fighter_shadow"
 	layer = FLY_LAYER
 	resistance_flags = RESIST_ALL

code/game/objects/items/binoculars.dm

@@ -1,7 +1,7 @@
 /obj/item/binoculars
 	name = "binoculars"
 	desc = "A pair of binoculars."
-	icon = 'icons/Marine/marine-navigation.dmi'
+	icon = 'icons/obj/items/binoculars.dmi'
 	icon_state = "binoculars"
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/inhands/equipment/binoculars_left.dmi',
@@ -30,7 +30,6 @@
 /obj/item/binoculars/tactical
 	name = "tactical binoculars"
 	desc = "A pair of binoculars, with a laser targeting function."
-	icon = 'icons/Marine/marine-navigation.dmi'
 	icon_state = "range_finders"
 	///The cooldown after we use
 	var/laser_cooldown = 0

code/game/objects/items/devices/minimap_tablet.dm

@@ -8,7 +8,6 @@ GLOBAL_PROTECT(roles_allowed_minimap_draw)
 /obj/item/minimap_tablet
 	name = "minimap tablet"
 	desc = "A drawing tablet with included touch pen. While high command may treat you like a child, being able to plan effectively might be a worthy trade."
-	icon = 'icons/Marine/marine-navigation.dmi'
 	icon_state = "req_tablet_off"
 	/// List of references to the tools we will be using to shape what the map looks like
 	var/list/atom/movable/screen/drawing_tools = list(

code/game/objects/items/devices/squad_transfer_tablet.dm

@@ -1,7 +1,6 @@
 /obj/item/squad_transfer_tablet
 	name = "squad transfer tablet"
 	desc = "A tablet for quickly transfering the squaddies from under one incompetent squad leader to another."
-	icon = 'icons/Marine/marine-navigation.dmi'
 	icon_state = "req_tablet_off"
 	flags_equip_slot = ITEM_SLOT_POCKET
 	w_class = WEIGHT_CLASS_SMALL

code/game/objects/items/devices/tablets.dm

@@ -1,7 +1,6 @@
 /obj/item/hud_tablet
 	name = "hud tablet"
 	desc = "A tablet with a live feed to a number of headset cameras"
-	icon = 'icons/Marine/marine-navigation.dmi'
 	icon_state = "req_tablet_off"
 	req_access = list(ACCESS_NT_CORPORATE)
 	flags_equip_slot = ITEM_SLOT_POCKET

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

@@ -183,7 +183,6 @@
 /obj/item/explosive/grenade/sticky/trailblazer/phosphorus
 	name = "\improper M45 Phosphorus trailblazer grenade"
 	desc = "Capsule based grenade that sticks to sufficiently hard surfaces, causing a trail of air combustable gel to form. But with phosphorus. It is set to detonate in 5 seconds."
-	icon = 'icons/obj/items/grenade.dmi'
 	icon_state = "grenade_sticky_phosphorus"
 	item_state = "grenade_sticky_phosphorus"
 	icon_state_mini = "grenade_trailblazer_phosphorus"
@@ -309,7 +308,6 @@
 	name = "\improper AGLS-37 HEDP grenade"
 	desc = "A small tiny smart grenade, it is about to blow up in your face, unless you found it inert. Otherwise a pretty normal grenade, other than it is somehow in a primeable state."
 	w_class = WEIGHT_CLASS_SMALL
-	icon = 'icons/obj/items/grenade.dmi'
 	icon_state = "ags_grenade"
 	item_state = "ags_grenade"
 	det_time = 1 SECONDS

code/game/objects/items/explosives/mine.dm

@@ -11,7 +11,7 @@ Stepping directly on the mine will also blow it up
 /obj/item/explosive/mine
 	name = "\improper M20 Claymore anti-personnel mine"
 	desc = "The M20 Claymore is a directional proximity triggered anti-personnel mine designed by Armat Systems for use by the TerraGov Marine Corps."
-	icon = 'icons/obj/items/grenade.dmi'
+	icon = 'icons/obj/items/mine.dmi'
 	icon_state = "m20"
 	force = 5
 	w_class = WEIGHT_CLASS_SMALL

code/game/objects/items/firesupport_binoculars.dm

@@ -1,7 +1,6 @@
 /obj/item/binoculars/fire_support
 	name = "tactical binoculars"
 	desc = "A pair of binoculars, used to mark targets for airstrikes and cruise missiles. Unique action to toggle mode. Ctrl+Click when using to target something."
-	icon = 'icons/Marine/marine-navigation.dmi'
 	icon_state = "range_finders"
 	w_class = WEIGHT_CLASS_SMALL
 	///Faction locks this item if specified

code/game/objects/items/marine_gear.dm

@@ -15,7 +15,7 @@
 	anchored = TRUE
 	opacity = TRUE
 	density = TRUE
-	icon = 'icons/Marine/apc.dmi'
+	icon = 'icons/obj/structures/broken_apc.dmi'
 	icon_state = "apc"
 
 
@@ -334,7 +334,6 @@
 /obj/item/compass
 	name = "compass"
 	desc = "A small compass that can tell you your coordinates on use."
-	icon = 'icons/Marine/marine-navigation.dmi'
 	icon_state = "compass"
 	w_class = WEIGHT_CLASS_TINY
 

code/game/objects/items/motion_detector.dm

@@ -3,7 +3,7 @@
 	return
 
 /obj/effect/blip/edge_blip
-	icon = 'icons/Marine/marine-items.dmi'
+	icon = 'icons/effects/blips.dmi'
 	plane = ABOVE_HUD_PLANE
 	/// A friendly/hostile identifier
 	var/identifier = MOTION_DETECTOR_HOSTILE
@@ -35,7 +35,7 @@
 	. = ..()
 	if(!operator?.client)
 		return INITIALIZE_HINT_QDEL
-	blip_image = image('icons/Marine/marine-items.dmi', src, "close_blip_[identifier]")
+	blip_image = image('icons/effects/blips.dmi', src, "close_blip_[identifier]")
 	blip_image.layer = BELOW_FULLSCREEN_LAYER
 	operator.client.images += blip_image
 

code/game/objects/items/pinpointer.dm

@@ -1,6 +1,6 @@
 /obj/item/pinpointer
 	name = "Xeno structure pinpointer"
-	icon = 'icons/Marine/marine-navigation.dmi'
+	icon = 'icons/obj/items/pinpointer.dmi'
 	icon_state = "pinoff"
 	flags_atom = CONDUCT
 	flags_equip_slot = ITEM_SLOT_BELT

code/game/objects/items/stacks/barbed_wire.dm

@@ -1,8 +1,6 @@
-
 /obj/item/stack/barbed_wire
 	name = "barbed wire"
 	desc = "A spiky length of wire."
-	icon = 'icons/Marine/marine-items.dmi'
 	icon_state = "barbed_wire"
 	flags_item = NOBLUDGEON
 	singular_name = "length"

code/game/objects/items/stacks/medical.dm

@@ -293,7 +293,6 @@
 	name = "combat trauma kit"
 	singular_name = "combat trauma kit"
 	desc = "An expensive huge kit for prolonged combat conditions. Has more space and better medicine compared to a regular one."
-	icon = 'icons/obj/stack_objects.dmi'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/inhands/equipment/medical_left.dmi',
 		slot_r_hand_str = 'icons/mob/inhands/equipment/medical_right.dmi',

code/game/objects/items/stacks/sheets/glass.dm

@@ -26,7 +26,7 @@
 				new/datum/stack_recipe("windoor", /obj/structure/windoor_assembly, 5, time = 4 SECONDS, max_per_turf = STACK_RECIPE_ONE_DIRECTIONAL_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_PLASTEEL))
 
 GLOBAL_LIST_INIT(glass_radial_images, list(
-	"recipes" = image('icons/Marine/barricades.dmi', icon_state = "plus"),
+	"recipes" = image('icons/obj/structures/barricades/upgrades.dmi', icon_state = "plus"),
 	"directional window" = image('icons/obj/structures/windows.dmi', "window"),
 	"fulltile window" = image('icons/obj/structures/windows.dmi', "window0"),
 	"windoor" = image('icons/obj/doors/windoor.dmi', icon_state = "left")

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -53,16 +53,16 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 
 
 GLOBAL_LIST_INIT(metal_radial_images, list(
-	"recipes" = image('icons/Marine/barricades.dmi', icon_state = "plus"),
-	"metal barricade" = image('icons/Marine/barricades.dmi', icon_state = "metal_0"),
-	"folding metal barricade" = image('icons/Marine/barricades.dmi', icon_state = "folding_metal_0"), //RUTGMC ADDON
+	"recipes" = image('icons/obj/structures/barricades/upgrades.dmi', icon_state = "plus"),
+	"metal barricade" = image('icons/obj/structures/barricades/metal.dmi', icon_state = "metal_0"),
+	"folding metal barricade" = image('icons/obj/structures/barricades/folding_metal.dmi', icon_state = "folding_metal_0"),
 	"razorwire" = image('icons/obj/structures/barbedwire.dmi', icon_state = "barbedwire_assembly"),
-	"barbedwire" = image('icons/Marine/marine-items.dmi', icon_state = "barbed_wire")
+	"barbedwire" = image('icons/obj/stack_objects.dmi', icon_state = "barbed_wire")
 	))
 
 GLOBAL_LIST_INIT(plasteel_radial_images, list(
-	"plasteel barricade" = image('icons/Marine/barricades.dmi', icon_state = "new_plasteel_0"),
-	"folding plasteel barricade" = image('icons/Marine/barricades.dmi', icon_state = "plasteel_closed_0"),
+	"plasteel barricade" = image('icons/obj/structures/barricades/new_plasteel.dmi', icon_state = "new_plasteel_0"),
+	"folding plasteel barricade" = image('icons/obj/structures/barricades/plasteel.dmi', icon_state = "plasteel_closed_0"),
 	))
 
 GLOBAL_LIST_INIT(plasteel_recipes, list ( \
@@ -189,8 +189,8 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	))
 
 GLOBAL_LIST_INIT(wood_radial_images, list(
-	"recipes" = image('icons/Marine/barricades.dmi', icon_state = "plus"),
-	"barricade" = image('icons/Marine/barricades.dmi', icon_state = "wooden"),
+	"recipes" = image('icons/obj/structures/barricades/upgrades.dmi', icon_state = "plus"),
+	"barricade" = image('icons/obj/structures/barricades/misc.dmi', icon_state = "wooden"),
 	"chair" = image('icons/obj/objects.dmi', icon_state = "wooden_chair"),
 	"tile" = image('icons/obj/stack_objects.dmi', icon_state = "tile-wood"),
 	"crate" = image('icons/obj/structures/crates.dmi', icon_state = "secure_crate")

code/game/objects/items/storage/holsters.dm

@@ -517,7 +517,7 @@
 	flags_storage = BYPASS_CRYO_CHECK
 	storage_slots = 28
 	max_storage_space = 28
-	icon = 'icons/Marine/marine-pouches.dmi'
+	icon = 'icons/obj/items/storage/pouches.dmi'
 	icon_state = "flare"
 	storage_type_limits = list(/obj/item/weapon/gun/grenade_launcher/single_shot/flare = 1)
 	can_hold = list(

code/game/objects/items/storage/pouch.dm

@@ -1,6 +1,6 @@
 /obj/item/storage/pouch
 	name = "abstract pouch"
-	icon = 'icons/Marine/marine-pouches.dmi'
+	icon = 'icons/obj/items/storage/pouches.dmi'
 	icon_state = "small_drop"
 	w_class = WEIGHT_CLASS_BULKY //does not fit in backpack
 	max_w_class = WEIGHT_CLASS_SMALL

code/game/objects/items/storage/reagent_pouch.dm

@@ -3,7 +3,7 @@
 /obj/item/reagent_containers/glass/reagent_canister // See the Reagent Canister Pouch, this is just the container
 	name = "pressurized reagent container"
 	desc = "A pressurized container. The inner part of a pressurized reagent canister pouch. Too large to fit in anything but the pouch it comes with."
-	icon = 'icons/Marine/marine-pouches.dmi'
+	icon = 'icons/obj/items/storage/pouches.dmi'
 	icon_state = "r_canister"
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/inhands/equipment/tanks_left.dmi',
@@ -91,19 +91,19 @@
 /obj/item/storage/pouch/pressurized_reagent_pouch/update_overlays()
 	. = ..()
 	if(!inner)
-		. += image('icons/Marine/marine-pouches.dmi', src, "reagent_pouch_0")
+		. += image('icons/obj/items/storage/pouches.dmi', src, "reagent_pouch_0")
 		return
-	. += image('icons/Marine/marine-pouches.dmi', src, "reagent_canister")
+	. += image('icons/obj/items/storage/pouches.dmi', src, "reagent_canister")
 	var/percentage = round((inner.reagents.total_volume/inner.reagents.maximum_volume)*100)
 	switch(percentage)
 		if(0)
-			. += image('icons/Marine/marine-pouches.dmi', src, "reagent_pouch_0")
+			. += image('icons/obj/items/storage/pouches.dmi', src, "reagent_pouch_0")
 		if(1 to 33)
-			. += image('icons/Marine/marine-pouches.dmi', src, "reagent_pouch_1")
+			. += image('icons/obj/items/storage/pouches.dmi', src, "reagent_pouch_1")
 		if(34 to 66)
-			. += image('icons/Marine/marine-pouches.dmi', src, "reagent_pouch_2")
+			. += image('icons/obj/items/storage/pouches.dmi', src, "reagent_pouch_2")
 		if(67 to 100)
-			. += image('icons/Marine/marine-pouches.dmi', src, "reagent_pouch_3")
+			. += image('icons/obj/items/storage/pouches.dmi', src, "reagent_pouch_3")
 
 /obj/item/storage/pouch/pressurized_reagent_pouch/AltClick(mob/user)
 	if(!remove_canister(user))

code/game/objects/items/weapons/twohanded.dm

@@ -384,7 +384,7 @@
 
 /obj/item/weapon/twohanded/spear/tactical/tacticool
 	name = "M-23 TACTICOOL spear"
-	icon = 'icons/Marine/gun64.dmi'
+	icon = 'icons/obj/items/gun/gun64.dmi'
 	desc = "A TACTICOOL spear. Used for TACTICOOLNESS in combat."
 
 /obj/item/weapon/twohanded/spear/tactical/tacticool/Initialize(mapload)

code/game/objects/items/whistle.dm

@@ -1,6 +1,5 @@
 /obj/item/whistle
 	name = "\improper whistle"
-	icon = 'icons/Marine/marine-navigation.dmi'
 	desc = "A metal pea-whistle. Can be blown while held, or worn in the mouth"
 	icon_state = "whistle"
 	w_class = WEIGHT_CLASS_TINY

code/game/objects/machinery/cic_maptable.dm

@@ -149,7 +149,7 @@
 		tool.UnregisterSignal(user, list(COMSIG_MOB_MOUSEDOWN, COMSIG_MOB_MOUSEUP))
 
 /obj/machinery/cic_maptable/drawable/big
-	icon = 'icons/Marine/mainship_props96.dmi'
+	icon = 'icons/obj/structures/mainship_props96.dmi'
 	layer = ABOVE_OBJ_LAYER
 	pixel_x = -16
 	pixel_y = -14