TGS Test Merge (#7782)

code/__HELPERS/icons.dm

@@ -581,7 +581,7 @@ world
 		A.overlays.Remove(src)
 
 /mob/proc/flick_heal_overlay(time, color = "#00FF00") //used for warden and queen healing
-	var/image/I = image('icons/mob/mob.dmi', src, "heal_overlay")
+	var/image/I = image('icons/mob/do_afters.dmi', src, "heal_overlay")
 	switch(icon_size)
 		if(48)
 			I.pixel_x = 8

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

@@ -6,6 +6,10 @@
 	name = "\improper Automated Storage Briefcase"
 	desc = "A suitcase-sized automated storage and retrieval system. Designed to efficiently store and selectively dispense small items."
 	icon = 'icons/obj/items/storage/briefcases.dmi'
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items/storage_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items/storage_righthand.dmi',
+	)
 	icon_state = "secure"
 	flags_atom = FPRINT|CONDUCT
 	force = 8

code/game/objects/items/props/helmetgarb.dm

@@ -662,6 +662,7 @@
 	name = "compass"
 	desc = "It always faces north. Are you sure it is not broken?"
 	icon = 'icons/obj/items/tools.dmi'
+	icon_state = "compass"
 	item_icons = list(
 		WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/misc.dmi',
 	)

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

@@ -16,7 +16,7 @@
 	icon_state = "smartpack"
 	icon = 'icons/obj/items/clothing/backpack/smartpack.dmi'
 	item_icons = list(
-		WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UA.dmi'
+		WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/smartpack.dmi'
 	)
 	flags_atom = FPRINT|NO_GAMEMODE_SKIN // same sprite for all gamemodes
 	max_storage_space = 14

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

@@ -47,6 +47,11 @@
 	name = "screwdriver"
 	desc = "You can be totally screwy with this."
 	icon = 'icons/obj/items/tools.dmi'
+	item_icons = list(
+		WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/objects.dmi',
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_righthand.dmi',
+	)
 	icon_state = "screwdriver"
 	pickup_sound = 'sound/handling/multitool_pickup.ogg'
 	drop_sound = 'sound/handling/screwdriver_drop.ogg'

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

@@ -44,6 +44,10 @@
 	name = "telescopic baton"
 	desc = "A compact yet rebalanced personal defense weapon. Can be concealed when folded. It will knock down humans when not on harm intent."
 	icon = 'icons/obj/items/weapons/melee/non_lethal.dmi'
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_righthand.dmi'
+	)
 	icon_state = "telebaton_0"
 	item_state = "telebaton_0"
 	flags_equip_slot = SLOT_WAIST

code/modules/clothing/head/head.dm

@@ -44,7 +44,7 @@
 	icon_state = "band2"
 	icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
 	item_icons = list(
-		WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
 	)
 	flags_atom = null
 
@@ -123,7 +123,7 @@
 	icon_state = "berettan"
 	icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
 	item_icons = list(
-		WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
 	)
 
 /obj/item/clothing/head/beret/cm/tan/Initialize(mapload, ...)
@@ -152,6 +152,7 @@
 /obj/item/clothing/head/beret/cm/squadberet
 	name = "USCM Squad Beret"
 	desc = "For those who want to show pride and have nothing to lose (in their head, at least)."
+	flags_atom = NO_GAMEMODE_SKIN
 
 /obj/item/clothing/head/beret/cm/white/civilian
 	name = "White Beret"
@@ -209,7 +210,7 @@
 	icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
 	flags_obj = OBJ_NO_HELMET_BAND|OBJ_IS_HELMET_GARB
 	item_icons = list(
-		WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi',
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi',
 		WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi',
 	)
 	item_state_slots = list(WEAR_AS_GARB = "headbandgreen")
@@ -284,7 +285,7 @@
 	icon = 'icons/obj/items/clothing/hats/headbands.dmi'
 	icon_state = null
 	item_icons = list(
-		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi',
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/headbands.dmi',
 		WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi',
 	)
 	item_state_slots = null
@@ -393,7 +394,7 @@ GLOBAL_LIST_INIT(allowed_hat_items, list(
 	icon_state = "cap"
 	icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
 	item_icons = list(
-		WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi',
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi',
 		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
 	)
@@ -673,7 +674,7 @@ GLOBAL_LIST_INIT(allowed_hat_items, list(
 	icon_state = "coberet"
 	icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
 	item_icons = list(
-		WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
 	)
 	black_market_value = 30
 
@@ -975,7 +976,7 @@ GLOBAL_LIST_INIT(allowed_hat_items, list(
 	icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
 	flags_inv_hide = HIDETOPHAIR
 	item_icons = list(
-		WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi',
+		WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi',
 		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
 	)

code/modules/clothing/suits/armor.dm

@@ -101,7 +101,7 @@
 	. = ..()
 	select_gamemode_skin(/obj/item/clothing/suit/armor/vest/pilot)
 
-/obj/item/clothing/suit/armor/vest/pilot/marine/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
+/obj/item/clothing/suit/armor/vest/pilot/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection)
 	. = ..()
 	switch(SSmapping.configs[GROUND_MAP].camouflage_type)
 		if("jungle")

code/modules/clothing/suits/labcoat.dm

@@ -151,6 +151,11 @@
 	name = "snow suit"
 	desc = "A standard snow suit. It can protect the wearer from extreme cold."
 	icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
+	item_icons = list(
+		WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/suits_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/suits_righthand.dmi',
+	)
 	icon_state = "snowsuit"
 	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
 	flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS

code/modules/clothing/under/marine_uniform.dm

@@ -21,6 +21,7 @@
 	siemens_coefficient = 0.9
 	///Makes it so that we can see the right name in the vendor.
 	var/specialty = "USCM"
+	var/snow_name = " snow uniform"
 	layer = UPPER_ITEM_LAYER
 	item_icons = list(
 		WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/jungle.dmi',
@@ -34,7 +35,7 @@
 	if(!(flags_atom & NO_NAME_OVERRIDE))
 		name = "[specialty]"
 		if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
-			name += " snow uniform"
+			name += snow_name
 		else
 			name += " uniform"
 	if(!(flags_atom & NO_GAMEMODE_SKIN))
@@ -190,7 +191,10 @@
 	worn_state = "pilot_flightsuit"
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
 	flags_cold_protection = ICE_PLANET_MIN_COLD_PROT
+	specialty = "pilot officer"
+	snow_name = " snow bodysuit"
 	suit_restricted = list(/obj/item/clothing/suit/armor/vest/pilot, /obj/item/clothing/suit/storage/marine/light/vest/dcc, /obj/item/clothing/suit/storage/jacket/marine/pilot, /obj/item/clothing/suit/storage/marine/light/vest)
+	flags_atom = FPRINT
 
 /obj/item/clothing/under/marine/officer/pilot/flight
 	name = "tactical pilot officer flightsuit"

code/modules/clothing/under/ties.dm

@@ -993,6 +993,11 @@
 /obj/item/clothing/accessory/holobadge/cord
 	icon_state = "holobadge-cord"
 	flags_equip_slot = SLOT_FACE
+	accessory_icons = list(
+		WEAR_FACE = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi',
+		WEAR_BODY = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi',
+		WEAR_JACKET = 'icons/mob/humans/onmob/clothing/accessory/misc.dmi'
+	)
 
 /obj/item/clothing/accessory/holobadge/attack_self(mob/user)
 	..()

code/modules/cm_marines/m2c.dm

@@ -47,6 +47,11 @@
 	w_class = SIZE_HUGE
 	flags_equip_slot = SLOT_BACK
 	icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/machineguns.dmi'
+	item_icons = list(
+		WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi',
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/machineguns_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/machineguns_righthand.dmi'
+	)
 	icon_state = "M2C_gun_mount"
 	item_state = "M2C_gun_mount"
 	var/rounds = 0

code/modules/projectiles/gun_attachables.dm

@@ -282,6 +282,7 @@ Defined in conflicts.dm of the #defines folder.
 	icon_state = "bayonet"
 	item_state = "combat_knife"
 	item_icons = list(
+		WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/objects.dmi',
 		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/knives_lefthand.dmi',
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/knives_righthand.dmi'
 	)