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.

Sign up for GitHub

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

Jump to bottom

Ports Different Variants of Nian Plushies and Introduces a Plush Spawner #27450

Merged
merged 23 commits into from
Dec 18, 2024
Merged

Ports Different Variants of Nian Plushies and Introduces a Plush Spawner #27450

merged 23 commits into from
Dec 18, 2024

Conversation

haydenredacted
Copy link
Contributor

@haydenredacted haydenredacted commented Nov 25, 2024 •
edited
Loading

What Does This PR Do

Ports over the different variants of moth plushies made by pigeonverde from beestation.
Adds a new type of spawner that only includes plushies and adds it to the maintenance loot pool
Due to more things being added into the maintenance loot pool, tools and materials have been made more rare.

Why It's Good For The Game

Who doesn't love more plushies especially cute nian ones
More varied maintenance loot also helps spice up each round and more unique spawners helps make mapmaking more fun

Images of changes

moth plushies

Testing

Spawned all the different types of nian plushies.
Saw all the types of plushies in maintenance

Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑
add: Adds more nian plush variants
add: New plushie spawner
tweak: tools and materials spawning in maintenance is more rare
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally Sprites This PR modifies the game sprites labels Nov 25, 2024
@Komrad822
Copy link
Contributor

The plush wars have begun

@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Nov 25, 2024
warriorstar-orion
warriorstar-orion suggested changes Nov 25, 2024
View reviewed changes
Copy link
Contributor

@warriorstar-orion warriorstar-orion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were you going to kill off /obj/random/carp_plushie and /obj/random/plushie in this PR or should I take care of it after this PR goes in?

haydenredacted and others added 8 commits November 25, 2024 12:06
@haydenredacted @warriorstar-orion
remove a value
eb03271 
Co-authored-by: warriorstar-orion <[email protected]>
Signed-off-by: Hayden Redacted <[email protected]>
@haydenredacted @warriorstar-orion
removed a value
8c2edfe 
Co-authored-by: warriorstar-orion <[email protected]>
Signed-off-by: Hayden Redacted <[email protected]>
@haydenredacted @warriorstar-orion
removed a value
2158af0 
Co-authored-by: warriorstar-orion <[email protected]>
Signed-off-by: Hayden Redacted <[email protected]>
@haydenredacted @warriorstar-orion
remove a value
a923ee3 
Co-authored-by: warriorstar-orion <[email protected]>
Signed-off-by: Hayden Redacted <[email protected]>
@haydenredacted @warriorstar-orion
Update code/game/objects/effects/spawners/random/plushie_spawners.dm
7f06a36 
Co-authored-by: warriorstar-orion <[email protected]>
Signed-off-by: Hayden Redacted <[email protected]>
@haydenredacted @warriorstar-orion
Update code/game/objects/effects/spawners/random/plushie_spawners.dm
c5bfa6f 
Co-authored-by: warriorstar-orion <[email protected]>
Signed-off-by: Hayden Redacted <[email protected]>
@haydenredacted
this should fix the conflict
4ae746d
@haydenredacted
Merge branch 'moffplushies' of https://github.com/haydenredacted/Para…
e6e52f0 
…dise into moffplushies
@haydenredacted
Copy link
Contributor Author

Were you going to kill off /obj/random/carp_plushie and /obj/random/plushie in this PR or should I take care of it after this PR goes in?

You can take care of it please.

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Nov 29, 2024
@SynthTwo
Copy link
Contributor

!wiki_label

@github-actions github-actions bot added the Requires Wiki Update Useful for Wiki Contributers to search for things that need updating label Nov 29, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting approval This PR is waiting for approval internally labels Dec 1, 2024
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Dec 7, 2024
Contrabang
Contrabang requested changes Dec 17, 2024
View reviewed changes
@Contrabang Contrabang added this pull request to the merge queue Dec 18, 2024
Merged via the queue into ParadiseSS13:master with commit ed626bf Dec 18, 2024
12 checks passed
@ss220app ss220app bot mentioned this pull request Dec 19, 2024
Merged
AyIong added a commit to ss220club/Paradise-SS220 that referenced this pull request Dec 19, 2024
@AyIong
Merge Upstream 19.12.2024 (#1706)
c911aa4 
This pull request merges upstream/master. Resolve possible conflicts
manually and make sure all the changes are applied correctly.

> [!NOTE]
> Requires Wiki Update:
> ParadiseSS13#27450
> ParadiseSS13#27479

## Changelog
:cl: ParadiseSS13
tweak: Воксы и Серые теперь имеют особые зимние куртки, которые
соответствуют их форме тела.
imageadd: Рюкзаки, сатчели и дюфели, получили респрайт (С TG).
imageadd: Одежда гуманоидных боргов была респрайтнута.
add: Добавлено больше вариантов плюшевых игрушех ниан. 
tweak: Инструменты и материалы спавнятся в техах немного реже.
imageadd: Респрайт обычной/мафия юниформ для драска.
imageadd: Респрайт униформ для Серых.
imageadd: Респрайт следующих униформ для людей и воксов: black,
reallyblack, navy, tan, burgundy, charcoal, checkered, black mafia,
mafia vest, white mafia.
fix: Исправлено мерцание чата в Byond 516 (Скоро бета).
/:cl:
@haydenredacted haydenredacted deleted the moffplushies branch January 1, 2025 04:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@warriorstar-orion warriorstar-orion warriorstar-orion approved these changes

@Contrabang Contrabang Contrabang approved these changes

@Burzah Burzah Burzah approved these changes

Assignees
No one assigned
Labels
-Status: Awaiting review This PR is awaiting review from the review team Requires Wiki Update Useful for Wiki Contributers to search for things that need updating Sprites This PR modifies the game sprites
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@haydenredacted @Komrad822 @SynthTwo @warriorstar-orion @Contrabang @Burzah @ParadiseSS13-Bot