Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Quickerfix #138

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Quickerfix #138

merged 2 commits into from
Oct 10, 2023

Conversation

TadJohnson00
Copy link
Contributor

Replaces the vast majority of armour in organic play with Delta V variants which: A) look nicer, B) are specialised, C) are less cringe B-)

About the PR

Added new armour types that replace most of the BasicArmour and BasicArmourSlim instances in organic play; barkeeps now have stabproof vests instead of generic body armour, security now has the option of damage resist types (see below). Most of the stuff should be adequately commented too :)

Why / Balance

Having bullet-resistant and stab-resistant vests helps give security the option of bullet-resistance and lower speed, or stab- and blunt-resistance at full speed. Plus the sprites and balance needed to be reworked anyways

Technical details

N/A

Media

image

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑 TJohnson

  • add: Added new vests to play to replace most of the Type I vests in organic play.
  • remove: Removed most of the Type I vests in organic play. Some might still crop up, but don't count on it!

Replaces the vast majority of armour in organic play with Delta V variants which: A) look nicer, B) are specialised, C) are less cringe B-)
@github-actions github-actions bot added Changes: Sprites Changes: YML Changes any yml files labels Oct 9, 2023
@TadJohnson00
Copy link
Contributor Author

Yet another PR in the wee hours of the morning, what could go wrong?

@github-actions
Copy link
Contributor

github-actions bot commented Oct 9, 2023

RSI Diff Bot; head commit adbd07a merging into 471bcf7
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after adbd07a

@TadJohnson00 TadJohnson00 changed the title Plate Carriers and Stabproof Vests Quickerfix Oct 9, 2023
Captain's winter coat and security winter coat are updated, greatcoat updated to match sec winter coat
@TadJohnson00
Copy link
Contributor Author

If you do not greentext after I changed like twenty lines of code I will maybe do a little rioting

Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥴

@Colin-Tel Colin-Tel merged commit b4a91df into DeltaV-Station:master Oct 10, 2023
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Oct 10, 2023
@TadJohnson00 TadJohnson00 deleted the quickerfix branch November 14, 2023 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants