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

[MIRROR] PR of the day, a day late | I HATE THE ANTICHRIST!! | Upgrades the SolFed response outfits (except the engineering one) #1221

Merged
merged 1 commit into from
Dec 21, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#25490

About The Pull Request

As the title says, the SolFed emergency call outfits have been updated with some of the new stuff we have, and some new items I'm adding for them.

image

Marshalls no longer look like wild west larpers, instead wearing a solfed-blue flak jacket alongside their uniform.

image

SWAT is now some proper SolFed peacekeepers, sporting blue helmets and all.

image

The military is now no longer just dressed as the HECU, and no longer uses the m16 (amen).

Note that the gas mask is the wrong one here, I just forgot to set it to the right one.

image

EMTs are now equipped like some real deal galactic EMTs, instead of just station paramedics

Of course, the new clothing items can also be found in cargo, because I'm fun like that.

How This Contributes To The Skyrat Roleplay Experience

It's hard to take the SolFed call guys seriously when they are all either larping as wild west cowboys, or when they're dressed like the fucking hecu from half life. Now that we have actual thematic armor and clothing for SolFed, its only right that their response teams are dressed with them.

Proof of Testing

See screenshots above for more

image
image

Changelog

🆑 Paxilmaniac
balance: SolFed response team equipment has been changed around a bit with the new armor and whatnot.
image: SolFed response teams (and cargo imports) can now see a new set of SolFed uniforms, one for peacekeepers and one for EMTs. No longer do they have to dress as wild west larpers, or half life HECU.
/:cl:

…lFed response outfits (except the engineering one) (#25490)

* everything

* puts  the right item paths there

* fixes the gas masks

* fixes outfit sanity

* Adds trailing commas to multi-line lists.

---------

Co-authored-by: GoldenAlpharex <[email protected]>
@ReezeBL ReezeBL merged commit fc662a1 into master Dec 21, 2023
23 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-25490 branch December 21, 2023 06:55
AnywayFarus added a commit that referenced this pull request Dec 21, 2023
Iajret pushed a commit that referenced this pull request Mar 1, 2024
* Fixed the floortile crate, adds them to blackmarket  (#81742)

tgstation/tgstation#81512

i accidentally added it to the emagged console it should be on
contraband now.
also added a backpack to present it from interfering.
and its available in uplink

:cl:
add: box with a set of floortile camo, which can be ordered in black
market uplink
add: also adds a backpack to camouflage
fix: i had the crate under emagged console, should be fixed now.
/:cl:

---------

Co-authored-by: Ghom <[email protected]>

* Fixed the floortile crate, adds them to blackmarket

---------

Co-authored-by: bigfatbananacyclops <[email protected]>
Co-authored-by: Ghom <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants