From d257d31fe9ba95a69c40c0c795ec3ad488d444e0 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Mon, 19 Aug 2024 15:41:53 -0400 Subject: [PATCH] UPP Jacket standardized --- code/modules/clothing/suits/marine_armor.dm | 41 ++++----------------- code/modules/gear_presets/upp.dm | 4 +- 2 files changed, 8 insertions(+), 37 deletions(-) diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index b1dc6968f9..e32b769064 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -1378,37 +1378,6 @@ /obj/item/ammo_magazine/pkp, ) -/obj/item/clothing/suit/storage/marine/faction/UPP/officer - name = "\improper UL4 officer jacket" - desc = "A lightweight jacket, issued to officers of the UPP's military. Slightly protective from incoming damage, best off with proper armor however." - icon_state = "upp_coat_officer" - slowdown = SLOWDOWN_ARMOR_NONE - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS - armor_melee = CLOTHING_ARMOR_LOW //wear actual armor if you go into combat - armor_bullet = CLOTHING_ARMOR_LOW - armor_energy = CLOTHING_ARMOR_LOW - armor_bomb = CLOTHING_ARMOR_LOW - armor_bio = CLOTHING_ARMOR_LOW - armor_rad = CLOTHING_ARMOR_LOW - armor_internaldamage = CLOTHING_ARMOR_LOW - storage_slots = 3 - -/obj/item/clothing/suit/storage/marine/faction/UPP/kapitan - name = "\improper UL4 senior officer jacket" - desc = "A lightweight jacket, issued to senior officers of the UPP's military. Made of high-quality materials, even going as far as having the ranks and insignia of the Kapitan and their Company emblazoned on the shoulders and front of the jacket. Slightly protective from incoming damage, best off with proper armor however." - icon_state = "upp_coat_kapitan" - slowdown = SLOWDOWN_ARMOR_NONE - armor_melee = CLOTHING_ARMOR_LOW //wear actual armor if you go into combat - armor_bullet = CLOTHING_ARMOR_LOW - armor_energy = CLOTHING_ARMOR_LOW - armor_bomb = CLOTHING_ARMOR_LOW - armor_bio = CLOTHING_ARMOR_LOW - armor_rad = CLOTHING_ARMOR_LOW - armor_internaldamage = CLOTHING_ARMOR_LOW - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS - storage_slots = 4 - - /obj/item/clothing/suit/storage/marine/faction/UPP/jacket name = "\improper UH4 camouflaged jacket" icon_state = "upp_coat" @@ -1421,21 +1390,25 @@ armor_bullet = CLOTHING_ARMOR_VERYLOW armor_laser = CLOTHING_ARMOR_NONE armor_energy = CLOTHING_ARMOR_NONE - armor_bomb = CLOTHING_ARMOR_LOW //marginally better against shrapnel. + armor_bomb = CLOTHING_ARMOR_LOW armor_bio = CLOTHING_ARMOR_NONE armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_NONE storage_slots = 2 valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL) - restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) time_to_unequip = 10 time_to_equip = 10 -/obj/item/clothing/suit/storage/marine/faction/UPP/jacket/mp +/obj/item/clothing/suit/storage/marine/faction/UPP/jacket/mp name = "\improper UH4-P camouflaged jacket" desc = "A UPP Military Police jacket featuring small dispersed para-aramid inserts providing the barest of defensive functionality." icon_state = "upp_coat_mp" +/obj/item/clothing/suit/storage/marine/faction/UPP/jacket/service + name = "\improper UL4 service jacket" + desc = "A standard issue UPP military service jacket featuring small dispersed para-aramid inserts providing the barest of defensive functionality." + icon_state = "upp_coat_officer" + //===========================//FREELANCER\\================================\\ //=====================================================================\\ diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 637e6a87eb..6628780d34 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -55,8 +55,6 @@ new_human.change_real_name(new_human, random_name) new_human.age = rand(20,35) - idtype = /obj/item/card/id/dogtag - //*****************************************************************************************************/ /datum/equipment_preset/upp/militia @@ -412,7 +410,7 @@ //uniform new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/officer, WEAR_BODY) //jacket - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/officer, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/jacket/service, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) //waist new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/t73, WEAR_WAIST)