Skip to content

Commit

Permalink
M4 Synthetic PMC 'armor' changes p1 (#4867)
Browse files Browse the repository at this point in the history
# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.


Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

this is #4758 but atomized, this one only changes code, next one will
only change sprite. the conflicts involved with sprites was quite
ridiculous



Basically M4 PMC Synthetic 'armor' stated it offered 'maximum
protection' even though it offers quite literally 0. Furthermore this
complete lack of protection does not constitute the 20% slowdown netted.

So I'm fixing the description to state clearly that there is NO ARMOR
OFFERED and furthermore, lowering it to a 10% slowdown(Justified by
having 1 extra storage space?). I think this is a step in teh right
direction for now.

10% comes from a new category called SUPERLIGHT which will be used for
this only atm. May go to other stuff later.
# Explain why it's good for the game
Description should match what an item offers and not be misleading. If
it says it has armor - it should have armor. If it isn't gonna have
armor, it shouldn't say so.

Next, 20% slowdown is A HUGE price for 1 single storage slot. Its almost
ridiculous. Hopefully 10% is better :)
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: SUPERLIGHT armor category.
balance: M4 Synthetic Armor slows by 10% to justify having 1 extra
storage slot.
spellcheck: Clarifies M4 Synthetic Armor description that it does not
have any armor whatsoever.
/:cl:
  • Loading branch information
QuickLode committed Nov 10, 2023
1 parent 6b63944 commit 2e8f3a3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/conflict.dm
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
#define SHOES_SLOWDOWN -1

#define SLOWDOWN_ARMOR_NONE 0
#define SLOWDOWN_ARMOR_SUPER_LIGHT 0.10
#define SLOWDOWN_ARMOR_VERY_LIGHT 0.20
#define SLOWDOWN_ARMOR_LIGHT 0.35
#define SLOWDOWN_ARMOR_MEDIUM 0.55
Expand Down
5 changes: 3 additions & 2 deletions code/modules/clothing/suits/marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1107,8 +1107,8 @@
item_state_slots = list(WEAR_JACKET = "pmc_sniper")

/obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth
name = "\improper M4 synthetic PMC armor"
desc = "A modification of the standard Armat Systems M3 armor. This variant was designed for PMC Support Units in the field, offering protection and storage while not restricting movement."
name = "\improper M4 Synthetic PMC armor"
desc = "A serious modification of the standard Armat Systems M3 armor. This variant was designed for PMC Support Units in the field, with every armor insert removed. It's designed with the idea of a high speed lifesaver in mind."
time_to_unequip = 0.5 SECONDS
time_to_equip = 1 SECONDS
armor_melee = CLOTHING_ARMOR_NONE
Expand All @@ -1120,6 +1120,7 @@
armor_rad = CLOTHING_ARMOR_NONE
armor_internaldamage = CLOTHING_ARMOR_NONE
storage_slots = 3
slowdown = SLOWDOWN_ARMOR_SUPER_LIGHT

/obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth/Initialize()
flags_atom |= NO_NAME_OVERRIDE
Expand Down
4 changes: 2 additions & 2 deletions maps/map_files/LV624/hydro/30.destroyed.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@
/area/lv624/lazarus/hydroponics)
"mK" = (
/obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth{
desc = "A modification of the standard Armat Systems M3 armor. This variant was designed for PMC Support Units in the field, offering protection and storage while not restricting movement. This set seems damaged...";
name = "damaged M4 synthetic PMC armor";
desc = "A serious modification of the standard Armat Systems M3 armor. This variant was designed for PMC Support Units in the field, with every armor insert removed. It's designed with the idea of a high speed lifesaver in mind. This set seems damaged...";
name = "damaged M4 Synthetic PMC armor";
pixel_x = -5;
pixel_y = -5
},
Expand Down

0 comments on commit 2e8f3a3

Please sign in to comment.