Skip to content

Commit

Permalink
Steelpoint Donor Armour Update (#5252)
Browse files Browse the repository at this point in the history
# About the pull request

Effects a sprite update to the M4X Armour (Donor Armour). Also changes
the item description to be more in-universe, and adds alt-camo options
for the armour based on the map type.

All credit to @Zenith for the sprite work. Camo sprites are my doing. 

Updates to donor gear are allowed based on my review of past PRs. 

# Explain why it's good for the game

Updating 2015 sprites to 2023 standards is good. 


# Testing Photographs and Procedure

![Screenshot 2023-12-20 12 43
35](https://github.com/cmss13-devs/cmss13/assets/6595389/a6326f14-ad85-41fe-a2f8-97b5e109b8a7)



# Changelog
:cl: Zenith, Steelpoint
add: Updates Steelpoint's donor armour, replacing it with a new sprite,
camouflage options for all maps and new item descriptions that are lore
friendly.
/:cl:

---------

Co-authored-by: Steelpoint <[email protected]>
  • Loading branch information
Steelpoint and Steelpoint authored Jan 11, 2024
1 parent 54e996a commit 05b0bef
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions code/modules/cm_marines/Donator_Items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,12 @@
item_state = "merc_armor"

/obj/item/clothing/suit/storage/marine/fluff/steelpoint //CKEY=steelpoint (UNIQUE)
name = "M4X Armor"
desc = "Armor to the M4X!!!! DONOR ITEM"
name = "M4-X Armor"
desc = "A next generation body armor system intended for Marines fighting against xenomorphs, the system is coated in a unique acid resistant polymer coating, as well as enhanced ballistics protection. This prototype version lacks those two features. DONOR ITEM"
flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE
icon_state = "steelpoint_armor"
item_state = "steelpoint_armor"


/obj/item/clothing/suit/storage/marine/fluff/valentine //CKEY=markvalentine
name = "Shocky's Armor"
desc = "Shockingly good armor. DONOR ITEM"
Expand Down Expand Up @@ -842,10 +842,11 @@
flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR

/obj/item/clothing/head/helmet/marine/fluff/steelpoint //CKEY=steelpoint (UNIQUE)
name = "M4X Helmet"
desc = "Helmets to the M4X!!! DONOR ITEM"
name = "M4-X Helmet"
desc = "A next generation combat helmet intended to be paired with the M4-X armor. The full faced helmet provides complete light ballistic-resistant protection alongside enchanced acid resistance. This prototype version lacks those features. DONOR ITEM"
icon_state = "steelpoint_helmet"
item_state = "steelpoint_helmet"
flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR

Expand Down Expand Up @@ -1148,8 +1149,8 @@
flags_jumpsuit = FALSE

/obj/item/clothing/under/marine/fluff/steelpoint //CKEY=steelpoint (UNIQUE)
name = "M4X Jumpsuit"
desc = "Jumpsuit to the M4X!!! DONOR ITEM"
name = "M4-X Jumpsuit"
desc = "Jumpsuit issued alongside the M4-X armor. Considered outdated compared to the more modern armor system. DONOR ITEM"
icon_state = "steelpoint_jumpsuit"
worn_state = "steelpoint_jumpsuit"
flags_jumpsuit = FALSE
Expand Down Expand Up @@ -1319,10 +1320,10 @@
item_state = "doom_boots"

/obj/item/clothing/shoes/marine/fluff/steelpoint //CKEY=steelpoint (UNIQUE)
name = "M4X Boot"
desc = "Boots to the M4X. DONOR ITEM"
icon_state = "jackboots"
item_state = "jackboots"
name = "M4-X Boot"
desc = "Standard issue boots issued alongside M4-X armor, features a special coating of acid-resistant layering to allow its operator to move through acid-dretched enviroments safely. This prototype version lacks that feature. DONOR ITEM"
icon_state = "marine"
item_state = "marine"

//GENERIC GLASSES, GLOVES, AND MISC ////////////////////

Expand Down
Binary file modified icons/mob/humans/onmob/head_0.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/suit_0.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/donor/HEAD.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/donor/SUITS.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/suits.dmi
Binary file not shown.

0 comments on commit 05b0bef

Please sign in to comment.