diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index d5e0e662b3..d8be5761bb 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -465,8 +465,6 @@ /obj/item/clothing/glasses, /obj/item/ammo_magazine/pistol, /obj/item/ammo_magazine/handful, - /obj/item/reagent_container/food/snacks/donut/normal, - /obj/item/reagent_container/food/snacks/donut/jelly, /obj/item/weapon/baton, /obj/item/weapon/gun/energy/taser, /obj/item/tool/lighter/zippo, @@ -474,7 +472,6 @@ /obj/item/clothing/glasses/hud/security, /obj/item/device/flashlight, /obj/item/device/radio/headset, - /obj/item/weapon, /obj/item/device/clue_scanner, ) @@ -531,6 +528,7 @@ new /obj/item/reagent_container/spray/pepper(src) new /obj/item/ammo_magazine/pistol/np92(src) new /obj/item/ammo_magazine/pistol/np92(src) + new /obj/item/ammo_magazine/pistol/np92(src) /obj/item/storage/belt/security/MP/CMB name = "\improper CMB duty belt" diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 2b3edf627b..f9abc13377 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -535,7 +535,7 @@ desc = "A pair of blue-grey slacks coupled with a blue shirt, featuring venlar armor inserts at critical areas to protect from blades and low caliber ballistics." icon_state = "upp_uniform_pap" worn_state = "upp_uniform_pap" - flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE /obj/item/clothing/under/marine/veteran/UPP/civi1 name = "\improper UPP Civilian-style Orange overalls" diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index aa2b28b554..1524255be9 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -912,6 +912,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/pap, WEAR_BODY) //jacket new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/jacket/pap, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) //waist new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/UPP/full, WEAR_WAIST) //limbs diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index f2a14e7f86..5b82dd6916 100644 Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ