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] rolls Heavy Sleeper into the new All Nighter quirk, which carries extra... baggage #867

Merged
merged 4 commits into from
Nov 29, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25298
Original PR: tgstation/tgstation#79725

About The Pull Request

Removes the Heavy Sleeper quirk and rolls its effects into the brand new All Nighter! On top of the effects of sleeping longer, All Nighter gives you permanent bags under your eyes as well as a permanent -3 moodlet.

Why It's Good For The Game

I've been wanting for a way to get bags under your eyes for a while, I think it'd be a fun visual aspect that can aid with RP and whatnot. I rolled heavy sleeper into all nighter because the two are both quite similar, and I didn't feel heavy sleeper quite justified itself on it's own.

Here's what the bags look like currently on a variety of skin tones and species:
dreamseeker_Vlc4rDlHaJ

Room for Improvement

Currently drafting for a few reasons. looking for input on all this stuff

  • bag sprites could be improved
  • bags don't work well on moths/grayer skin tones. cest la vie?
  • should heavy sleeper stay? ultimately all I want is bags here, is there a better way of doing this?
  • all quirk elements are not properly applied and removed via VV (no need for input, i can figure this out myself)

Changelog

🆑 wesoda25
add: the All Nighter quirk!
remove: Heavy Sleeper (functionality has been rolled into All Nighter)
/:cl:

…rries extra... baggage [MDB IGNORE] (#25298)

* rolls Heavy Sleeper into the new All Nighter quirk, which carries extra... baggage (#79725)

Removes the Heavy Sleeper quirk and rolls its effects into the brand new
All Nighter! On top of the effects of sleeping longer, All Nighter gives
you permanent bags under your eyes as well as a permanent -3 moodlet.

I've been wanting for a way to get bags under your eyes for a while, I
think it'd be a fun visual aspect that can aid with RP and whatnot. I
rolled heavy sleeper into all nighter because the two are both quite
similar, and I didn't feel heavy sleeper quite justified itself on it's
own.

Here's what the bags look like currently on a variety of skin tones and
species:

![dreamseeker_Vlc4rDlHaJ](https://github.com/tgstation/tgstation/assets/37246588/9bb5ba08-f5c7-4976-9f44-8b9993e2162e)

Currently drafting for a few reasons. looking for input on all this
stuff

- [x] bag sprites could be improved
- [x] bags don't work well on moths/grayer skin tones. cest la vie?
- [x] should heavy sleeper stay? ultimately all I want is bags here, is
there a better way of doing this?
- [x] all quirk elements are not properly applied and removed via VV (no
need for input, i can figure this out myself)

:cl:
add: the All Nighter quirk!
remove: Heavy Sleeper (functionality has been rolled into All Nighter)
/:cl:

* rolls Heavy Sleeper into the new All Nighter quirk, which carries extra... baggage

* Adds back heavy sleeper

* Reorganizes these quirks

* Fixes same icon being used for both quirks

---------

Co-authored-by: wesoda25 <[email protected]>
Co-authored-by: Giz <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror Feature labels Nov 28, 2023
@Iajret Iajret merged commit bd894e5 into master Nov 29, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-25298 branch November 29, 2023 18:34
Iajret pushed a commit that referenced this pull request Feb 9, 2024
* settlers can rename their pets (#81190)

## About The Pull Request
settlers can now rename their tamed pets

## Why It's Good For The Game
adds another fun and harmless interaction between settlers and their
pets

## Changelog
:cl:
add: settlers can rename their pets
/:cl:

---------

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

* settlers can rename their pets

---------

Co-authored-by: Ben10Omintrix <[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
Labels
Feature Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота Sprites TG Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants