diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 3daaf0228e..6263076e62 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -334,6 +334,16 @@ storage_slots = null max_storage_space = 15 +/obj/item/storage/backpack/satchel/blue + name = "leather satchel" + desc = "A very fancy satchel made of fine leather. Looks pretty pricey. This one is blue." + icon_state = "satchel-blue" + +/obj/item/storage/backpack/satchel/black + name = "leather satchel" + desc = "A very fancy satchel made of fine leather. Looks pretty pricey. This one is black." + icon_state = "satchel-black" + /obj/item/storage/backpack/satchel/withwallet /obj/item/storage/backpack/satchel/withwallet/fill_preset_inventory() diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index a4808bf87a..2de02ccf32 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -524,6 +524,13 @@ suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/UPP, /obj/item/clothing/suit/gimmick/jason, /obj/item/clothing/suit/storage/snow_suit/soviet, /obj/item/clothing/suit/storage/snow_suit/survivor, /obj/item/clothing/suit/storage/webbing) flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE +/obj/item/clothing/under/marine/veteran/UPP/boiler + name = "\improper UPP operations fatigues" + desc = "A set of UPP operations 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_boiler" + 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." @@ -732,6 +739,22 @@ worn_state = "clf_uniform" sensor_faction = FACTION_CLF +/obj/item/clothing/under/colonist/prison_boiler + name = "\improper prisoner boiler uniform" + desc = "A standardised prisoner-wear boiler uniform." + icon_state = "prison_boiler" + worn_state = "prison_boiler" + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE + +/obj/item/clothing/under/colonist/ua_boiler + name = "\improper UA blue operations uniform" + desc = "A stylish blue jumpsuit - standard issue for UA civilian support personnel." + icon_state = "ua_boiler" + worn_state = "ua_boiler" + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE + has_sensor = UNIFORM_HAS_SENSORS + sensor_faction = FACTION_MARINE + /obj/item/clothing/under/colonist/ua_civvies name = "\improper UA gray utility uniform" desc = "A stylish gray jumpsuit - standard issue for UA civilian support personnel." diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index a6e9ef72c0..ef17d1cfc6 100644 Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ diff --git a/icons/mob/humans/onmob/feet.dmi b/icons/mob/humans/onmob/feet.dmi index e0611d5b7e..84121e6b09 100644 Binary files a/icons/mob/humans/onmob/feet.dmi and b/icons/mob/humans/onmob/feet.dmi differ diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index 2a60a33f69..74edf91201 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/backpacks.dmi b/icons/obj/items/clothing/backpacks.dmi index 4119b32a09..9ebed71a12 100644 Binary files a/icons/obj/items/clothing/backpacks.dmi and b/icons/obj/items/clothing/backpacks.dmi differ diff --git a/icons/obj/items/clothing/suits.dmi b/icons/obj/items/clothing/suits.dmi index df3a572d9f..a73de66d58 100644 Binary files a/icons/obj/items/clothing/suits.dmi and b/icons/obj/items/clothing/suits.dmi differ diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi index 347044d565..5c36b764dd 100644 Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ