Skip to content

Commit

Permalink
maybe this
Browse files Browse the repository at this point in the history
  • Loading branch information
AmoryBlaine committed Aug 19, 2024
1 parent b3a7329 commit 3455995
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/modules/clothing/suits/marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1394,6 +1394,7 @@
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)
time_to_unequip = 10
time_to_equip = 10
Expand All @@ -1404,7 +1405,7 @@
icon_state = "upp_coat_mp"

/obj/item/clothing/suit/storage/marine/faction/UPP/jacket/service
name = "\improper UL4 service jacket"
name = "\improper UL2 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"

Expand Down
1 change: 1 addition & 0 deletions code/modules/gear_presets/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
var/maybejacket = prob(100) ? pick(/obj/item/clothing/suit/storage/marine/faction/UPP/jacket, /obj/item/clothing/suit/storage/marine/veteran/lamp) : null
if(maybejacket)
new_human.equip_to_slot_or_del(new maybejacket, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_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/explosive/grenade/high_explosive/upp, WEAR_IN_JACKET)
Expand Down

0 comments on commit 3455995

Please sign in to comment.