diff --git a/code/modules/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm index 51dcf3ae213..99d2f585c34 100644 --- a/code/modules/clothing/suits/marine_coat.dm +++ b/code/modules/clothing/suits/marine_coat.dm @@ -423,3 +423,8 @@ name = "\improper UL2 coldweather service jacket" desc = "A standard issue coldweather UPP military service jacket featuring small dispersed para-aramid inserts providing the barest of defensive functionality, and a Personal Light Unit rig." icon_state = "upp_coat_officer" + +/obj/item/clothing/suit/storage/jacket/marine/upp/naval + name = "\improper UPP naval infantry jacket" + desc = "A standard issue naval infantry service jacket featuring small dispersed para-aramid inserts providing the barest of defensive functionality." + icon_state = "upp_coat_naval" diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 2c703eee03d..3f7890b1179 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -546,6 +546,15 @@ worn_state = "upp_uniform_service" flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE +/obj/item/clothing/under/marine/veteran/UPP/naval + name = "\improper UPP naval infantry uniform" + flags_armor_protection = BODY_FLAG_GROIN|BODY_FLAG_LEGS + desc = "A pair of black bell bottom naval pants matched with a blue telnyashka." + icon_state = "upp_uniform_naval" + worn_state = "upp_uniform_naval" + flags_jumpsuit = UNIFORM_SLEEVE_CUT + valid_accessory_slots = list(ACCESSORY_SLOT_UTILITY, ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_UTILITY, ACCESSORY_SLOT_HOLSTER) + //=========================//Freelancer\\================================\\ /obj/item/clothing/under/marine/veteran/freelancer diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index a13328c2b3e..2b53a0445c2 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -687,10 +687,14 @@ new_human.undershirt = "Naval Infantry Telnyashka" new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/naval(new_human), WEAR_BODY) + var/obj/item/clothing/under/marine/veteran/UPP/naval/uniform = new() + + new_human.equip_to_slot_or_del(uniform, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/upp/naval(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp_knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/np92(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index 8688e825414..6db64cd495d 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index 1fa418da6ab..7f8e46c37e5 100644 Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ diff --git a/icons/obj/items/clothing/cm_suits.dmi b/icons/obj/items/clothing/cm_suits.dmi index 6a3f51b15f2..43afd05f776 100644 Binary files a/icons/obj/items/clothing/cm_suits.dmi and b/icons/obj/items/clothing/cm_suits.dmi differ diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi index c9d6dd0e86f..5a2a6e761a2 100644 Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm index 441443772fd..848e22503ee 100644 --- a/maps/map_files/chapaev/chapaev.dmm +++ b/maps/map_files/chapaev/chapaev.dmm @@ -3983,12 +3983,12 @@ can_block_movement = 0; has_cryo_gear = 0 }, -/obj/item/clothing/under/marine/veteran/UPP, -/obj/item/clothing/under/marine/veteran/UPP/boiler, /obj/item/clothing/accessory/patch/upp/naval, /obj/item/clothing/accessory/patch/upp, /obj/item/clothing/shoes/marine/upp, /obj/item/device/radio/headset/almayer/marine/solardevils/upp, +/obj/item/clothing/under/marine/veteran/UPP/naval, +/obj/item/clothing/suit/storage/jacket/marine/upp/naval, /turf/open/floor/corsat, /area/golden_arrow/cryo_cells) "Ja" = (