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] qm uses cargo tech icons #1206

Merged
merged 1 commit into from
Dec 20, 2023
Merged

[MIRROR] qm uses cargo tech icons #1206

merged 1 commit into from
Dec 20, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25707
Original PR: tgstation/tgstation#80411

About The Pull Request

qm now has the "x-in-training" intern title instead of "intern quartermaster", similar to the other heads of staff
qm's hud and id card icons are now the cargo tech's icon (but blue), following the other heads of staff which have blue versions of their dept (blue wrench, blue cross, blue... sec badge?? blue exclamation)

Why It's Good For The Game

makes the qm more visually consistent with the other heads, makes it clearer that the qm is the head of the cargo department
the current icon is kinda hard to decipher too? you can tell the cargo tech's is a crate, but the qm's is just like a weird head dude (which the hop already has, making those ids hard to distinguish since theyre both blue)? or a stamp?

Changelog

🆑 Fikou
fix: qm's intern id is now "quartermaster-in-training"
image: qm's id and hud icons now use the cargo tech icons (but blue) to be consistent with the other heads of staff
/:cl:

* qm uses cargo tech icons (#80411)

## About The Pull Request
qm now has the "x-in-training" intern title instead of "intern
quartermaster", similar to the other heads of staff
qm's hud and id card icons are now the cargo tech's icon (but blue),
following the other heads of staff which have blue versions of their
dept (blue wrench, blue cross, blue... sec badge?? blue exclamation)

## Why It's Good For The Game
makes the qm more visually consistent with the other heads, makes it
clearer that the qm is the head of the cargo department
the current icon is kinda hard to decipher too? you can tell the cargo
tech's is a crate, but the qm's is just like a weird head dude (which
the hop already has, making those ids hard to distinguish since theyre
both blue)? or a stamp?

## Changelog
:cl:
fix: qm's intern id is now "quartermaster-in-training"
image: qm's id and hud icons now use the cargo tech icons (but blue) to
be consistent with the other heads of staff
/:cl:

* qm uses cargo tech icons

* Removes the icon from modular as well

* Revert "Removes the icon from modular as well"

This reverts commit ac6a674887ca74a1231a8433373d55aa8df912e8.

* Updates the modular icons with the new version

---------

Co-authored-by: Fikou <[email protected]>
Co-authored-by: Giz <[email protected]>
@ReezeBL ReezeBL merged commit d65fdad into master Dec 20, 2023
23 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-25707 branch December 20, 2023 06:46
AnywayFarus added a commit that referenced this pull request Dec 20, 2023
Iajret pushed a commit that referenced this pull request Feb 29, 2024
… 0 (#1206)

* bloody spreader now deletes itself once `blood_left` reaches 0 (#81723)

## About The Pull Request
This will fix #81626.

## Why It's Good For The Game
See above or below.

## Changelog

:cl:
fix: Meat and other bloody things will not spread blood forever.
/:cl:

* bloody spreader now deletes itself once `blood_left` reaches 0

---------

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