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

Adjusts Cargo Market #1377

Merged
merged 12 commits into from
Dec 30, 2024
Merged

Conversation

BlueHNT
Copy link
Contributor

@BlueHNT BlueHNT commented Dec 24, 2024

Description

Long story short, cargo and command abuses the new reverse-engineered suits and warning them as admins about it is getting quite tiring. So I decided to put my hand to the craft and comment them out for now, until a better way for them to be gotten is made.

I have also taken this opportunity to fix some of the longstanding issues with cargo I have had, such as there missing sec masks in the riot crate or there not being a way to get the swat items.

While I am still missing the properly developed versions with space proofing and minor cold/head protection, the old non ARCS riot suit will do for now.

This PR fixes #1376


TODO

  • Remove problematic items from cargo
  • Add proper swat crate

Opt:

  • Make proper swat set (soon:tm:)
  • Adjust the armor values to fit better (can be delayed)

Media

I ain't got nothing chief.


Changelog

🆑

  • add: Added swat suit
  • add: Added swat crate
  • add: Added new crate category for secure reinforced crates
  • tweak: Tweaked security supplies and crates
  • tweak: Tweaked the price of Cybersun's tacsuits because apparently they weren't charging enough to properly scam salvage techs.
  • tweak: Tweaked StructuralMetallicStrong structural protection from 10 to 80

@github-actions github-actions bot added the Changes: YML Changes any yml files label Dec 24, 2024
@SimpleStation14 SimpleStation14 changed the title Adjusts cargo market Adjusts Cargo Market Dec 24, 2024
@github-actions github-actions bot added the Changes: Sprite Changes any png or json in an RSI label Dec 24, 2024
Copy link
Contributor

github-actions bot commented Dec 24, 2024

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

Resources/Textures/Clothing/OuterClothing/Armor/swat.rsi

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

Edit: diff updated after a1b12ef

@BlueHNT BlueHNT marked this pull request as ready for review December 24, 2024 02:21
@sleepyyapril
Copy link
Contributor

test fail real

@VMSolidus
Copy link
Member

Test fails are legitimate.

@BlueHNT
Copy link
Contributor Author

BlueHNT commented Dec 30, 2024

I'm unable to find the issue.

Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

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

It was a stray "-type: Clothing" in a place where there shouldn't have been one.

@BlueHNT
Copy link
Contributor Author

BlueHNT commented Dec 30, 2024

Yeah that 100% shouldn't have been there. No wonder I couldn't find it.

@VMSolidus VMSolidus merged commit eb1dde1 into Simple-Station:master Dec 30, 2024
13 of 14 checks passed
sleepyyapril pushed a commit to sleepyyapril/Einstein-Engines that referenced this pull request Dec 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

More powergaming?
4 participants