diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index 21049fe9783..dfb47b757ec 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -1178,7 +1178,7 @@ /obj/item/clothing/under/marine/striped = -1, /obj/item/clothing/under/marine/slav = -1, /obj/item/clothing/under/marine/camo = -1, - /obj/item/clothing/under/marine/veteran = -1, + /obj/item/clothing/under/marine/veteran/marine = -1, /obj/item/clothing/under/marine/separatist = -1, /obj/item/clothing/under/marine/jaeger = -1, /obj/item/clothing/under/marine/squad/neck/delta = -1, diff --git a/code/game/objects/machinery/vending/new_marine_vendors.dm b/code/game/objects/machinery/vending/new_marine_vendors.dm index 04b8c64f58e..76ba28fcccc 100644 --- a/code/game/objects/machinery/vending/new_marine_vendors.dm +++ b/code/game/objects/machinery/vending/new_marine_vendors.dm @@ -988,7 +988,7 @@ desc = "TerraGov Marine Corps Veteran Uniform Set. Modified mostly by hand, but still quite stylish." gear_to_spawn = list( /obj/item/clothing/mask/gas/veteran, - /obj/item/clothing/under/marine/veteran, + /obj/item/clothing/under/marine/veteran/marine, /obj/item/clothing/gloves/marine/veteran/marine, /obj/item/clothing/shoes/marine/headskin, ) diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 8b77a6c52a9..a7ce43e9a28 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -529,11 +529,8 @@ /obj/item/clothing/under/marine/squad/neck/foreign name = "\improper TGMC Foreign Legion turtleneck" desc = "Tacticool looking, squad issued uniform. This one belongs to the Foreign Legion, smells like fast food." - icon = 'icons/obj/clothing/uniforms/marine_uniforms.dmi' icon_state = "foreign_merc" item_state = "foreign_merc" - item_icons = list( - slot_w_uniform_str = 'icons/mob/clothing/uniforms/marine_uniforms.dmi') /obj/item/clothing/under/marine/slav name = "\improper Old slavic uniform" @@ -568,15 +565,18 @@ /obj/item/clothing/under/marine/whites/blacks name = "\improper TGMC black dress uniform" desc = "A standard-issue TerraGov Marine Corps black dress uniform. The starch in the fabric chafes a small amount but it pales in comparison to the pride you feel when you first put it on during graduation from boot camp. Doesn't seem to fit perfectly around the waist though." - icon = 'icons/obj/clothing/uniforms/marine_uniforms.dmi' icon_state = "marine_blacks" - item_icons = list( - slot_w_uniform_str = 'icons/mob/clothing/uniforms/marine_uniforms.dmi') -/obj/item/clothing/under/marine/veteran +/obj/item/clothing/under/marine/veteran/marine name = "\improper Veteran uniform" desc = "A custom-made protective uniform for the Marine Corps with a long service life. It is reinforced with additional protective plates, Kevlar inserts, sewn metal mesh and impregnated with a refractory mixture. Anyway, that's what the tag on the leg says. Believe it or not, after all, if you've really served in the corps long enough, you know the answer." + icon = 'icons/obj/clothing/uniforms/marine_uniforms.dmi' icon_state = "veteran" + item_icons = list( + slot_w_uniform_str = 'icons/mob/clothing/uniforms/marine_uniforms.dmi', + slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', + slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + ) adjustment_variants = list() /obj/item/clothing/under/marine/separatist diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 6342ce04eef..54395e7259c 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ