diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index c2a9831048..9599409312 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -225,8 +225,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_upp_medic, list( list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("ARMOR (CHOOSE 1)", 0, null, null, null), - list("Support Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/support, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), - list("Personal Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("6B72-03 Combat Vest", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/light, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), + list("6B90 Carapace Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("BACKPACK (CHOOSE 1)", 0, null, null, null), list("Medical Backpack", 0, /obj/item/storage/backpack/marine/medic/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 33dcd5e1c5..975caefeee 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -167,7 +167,7 @@ list("Military Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine/upp, VENDOR_ITEM_REGULAR), list("UPP Uniform", round(scale * 15), /obj/item/clothing/under/marine/veteran/UPP, VENDOR_ITEM_REGULAR), list("Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR), - list("UM4 Pattern Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine/veteran/UPP, VENDOR_ITEM_REGULAR), + list("6B75 Combat Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine/veteran/UPP, VENDOR_ITEM_REGULAR), list("Radio Headset", round(scale * 15), /obj/item/device/radio/headset/distress/UPP, VENDOR_ITEM_REGULAR), list("WEBBINGS", -1, null, null), @@ -178,11 +178,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("Type 5 carapace armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/faction/UPP, VENDOR_ITEM_REGULAR), - list("Type 3 vest armor", round(scale * 10), /obj/item/clothing/suit/storage/marine/faction/UPP/support, VENDOR_ITEM_REGULAR), + list("6B90 Carapace Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/faction/UPP, VENDOR_ITEM_REGULAR), + list("6B91 Carapace Armor", round(scale * 10), /obj/item/clothing/suit/storage/marine/faction/UPP/heavy, VENDOR_ITEM_REGULAR), + list("6B72-03 Combat Vest", round(scale * 10), /obj/item/clothing/suit/storage/marine/faction/UPP/light, VENDOR_ITEM_REGULAR), list("BACKPACK", -1, null, null, null), - list("Lightweight IMP Backpack", round(scale * 15), /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR), list("UPP Satchel", round(scale * 15), /obj/item/storage/backpack/lightpack/upp, VENDOR_ITEM_REGULAR), list("RESTRICTED BACKPACKS", -1, null, null), diff --git a/code/game/objects/items/devices/helmet_visors.dm b/code/game/objects/items/devices/helmet_visors.dm index 7bdcf2339d..dd234c1252 100644 --- a/code/game/objects/items/devices/helmet_visors.dm +++ b/code/game/objects/items/devices/helmet_visors.dm @@ -73,6 +73,11 @@ /obj/item/device/helmet_visor/proc/get_helmet_examine_text() return SPAN_NOTICE("\A [name] is flipped down.") +/obj/item/device/helmet_visor/upp + name = "squad optic" + desc = "An insertable visor HUD into a standard UPP helmet." + hud_type = MOB_HUD_FACTION_UPP + /obj/item/device/helmet_visor/medical name = "basic medical optic" icon_state = "med_sight" diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 81e838b30b..686cef9669 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -1069,7 +1069,7 @@ /obj/item/storage/backpack/marine/satchel/scout_cloak/upp name = "\improper V86 Thermal Cloak" desc = "A thermo-optic camouflage cloak commonly used by UPP commando units." - uniform_restricted = list(/obj/item/clothing/suit/storage/marine/faction/UPP/commando) //Need to wear UPP commando armor to equip this. + uniform_restricted = list(/obj/item/clothing/suit/storage/marine/faction/UPP/light) //Need to wear UPP commando armor to equip this. max_storage_space = 21 camo_alpha = 10 diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 79d55d03c5..0ff28cf1ac 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -1107,8 +1107,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( // UPP Are very powerful against bullets (marines) but middling against melee (xenos) /obj/item/clothing/head/helmet/marine/veteran/UPP - name = "\improper Type 5 helmet" - desc = "EVA-capable enclosed helmet of the UPP's Naval Infantry. This instance lacks the attachable visor to properly seal the helmet, which is typically foregone in favour of better visibility." + name = "\improper 6B75 helmet" + desc = "Union combat helmet Almaz. Part of protective complex Kuija-M, constructed of a thin alloy shattering plate and para-aramid underlayers. The helmet includes cheek shields for shrapnel or ricochet protection, a low resolution camera system, hearing protection, and an integrated communications system. Ports for connecting infrared visors or night vision systems are also provided." icon_state = "upp_helmet" armor_bullet = CLOTHING_ARMOR_HIGH armor_energy = CLOTHING_ARMOR_MEDIUM @@ -1117,19 +1117,13 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( armor_rad = CLOTHING_ARMOR_MEDIUMLOW armor_internaldamage = CLOTHING_ARMOR_HIGH min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT - clothing_traits = list(TRAIT_EAR_PROTECTION) //the sprites clearly fully cover the ears and most of the head + clothing_traits = list(TRAIT_EAR_PROTECTION) + flags_marine_helmet = HELMET_SQUAD_OVERLAY|HELMET_GARB_OVERLAY|HELMET_DAMAGE_OVERLAY + built_in_visors = list(new /obj/item/device/helmet_visor/upp) -/obj/item/clothing/head/helmet/marine/veteran/UPP/engi - name = "\improper UM4-V helmet" - desc = "This version of the UM4 helmet has a ballistic-glass visor, allowing for the UPP Engineers to safely weld, but by some reports hindering sight in the process." - icon_state = "upp_helmet_engi" - armor_melee = CLOTHING_ARMOR_MEDIUMHIGH - armor_energy = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_HIGH - var/protection_on = TRUE -/obj/item/clothing/head/helmet/marine/veteran/UPP/heavy - name = "\improper Type 6 helmet" +/* /obj/item/clothing/head/helmet/marine/veteran/UPP/heavy + name = "\improper 6B79 helmet" desc = "EVA-capable enclosed helmet of the UPP's Naval Infantry. Despite offering a higher armor rating, this helmet's cumbersome design has kept it from outright replacing the Type 5, instead being utilized mostly by heavy machinegunners." icon_state = "upp_helmet_heavy" armor_melee = CLOTHING_ARMOR_MEDIUMHIGH @@ -1137,11 +1131,11 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( armor_energy = CLOTHING_ARMOR_MEDIUM armor_bomb = CLOTHING_ARMOR_HIGH armor_bio = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS + armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS */ /obj/item/clothing/head/uppcap - name = "\improper UL2 UPP cap" - desc = "UPP headgear issued to soldiers when they're not expected to face combat, and may be requested by officers and above." + name = "\improper UL2 cap" + desc = "Standard issue patrol cap of the UPP's military." icon = 'icons/obj/items/clothing/cm_hats.dmi' icon_state = "upp_cap" item_icons = list( @@ -1161,39 +1155,40 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT flags_inventory = null +/obj/item/clothing/head/uppcap/civi + name = "\improper UL2c cap" + icon_state = "upp_cap_civi" + /obj/item/clothing/head/uppcap/boonie - name = "\improper UL3 UPP hat" - desc = "UPP headgear issued to soldiers when they're not expected to face combat, and may be requested by officers and above." + name = "\improper UL5 hat" + desc = "Standard issue soft brimmed hat for Territorial Guard units stationed in areas with extreme heat." icon = 'icons/obj/items/clothing/cm_hats.dmi' icon_state = "upp_boonie" /obj/item/clothing/head/uppcap/beret/naval - name = "\improper UL4 UPP Naval Infantry beret" - desc = "A Naval Infantry beret worn by the UPP's equivalent of the USCM. Wear it with pride." + name = "\improper UL4 Naval Infantry beret" + desc = "A black beret worn by the UPP's Naval Infantry. Wear it with pride." icon = 'icons/obj/items/clothing/cm_hats.dmi' icon_state = "upp_beret_naval" -/obj/item/clothing/head/uppcap/civi - name = "\improper UL2 UPP cap" - desc = "UPP civilian headgear. It's of poor quality, and isn't expected to last all that long, however for as long as it's whole, it appears quite stylish." - icon_state = "upp_cap_civi" - /obj/item/clothing/head/uppcap/beret - name = "\improper UL3 UPP beret" + name = "\improper UL3 beret" + desc = "Standard issue beret of the UPP's military." icon_state = "upp_beret" /obj/item/clothing/head/uppcap/peaked - name = "\improper UL3 UPP peaked cap" - desc = "UPP headgear issued to Kapitans and above. It is made of high-quality materials, and has the officers rank in gold placed upon the front of the cap." + name = "\improper UL3 peaked cap" + desc = "Standard issue peaked service cap of the UPP's military." icon_state = "upp_peaked" /obj/item/clothing/head/uppcap/peaked/police name = "\improper UL3 PaP peaked cap" - desc = "UPP headgear issued to constables of the People's Police." + desc = "Standard issue peaked cap of the People's Police." icon_state = "upp_peaked_police" /obj/item/clothing/head/uppcap/ushanka - name = "\improper UL8 UPP ushanka" + name = "\improper UL2 ushanka" + desc = "Standard issue cold weather hat of the UPP's military." icon_state = "upp_ushanka" item_state = "upp_ushanka" var/tied = FALSE @@ -1219,10 +1214,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( update_clothing_icon(src) //Update the on-mob icon. - - /obj/item/clothing/head/uppcap/ushanka/civi - name = "\improper UL8c UPP ushanka" + name = "\improper UL2c ushanka" icon_state = "upp_ushanka_civi" item_state = "upp_ushanka_civi" original_state = "upp_ushanka_civi" @@ -1235,7 +1228,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( item_state = "s_helmet" flags_marine_helmet = NO_FLAGS - //head rag /obj/item/clothing/head/helmet/specrag diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index be57b0649b..363d4f5181 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -41,7 +41,7 @@ ) flags_atom = FPRINT|CONDUCT flags_inventory = BLOCKSHARPOBJ - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS min_cold_protection_temperature = HELMET_MIN_COLD_PROT @@ -437,17 +437,15 @@ flags_atom = NO_SNOW_TYPE icon_state = "8fancy" -/obj/item/clothing/suit/storage/marine/faction/UPP/heavy - /obj/item/clothing/suit/storage/marine/smartgunner/upp - name = "\improper Type 5-H UPP armor" - desc = "Experimental variant of the standard body armor of the UPP Naval Infantry, the Type 5 provides excellent defense against everything up to and including peer service rifle rounds, putting it slightly ahead of the lighter M3 pattern armor in service with the USCM. This variant has included the less popular arm plates providing total coverage as well as an experimental harness for the QYJ-72-I smartmachinegun. Another aspect of the armor is the sealed neckguard designed to work in tandem with the armor's EVA-capable helmet." - icon_state = "upp_armor_heavy" + name = "\improper 6B91-2 UPP armor" + desc = "Deep modification of the standard body armor, intended for Union machinegunners. Contains compact fire control computers and an encrypted data processing unit in the lower back, as well as an armored cable to connect to the machine gun. Covers all requirements to operate the weapon, but a common complaint is the bulkiness." + icon_state = "upp_armor_support" storage_slots = 1 - slowdown = SLOWDOWN_ARMOR_HEAVY + slowdown = SLOWDOWN_ARMOR_LOWHEAVY flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS armor_melee = CLOTHING_ARMOR_HIGH armor_bullet = CLOTHING_ARMOR_HIGH armor_laser = CLOTHING_ARMOR_MEDIUMLOW @@ -1322,13 +1320,12 @@ slowdown = SLOWDOWN_ARMOR_MEDIUM movement_compensation = SLOWDOWN_ARMOR_LIGHT - /obj/item/clothing/suit/storage/marine/faction/UPP - name = "\improper Type 5 UPP armor" - desc = "Standard body armor of the UPP Naval Infantry, the Type 5 armor system provides excellent defense against everything up to and including peer service rifle rounds, putting it slightly ahead of the lighter M3 pattern armor in service with the USCM. It lacks the fullbody coverage that would otherwise be offered by the missing arm plating. Another aspect of the armor is the sealed neckguard designed to work in tandem with the armor's EVA-capable helmet." + name = "\improper 6B90 pattern UPP armor" + desc = "Union frontline issue body armor. Part of protective complex Kuija-M, 6B90 is capable of rifle threats with new ultralight alloy plates over the vitals, while ballistic mesh inserts provide torso protection from shrapnel or ricochets. A small transmitter on the lower back supports low resolution video/audio and biotelemetry feeds for the TOC. While designed to be one size fits all, the support system proves difficult to comfortably adjust." icon_state = "upp_armor" flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS - slowdown = SLOWDOWN_ARMOR_LOWHEAVY + slowdown = SLOWDOWN_ARMOR_MEDIUM flags_inventory = BLOCKSHARPOBJ armor_melee = CLOTHING_ARMOR_HIGH armor_bullet = CLOTHING_ARMOR_HIGH @@ -1337,37 +1334,16 @@ armor_rad = CLOTHING_ARMOR_MEDIUMHIGH armor_internaldamage = CLOTHING_ARMOR_HIGH storage_slots = 3 - -/obj/item/clothing/suit/storage/marine/faction/UPP/support - name = "\improper Type 3 UPP armor" - desc = "A lightweight alternative to the Type 5, the Type 3 is weaker than its heavier, modernized alternative but provides better mobility." - icon_state = "upp_armor_light" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN - slowdown = SLOWDOWN_ARMOR_LIGHT - armor_melee = CLOTHING_ARMOR_MEDIUM - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_LOW - armor_bio = CLOTHING_ARMOR_LOW - armor_rad = CLOTHING_ARMOR_LOW - armor_internaldamage = CLOTHING_ARMOR_MEDIUM - time_to_unequip = 10 - time_to_equip = 10 - storage_slots = 3 - -/obj/item/clothing/suit/storage/marine/faction/UPP/commando - name = "\improper UM5CU personal armor" - desc = "A modification of the UM5, designed for stealth operations." - icon_state = "upp_armor_commando" - storage_slots = 2 - slowdown = SLOWDOWN_ARMOR_LIGHT + flags_inventory = BLOCKSHARPOBJ /obj/item/clothing/suit/storage/marine/faction/UPP/heavy - name = "\improper Type 5-H UPP armor" - desc = "Standard body armor of the UPP Naval Infantry, the Type 5 armor system provides excellent defense against everything up to and including peer service rifle rounds, putting it slightly ahead of the lighter M3 pattern armor in service with the USCM. This variant has included the less popular arm plates providing total coverage. Another aspect of the armor is the sealed neckguard designed to work in tandem with the armor's EVA-capable helmet." + name = "\improper 6B91 pattern UPP armor" + desc = "Union heavy armor system. Part of protective complex Kuija-M, 6B91 is an add-on kit that extends rifle grade protection along the arms, and AP protection along the chest. Because of drastically higher stamina requirements, the armor proves unpopular with most infantry, and is mostly seen in assault units or internal security forces." icon_state = "upp_armor_heavy" storage_slots = 3 flags_inventory = BLOCKSHARPOBJ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + slowdown = SLOWDOWN_ARMOR_LOWHEAVY /obj/item/clothing/suit/storage/marine/faction/UPP/heavy/Initialize() . = ..() @@ -1376,6 +1352,23 @@ /obj/item/ammo_magazine/pkp, ) +/obj/item/clothing/suit/storage/marine/faction/UPP/light + name = "\improper 6B72-03 pattern UPP armor" + desc = "Vintage UPP armor system Vadasz. Provides basic ballistic/shrapnel protection for armor crew or rear line forces with wraparound soft armor and ceramic composite chestplate. Lightweight, but lacking protection class and coverage. Still issued to territorial forces, and used by some spetznaz." + icon_state = "upp_armor_light" + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN + slowdown = SLOWDOWN_ARMOR_VERY_LIGHT + armor_melee = CLOTHING_ARMOR_MEDIUM + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_LOW + armor_bio = CLOTHING_ARMOR_LOW + armor_rad = CLOTHING_ARMOR_LOW + armor_internaldamage = CLOTHING_ARMOR_MEDIUM + time_to_unequip = 10 + time_to_equip = 10 + storage_slots = 2 + flags_inventory = null + /obj/item/clothing/suit/storage/marine/faction/UPP/jacket name = "\improper UH4 camouflaged jacket" icon_state = "upp_coat" diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 84b6334af6..0e7a9e8f7d 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -522,27 +522,6 @@ worn_state = "upp_boiler" flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE -/obj/item/clothing/under/marine/veteran/UPP/medic - name = "\improper UPP medic fatigues" - desc = "A set of medic UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm." - icon_state = "upp_uniform_medic" - worn_state = "upp_uniform_medic" - flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE - -/obj/item/clothing/under/marine/veteran/UPP/engi - name = "\improper UPP engineer fatigues" - desc = "A set of Engineer UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm." - icon_state = "upp_uniform_engi" - worn_state = "upp_uniform_engi" - flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE - -/obj/item/clothing/under/marine/veteran/UPP/mp - name = "\improper UPP Military Police fatigues" - desc = "A set of Military Police UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm." - icon_state = "upp_uniform_mp" - worn_state = "upp_uniform_mp" - flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE - /obj/item/clothing/under/marine/veteran/UPP/officer name = "\improper UPP Officer fatigues" desc = "A set of Officer UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm." diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index b13192033d..14126a3678 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -1113,7 +1113,7 @@ var/list/rebel_rifles = list( new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET) if (5) 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/suit/storage/marine/faction/UPP/support(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/light(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET) /datum/equipment_preset/proc/spawn_random_upp_belt(mob/living/carbon/human/new_human) diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 278a6e7e3a..52bfad8cad 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -206,7 +206,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY) 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/platoon, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/support, WEAR_JACKET) //medic should move fast + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/light, WEAR_JACKET) //medic should move fast new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/carbine, WEAR_J_STORE) //waist new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) @@ -243,7 +243,7 @@ //face new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) //head - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP/heavy, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD) //body new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) @@ -370,7 +370,7 @@ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret, WEAR_HEAD) //uniform - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/mp, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY) //jacket new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/jacket/mp , WEAR_JACKET) @@ -507,7 +507,7 @@ //body new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY) new_human.equip_to_slot_or_del(/obj/item/clothing/accessory/storage/tool_webbing/equipped, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/support, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/light, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bottle/tricordrazine, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/bizon/upp, WEAR_J_STORE) //waist @@ -548,7 +548,7 @@ //TODO: add backpacks and satchels new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/kdo, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/commando, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/light, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap, WEAR_HEAD) @@ -589,7 +589,7 @@ //TODO: add backpacks and satchels new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/kdo/command, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/commando, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/light, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret, WEAR_HEAD) diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index c4d2ce08f6..c59cbf71e0 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -513,7 +513,6 @@ /datum/equipment_preset/uscm/tl name = "USCM Squad Sergeant" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE - access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_TL_PREP) assignment = JOB_SQUAD_TEAM_LEADER rank = JOB_SQUAD_TEAM_LEADER diff --git a/icons/mob/humans/onmob/belt.dmi b/icons/mob/humans/onmob/belt.dmi index 54cb4563be..d4beba3714 100644 Binary files a/icons/mob/humans/onmob/belt.dmi and b/icons/mob/humans/onmob/belt.dmi differ diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index 6eb07c0075..afc2554973 100644 Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index 5ef81386c6..bd48fdadbd 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 796b24f924..d6852d2fed 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 9ac8987abe..9e58a51203 100644 Binary files a/icons/obj/items/clothing/cm_suits.dmi and b/icons/obj/items/clothing/cm_suits.dmi differ diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm index ec03e22945..f3102ef428 100644 --- a/maps/map_files/chapaev/chapaev.dmm +++ b/maps/map_files/chapaev/chapaev.dmm @@ -1774,7 +1774,7 @@ }, /obj/item/clothing/shoes/marine/upp, /obj/item/device/radio/headset/distress/UPP, -/obj/item/clothing/under/marine/veteran/UPP/medic, +/obj/item/clothing/under/marine/veteran/UPP, /turf/open/floor/strata{ dir = 4; icon_state = "cyan1"