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] Fix hub shuttle time (#80819) #1465

Merged
merged 1 commit into from
Jan 6, 2024
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#334

Original: tgstation/tgstation#80819

Was showing a constant "Shuttle: 00:10" in hub
hopefully should no longer show shuttle info if it hasn't actually been called yet

🆑 13spacemen
fix: Hub shuttle time works correctly
/:cl:

[NO GBP] Fix hub shuttle time (#80819)

Was showing a constant "Shuttle: 00:10" in hub
hopefully should no longer show shuttle info if it hasn't actually been
called yet

<!-- 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:
fix: Hub shuttle time works correctly
/: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: 13spacemen <[email protected]>
@Iajret Iajret merged commit cec058a into master Jan 6, 2024
24 checks passed
@Iajret Iajret deleted the upstream-mirror-334 branch January 6, 2024 19:30
AnywayFarus added a commit that referenced this pull request Jan 6, 2024
Iajret pushed a commit that referenced this pull request Mar 19, 2024
* New GaGs clothing: Part 1 - 'Dress'ing up! (#81785)

## About The Pull Request
I'm going to keep this simple, I have added four GaGs configs and the
sprites for some outfits, I intend to expand on the recolouring
abilities, so you will be able to use more than just spraycans.
The outfits are as follows; The Cardigan skirt (formerly named black
skirt), the Evening gown (It's no longer the 'RED' gown, since it can be
any colour), the striped dress and the sailor dress.


![image](https://github.com/tgstation/tgstation/assets/53197594/04c2e2ee-1d26-484e-9dde-b90cb7c33175)

![image](https://github.com/tgstation/tgstation/assets/53197594/e2ca4171-7b28-4fb2-9cc0-e6916367995e)

![image](https://github.com/tgstation/tgstation/assets/53197594/2c5a0985-b4fc-4fc3-8da1-13923f2742fb)

![image](https://github.com/tgstation/tgstation/assets/53197594/537006c0-1e67-4278-89d6-b4e294c335e8)
## Why It's Good For The Game
Customisation is always good, allowing players to express their
character how they want isn't a bad thing!
## Changelog
:cl:
image: added gags sprites for; Sailor dress, Evening gown, Cardigan
skirts and striped dresses.
/:cl:

* New GaGs clothing: Part 1 - 'Dress'ing up!

* Fixing this update paths script for downstreams

It didn't even work before, your welcome downstreams

* Fix paths,

* fix missing icon states, This will...probally fuck things up

* GAGS configs

* attempting this first

---------

Co-authored-by: xXPawnStarrXx <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
ReezeBL pushed a commit that referenced this pull request Mar 20, 2024
* New GaGs clothing: Part 1 - 'Dress'ing up! (#81785)

## About The Pull Request
I'm going to keep this simple, I have added four GaGs configs and the
sprites for some outfits, I intend to expand on the recolouring
abilities, so you will be able to use more than just spraycans.
The outfits are as follows; The Cardigan skirt (formerly named black
skirt), the Evening gown (It's no longer the 'RED' gown, since it can be
any colour), the striped dress and the sailor dress.


![image](https://github.com/tgstation/tgstation/assets/53197594/04c2e2ee-1d26-484e-9dde-b90cb7c33175)

![image](https://github.com/tgstation/tgstation/assets/53197594/e2ca4171-7b28-4fb2-9cc0-e6916367995e)

![image](https://github.com/tgstation/tgstation/assets/53197594/2c5a0985-b4fc-4fc3-8da1-13923f2742fb)

![image](https://github.com/tgstation/tgstation/assets/53197594/537006c0-1e67-4278-89d6-b4e294c335e8)
## Why It's Good For The Game
Customisation is always good, allowing players to express their
character how they want isn't a bad thing!
## Changelog
:cl:
image: added gags sprites for; Sailor dress, Evening gown, Cardigan
skirts and striped dresses.
/:cl:

* New GaGs clothing: Part 1 - 'Dress'ing up!

* Fixing this update paths script for downstreams

It didn't even work before, your welcome downstreams

* Fix paths,

* fix missing icon states, This will...probally fuck things up

* GAGS configs

* attempting this first

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: xXPawnStarrXx <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
Co-authored-by: SomeRandomOwl <[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