[IDB Ignore] Icons folder reorganization and cleaning

code/__DEFINES/mobs.dm

@@ -312,24 +312,24 @@
 #define CAN_HOLD_ONE_HAND 2
 
 GLOBAL_LIST_INIT(default_onmob_icons, list(
-		WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_0.dmi',
-		WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_0.dmi',
-		WEAR_WAIST = 'icons/mob/humans/onmob/belt.dmi',
-		WEAR_BACK = 'icons/mob/humans/onmob/back.dmi',
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items/items_lefthand_64.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items/items_righthand_64.dmi',
+		WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts.dmi',
+		WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/backpacks.dmi',
 		WEAR_L_EAR = 'icons/mob/humans/onmob/ears.dmi',
 		WEAR_R_EAR = 'icons/mob/humans/onmob/ears.dmi',
 		WEAR_EYES = 'icons/mob/humans/onmob/eyes.dmi',
 		WEAR_ID = 'icons/mob/mob.dmi',
-		WEAR_BODY = 'icons/mob/humans/onmob/uniform_0.dmi',
-		WEAR_JACKET = 'icons/mob/humans/onmob/suit_0.dmi',
-		WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi',
+		WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi',
+		WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/misc_ert.dmi',
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats.dmi',
 		WEAR_FEET = 'icons/mob/humans/onmob/feet.dmi',
-		WEAR_FACE = 'icons/mob/humans/onmob/mask.dmi',
+		WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/masks.dmi',
 		WEAR_HANDCUFFED = 'icons/mob/mob.dmi',
 		WEAR_LEGCUFFED = 'icons/mob/mob.dmi',
 		WEAR_HANDS = 'icons/mob/humans/onmob/hands.dmi',
-		WEAR_J_STORE = 'icons/mob/humans/onmob/suit_slot.dmi',
-		WEAR_ACCESSORIES = 'icons/mob/humans/onmob/ties.dmi'
+		WEAR_J_STORE = 'icons/mob/humans/onmob/clothing/suit_storage/misc.dmi',
+		WEAR_ACCESSORIES = 'icons/mob/humans/onmob/clothing/accessory/ties.dmi'
 		))
 
 GLOBAL_LIST_INIT(default_xeno_onmob_icons, list(

code/__HELPERS/unsorted.dm

@@ -611,79 +611,79 @@ GLOBAL_DATUM(action_purple_power_up, /image)
 /proc/get_busy_icon(busy_type)
 	if(busy_type == BUSY_ICON_GENERIC)
 		if(!GLOB.busy_indicator_clock)
-			GLOB.busy_indicator_clock = image('icons/mob/mob.dmi', null, "busy_generic", "pixel_y" = 22)
+			GLOB.busy_indicator_clock = image('icons/mob/do_afters.dmi', null, "busy_generic", "pixel_y" = 22)
 			GLOB.busy_indicator_clock.layer = FLY_LAYER
 			GLOB.busy_indicator_clock.plane = ABOVE_GAME_PLANE
 		return GLOB.busy_indicator_clock
 	else if(busy_type == BUSY_ICON_MEDICAL)
 		if(!GLOB.busy_indicator_medical)
-			GLOB.busy_indicator_medical = image('icons/mob/mob.dmi', null, "busy_medical", "pixel_y" = 0) //This shows directly on top of the mob, no offset!
+			GLOB.busy_indicator_medical = image('icons/mob/do_afters.dmi', null, "busy_medical", "pixel_y" = 0) //This shows directly on top of the mob, no offset!
 			GLOB.busy_indicator_medical.layer = FLY_LAYER
 			GLOB.busy_indicator_medical.plane = ABOVE_GAME_PLANE
 		return GLOB.busy_indicator_medical
 	else if(busy_type == BUSY_ICON_BUILD)
 		if(!GLOB.busy_indicator_build)
-			GLOB.busy_indicator_build = image('icons/mob/mob.dmi', null, "busy_build", "pixel_y" = 22)
+			GLOB.busy_indicator_build = image('icons/mob/do_afters.dmi', null, "busy_build", "pixel_y" = 22)
 			GLOB.busy_indicator_build.layer = FLY_LAYER
 			GLOB.busy_indicator_build.plane = ABOVE_GAME_PLANE
 		return GLOB.busy_indicator_build
 	else if(busy_type == BUSY_ICON_FRIENDLY)
 		if(!GLOB.busy_indicator_friendly)
-			GLOB.busy_indicator_friendly = image('icons/mob/mob.dmi', null, "busy_friendly", "pixel_y" = 22)
+			GLOB.busy_indicator_friendly = image('icons/mob/do_afters.dmi', null, "busy_friendly", "pixel_y" = 22)
 			GLOB.busy_indicator_friendly.layer = FLY_LAYER
 			GLOB.busy_indicator_friendly.plane = ABOVE_GAME_PLANE
 		return GLOB.busy_indicator_friendly
 	else if(busy_type == BUSY_ICON_HOSTILE)
 		if(!GLOB.busy_indicator_hostile)
-			GLOB.busy_indicator_hostile = image('icons/mob/mob.dmi', null, "busy_hostile", "pixel_y" = 22)
+			GLOB.busy_indicator_hostile = image('icons/mob/do_afters.dmi', null, "busy_hostile", "pixel_y" = 22)
 			GLOB.busy_indicator_hostile.layer = FLY_LAYER
 			GLOB.busy_indicator_hostile.plane = ABOVE_GAME_PLANE
 		return GLOB.busy_indicator_hostile
 	else if(busy_type == EMOTE_ICON_HIGHFIVE)
 		if(!GLOB.emote_indicator_highfive)
-			GLOB.emote_indicator_highfive = image('icons/mob/mob.dmi', null, "emote_highfive", "pixel_y" = 22)
+			GLOB.emote_indicator_highfive = image('icons/mob/do_afters.dmi', null, "emote_highfive", "pixel_y" = 22)
 			GLOB.emote_indicator_highfive.layer = FLY_LAYER
 			GLOB.emote_indicator_highfive.plane = ABOVE_GAME_PLANE
 		return GLOB.emote_indicator_highfive
 	else if(busy_type == EMOTE_ICON_FISTBUMP)
 		if(!GLOB.emote_indicator_fistbump)
-			GLOB.emote_indicator_fistbump = image('icons/mob/mob.dmi', null, "emote_fistbump", "pixel_y" = 22)
+			GLOB.emote_indicator_fistbump = image('icons/mob/do_afters.dmi', null, "emote_fistbump", "pixel_y" = 22)
 			GLOB.emote_indicator_fistbump.layer = FLY_LAYER
 			GLOB.emote_indicator_fistbump.plane = ABOVE_GAME_PLANE
 		return GLOB.emote_indicator_fistbump
 	else if(busy_type == EMOTE_ICON_ROCK_PAPER_SCISSORS)
 		if(!GLOB.emote_indicator_rock_paper_scissors)
-			GLOB.emote_indicator_rock_paper_scissors = image('icons/mob/mob.dmi', null, "emote_rps", "pixel_y" = 22)
+			GLOB.emote_indicator_rock_paper_scissors = image('icons/mob/do_afters.dmi', null, "emote_rps", "pixel_y" = 22)
 			GLOB.emote_indicator_rock_paper_scissors.layer = FLY_LAYER
 			GLOB.emote_indicator_rock_paper_scissors.plane = ABOVE_GAME_PLANE
 		return GLOB.emote_indicator_rock_paper_scissors
 	else if(busy_type == EMOTE_ICON_ROCK)
 		if(!GLOB.emote_indicator_rock)
-			GLOB.emote_indicator_rock = image('icons/mob/mob.dmi', null, "emote_rock", "pixel_y" = 22)
+			GLOB.emote_indicator_rock = image('icons/mob/do_afters.dmi', null, "emote_rock", "pixel_y" = 22)
 			GLOB.emote_indicator_rock.layer = FLY_LAYER
 			GLOB.emote_indicator_rock.plane = ABOVE_GAME_PLANE
 		return GLOB.emote_indicator_rock
 	else if(busy_type == EMOTE_ICON_PAPER)
 		if(!GLOB.emote_indicator_paper)
-			GLOB.emote_indicator_paper = image('icons/mob/mob.dmi', null, "emote_paper", "pixel_y" = 22)
+			GLOB.emote_indicator_paper = image('icons/mob/do_afters.dmi', null, "emote_paper", "pixel_y" = 22)
 			GLOB.emote_indicator_paper.layer = FLY_LAYER
 			GLOB.emote_indicator_paper.plane = ABOVE_GAME_PLANE
 		return GLOB.emote_indicator_paper
 	else if(busy_type == EMOTE_ICON_SCISSORS)
 		if(!GLOB.emote_indicator_scissors)
-			GLOB.emote_indicator_scissors = image('icons/mob/mob.dmi', null, "emote_scissors", "pixel_y" = 22)
+			GLOB.emote_indicator_scissors = image('icons/mob/do_afters.dmi', null, "emote_scissors", "pixel_y" = 22)
 			GLOB.emote_indicator_scissors.layer = FLY_LAYER
 			GLOB.emote_indicator_scissors.plane = ABOVE_GAME_PLANE
 		return GLOB.emote_indicator_scissors
 	else if(busy_type == EMOTE_ICON_HEADBUTT)
 		if(!GLOB.emote_indicator_headbutt)
-			GLOB.emote_indicator_headbutt = image('icons/mob/mob.dmi', null, "emote_headbutt", "pixel_y" = 22)
+			GLOB.emote_indicator_headbutt = image('icons/mob/do_afters.dmi', null, "emote_headbutt", "pixel_y" = 22)
 			GLOB.emote_indicator_headbutt.layer = FLY_LAYER
 			GLOB.emote_indicator_headbutt.plane = ABOVE_GAME_PLANE
 		return GLOB.emote_indicator_headbutt
 	else if(busy_type == EMOTE_ICON_TAILSWIPE)
 		if(!GLOB.emote_indicator_tailswipe)
-			GLOB.emote_indicator_tailswipe = image('icons/mob/mob.dmi', null, "emote_tailswipe", "pixel_y" = 22)
+			GLOB.emote_indicator_tailswipe = image('icons/mob/do_afters.dmi', null, "emote_tailswipe", "pixel_y" = 22)
 			GLOB.emote_indicator_tailswipe.layer = FLY_LAYER
 			GLOB.emote_indicator_tailswipe.plane = ABOVE_GAME_PLANE
 		return GLOB.emote_indicator_tailswipe

code/_globalvars/global_lists.dm

@@ -505,8 +505,7 @@ GLOBAL_LIST_INIT(hj_emotes, setup_hazard_joe_emotes())
 		HUD_ORANGE = new /datum/custom_hud/orange(),
 		HUD_RED = new /datum/custom_hud/red(),
 		HUD_WHITE = new /datum/custom_hud/white(),
-		HUD_ALIEN = new /datum/custom_hud/alien(),
-		HUD_ROBOT = new /datum/custom_hud/robot()
+		HUD_ALIEN = new /datum/custom_hud/alien()
 	)
 
 /proc/setup_human_huds()

code/_onclick/hud/ghost.dm

@@ -24,22 +24,6 @@
 
 	ghost.minimap.action_activate()
 
-// /atom/movable/screen/ghost/follow_xeno
-// name = "Follow Xeno"
-// icon_state = "follow_xeno"
-
-// /atom/movable/screen/ghost/follow_xeno/Click()
-// var/mob/dead/observer/G = usr
-// G.follow_xeno()
-
-// /atom/movable/screen/ghost/follow_human
-// name = "Follow Humans"
-// icon_state = "follow_human"
-
-// /atom/movable/screen/ghost/follow_human/Click()
-// var/mob/dead/observer/G = usr
-// G.follow_human()
-
 /atom/movable/screen/ghost/reenter_corpse
 	name = "Reenter corpse"
 	icon_state = "reenter_corpse"

code/datums/custom_hud.dm

@@ -162,19 +162,3 @@
 	var/ui_alienplasmadisplay = "EAST-1:28,6:13"
 	var/ui_alienarmordisplay = "EAST-1:28,5:13"
 	var/ui_mark_locator = "EAST-1:28,10:13"
-
-/datum/custom_hud/robot
-	ui_style_icon = 'icons/mob/hud/screen1_robot.dmi'
-
-	var/ui_inv1 = "WEST+5:16,1:5"
-	var/ui_inv2 = "WEST+6:16,1:5"
-	var/ui_inv3 = "WEST+7:16,1:5"
-	var/ui_borg_store = "WEST+8:16,1:5"
-
-	var/ui_borg_pull = "EAST-3:24,2:7"
-	var/ui_borg_module = "EAST-2:26,2:7"
-	var/ui_borg_panel = "EAST-1:28,2:7"
-
-	var/ui_toxin = "EAST-1:28,13:27"
-	var/ui_borg_health = "EAST-1:28,6:13"
-	var/ui_borg_temp = "EAST-1:28,10:21"

code/datums/datacore.dm

@@ -412,7 +412,7 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 		eyes_s.Blend(facial_s, ICON_OVERLAY)
 
 	var/icon/clothes_s = null
-	clothes_s = new /icon('icons/mob/humans/onmob/uniform_0.dmi', "marine_underpants_s")
+	clothes_s = new /icon('icons/mob/humans/onmob/clothing/uniforms/underwear_uniforms.dmi', "marine_underpants_s")
 	clothes_s.Blend(new /icon('icons/mob/humans/onmob/feet.dmi', "black"), ICON_UNDERLAY)
 	preview_icon.Blend(eyes_s, ICON_OVERLAY)
 	if(clothes_s)

code/game/gamemodes/colonialmarines/huntergames.dm

@@ -281,17 +281,14 @@
 			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET)
 			H.remove_language(LANGUAGE_ENGLISH)
 			H.add_language(LANGUAGE_RUSSIAN)
-		if(7) //Highlander!
-			H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(H), WEAR_BODY)
-			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), WEAR_FEET)
-		if(8) //Assassin!
+		if(7) //Assassin!
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(H), WEAR_BODY)
 			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET)
-		if(9) //Corporate guy
+		if(8) //Corporate guy
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(H), WEAR_BODY)
 			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/wcoat(H), WEAR_JACKET)
 			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET)
-		if(10) //Colonial Marshal
+		if(9) //Colonial Marshal
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(H), WEAR_BODY)
 			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET)
 

code/game/machinery/washing_machine.dm

@@ -103,9 +103,6 @@
 // if ( istype(W,/obj/item/clothing/suit/powered ) )
 // to_chat(user, "This item does not fit.")
 // return
-		if ( istype(W,/obj/item/clothing/suit/cyborg_suit ) )
-			to_chat(user, "This item does not fit.")
-			return
 		if ( istype(W,/obj/item/clothing/suit/bomb_suit ) )
 			to_chat(user, "This item does not fit.")
 			return

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

@@ -21,44 +21,13 @@
 	new /obj/item/clothing/head/helmet/gladiator(src.loc)
 	return INITIALIZE_HINT_QDEL
 
-/obj/effect/landmark/costume/madscientist/Initialize()
-	. = ..()
-	new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
-	new /obj/item/clothing/head/flatcap(src.loc)
-	new /obj/item/clothing/suit/storage/labcoat/mad(src.loc)
-	new /obj/item/clothing/glasses/gglasses(src.loc)
-	return INITIALIZE_HINT_QDEL
-
-/obj/effect/landmark/costume/elpresidente/Initialize()
-	. = ..()
-	new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
-	new /obj/item/clothing/head/flatcap(src.loc)
-	new /obj/item/clothing/mask/cigarette/cigar/havana(src.loc)
-	new /obj/item/clothing/shoes/jackboots(src.loc)
-	return INITIALIZE_HINT_QDEL
-
 /obj/effect/landmark/costume/butler/Initialize()
 	. = ..()
 	new /obj/item/clothing/suit/storage/wcoat(src.loc)
 	new /obj/item/clothing/under/suit_jacket(src.loc)
 	new /obj/item/clothing/head/that(src.loc)
 	return INITIALIZE_HINT_QDEL
 
-/obj/effect/landmark/costume/scratch/Initialize()
-	. = ..()
-	new /obj/item/clothing/gloves/white(src.loc)
-	new /obj/item/clothing/shoes/white(src.loc)
-	new /obj/item/clothing/under/scratch(src.loc)
-	if (prob(30))
-		new /obj/item/clothing/head/cueball(src.loc)
-	return INITIALIZE_HINT_QDEL
-
-/obj/effect/landmark/costume/highlander/Initialize()
-	. = ..()
-	new /obj/item/clothing/under/kilt(src.loc)
-	new /obj/item/clothing/head/beret(src.loc)
-	return INITIALIZE_HINT_QDEL
-
 /obj/effect/landmark/costume/prig/Initialize()
 	. = ..()
 	new /obj/item/clothing/suit/storage/wcoat(src.loc)
@@ -71,12 +40,6 @@
 	new /obj/item/clothing/mask/fakemoustache(src.loc)
 	return INITIALIZE_HINT_QDEL
 
-/obj/effect/landmark/costume/plaguedoctor/Initialize()
-	. = ..()
-	new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc)
-	new /obj/item/clothing/head/plaguedoctorhat(src.loc)
-	return INITIALIZE_HINT_QDEL
-
 /obj/effect/landmark/costume/pirate/Initialize()
 	. = ..()
 	new /obj/item/clothing/under/pirate(src.loc)
@@ -86,8 +49,3 @@
 	new /obj/item/clothing/glasses/eyepatch(src.loc)
 	return INITIALIZE_HINT_QDEL
 
-/obj/effect/landmark/costume/commie/Initialize()
-	. = ..()
-	new /obj/item/clothing/under/soviet(src.loc)
-	new /obj/item/clothing/head/ushanka(src.loc)
-	return INITIALIZE_HINT_QDEL

code/game/objects/effects/misc.dm

@@ -2,7 +2,7 @@
 /obj/effect/spresent
 	name = "strange present"
 	desc = "It's a ... present?"
-	icon = 'icons/obj/items/items.dmi'
+	icon = 'icons/obj/items/gifts.dmi'
 	icon_state = "strangepresent"
 	density = TRUE
 	anchored = FALSE

code/game/objects/effects/spawners/wo_spawners/supplies.dm

@@ -141,7 +141,7 @@
 	stuff = list(/obj/item/storage/large_holster/m37)
 
 /obj/effect/landmark/wo_supplies/storage/belts
-	icon = 'icons/obj/items/clothing/belts.dmi'
+	icon = 'icons/obj/items/clothing/belts/belts.dmi'
 	amount = list(1,3)
 
 /obj/effect/landmark/wo_supplies/storage/belts/grenade

code/game/objects/items.dm

@@ -1,6 +1,5 @@
 /obj/item
 	name = "item"
-	icon = 'icons/obj/items/items.dmi'
 	mouse_drag_pointer = MOUSE_ACTIVE_POINTER
 	layer = ITEM_LAYER
 	light_system = MOVABLE_LIGHT

code/game/objects/items/XMAS.dm

@@ -4,7 +4,7 @@
 /obj/item/m_gift //Marine Gift
 	name = "Present"
 	desc = "One, standard issue USCM Present"
-	icon = 'icons/obj/items/items.dmi'
+	icon = 'icons/obj/items/gifts.dmi'
 	icon_state = "gift1"
 	item_state = "gift1"
 

code/game/objects/items/ashtray.dm

@@ -1,5 +1,5 @@
 /obj/item/ashtray
-	icon = 'icons/obj/items/ashtray.dmi'
+	icon = 'icons/obj/items/smoking/ashtray.dmi'
 
 	var/max_butts = 0
 	var/empty_desc = ""

code/game/objects/items/bodybag.dm

@@ -31,8 +31,8 @@
 /obj/item/bodybag/cryobag
 	name = "stasis bag"
 	desc = "A folded, reusable bag designed to prevent additional damage to an occupant."
-	icon = 'icons/obj/cryobag.dmi'
-	icon_state = "bodybag_folded"
+	icon = 'icons/obj/bodybag.dmi'
+	icon_state = "cryobag_folded"
 	unfolded_path = /obj/structure/closet/bodybag/cryobag
 	matter = list("plastic" = 7500)
 	var/used = 0
@@ -209,7 +209,10 @@
 	name = "stasis bag"
 	bag_name = "stasis bag"
 	desc = "A reusable plastic bag designed to prevent additional damage to an occupant."
-	icon = 'icons/obj/cryobag.dmi'
+	icon = 'icons/obj/bodybag.dmi'
+	icon_state = "cryobag_closed"
+	icon_closed = "cryobag_closed"
+	icon_opened = "cryobag_open"
 	item_path = /obj/item/bodybag/cryobag
 	store_items = FALSE
 	/// the mob in stasis
@@ -366,6 +369,6 @@
 
 /obj/item/trash/used_stasis_bag
 	name = "used stasis bag"
-	icon = 'icons/obj/cryobag.dmi'
-	icon_state = "bodybag_used"
+	icon = 'icons/obj/bodybag.dmi'
+	icon_state = "cryobag_used"
 	desc = "It's been ripped open. You will need to find a machine capable of recycling it."

code/game/objects/items/cosmetics.dm

@@ -2,7 +2,7 @@
 	gender = PLURAL
 	name = "facepaint"
 	desc = "Paint, for your face. Wipe it off your face with some paper if you need to. This one is a deep, forest green."
-	icon = 'icons/obj/items/items.dmi'
+	icon = 'icons/obj/items/paint.dmi'
 	icon_state = "camo"
 	var/paint_type = "green"
 	w_class = SIZE_TINY

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

@@ -1,7 +1,7 @@
 //*****************************Coin********************************/
 
 /obj/item/coin
-	icon = 'icons/obj/items/items.dmi'
+	icon = 'icons/obj/items/economy.dmi'
 	name = "Coin"
 	icon_state = "coin"
 	flags_atom = FPRINT|CONDUCT
@@ -86,7 +86,7 @@
 			to_chat(user, SPAN_NOTICE("There already is a string attached to this coin."))
 			return
 		if (CC.use(1))
-			overlays += image('icons/obj/items/items.dmi',"coin_string_overlay")
+			overlays += image('icons/obj/items/economy.dmi',"coin_string_overlay")
 			string_attached = 1
 			to_chat(user, SPAN_NOTICE("You attach a string to the coin."))
 		else