Finishing SG Stuff

code/__DEFINES/equipment.dm

@@ -475,6 +475,7 @@ GLOBAL_LIST_INIT(slot_to_contained_sprite_shorthand, list(
 #define ACCESSORY_SLOT_SGPAINT "SG Paint"
 #define ACCESSORY_SLOT_PAINT "Paint"
 #define ACCESSORY_SLOT_M3UTILITY "M3 Utility"
+#define ACCESSORY_SLOT_M56UTILITY "M56 Utility"
 
 /// Used for uniform armor inserts.
 #define ACCESSORY_SLOT_ARMOR_C "Chest armor"

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

@@ -134,9 +134,9 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list(
 		list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
 
 		list("ARMOR (CHOOSE 1)", 0, null, null, null),
-		list("Light Armor", 0, /obj/item/clothing/suit/marine/light, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
-		list("Medium Armor", 0, /obj/item/clothing/suit/marine, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
-		list("Heavy Armor", 0, /obj/item/clothing/suit/marine/heavy, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+		list("Light Armor", 0, /obj/item/clothing/suit/marine/light/pads, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+		list("Medium Armor", 0, /obj/item/clothing/suit/marine/pads, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
+		list("Heavy Armor", 0, /obj/item/clothing/suit/marine/heavy/pads, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
 
 		list("ARMOR PAINT (CHOOSE 1)", 0, null, null, null),
 		list("Red Cross Paint", 0, /obj/item/clothing/accessory/paint/medic, MARINE_CAN_BUY_PAINT, VENDOR_ITEM_RECOMMENDED),
@@ -310,7 +310,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_forecon_medic, list(
 		list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
 
 		list("ARMOR (CHOOSE 1)", 0, null, null, null),
-		list("M3-R Armor", 0, /obj/item/clothing/suit/marine/rto/forecon, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
+		list("M3-R Armor", 0, /obj/item/clothing/suit/marine/pads/rto/forecon, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
 
 		list("BACKPACK (CHOOSE 1)", 0, null, null, null),
 		list("Medical Backpack", 0, /obj/item/storage/backpack/marine/medic/standard, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),

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

@@ -118,11 +118,11 @@
 		list("Shoulder Holster", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),
 
 		list("ARMOR", -1, null, null),
-		list("M3 Pattern Marine Armor", round(scale * 15), /obj/item/clothing/suit/marine, VENDOR_ITEM_REGULAR),
-		list("M3 Pattern Ridged Marine Armor", round(scale * 15), /obj/item/clothing/suit/marine/padless_lines, VENDOR_ITEM_REGULAR),
-		list("M3 Pattern Smooth Marine Armor", round(scale * 15), /obj/item/clothing/suit/marine/smooth, VENDOR_ITEM_REGULAR),
-		list("M3-EOD Pattern Heavy Armor", round(scale * 10), /obj/item/clothing/suit/marine/heavy, VENDOR_ITEM_REGULAR),
-		list("M3-L Pattern Light Armor", round(scale * 10), /obj/item/clothing/suit/marine/light, VENDOR_ITEM_REGULAR),
+		list("M3 Pattern Marine Armor", round(scale * 15), /obj/item/clothing/suit/marine/pads, VENDOR_ITEM_REGULAR),
+		list("M3 Pattern Ridged Marine Armor", round(scale * 15), /obj/item/clothing/suit/marine/pads/padless_lines, VENDOR_ITEM_REGULAR),
+		list("M3 Pattern Smooth Marine Armor", round(scale * 15), /obj/item/clothing/suit/marine/pads/smooth, VENDOR_ITEM_REGULAR),
+		list("M3-EOD Pattern Heavy Armor", round(scale * 10), /obj/item/clothing/suit/marine/heavy/pads, VENDOR_ITEM_REGULAR),
+		list("M3-L Pattern Light Armor", round(scale * 10), /obj/item/clothing/suit/marine/light/pads, VENDOR_ITEM_REGULAR),
 		list("M3 Pattern Arm Bracers", round(scale * 10), /obj/item/clothing/accessory/pads/bracers, VENDOR_ITEM_REGULAR),
 		list("M3 Pattern Neck Brace", round(scale * 15), /obj/item/clothing/accessory/pads/neckguard, VENDOR_ITEM_REGULAR),
 
@@ -282,7 +282,7 @@
 		list("Shoulder Holster", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),
 
 		list("ARMOR", -1, null, null),
-		list("M3-R Pattern Recon Armor", round(scale * 10), /obj/item/clothing/suit/marine/rto/forecon, VENDOR_ITEM_REGULAR),
+		list("M3-R Pattern Recon Armor", round(scale * 10), /obj/item/clothing/suit/marine/pads/rto/forecon, VENDOR_ITEM_REGULAR),
 
 		list("BACKPACK", -1, null, null, null),
 		list("Lightweight IMP Backpack", round(scale * 15), /obj/item/storage/backpack/marine/standard, VENDOR_ITEM_REGULAR),
@@ -670,14 +670,14 @@
 //------------ESSENTIAL SETS---------------
 /obj/effect/essentials_set/random/uscm_light_armor
 	spawned_gear_list = list(
-		/obj/item/clothing/suit/marine/light/padless_lines,
-		/obj/item/clothing/suit/marine/light/smooth,
+		/obj/item/clothing/suit/marine/light/pads/padless_lines,
+		/obj/item/clothing/suit/marine/light/pads/smooth,
 	)
 
 /obj/effect/essentials_set/random/uscm_heavy_armor
 	spawned_gear_list = list(
-		/obj/item/clothing/suit/marine/heavy/padless_lines,
-		/obj/item/clothing/suit/marine/heavy/smooth,
+		/obj/item/clothing/suit/marine/heavy/pads/padless_lines,
+		/obj/item/clothing/suit/marine/heavy/pads/smooth,
 	)
 
 //------------MARINE CIVILIAN CLOTHING---------------

code/game/objects/items/devices/radio/headset.dm

@@ -517,6 +517,10 @@
 	desc = "This is used by members of the marine honor guard. Channels are as follows: :p - military police, :v - marine command. :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad."
 	icon_override = 'icons/obj/items/radio.dmi'
 	icon_state = "sec_headset"
+	item_icons = list(
+		WEAR_L_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		WEAR_R_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		)
 	initial_keys = list(/obj/item/device/encryptionkey/mmpo)
 	volume = RADIO_VOLUME_RAISED
 	locate_setting = TRACKER_CO
@@ -630,7 +634,7 @@
 	initial_keys = list(/obj/item/device/encryptionkey/mcom/ai)
 	volume = RADIO_VOLUME_CRITICAL
 
-/obj/item/device/radio/headset/almayer/marine/solardevils
+/obj/item/device/radio/headset/almayer/marine
 	name = "marine radio headset"
 	desc = "A standard marine radio headset. When worn, grants access to Squad Leader tracker. Click tracker with empty hand to open Squad Info window."
 	icon_state = "generic_headset"
@@ -659,13 +663,20 @@
 	has_hud = TRUE
 	hud_type = MOB_HUD_FACTION_MARINE
 
+/obj/item/device/radio/headset/almayer/marine/solardevils/foxtrot
+	frequency = CRYO_FREQ
+
 
 //############################## ALPHA ###############################
 /obj/item/device/radio/headset/almayer/marine/alpha
 	name = "marine alpha radio headset"
 	desc = "This is used by Alpha squad members. When worn, grants access to Squad Leader tracker. Click tracker with empty hand to open Squad Info window."
 	icon_override = 'icons/obj/items/radio.dmi'
 	icon_state = "alpha_headset"
+	item_icons = list(
+		WEAR_L_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		WEAR_R_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		)
 	frequency = ALPHA_FREQ //default frequency is alpha squad channel, not PUB_FREQ
 
 /obj/item/device/radio/headset/almayer/marine/alpha/lead
@@ -696,6 +707,10 @@
 	desc = "This is used by Bravo squad members. When worn, grants access to Squad Leader tracker. Click tracker with empty hand to open Squad Info window."
 	icon_override = 'icons/obj/items/radio.dmi'
 	icon_state = "bravo_headset"
+	item_icons = list(
+		WEAR_L_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		WEAR_R_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		)
 	frequency = BRAVO_FREQ
 
 /obj/item/device/radio/headset/almayer/marine/bravo/lead
@@ -727,6 +742,10 @@
 	icon_override = 'icons/obj/items/radio.dmi'
 	icon_state = "charlie_headset"
 	frequency = CHARLIE_FREQ
+	item_icons = list(
+		WEAR_L_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		WEAR_R_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		)
 
 /obj/item/device/radio/headset/almayer/marine/charlie/lead
 	name = "marine charlie leader radio headset"
@@ -756,6 +775,10 @@
 	desc = "This is used by Delta squad members. When worn, grants access to Squad Leader tracker. Click tracker with empty hand to open Squad Info window."
 	icon_override = 'icons/obj/items/radio.dmi'
 	icon_state = "delta_headset"
+	item_icons = list(
+		WEAR_L_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		WEAR_R_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		)
 	frequency = DELTA_FREQ
 
 /obj/item/device/radio/headset/almayer/marine/delta/lead
@@ -786,6 +809,10 @@
 	desc = "This is used by Echo squad members. When worn, grants access to Squad Leader tracker. Click tracker with empty hand to open Squad Info window."
 	icon_override = 'icons/obj/items/radio.dmi'
 	icon_state = "echo_headset"
+	item_icons = list(
+		WEAR_L_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		WEAR_R_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		)
 	frequency = ECHO_FREQ
 
 /obj/item/device/radio/headset/almayer/marine/echo/lead
@@ -817,6 +844,10 @@
 	desc = "This is used by Foxtrot squad members. When worn, grants access to Squad Leader tracker. Click tracker with empty hand to open Squad Info window."
 	icon_override = 'icons/obj/items/radio.dmi'
 	icon_state = "cryo_headset"
+	item_icons = list(
+		WEAR_L_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		WEAR_R_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		)
 	frequency = CRYO_FREQ
 
 /obj/item/device/radio/headset/almayer/marine/cryo/lead
@@ -846,6 +877,10 @@
 	desc = "This is used by the dust raider's bunker mortar crew to get feedback on how good the hits of that 80mm rain turned out. Comes with access to the engineering channel with :e, JTAC for coordinating with :j, Intel with :t, and request more shells supply with :u - this ain't Winchester Outpost!"
 	icon_override = 'icons/obj/items/radio.dmi'
 	icon_state = "ce_headset"
+	item_icons = list(
+		WEAR_L_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		WEAR_R_EAR = 'icons/mob/humans/onmob/ears.dmi',
+		)
 	initial_keys = list(/obj/item/device/encryptionkey/mortar)
 	volume = RADIO_VOLUME_RAISED
 

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -125,11 +125,14 @@
 	. = ..()
 	new /obj/item/weapon/gun/smartgun(src)
 	new /obj/item/smartgun_battery(src)
-	new /obj/item/clothing/suit/storage/marine/smartgunner(src)
+	new /obj/item/clothing/suit/marine/smartgunner(src)
 	new /obj/item/storage/belt/gun/smartgunner/garrow(src)
 	new /obj/item/ammo_magazine/smartgun(src)
 	new /obj/item/ammo_magazine/smartgun(src)
 	new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(src)
+	new /obj/item/storage/large_holster/machete/smartgunner/full(src)
+	new /obj/item/clothing/accessory/storage/webbing/m56(src)
+	new /obj/item/clothing/accessory/storage/webbing/m56/grenade(src)
 
 /obj/structure/closet/secure_closet/smartgunner_forecon
 	name = "smartgunner locker"
@@ -140,11 +143,14 @@
 	. = ..()
 	new /obj/item/weapon/gun/smartgun(src)
 	new /obj/item/smartgun_battery(src)
-	new /obj/item/clothing/suit/storage/marine/smartgunner/standard(src)
+	new /obj/item/clothing/suit/marine/smartgunner/standard(src)
 	new /obj/item/storage/belt/gun/smartgunner/garrow(src)
 	new /obj/item/ammo_magazine/smartgun(src)
 	new /obj/item/ammo_magazine/smartgun(src)
 	new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(src)
+	new /obj/item/storage/large_holster/machete/smartgunner/full(src)
+	new /obj/item/clothing/accessory/storage/webbing/m56(src)
+	new /obj/item/clothing/accessory/storage/webbing/m56/grenade(src)
 
 /obj/structure/closet/cryo/Initialize()
 	. = ..()

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

@@ -628,8 +628,6 @@
 	update_icon()
 
 	light_holder = new(src)
-	var/obj/item/clothing/accessory/pads/pads = new()
-	src.attach_accessory(null, pads, TRUE)
 
 /obj/item/clothing/suit/marine/Destroy()
 	QDEL_NULL(light_holder)
@@ -746,6 +744,23 @@
 	icon_state = "3"
 	specialty = "M3 pattern smooth marine"
 
+/obj/item/clothing/suit/marine/pads
+
+/obj/item/clothing/suit/marine/pads/Initialize(mapload)
+	. = ..()
+	var/obj/item/clothing/accessory/pads/pads = new()
+	src.attach_accessory(null, pads, TRUE)
+
+/obj/item/clothing/suit/marine/pads/padless_lines
+	name = "M3 pattern ridged marine armor"
+	icon_state = "2"
+	specialty = "M3 pattern ridged marine"
+
+/obj/item/clothing/suit/marine/pads/smooth
+	name = "M3 pattern smooth marine armor"
+	icon_state = "3"
+	specialty = "M3 pattern smooth marine"
+
 /obj/item/clothing/suit/marine/light
 	name = "\improper M3-L pattern light armor"
 	desc = "A lighter, cut down version of the standard M3 pattern armor. It sacrifices durability for less weight."
@@ -762,15 +777,24 @@
 	valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_DECORARMOR, ACCESSORY_SLOT_DECORBRACER, ACCESSORY_SLOT_PAINT, ACCESSORY_SLOT_M3UTILITY, ACCESSORY_SLOT_PONCHO)
 	restricted_accessory_slots = list(ACCESSORY_SLOT_DECORARMOR, ACCESSORY_SLOT_DECORBRACER, ACCESSORY_SLOT_M3UTILITY, ACCESSORY_SLOT_PAINT)
 
-/obj/item/clothing/suit/marine/light/padless_lines
+/obj/item/clothing/suit/marine/light/pads
+
+/obj/item/clothing/suit/marine/light/pads/Initialize(mapload)
+	. = ..()
+	var/obj/item/clothing/accessory/pads/pads = new()
+	src.attach_accessory(null, pads, TRUE)
+
+/obj/item/clothing/suit/marine/light/pads/padless_lines
+	name = "M3 pattern ridged marine armor"
 	icon_state = "L2"
 	armor_variation = 0
 
-/obj/item/clothing/suit/marine/light/smooth
+/obj/item/clothing/suit/marine/light/pads/smooth
+	name = "M3 pattern smooth marine armor"
 	icon_state = "L3"
 	armor_variation = 0
 
-/obj/item/clothing/suit/marine/light/standard
+/obj/item/clothing/suit/marine/light/pads/standard
 	flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
 
 /obj/item/clothing/suit/marine/heavy
@@ -788,15 +812,24 @@
 	slowdown = SLOWDOWN_ARMOR_LOWHEAVY
 	movement_compensation = SLOWDOWN_ARMOR_MEDIUM
 
-/obj/item/clothing/suit/marine/heavy/padless_lines
-	icon_state = "H2"
+/obj/item/clothing/suit/marine/heavy/pads
+
+/obj/item/clothing/suit/marine/heavy/pads/Initialize(mapload)
+	. = ..()
+	var/obj/item/clothing/accessory/pads/pads = new()
+	src.attach_accessory(null, pads, TRUE)
+
+/obj/item/clothing/suit/marine/heavy/pads/padless_lines
+	name = "M3 pattern ridged marine armor"
+	icon_state = "L2"
 	armor_variation = 0
 
-/obj/item/clothing/suit/marine/heavy/smooth
-	icon_state = "H3"
+/obj/item/clothing/suit/marine/heavy/pads/smooth
+	name = "M3 pattern smooth marine armor"
+	icon_state = "L3"
 	armor_variation = 0
 
-/obj/item/clothing/suit/marine/rto
+/obj/item/clothing/suit/marine/pads/rto
 	icon_state = "io"
 	name = "\improper M4 pattern marine armor"
 	desc = "A well tinkered and crafted hybrid of Smart-Gunner mesh and M3 pattern plates. Robust, yet nimble, with room for all your pouches."
@@ -805,18 +838,18 @@
 	light_range = 5 //slightly higher
 	specialty = "M4 pattern marine"
 
-/obj/item/clothing/suit/marine/rto/intel
+/obj/item/clothing/suit/marine/pads/rto/intel
 	name = "\improper XM4 pattern intelligence officer armor"
 	uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/marine/officer/intel)
 	specialty = "XM4 pattern intel"
 
-/obj/item/clothing/suit/marine/rto/forecon
+/obj/item/clothing/suit/marine/pads/rto/forecon
 	name = "\improper M3-R pattern recon armor"
 	desc = "A modified Colonial Marines M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. Issued exclusively to FORECON units."
 	icon_state = "L1"
 	flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
 
-/obj/item/clothing/suit/marine/leader
+/obj/item/clothing/suit/marine/pads/leader
 	name = "\improper B12 pattern marine armor"
 	desc = "Semi-experimental body armor system similar to M3, incorporating primarily carbon fiber instead of boron carbide. \nDesigned in a lovely olive green, slightly improved protection against blunt impact and biological hazards."
 	icon_state = "7"

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

@@ -23,7 +23,7 @@
 		/obj/item/device/walkman,
 	)
 	var/list/smartgun_back = list(
-		/obj/item/storage/large_holster/machete,
+		/obj/item/storage/large_holster/machete/smartgunner,
 	)
 	valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_SGPAINT, ACCESSORY_SLOT_PAINT, ACCESSORY_SLOT_PONCHO)
 
@@ -145,9 +145,11 @@
 		/obj/item/device/walkman,
 	)
 	var/list/smartgun_back = list(
-		/obj/item/storage/large_holster/machete,
+		/obj/item/storage/large_holster/machete/smartgunner,
+		/obj/item/storage/belt/gun/smartgunner,
+		/obj/item/weapon/gun/smartgun,
 	)
-	valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_SGPAINT, ACCESSORY_SLOT_SGDECOR, ACCESSORY_SLOT_PAINT, ACCESSORY_SLOT_PONCHO)
+	valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_SGPAINT, ACCESSORY_SLOT_M56UTILITY, ACCESSORY_SLOT_SGDECOR, ACCESSORY_SLOT_PAINT, ACCESSORY_SLOT_PONCHO)
 
 /obj/item/clothing/suit/marine/smartgunner/Initialize()
 	. = ..()

code/modules/clothing/under/ties.dm

@@ -1146,8 +1146,8 @@
 /obj/item/clothing/accessory/pads/m56
 	name = "\improper M3 Shin Guards"
 	desc = "A set shinguards usually shipped with M3 pattern armor, though this set has been repurposed."
-	icon_state = "shinguard"
-	item_state = "shinguard"
+	icon_state = "shinguards"
+	item_state = "shinguards"
 	slot = ACCESSORY_SLOT_SGDECOR
 
 /obj/item/clothing/accessory/paint/skull
@@ -1196,6 +1196,13 @@
 	desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden."
 	icon_state = "m56pouch"
 	hold = /obj/item/storage/internal/accessory/black_vest/m56
+	slot = ACCESSORY_SLOT_M56UTILITY
+
+/obj/item/clothing/accessory/storage/webbing/m56/Initialize(mapload)
+	. = ..()
+	if(!(flags_atom & NO_SNOW_TYPE))
+		select_gamemode_skin(type)
+	update_icon()
 
 /obj/item/clothing/accessory/storage/webbing/m56/grenade
 	name = "\improper M56 Harness Grenade Band"