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] And look, the red just washes right out! | Changes a lot of blueshield equipment stuff and resprites their crew monitor #1911

Closed
wants to merge 3 commits into from

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: NovaSector/NovaSector#372

About The Pull Request

This does a collection of things:

  • The blueshield's crew monitor was resprited to be a little nicer and has been added to spawn in the blueshield's left pocket, with a spare in their locker.

  • The blueshield super sized medkit has been removed, they now get one of the red frontier kits in their locker.

  • Blueshields now get plain tackler gloves, rather than insulated combat tackler super gloves.

  • A lot of blueshield clothing and armor has had unnecessarily added acid, bomb, and fire resistance removed.

  • The blueshield's modsuit has been pretty heavily nerfed, it:
    -- No longer spawns with a jetpack or expanded storage, only regular storage
    -- Has 12 max capacity, rather than 18
    -- Is no longer entirely shock proof
    -- Now has the same armor as the sec modsuit
    -- Has the same slowdown as a sec mod, less than a normal mod but more than it was before
    -- Is no longer able to protect the user entirely from fire
    -- It spawns with a high capacity cell, rather than a hyper capacity cell

Aside from that, there was a good bit of random unused stuff in the blueshield folder that we really don't need to keep around anymore. So, I took the liberty of deleting it. No more m45a5 super pistol sprites, and whatever else was there.

How This Contributes To The Nova Sector Roleplay Experience

As someone in the discord eloquently put it, blueshields are creeping up in their gear to be the raid boss of command, not the bodyguard of command. Their gear builds up to make them one of the strongest offensive fighters at roundstart and a good while beyond. But you don't need to be a one man ultra army as blueshield, you just need to be the bodyguard.

Proof of Testing

Screenshots/Videos

image
image
image
image

Changelog

🆑 Paxilmaniac
balance: A good bit of the equipment a blueshield gets has been tweaked balance-wise, removed, or changed for something else
image: The blueshield's crew monitor has been resprited to something much nicer than before
code: A lot of unused assets and other things regarding the blueshield module folder have been removed
/:cl:

…d equipment stuff and resprites their crew monitor (#372)

* no stains or your money back

* like they werent ever there at all!

* actually puts their crew monitor in their equipment

* byeah

* makes the blueshield mod not worse than a sec mod

* Update modular_nova/modules/blueshield/code/modsuit/mod_theme.dm

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

---------

Co-authored-by: Bloop <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота Nova Mirror labels Feb 10, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself.

@github-actions github-actions bot added the Stale label Feb 17, 2024
@github-actions github-actions bot closed this Feb 28, 2024
Iajret pushed a commit that referenced this pull request Apr 11, 2024
…ts. (#1911)

* Clowns can now make balloon... toys. And also mallets and hats. (#82288)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Clowns will now start with a box of 24 random long balloons and a
skillchip in their noggin allowing them to create balloon animals by
combining two of them of different colour together. Owners of the
skillchip also gain access to crafting recepies of balloon mallets,
vests, helmets and tophats, all created from long balloons. A crate of
long balloons, with a box of balloons inside, can be bought at cargo, in
case the clown runs out. I might edit this once I wake up, its 3 in the
morning right now.
Oh also, resprited how balloons look in inventory.


![image](https://github.com/tgstation/tgstation/assets/122572637/2d7ce955-c787-48a5-bfda-4613d2eed837)

## Why It's Good For The Game

Balloon animals funny.
Silly features are my favourite kind of features, and this one's
open-ended too.
Someone on the coder chat recommended someone would do it that one time,
here it goes.


## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Added long balloon box to the clown's starting inventory, and a
skill-chip of long lost honk-motherian knowledge to their brain.
add: Added long balloons. Consequently, added balloon animals to make
from such balloons. Also, balloon top hat, vest, helmet, and a mallet.
Don't ask about the mallet.
add: A long balloons box harvested fresh from the farms on the clown
planet will be able to be shipped in a crate to the cargo department
near you!
add: As per requests; water balloons can now be printed at service
lathe, and entertainment modsuit can now blow long balloons!
image: Balloons will now have an unique sprite when in the inventory,
compared when to on the ground.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: _0Steven <[email protected]>
Co-authored-by: san7890 <[email protected]>
Co-authored-by: Jacquerel <[email protected]>

* Clowns can now make balloon... toys. And also mallets and hats.

* Update storage.dmi

---------

Co-authored-by: YesterdaysPromise <[email protected]>
Co-authored-by: _0Steven <[email protected]>
Co-authored-by: san7890 <[email protected]>
Co-authored-by: Jacquerel <[email protected]>
Co-authored-by: Mal <[email protected]>
ReezeBL pushed a commit that referenced this pull request Apr 11, 2024
…ts. (#1911) (#2837)

* Clowns can now make balloon... toys. And also mallets and hats. (#82288)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Clowns will now start with a box of 24 random long balloons and a
skillchip in their noggin allowing them to create balloon animals by
combining two of them of different colour together. Owners of the
skillchip also gain access to crafting recepies of balloon mallets,
vests, helmets and tophats, all created from long balloons. A crate of
long balloons, with a box of balloons inside, can be bought at cargo, in
case the clown runs out. I might edit this once I wake up, its 3 in the
morning right now.
Oh also, resprited how balloons look in inventory.


![image](https://github.com/tgstation/tgstation/assets/122572637/2d7ce955-c787-48a5-bfda-4613d2eed837)

## Why It's Good For The Game

Balloon animals funny.
Silly features are my favourite kind of features, and this one's
open-ended too.
Someone on the coder chat recommended someone would do it that one time,
here it goes.


## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Added long balloon box to the clown's starting inventory, and a
skill-chip of long lost honk-motherian knowledge to their brain.
add: Added long balloons. Consequently, added balloon animals to make
from such balloons. Also, balloon top hat, vest, helmet, and a mallet.
Don't ask about the mallet.
add: A long balloons box harvested fresh from the farms on the clown
planet will be able to be shipped in a crate to the cargo department
near you!
add: As per requests; water balloons can now be printed at service
lathe, and entertainment modsuit can now blow long balloons!
image: Balloons will now have an unique sprite when in the inventory,
compared when to on the ground.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------





* Clowns can now make balloon... toys. And also mallets and hats.

* Update storage.dmi

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: YesterdaysPromise <[email protected]>
Co-authored-by: _0Steven <[email protected]>
Co-authored-by: san7890 <[email protected]>
Co-authored-by: Jacquerel <[email protected]>
Co-authored-by: Mal <[email protected]>
@AnywayFarus AnywayFarus deleted the upstream-mirror-372 branch June 2, 2024 13:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Map Modification Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота Nova Mirror Sprites Stale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants