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

Further Resprites #164

Merged
merged 2 commits into from
Oct 13, 2023
Merged

Conversation

TadJohnson00
Copy link
Contributor

Resprites HoS and warden headgear, greatcoat, leather jacket, and overcoat, also removing soft sec hats from secdrobe and adding overcoats to lawdrobe

About the PR

Resprites, edit lawdrobe and secdrobe inventory

Why / Balance

Resprites were necessary, added overcoat to lawdrobe for drip, removed soft hats from secdrobe due to inconsistency with style

Technical details

Nope

Media

just look at the changed files, there's really not much to see here

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

N/A
Changelog

whatever

Resprites HoS and warden headgear, greatcoat, leather jacket, and overcoat, also removing soft sec hats from secdrobe and adding overcoats to lawdrobe
@github-actions github-actions bot added Changes: Sprites Changes: YML Changes any yml files labels Oct 12, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 12, 2023

RSI Diff Bot; head commit 10a0fcf merging into 633644c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified

Resources/Textures/DeltaV/Clothing/Head/Hats/beret_hos.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added

Resources/Textures/DeltaV/Clothing/Head/Hats/beret_warden.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/DeltaV/Clothing/Head/Hats/hoshat.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Head/Hats/warden.rsi

State Old New Status
equipped-HELMET Added
icon Added

Edit: diff updated after 10a0fcf

@ps3moira
Copy link
Contributor

ps3moira commented Oct 12, 2023

I think HoS's cowboy hat was fine as is :( I do think the rest is fine though, but I would like to keep HoS's cowboy hat the same.

@TadJohnson00
Copy link
Contributor Author

But muh colour palette~

@Colin-Tel Colin-Tel merged commit 5708913 into DeltaV-Station:master Oct 13, 2023
12 checks passed
@TadJohnson00 TadJohnson00 deleted the furtherresprite branch November 14, 2023 01:37
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
## Mirror of PR #25856: [Fix rounds restarting in the next
round](space-wizards/space-station-14#25856)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `02cc9c05ddf853b613361690b88ba893ce57bab3`

PR opened by <img
src="https://avatars.githubusercontent.com/u/31366439?v=4"
width="16"/><a href="https://github.com/metalgearsloth">
metalgearsloth</a> at 2024-03-05 07:13:06 UTC
PR merged by <img
src="https://avatars.githubusercontent.com/u/19864447?v=4"
width="16"/><a href="https://github.com/web-flow"> web-flow</a> at
2024-03-12 18:54:28 UTC

---

PR changed 2 files with 10 additions and 2 deletions.

The PR had the following labels:


---

<details open="true"><summary><h1>Original Body</h1></summary>

> Doesn't fix them restarting in lobby I think but should fix most of
it.


</details>

Co-authored-by: metalgearsloth <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants