Skip to content

Commit

Permalink
New UPP/UA/Prison boiler fatigues (#119)
Browse files Browse the repository at this point in the history
Co-authored-by: Jeff Watchson <[email protected]>
  • Loading branch information
BadAtThisGame302 and Jeff Watchson committed Feb 26, 2024
1 parent 925e869 commit fa2a9bb
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 0 deletions.
10 changes: 10 additions & 0 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
23 changes: 23 additions & 0 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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."
Expand Down
Binary file modified icons/mob/humans/onmob/back.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/feet.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/uniform_0.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/backpacks.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms.dmi
Binary file not shown.

0 comments on commit fa2a9bb

Please sign in to comment.